diff --git a/Makefile b/Makefile
index 2555f86499229f70f501a734fbfe1b0f7ad4504b..bc985981ab1e65d7be4362008051c09a3456bbc3 100755
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ TTOOL_PATH := $(shell /bin/pwd)
 TTOOL_SRC = $(TTOOL_PATH)/src
 TTOOL_WEBCRAWLER_SRC = $(TTOOL_PATH)/src/web/crawler
 TTOOL_BIN = $(TTOOL_PATH)/bin
-TTOOL_CLASSPATH_BINARY = $(TTOOL_BIN)/JavaPlot.jar:$(TTOOL_BIN)/commons-codec-1.10.jar:$(TTOOL_BIN)/commons-io-2.4-javadoc.jar:$(TTOOL_BIN)/commons-io-2.4.jar:$(TTOOL_BIN)/derby.jar:$(TTOOL_BIN)/derbyclient-10.9.1.0.jar:$(TTOOL_BIN)/derbynet.jar:$(TTOOL_BIN)/dom4j-1.6.1.jar:$(TTOOL_BIN)/jaxen-1.1.6.jar:$(TTOOL_BIN)/jsoup-1.8.1.jar:$(TTOOL_BIN)/opencloud.jar:$(TTOOL_BIN)/gs-core-1.3.jar:.
+TTOOL_CLASSPATH_BINARY = $(TTOOL_BIN)/JavaPlot.jar:$(TTOOL_BIN)/commons-codec-1.10.jar:$(TTOOL_BIN)/commons-io-2.5-javadoc.jar:$(TTOOL_BIN)/commons-io-2.5.jar:$(TTOOL_BIN)/derby.jar:$(TTOOL_BIN)/derbyclient-10.9.1.0.jar:$(TTOOL_BIN)/derbynet.jar:$(TTOOL_BIN)/dom4j-1.6.1.jar:$(TTOOL_BIN)/jaxen-1.1.6.jar:$(TTOOL_BIN)/jsoup-1.8.1.jar:$(TTOOL_BIN)/opencloud.jar:$(TTOOL_BIN)/gs-core-1.3.jar:.
 TTOOL_MODELING = $(TTOOL_PATH)/modeling
 #TTOOL_MODELING = $(TTOOL_PATH)/figures
 TTOOL_EXECUTABLECODE = $(TTOOL_PATH)/executablecode
diff --git a/bin/commons-io-2.5-javadoc.jar b/bin/commons-io-2.5-javadoc.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b9575294aea25ddb56d521a106419af723a64545
Binary files /dev/null and b/bin/commons-io-2.5-javadoc.jar differ
diff --git a/bin/commons-io-2.5.jar b/bin/commons-io-2.5.jar
new file mode 100644
index 0000000000000000000000000000000000000000..12349182711347e3d0b66ecfa35ec7b69a023b7e
Binary files /dev/null and b/bin/commons-io-2.5.jar differ
diff --git a/bin/config.xml b/bin/config.xml
index d3d6c5cd16fb90cd74d1aa58869bb67a99c54e21..be45f75df3fd8b3f2f8af26c5ac3a4e396e1267b 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -63,7 +63,9 @@
 <ExternalCommand2Host data="localhost"/>
 <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/>
 
-<LastOpenFile data="/home/dblouin/Projets/TTool/git/TTool/modeling/AVATAR/CoffeeMachine_Avatar.xml"/>
+<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
+
+<LastOpenFile data="/home/dblouin/Projets/TTool/git/TTool/modeling/DIPLODOCUS/ZigBeeDEMO.xml"/>
 
 
 
diff --git a/build.txt b/build.txt
index 228d5e3054cf58166bcac2a4bc0ab7640dca99a1..8d615eed3a175de51e1a6c4002f8b17d7d23877a 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-12231
\ No newline at end of file
+12244
\ No newline at end of file
diff --git a/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml b/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
index 2f4b72663a66c7dacb7bb3486a16c9bae321335b..e6b203e506fc11bfe60bef8b9bf81da281d35fac 100644
--- a/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
+++ b/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="Avatar Requirement" nameTab="Requirements" >
 <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
@@ -3727,7 +3727,7 @@ or by a maintenance station
 
 </InteractionOverviewDiagramPanel>
 
-<UseCaseDiagramPanel name="Use Case Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<UseCaseDiagramPanel name="Use Case Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="703" id="1881" >
 <cdparam x="107" y="100" />
 <sizeparam width="116" height="50" minWidth="40" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4293,300 +4293,9 @@ or by a maintenance station
 
 </UseCaseDiagramPanel>
 
-<SequenceDiagramPanel name="Heating" minX="10" maxX="1400" minY="10" maxY="900" >
+<SequenceDiagramPanelZV name="Heating" minX="10" maxX="2500" minY="10" maxY="1500" >
 
-</SequenceDiagramPanel>
-
-<SequenceDiagramPanel name="OpenDoorDuringHeating" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="606" id="2245" >
-<cdparam x="712" y="61" />
-<sizeparam width="10" height="287" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="instance" value="MagnetronActuator" />
-<TGConnectingPoint num="0" id="2218" />
-<TGConnectingPoint num="1" id="2219" />
-<TGConnectingPoint num="2" id="2220" />
-<TGConnectingPoint num="3" id="2221" />
-<TGConnectingPoint num="4" id="2222" />
-<TGConnectingPoint num="5" id="2223" />
-<TGConnectingPoint num="6" id="2224" />
-<TGConnectingPoint num="7" id="2225" />
-<TGConnectingPoint num="8" id="2226" />
-<TGConnectingPoint num="9" id="2227" />
-<TGConnectingPoint num="10" id="2228" />
-<TGConnectingPoint num="11" id="2229" />
-<TGConnectingPoint num="12" id="2230" />
-<TGConnectingPoint num="13" id="2231" />
-<TGConnectingPoint num="14" id="2232" />
-<TGConnectingPoint num="15" id="2233" />
-<TGConnectingPoint num="16" id="2234" />
-<TGConnectingPoint num="17" id="2235" />
-<TGConnectingPoint num="18" id="2236" />
-<TGConnectingPoint num="19" id="2237" />
-<TGConnectingPoint num="20" id="2238" />
-<TGConnectingPoint num="21" id="2239" />
-<TGConnectingPoint num="22" id="2240" />
-<TGConnectingPoint num="23" id="2241" />
-<TGConnectingPoint num="24" id="2242" />
-<TGConnectingPoint num="25" id="2243" />
-<TGConnectingPoint num="26" id="2244" />
-<extraparam>
-<Actor data="true" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="2291" >
-<cdparam x="574" y="61" />
-<sizeparam width="10" height="285" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="instance" value="MagnetronDriver" />
-<TGConnectingPoint num="0" id="2264" />
-<TGConnectingPoint num="1" id="2265" />
-<TGConnectingPoint num="2" id="2266" />
-<TGConnectingPoint num="3" id="2267" />
-<TGConnectingPoint num="4" id="2268" />
-<TGConnectingPoint num="5" id="2269" />
-<TGConnectingPoint num="6" id="2270" />
-<TGConnectingPoint num="7" id="2271" />
-<TGConnectingPoint num="8" id="2272" />
-<TGConnectingPoint num="9" id="2273" />
-<TGConnectingPoint num="10" id="2274" />
-<TGConnectingPoint num="11" id="2275" />
-<TGConnectingPoint num="12" id="2276" />
-<TGConnectingPoint num="13" id="2277" />
-<TGConnectingPoint num="14" id="2278" />
-<TGConnectingPoint num="15" id="2279" />
-<TGConnectingPoint num="16" id="2280" />
-<TGConnectingPoint num="17" id="2281" />
-<TGConnectingPoint num="18" id="2282" />
-<TGConnectingPoint num="19" id="2283" />
-<TGConnectingPoint num="20" id="2284" />
-<TGConnectingPoint num="21" id="2285" />
-<TGConnectingPoint num="22" id="2286" />
-<TGConnectingPoint num="23" id="2287" />
-<TGConnectingPoint num="24" id="2288" />
-<TGConnectingPoint num="25" id="2289" />
-<TGConnectingPoint num="26" id="2290" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="609" id="2254" >
-<father id="2291" num="0" />
-<cdparam x="579" y="241" />
-<sizeparam width="32" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="255" />
-<infoparam name="action state" value="end" />
-<TGConnectingPoint num="0" id="2246" />
-<TGConnectingPoint num="1" id="2247" />
-<TGConnectingPoint num="2" id="2248" />
-<TGConnectingPoint num="3" id="2249" />
-<TGConnectingPoint num="4" id="2250" />
-<TGConnectingPoint num="5" id="2251" />
-<TGConnectingPoint num="6" id="2252" />
-<TGConnectingPoint num="7" id="2253" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="609" id="2263" >
-<father id="2291" num="1" />
-<cdparam x="579" y="177" />
-<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="255" />
-<infoparam name="action state" value="magnetronIsOn" />
-<TGConnectingPoint num="0" id="2255" />
-<TGConnectingPoint num="1" id="2256" />
-<TGConnectingPoint num="2" id="2257" />
-<TGConnectingPoint num="3" id="2258" />
-<TGConnectingPoint num="4" id="2259" />
-<TGConnectingPoint num="5" id="2260" />
-<TGConnectingPoint num="6" id="2261" />
-<TGConnectingPoint num="7" id="2262" />
-</SUBCOMPONENT>
-
-<COMPONENT type="606" id="2319" >
-<cdparam x="308" y="61" />
-<sizeparam width="10" height="285" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="instance" value="DoorDriver" />
-<TGConnectingPoint num="0" id="2292" />
-<TGConnectingPoint num="1" id="2293" />
-<TGConnectingPoint num="2" id="2294" />
-<TGConnectingPoint num="3" id="2295" />
-<TGConnectingPoint num="4" id="2296" />
-<TGConnectingPoint num="5" id="2297" />
-<TGConnectingPoint num="6" id="2298" />
-<TGConnectingPoint num="7" id="2299" />
-<TGConnectingPoint num="8" id="2300" />
-<TGConnectingPoint num="9" id="2301" />
-<TGConnectingPoint num="10" id="2302" />
-<TGConnectingPoint num="11" id="2303" />
-<TGConnectingPoint num="12" id="2304" />
-<TGConnectingPoint num="13" id="2305" />
-<TGConnectingPoint num="14" id="2306" />
-<TGConnectingPoint num="15" id="2307" />
-<TGConnectingPoint num="16" id="2308" />
-<TGConnectingPoint num="17" id="2309" />
-<TGConnectingPoint num="18" id="2310" />
-<TGConnectingPoint num="19" id="2311" />
-<TGConnectingPoint num="20" id="2312" />
-<TGConnectingPoint num="21" id="2313" />
-<TGConnectingPoint num="22" id="2314" />
-<TGConnectingPoint num="23" id="2315" />
-<TGConnectingPoint num="24" id="2316" />
-<TGConnectingPoint num="25" id="2317" />
-<TGConnectingPoint num="26" id="2318" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="2356" >
-<cdparam x="443" y="61" />
-<sizeparam width="10" height="284" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="instance" value="Controller" />
-<TGConnectingPoint num="0" id="2329" />
-<TGConnectingPoint num="1" id="2330" />
-<TGConnectingPoint num="2" id="2331" />
-<TGConnectingPoint num="3" id="2332" />
-<TGConnectingPoint num="4" id="2333" />
-<TGConnectingPoint num="5" id="2334" />
-<TGConnectingPoint num="6" id="2335" />
-<TGConnectingPoint num="7" id="2336" />
-<TGConnectingPoint num="8" id="2337" />
-<TGConnectingPoint num="9" id="2338" />
-<TGConnectingPoint num="10" id="2339" />
-<TGConnectingPoint num="11" id="2340" />
-<TGConnectingPoint num="12" id="2341" />
-<TGConnectingPoint num="13" id="2342" />
-<TGConnectingPoint num="14" id="2343" />
-<TGConnectingPoint num="15" id="2344" />
-<TGConnectingPoint num="16" id="2345" />
-<TGConnectingPoint num="17" id="2346" />
-<TGConnectingPoint num="18" id="2347" />
-<TGConnectingPoint num="19" id="2348" />
-<TGConnectingPoint num="20" id="2349" />
-<TGConnectingPoint num="21" id="2350" />
-<TGConnectingPoint num="22" id="2351" />
-<TGConnectingPoint num="23" id="2352" />
-<TGConnectingPoint num="24" id="2353" />
-<TGConnectingPoint num="25" id="2354" />
-<TGConnectingPoint num="26" id="2355" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="602" id="2328" >
-<father id="2356" num="0" />
-<cdparam x="448" y="219" />
-<sizeparam width="169" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="5" maxX="5" minY="10" maxY="254" />
-<infoparam name="action state" value="saveRemainingHeatingTime" />
-<TGConnectingPoint num="0" id="2320" />
-<TGConnectingPoint num="1" id="2321" />
-<TGConnectingPoint num="2" id="2322" />
-<TGConnectingPoint num="3" id="2323" />
-<TGConnectingPoint num="4" id="2324" />
-<TGConnectingPoint num="5" id="2325" />
-<TGConnectingPoint num="6" id="2326" />
-<TGConnectingPoint num="7" id="2327" />
-</SUBCOMPONENT>
-
-<COMPONENT type="606" id="2385" >
-<cdparam x="182" y="61" />
-<sizeparam width="10" height="292" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="instance" value="DoorSensor" />
-<TGConnectingPoint num="0" id="2357" />
-<TGConnectingPoint num="1" id="2358" />
-<TGConnectingPoint num="2" id="2359" />
-<TGConnectingPoint num="3" id="2360" />
-<TGConnectingPoint num="4" id="2361" />
-<TGConnectingPoint num="5" id="2362" />
-<TGConnectingPoint num="6" id="2363" />
-<TGConnectingPoint num="7" id="2364" />
-<TGConnectingPoint num="8" id="2365" />
-<TGConnectingPoint num="9" id="2366" />
-<TGConnectingPoint num="10" id="2367" />
-<TGConnectingPoint num="11" id="2368" />
-<TGConnectingPoint num="12" id="2369" />
-<TGConnectingPoint num="13" id="2370" />
-<TGConnectingPoint num="14" id="2371" />
-<TGConnectingPoint num="15" id="2372" />
-<TGConnectingPoint num="16" id="2373" />
-<TGConnectingPoint num="17" id="2374" />
-<TGConnectingPoint num="18" id="2375" />
-<TGConnectingPoint num="19" id="2376" />
-<TGConnectingPoint num="20" id="2377" />
-<TGConnectingPoint num="21" id="2378" />
-<TGConnectingPoint num="22" id="2379" />
-<TGConnectingPoint num="23" id="2380" />
-<TGConnectingPoint num="24" id="2381" />
-<TGConnectingPoint num="25" id="2382" />
-<TGConnectingPoint num="26" id="2383" />
-<TGConnectingPoint num="27" id="2384" />
-<extraparam>
-<Actor data="true" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="106" id="2386" >
-<cdparam x="313" y="301" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="doorClose()" />
-<P1  x="313" y="301" id="2315" />
-<P2  x="448" y="301" id="2352" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2387" >
-<cdparam x="187" y="271" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="close()" />
-<P1  x="187" y="271" id="2377" />
-<P2  x="313" y="271" id="2312" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2388" >
-<cdparam x="663" y="221" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="turnOff()" />
-<P1  x="579" y="221" id="2279" />
-<P2  x="717" y="221" id="2233" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2389" >
-<cdparam x="488" y="151" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="stopMagnetron()" />
-<P1  x="448" y="151" id="2337" />
-<P2  x="579" y="151" id="2272" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2390" >
-<cdparam x="313" y="121" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="doorOpened()" />
-<P1  x="313" y="121" id="2297" />
-<P2  x="448" y="121" id="2334" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2391" >
-<cdparam x="163" y="91" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="open()" />
-<P1  x="187" y="91" id="2359" />
-<P2  x="313" y="91" id="2294" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-
-</SequenceDiagramPanel>
+</SequenceDiagramPanelZV>
 
 </Modeling>
 
@@ -4646,13 +4355,13 @@ or by a maintenance station
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="2393" >
+<CONNECTOR type="5002" id="2219" >
 <cdparam x="770" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2392" />
-<P1  x="722" y="954" id="2560" />
-<P2  x="727" y="996" id="2411" />
+<TGConnectingPoint num="0" id="2218" />
+<P1  x="722" y="954" id="2386" />
+<P2  x="727" y="996" id="2237" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obs_open()" />
@@ -4664,13 +4373,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2395" >
+<CONNECTOR type="5002" id="2221" >
 <cdparam x="344" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2394" />
-<P1  x="468" y="658" id="2630" />
-<P2  x="173" y="657" id="2655" />
+<TGConnectingPoint num="0" id="2220" />
+<P1  x="468" y="658" id="2456" />
+<P2  x="173" y="657" id="2481" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -4678,15 +4387,15 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2401" >
+<CONNECTOR type="5002" id="2227" >
 <cdparam x="800" y="441" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2398" />
-<TGConnectingPoint num="1" id="2399" />
-<TGConnectingPoint num="2" id="2400" />
-<P1  x="389" y="343" id="2678" />
-<P2  x="873" y="343" id="2679" />
+<TGConnectingPoint num="0" id="2224" />
+<TGConnectingPoint num="1" id="2225" />
+<TGConnectingPoint num="2" id="2226" />
+<P1  x="389" y="343" id="2504" />
+<P2  x="873" y="343" id="2505" />
 <Point x="395" y="310" />
 <Point x="878" y="310" />
 <AutomaticDrawing  data="true" />
@@ -4695,16 +4404,16 @@ or by a maintenance station
 <osd value="out wirelessChannelWrite(Message msg)" />
 <FIFOType asynchronous="true" size="5" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2396" >
-<father id="2401" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2222" >
+<father id="2227" num="0" />
 <cdparam x="395" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2397" >
-<father id="2401" num="1" />
+<SUBCOMPONENT type="-1" id="2223" >
+<father id="2227" num="1" />
 <cdparam x="878" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -4712,13 +4421,13 @@ or by a maintenance station
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="2403" >
+<CONNECTOR type="5002" id="2229" >
 <cdparam x="719" y="481" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2402" />
-<P1  x="476" y="912" id="2557" />
-<P2  x="377" y="911" id="2499" />
+<TGConnectingPoint num="0" id="2228" />
+<P1  x="476" y="912" id="2383" />
+<P2  x="377" y="911" id="2325" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -4726,13 +4435,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2405" >
+<CONNECTOR type="5002" id="2231" >
 <cdparam x="422" y="503" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2404" />
-<P1  x="850" y="926" id="2607" />
-<P2  x="804" y="912" id="2558" />
+<TGConnectingPoint num="0" id="2230" />
+<P1  x="850" y="926" id="2433" />
+<P2  x="804" y="912" id="2384" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in open()" />
@@ -4742,13 +4451,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2407" >
+<CONNECTOR type="5002" id="2233" >
 <cdparam x="714" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2406" />
-<P1  x="804" y="787" id="2547" />
-<P2  x="835" y="698" id="2573" />
+<TGConnectingPoint num="0" id="2232" />
+<P1  x="804" y="787" id="2373" />
+<P2  x="835" y="698" id="2399" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -4758,13 +4467,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2409" >
+<CONNECTOR type="5002" id="2235" >
 <cdparam x="394" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2408" />
-<P1  x="443" y="757" id="2524" />
-<P2  x="476" y="870" id="2548" />
+<TGConnectingPoint num="0" id="2234" />
+<P1  x="443" y="757" id="2350" />
+<P2  x="476" y="870" id="2374" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in LEDOn()" />
@@ -4776,83 +4485,83 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="2434" >
+<COMPONENT type="5000" id="2260" >
 <cdparam x="615" y="996" />
 <sizeparam width="225" height="131" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="ObserverProp1" />
-<TGConnectingPoint num="0" id="2410" />
-<TGConnectingPoint num="1" id="2411" />
-<TGConnectingPoint num="2" id="2412" />
-<TGConnectingPoint num="3" id="2413" />
-<TGConnectingPoint num="4" id="2414" />
-<TGConnectingPoint num="5" id="2415" />
-<TGConnectingPoint num="6" id="2416" />
-<TGConnectingPoint num="7" id="2417" />
-<TGConnectingPoint num="8" id="2418" />
-<TGConnectingPoint num="9" id="2419" />
-<TGConnectingPoint num="10" id="2420" />
-<TGConnectingPoint num="11" id="2421" />
-<TGConnectingPoint num="12" id="2422" />
-<TGConnectingPoint num="13" id="2423" />
-<TGConnectingPoint num="14" id="2424" />
-<TGConnectingPoint num="15" id="2425" />
-<TGConnectingPoint num="16" id="2426" />
-<TGConnectingPoint num="17" id="2427" />
-<TGConnectingPoint num="18" id="2428" />
-<TGConnectingPoint num="19" id="2429" />
-<TGConnectingPoint num="20" id="2430" />
-<TGConnectingPoint num="21" id="2431" />
-<TGConnectingPoint num="22" id="2432" />
-<TGConnectingPoint num="23" id="2433" />
+<TGConnectingPoint num="0" id="2236" />
+<TGConnectingPoint num="1" id="2237" />
+<TGConnectingPoint num="2" id="2238" />
+<TGConnectingPoint num="3" id="2239" />
+<TGConnectingPoint num="4" id="2240" />
+<TGConnectingPoint num="5" id="2241" />
+<TGConnectingPoint num="6" id="2242" />
+<TGConnectingPoint num="7" id="2243" />
+<TGConnectingPoint num="8" id="2244" />
+<TGConnectingPoint num="9" id="2245" />
+<TGConnectingPoint num="10" id="2246" />
+<TGConnectingPoint num="11" id="2247" />
+<TGConnectingPoint num="12" id="2248" />
+<TGConnectingPoint num="13" id="2249" />
+<TGConnectingPoint num="14" id="2250" />
+<TGConnectingPoint num="15" id="2251" />
+<TGConnectingPoint num="16" id="2252" />
+<TGConnectingPoint num="17" id="2253" />
+<TGConnectingPoint num="18" id="2254" />
+<TGConnectingPoint num="19" id="2255" />
+<TGConnectingPoint num="20" id="2256" />
+<TGConnectingPoint num="21" id="2257" />
+<TGConnectingPoint num="22" id="2258" />
+<TGConnectingPoint num="23" id="2259" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in obs_open()" />
-<Signal value="in obs_closed()" />
-<Signal value="in obs_magnetronStart()" />
+<Signal value="in obs_open()" attached="false" />
+<Signal value="in obs_closed()" attached="false" />
+<Signal value="in obs_magnetronStart()" attached="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="2443" >
+<COMPONENT type="5003" id="2269" >
 <cdparam x="384" y="998" />
 <sizeparam width="203" height="93" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="2435" />
-<TGConnectingPoint num="1" id="2436" />
-<TGConnectingPoint num="2" id="2437" />
-<TGConnectingPoint num="3" id="2438" />
-<TGConnectingPoint num="4" id="2439" />
-<TGConnectingPoint num="5" id="2440" />
-<TGConnectingPoint num="6" id="2441" />
-<TGConnectingPoint num="7" id="2442" />
+<TGConnectingPoint num="0" id="2261" />
+<TGConnectingPoint num="1" id="2262" />
+<TGConnectingPoint num="2" id="2263" />
+<TGConnectingPoint num="3" id="2264" />
+<TGConnectingPoint num="4" id="2265" />
+<TGConnectingPoint num="5" id="2266" />
+<TGConnectingPoint num="6" id="2267" />
+<TGConnectingPoint num="7" id="2268" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="2452" >
+<COMPONENT type="5003" id="2278" >
 <cdparam x="150" y="996" />
 <sizeparam width="203" height="90" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="2444" />
-<TGConnectingPoint num="1" id="2445" />
-<TGConnectingPoint num="2" id="2446" />
-<TGConnectingPoint num="3" id="2447" />
-<TGConnectingPoint num="4" id="2448" />
-<TGConnectingPoint num="5" id="2449" />
-<TGConnectingPoint num="6" id="2450" />
-<TGConnectingPoint num="7" id="2451" />
+<TGConnectingPoint num="0" id="2270" />
+<TGConnectingPoint num="1" id="2271" />
+<TGConnectingPoint num="2" id="2272" />
+<TGConnectingPoint num="3" id="2273" />
+<TGConnectingPoint num="4" id="2274" />
+<TGConnectingPoint num="5" id="2275" />
+<TGConnectingPoint num="6" id="2276" />
+<TGConnectingPoint num="7" id="2277" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="2469" >
+<COMPONENT type="301" id="2295" >
 <cdparam x="125" y="225" />
 <sizeparam width="586" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -4862,22 +4571,22 @@ or by a maintenance station
 
 #InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK
 " />
-<TGConnectingPoint num="0" id="2453" />
-<TGConnectingPoint num="1" id="2454" />
-<TGConnectingPoint num="2" id="2455" />
-<TGConnectingPoint num="3" id="2456" />
-<TGConnectingPoint num="4" id="2457" />
-<TGConnectingPoint num="5" id="2458" />
-<TGConnectingPoint num="6" id="2459" />
-<TGConnectingPoint num="7" id="2460" />
-<TGConnectingPoint num="8" id="2461" />
-<TGConnectingPoint num="9" id="2462" />
-<TGConnectingPoint num="10" id="2463" />
-<TGConnectingPoint num="11" id="2464" />
-<TGConnectingPoint num="12" id="2465" />
-<TGConnectingPoint num="13" id="2466" />
-<TGConnectingPoint num="14" id="2467" />
-<TGConnectingPoint num="15" id="2468" />
+<TGConnectingPoint num="0" id="2279" />
+<TGConnectingPoint num="1" id="2280" />
+<TGConnectingPoint num="2" id="2281" />
+<TGConnectingPoint num="3" id="2282" />
+<TGConnectingPoint num="4" id="2283" />
+<TGConnectingPoint num="5" id="2284" />
+<TGConnectingPoint num="6" id="2285" />
+<TGConnectingPoint num="7" id="2286" />
+<TGConnectingPoint num="8" id="2287" />
+<TGConnectingPoint num="9" id="2288" />
+<TGConnectingPoint num="10" id="2289" />
+<TGConnectingPoint num="11" id="2290" />
+<TGConnectingPoint num="12" id="2291" />
+<TGConnectingPoint num="13" id="2292" />
+<TGConnectingPoint num="14" id="2293" />
+<TGConnectingPoint num="15" id="2294" />
 <extraparam>
 <Line value="#Confidentiality RemoteControl.duration" />
 <Line value="#Authenticity RemoteControl.SendingRemoteOrder.msg1 WirelessInterface.gotWirelessOrder.msg2" />
@@ -4886,75 +4595,75 @@ or by a maintenance station
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="2694" >
+<COMPONENT type="5000" id="2520" >
 <cdparam x="148" y="343" />
 <sizeparam width="967" height="631" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="RemotelyControlledMicrowave" />
-<TGConnectingPoint num="0" id="2670" />
-<TGConnectingPoint num="1" id="2671" />
-<TGConnectingPoint num="2" id="2672" />
-<TGConnectingPoint num="3" id="2673" />
-<TGConnectingPoint num="4" id="2674" />
-<TGConnectingPoint num="5" id="2675" />
-<TGConnectingPoint num="6" id="2676" />
-<TGConnectingPoint num="7" id="2677" />
-<TGConnectingPoint num="8" id="2678" />
-<TGConnectingPoint num="9" id="2679" />
-<TGConnectingPoint num="10" id="2680" />
-<TGConnectingPoint num="11" id="2681" />
-<TGConnectingPoint num="12" id="2682" />
-<TGConnectingPoint num="13" id="2683" />
-<TGConnectingPoint num="14" id="2684" />
-<TGConnectingPoint num="15" id="2685" />
-<TGConnectingPoint num="16" id="2686" />
-<TGConnectingPoint num="17" id="2687" />
-<TGConnectingPoint num="18" id="2688" />
-<TGConnectingPoint num="19" id="2689" />
-<TGConnectingPoint num="20" id="2690" />
-<TGConnectingPoint num="21" id="2691" />
-<TGConnectingPoint num="22" id="2692" />
-<TGConnectingPoint num="23" id="2693" />
+<TGConnectingPoint num="0" id="2496" />
+<TGConnectingPoint num="1" id="2497" />
+<TGConnectingPoint num="2" id="2498" />
+<TGConnectingPoint num="3" id="2499" />
+<TGConnectingPoint num="4" id="2500" />
+<TGConnectingPoint num="5" id="2501" />
+<TGConnectingPoint num="6" id="2502" />
+<TGConnectingPoint num="7" id="2503" />
+<TGConnectingPoint num="8" id="2504" />
+<TGConnectingPoint num="9" id="2505" />
+<TGConnectingPoint num="10" id="2506" />
+<TGConnectingPoint num="11" id="2507" />
+<TGConnectingPoint num="12" id="2508" />
+<TGConnectingPoint num="13" id="2509" />
+<TGConnectingPoint num="14" id="2510" />
+<TGConnectingPoint num="15" id="2511" />
+<TGConnectingPoint num="16" id="2512" />
+<TGConnectingPoint num="17" id="2513" />
+<TGConnectingPoint num="18" id="2514" />
+<TGConnectingPoint num="19" id="2515" />
+<TGConnectingPoint num="20" id="2516" />
+<TGConnectingPoint num="21" id="2517" />
+<TGConnectingPoint num="22" id="2518" />
+<TGConnectingPoint num="23" id="2519" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in wirelessChannelRead(Message msg)" />
-<Signal value="out wirelessChannelWrite(Message msg)" />
+<Signal value="in wirelessChannelRead(Message msg)" attached="false" />
+<Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="2494" >
-<father id="2694" num="0" />
+<SUBCOMPONENT type="5000" id="2320" >
+<father id="2520" num="0" />
 <cdparam x="491" y="390" />
 <sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
 <infoparam name="Block0" value="RemoteControl" />
-<TGConnectingPoint num="0" id="2470" />
-<TGConnectingPoint num="1" id="2471" />
-<TGConnectingPoint num="2" id="2472" />
-<TGConnectingPoint num="3" id="2473" />
-<TGConnectingPoint num="4" id="2474" />
-<TGConnectingPoint num="5" id="2475" />
-<TGConnectingPoint num="6" id="2476" />
-<TGConnectingPoint num="7" id="2477" />
-<TGConnectingPoint num="8" id="2478" />
-<TGConnectingPoint num="9" id="2479" />
-<TGConnectingPoint num="10" id="2480" />
-<TGConnectingPoint num="11" id="2481" />
-<TGConnectingPoint num="12" id="2482" />
-<TGConnectingPoint num="13" id="2483" />
-<TGConnectingPoint num="14" id="2484" />
-<TGConnectingPoint num="15" id="2485" />
-<TGConnectingPoint num="16" id="2486" />
-<TGConnectingPoint num="17" id="2487" />
-<TGConnectingPoint num="18" id="2488" />
-<TGConnectingPoint num="19" id="2489" />
-<TGConnectingPoint num="20" id="2490" />
-<TGConnectingPoint num="21" id="2491" />
-<TGConnectingPoint num="22" id="2492" />
-<TGConnectingPoint num="23" id="2493" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="2296" />
+<TGConnectingPoint num="1" id="2297" />
+<TGConnectingPoint num="2" id="2298" />
+<TGConnectingPoint num="3" id="2299" />
+<TGConnectingPoint num="4" id="2300" />
+<TGConnectingPoint num="5" id="2301" />
+<TGConnectingPoint num="6" id="2302" />
+<TGConnectingPoint num="7" id="2303" />
+<TGConnectingPoint num="8" id="2304" />
+<TGConnectingPoint num="9" id="2305" />
+<TGConnectingPoint num="10" id="2306" />
+<TGConnectingPoint num="11" id="2307" />
+<TGConnectingPoint num="12" id="2308" />
+<TGConnectingPoint num="13" id="2309" />
+<TGConnectingPoint num="14" id="2310" />
+<TGConnectingPoint num="15" id="2311" />
+<TGConnectingPoint num="16" id="2312" />
+<TGConnectingPoint num="17" id="2313" />
+<TGConnectingPoint num="18" id="2314" />
+<TGConnectingPoint num="19" id="2315" />
+<TGConnectingPoint num="20" id="2316" />
+<TGConnectingPoint num="21" id="2317" />
+<TGConnectingPoint num="22" id="2318" />
+<TGConnectingPoint num="23" id="2319" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="duration" value="12" type="8" typeOther="" />
 <Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
@@ -4970,81 +4679,91 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 <globalCode value="" />
 <globalCode value="/* This is my global code !!!! */" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2669" >
-<father id="2694" num="1" />
+<SUBCOMPONENT type="5000" id="2495" >
+<father id="2520" num="1" />
 <cdparam x="173" y="554" />
 <sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
 <infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="2645" />
-<TGConnectingPoint num="1" id="2646" />
-<TGConnectingPoint num="2" id="2647" />
-<TGConnectingPoint num="3" id="2648" />
-<TGConnectingPoint num="4" id="2649" />
-<TGConnectingPoint num="5" id="2650" />
-<TGConnectingPoint num="6" id="2651" />
-<TGConnectingPoint num="7" id="2652" />
-<TGConnectingPoint num="8" id="2653" />
-<TGConnectingPoint num="9" id="2654" />
-<TGConnectingPoint num="10" id="2655" />
-<TGConnectingPoint num="11" id="2656" />
-<TGConnectingPoint num="12" id="2657" />
-<TGConnectingPoint num="13" id="2658" />
-<TGConnectingPoint num="14" id="2659" />
-<TGConnectingPoint num="15" id="2660" />
-<TGConnectingPoint num="16" id="2661" />
-<TGConnectingPoint num="17" id="2662" />
-<TGConnectingPoint num="18" id="2663" />
-<TGConnectingPoint num="19" id="2664" />
-<TGConnectingPoint num="20" id="2665" />
-<TGConnectingPoint num="21" id="2666" />
-<TGConnectingPoint num="22" id="2667" />
-<TGConnectingPoint num="23" id="2668" />
+<TGConnectingPoint num="0" id="2471" />
+<TGConnectingPoint num="1" id="2472" />
+<TGConnectingPoint num="2" id="2473" />
+<TGConnectingPoint num="3" id="2474" />
+<TGConnectingPoint num="4" id="2475" />
+<TGConnectingPoint num="5" id="2476" />
+<TGConnectingPoint num="6" id="2477" />
+<TGConnectingPoint num="7" id="2478" />
+<TGConnectingPoint num="8" id="2479" />
+<TGConnectingPoint num="9" id="2480" />
+<TGConnectingPoint num="10" id="2481" />
+<TGConnectingPoint num="11" id="2482" />
+<TGConnectingPoint num="12" id="2483" />
+<TGConnectingPoint num="13" id="2484" />
+<TGConnectingPoint num="14" id="2485" />
+<TGConnectingPoint num="15" id="2486" />
+<TGConnectingPoint num="16" id="2487" />
+<TGConnectingPoint num="17" id="2488" />
+<TGConnectingPoint num="18" id="2489" />
+<TGConnectingPoint num="19" id="2490" />
+<TGConnectingPoint num="20" id="2491" />
+<TGConnectingPoint num="21" id="2492" />
+<TGConnectingPoint num="22" id="2493" />
+<TGConnectingPoint num="23" id="2494" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" />
+<Signal value="in remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2519" >
-<father id="2669" num="0" />
+<SUBCOMPONENT type="5000" id="2345" >
+<father id="2495" num="0" />
 <cdparam x="196" y="864" />
 <sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
 <infoparam name="Block0" value="Bell" />
-<TGConnectingPoint num="0" id="2495" />
-<TGConnectingPoint num="1" id="2496" />
-<TGConnectingPoint num="2" id="2497" />
-<TGConnectingPoint num="3" id="2498" />
-<TGConnectingPoint num="4" id="2499" />
-<TGConnectingPoint num="5" id="2500" />
-<TGConnectingPoint num="6" id="2501" />
-<TGConnectingPoint num="7" id="2502" />
-<TGConnectingPoint num="8" id="2503" />
-<TGConnectingPoint num="9" id="2504" />
-<TGConnectingPoint num="10" id="2505" />
-<TGConnectingPoint num="11" id="2506" />
-<TGConnectingPoint num="12" id="2507" />
-<TGConnectingPoint num="13" id="2508" />
-<TGConnectingPoint num="14" id="2509" />
-<TGConnectingPoint num="15" id="2510" />
-<TGConnectingPoint num="16" id="2511" />
-<TGConnectingPoint num="17" id="2512" />
-<TGConnectingPoint num="18" id="2513" />
-<TGConnectingPoint num="19" id="2514" />
-<TGConnectingPoint num="20" id="2515" />
-<TGConnectingPoint num="21" id="2516" />
-<TGConnectingPoint num="22" id="2517" />
-<TGConnectingPoint num="23" id="2518" />
+<TGConnectingPoint num="0" id="2321" />
+<TGConnectingPoint num="1" id="2322" />
+<TGConnectingPoint num="2" id="2323" />
+<TGConnectingPoint num="3" id="2324" />
+<TGConnectingPoint num="4" id="2325" />
+<TGConnectingPoint num="5" id="2326" />
+<TGConnectingPoint num="6" id="2327" />
+<TGConnectingPoint num="7" id="2328" />
+<TGConnectingPoint num="8" id="2329" />
+<TGConnectingPoint num="9" id="2330" />
+<TGConnectingPoint num="10" id="2331" />
+<TGConnectingPoint num="11" id="2332" />
+<TGConnectingPoint num="12" id="2333" />
+<TGConnectingPoint num="13" id="2334" />
+<TGConnectingPoint num="14" id="2335" />
+<TGConnectingPoint num="15" id="2336" />
+<TGConnectingPoint num="16" id="2337" />
+<TGConnectingPoint num="17" id="2338" />
+<TGConnectingPoint num="18" id="2339" />
+<TGConnectingPoint num="19" id="2340" />
+<TGConnectingPoint num="20" id="2341" />
+<TGConnectingPoint num="21" id="2342" />
+<TGConnectingPoint num="22" id="2343" />
+<TGConnectingPoint num="23" id="2344" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$runBell()" />
-<Signal value="in ring()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
@@ -5054,93 +4773,93 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2544" >
-<father id="2669" num="1" />
+<SUBCOMPONENT type="5000" id="2370" >
+<father id="2495" num="1" />
 <cdparam x="187" y="676" />
 <sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
 <infoparam name="Block0" value="ControlPanel" />
-<TGConnectingPoint num="0" id="2520" />
-<TGConnectingPoint num="1" id="2521" />
-<TGConnectingPoint num="2" id="2522" />
-<TGConnectingPoint num="3" id="2523" />
-<TGConnectingPoint num="4" id="2524" />
-<TGConnectingPoint num="5" id="2525" />
-<TGConnectingPoint num="6" id="2526" />
-<TGConnectingPoint num="7" id="2527" />
-<TGConnectingPoint num="8" id="2528" />
-<TGConnectingPoint num="9" id="2529" />
-<TGConnectingPoint num="10" id="2530" />
-<TGConnectingPoint num="11" id="2531" />
-<TGConnectingPoint num="12" id="2532" />
-<TGConnectingPoint num="13" id="2533" />
-<TGConnectingPoint num="14" id="2534" />
-<TGConnectingPoint num="15" id="2535" />
-<TGConnectingPoint num="16" id="2536" />
-<TGConnectingPoint num="17" id="2537" />
-<TGConnectingPoint num="18" id="2538" />
-<TGConnectingPoint num="19" id="2539" />
-<TGConnectingPoint num="20" id="2540" />
-<TGConnectingPoint num="21" id="2541" />
-<TGConnectingPoint num="22" id="2542" />
-<TGConnectingPoint num="23" id="2543" />
+<TGConnectingPoint num="0" id="2346" />
+<TGConnectingPoint num="1" id="2347" />
+<TGConnectingPoint num="2" id="2348" />
+<TGConnectingPoint num="3" id="2349" />
+<TGConnectingPoint num="4" id="2350" />
+<TGConnectingPoint num="5" id="2351" />
+<TGConnectingPoint num="6" id="2352" />
+<TGConnectingPoint num="7" id="2353" />
+<TGConnectingPoint num="8" id="2354" />
+<TGConnectingPoint num="9" id="2355" />
+<TGConnectingPoint num="10" id="2356" />
+<TGConnectingPoint num="11" id="2357" />
+<TGConnectingPoint num="12" id="2358" />
+<TGConnectingPoint num="13" id="2359" />
+<TGConnectingPoint num="14" id="2360" />
+<TGConnectingPoint num="15" id="2361" />
+<TGConnectingPoint num="16" id="2362" />
+<TGConnectingPoint num="17" id="2363" />
+<TGConnectingPoint num="18" id="2364" />
+<TGConnectingPoint num="19" id="2365" />
+<TGConnectingPoint num="20" id="2366" />
+<TGConnectingPoint num="21" id="2367" />
+<TGConnectingPoint num="22" id="2368" />
+<TGConnectingPoint num="23" id="2369" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2569" >
-<father id="2669" num="2" />
+<SUBCOMPONENT type="5000" id="2395" >
+<father id="2495" num="2" />
 <cdparam x="476" y="787" />
 <sizeparam width="328" height="167" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="593" minY="0" maxY="245" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="2545" />
-<TGConnectingPoint num="1" id="2546" />
-<TGConnectingPoint num="2" id="2547" />
-<TGConnectingPoint num="3" id="2548" />
-<TGConnectingPoint num="4" id="2549" />
-<TGConnectingPoint num="5" id="2550" />
-<TGConnectingPoint num="6" id="2551" />
-<TGConnectingPoint num="7" id="2552" />
-<TGConnectingPoint num="8" id="2553" />
-<TGConnectingPoint num="9" id="2554" />
-<TGConnectingPoint num="10" id="2555" />
-<TGConnectingPoint num="11" id="2556" />
-<TGConnectingPoint num="12" id="2557" />
-<TGConnectingPoint num="13" id="2558" />
-<TGConnectingPoint num="14" id="2559" />
-<TGConnectingPoint num="15" id="2560" />
-<TGConnectingPoint num="16" id="2561" />
-<TGConnectingPoint num="17" id="2562" />
-<TGConnectingPoint num="18" id="2563" />
-<TGConnectingPoint num="19" id="2564" />
-<TGConnectingPoint num="20" id="2565" />
-<TGConnectingPoint num="21" id="2566" />
-<TGConnectingPoint num="22" id="2567" />
-<TGConnectingPoint num="23" id="2568" />
+<TGConnectingPoint num="0" id="2371" />
+<TGConnectingPoint num="1" id="2372" />
+<TGConnectingPoint num="2" id="2373" />
+<TGConnectingPoint num="3" id="2374" />
+<TGConnectingPoint num="4" id="2375" />
+<TGConnectingPoint num="5" id="2376" />
+<TGConnectingPoint num="6" id="2377" />
+<TGConnectingPoint num="7" id="2378" />
+<TGConnectingPoint num="8" id="2379" />
+<TGConnectingPoint num="9" id="2380" />
+<TGConnectingPoint num="10" id="2381" />
+<TGConnectingPoint num="11" id="2382" />
+<TGConnectingPoint num="12" id="2383" />
+<TGConnectingPoint num="13" id="2384" />
+<TGConnectingPoint num="14" id="2385" />
+<TGConnectingPoint num="15" id="2386" />
+<TGConnectingPoint num="16" id="2387" />
+<TGConnectingPoint num="17" id="2388" />
+<TGConnectingPoint num="18" id="2389" />
+<TGConnectingPoint num="19" id="2390" />
+<TGConnectingPoint num="20" id="2391" />
+<TGConnectingPoint num="21" id="2392" />
+<TGConnectingPoint num="22" id="2393" />
+<TGConnectingPoint num="23" id="2394" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
 <Method value="$startCooking(int duration)" />
 <Method value="$durationModified(int duration)" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out obs_open()" />
-<Signal value="out obs_closed()" />
-<Signal value="out obs_magnetronStart()" />
+<Signal value="in start(int duration)" attached="false" />
+<Signal value="in closed()" attached="false" />
+<Signal value="in open()" attached="false" />
+<Signal value="out ringBell()" attached="false" />
+<Signal value="out startMagnetron()" attached="false" />
+<Signal value="out stopMagnetron()" attached="false" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out obs_open()" attached="false" />
+<Signal value="out obs_closed()" attached="false" />
+<Signal value="out obs_magnetronStart()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dur = &quot;Duration&quot;;" />
@@ -5171,44 +4890,44 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2594" >
-<father id="2669" num="3" />
+<SUBCOMPONENT type="5000" id="2420" >
+<father id="2495" num="3" />
 <cdparam x="835" y="618" />
 <sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
 <infoparam name="Block0" value="Magnetron" />
-<TGConnectingPoint num="0" id="2570" />
-<TGConnectingPoint num="1" id="2571" />
-<TGConnectingPoint num="2" id="2572" />
-<TGConnectingPoint num="3" id="2573" />
-<TGConnectingPoint num="4" id="2574" />
-<TGConnectingPoint num="5" id="2575" />
-<TGConnectingPoint num="6" id="2576" />
-<TGConnectingPoint num="7" id="2577" />
-<TGConnectingPoint num="8" id="2578" />
-<TGConnectingPoint num="9" id="2579" />
-<TGConnectingPoint num="10" id="2580" />
-<TGConnectingPoint num="11" id="2581" />
-<TGConnectingPoint num="12" id="2582" />
-<TGConnectingPoint num="13" id="2583" />
-<TGConnectingPoint num="14" id="2584" />
-<TGConnectingPoint num="15" id="2585" />
-<TGConnectingPoint num="16" id="2586" />
-<TGConnectingPoint num="17" id="2587" />
-<TGConnectingPoint num="18" id="2588" />
-<TGConnectingPoint num="19" id="2589" />
-<TGConnectingPoint num="20" id="2590" />
-<TGConnectingPoint num="21" id="2591" />
-<TGConnectingPoint num="22" id="2592" />
-<TGConnectingPoint num="23" id="2593" />
+<TGConnectingPoint num="0" id="2396" />
+<TGConnectingPoint num="1" id="2397" />
+<TGConnectingPoint num="2" id="2398" />
+<TGConnectingPoint num="3" id="2399" />
+<TGConnectingPoint num="4" id="2400" />
+<TGConnectingPoint num="5" id="2401" />
+<TGConnectingPoint num="6" id="2402" />
+<TGConnectingPoint num="7" id="2403" />
+<TGConnectingPoint num="8" id="2404" />
+<TGConnectingPoint num="9" id="2405" />
+<TGConnectingPoint num="10" id="2406" />
+<TGConnectingPoint num="11" id="2407" />
+<TGConnectingPoint num="12" id="2408" />
+<TGConnectingPoint num="13" id="2409" />
+<TGConnectingPoint num="14" id="2410" />
+<TGConnectingPoint num="15" id="2411" />
+<TGConnectingPoint num="16" id="2412" />
+<TGConnectingPoint num="17" id="2413" />
+<TGConnectingPoint num="18" id="2414" />
+<TGConnectingPoint num="19" id="2415" />
+<TGConnectingPoint num="20" id="2416" />
+<TGConnectingPoint num="21" id="2417" />
+<TGConnectingPoint num="22" id="2418" />
+<TGConnectingPoint num="23" id="2419" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="power" value="0" type="8" typeOther="" />
 <Method value="$ON()" />
 <Method value="$OFF()" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="" />
@@ -5221,43 +4940,43 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2619" >
-<father id="2669" num="4" />
+<SUBCOMPONENT type="5000" id="2445" >
+<father id="2495" num="4" />
 <cdparam x="850" y="832" />
 <sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
 <infoparam name="Block0" value="Door" />
-<TGConnectingPoint num="0" id="2595" />
-<TGConnectingPoint num="1" id="2596" />
-<TGConnectingPoint num="2" id="2597" />
-<TGConnectingPoint num="3" id="2598" />
-<TGConnectingPoint num="4" id="2599" />
-<TGConnectingPoint num="5" id="2600" />
-<TGConnectingPoint num="6" id="2601" />
-<TGConnectingPoint num="7" id="2602" />
-<TGConnectingPoint num="8" id="2603" />
-<TGConnectingPoint num="9" id="2604" />
-<TGConnectingPoint num="10" id="2605" />
-<TGConnectingPoint num="11" id="2606" />
-<TGConnectingPoint num="12" id="2607" />
-<TGConnectingPoint num="13" id="2608" />
-<TGConnectingPoint num="14" id="2609" />
-<TGConnectingPoint num="15" id="2610" />
-<TGConnectingPoint num="16" id="2611" />
-<TGConnectingPoint num="17" id="2612" />
-<TGConnectingPoint num="18" id="2613" />
-<TGConnectingPoint num="19" id="2614" />
-<TGConnectingPoint num="20" id="2615" />
-<TGConnectingPoint num="21" id="2616" />
-<TGConnectingPoint num="22" id="2617" />
-<TGConnectingPoint num="23" id="2618" />
+<TGConnectingPoint num="0" id="2421" />
+<TGConnectingPoint num="1" id="2422" />
+<TGConnectingPoint num="2" id="2423" />
+<TGConnectingPoint num="3" id="2424" />
+<TGConnectingPoint num="4" id="2425" />
+<TGConnectingPoint num="5" id="2426" />
+<TGConnectingPoint num="6" id="2427" />
+<TGConnectingPoint num="7" id="2428" />
+<TGConnectingPoint num="8" id="2429" />
+<TGConnectingPoint num="9" id="2430" />
+<TGConnectingPoint num="10" id="2431" />
+<TGConnectingPoint num="11" id="2432" />
+<TGConnectingPoint num="12" id="2433" />
+<TGConnectingPoint num="13" id="2434" />
+<TGConnectingPoint num="14" id="2435" />
+<TGConnectingPoint num="15" id="2436" />
+<TGConnectingPoint num="16" id="2437" />
+<TGConnectingPoint num="17" id="2438" />
+<TGConnectingPoint num="18" id="2439" />
+<TGConnectingPoint num="19" id="2440" />
+<TGConnectingPoint num="20" id="2441" />
+<TGConnectingPoint num="21" id="2442" />
+<TGConnectingPoint num="22" id="2443" />
+<TGConnectingPoint num="23" id="2444" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$openM()" />
 <Method value="$closeM()" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
 <globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
@@ -5273,39 +4992,39 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2644" >
-<father id="2669" num="5" />
+<SUBCOMPONENT type="5000" id="2470" >
+<father id="2495" num="5" />
 <cdparam x="468" y="620" />
 <sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
 <infoparam name="Block0" value="WirelessInterface" />
-<TGConnectingPoint num="0" id="2620" />
-<TGConnectingPoint num="1" id="2621" />
-<TGConnectingPoint num="2" id="2622" />
-<TGConnectingPoint num="3" id="2623" />
-<TGConnectingPoint num="4" id="2624" />
-<TGConnectingPoint num="5" id="2625" />
-<TGConnectingPoint num="6" id="2626" />
-<TGConnectingPoint num="7" id="2627" />
-<TGConnectingPoint num="8" id="2628" />
-<TGConnectingPoint num="9" id="2629" />
-<TGConnectingPoint num="10" id="2630" />
-<TGConnectingPoint num="11" id="2631" />
-<TGConnectingPoint num="12" id="2632" />
-<TGConnectingPoint num="13" id="2633" />
-<TGConnectingPoint num="14" id="2634" />
-<TGConnectingPoint num="15" id="2635" />
-<TGConnectingPoint num="16" id="2636" />
-<TGConnectingPoint num="17" id="2637" />
-<TGConnectingPoint num="18" id="2638" />
-<TGConnectingPoint num="19" id="2639" />
-<TGConnectingPoint num="20" id="2640" />
-<TGConnectingPoint num="21" id="2641" />
-<TGConnectingPoint num="22" id="2642" />
-<TGConnectingPoint num="23" id="2643" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="2446" />
+<TGConnectingPoint num="1" id="2447" />
+<TGConnectingPoint num="2" id="2448" />
+<TGConnectingPoint num="3" id="2449" />
+<TGConnectingPoint num="4" id="2450" />
+<TGConnectingPoint num="5" id="2451" />
+<TGConnectingPoint num="6" id="2452" />
+<TGConnectingPoint num="7" id="2453" />
+<TGConnectingPoint num="8" id="2454" />
+<TGConnectingPoint num="9" id="2455" />
+<TGConnectingPoint num="10" id="2456" />
+<TGConnectingPoint num="11" id="2457" />
+<TGConnectingPoint num="12" id="2458" />
+<TGConnectingPoint num="13" id="2459" />
+<TGConnectingPoint num="14" id="2460" />
+<TGConnectingPoint num="15" id="2461" />
+<TGConnectingPoint num="16" id="2462" />
+<TGConnectingPoint num="17" id="2463" />
+<TGConnectingPoint num="18" id="2464" />
+<TGConnectingPoint num="19" id="2465" />
+<TGConnectingPoint num="20" id="2466" />
+<TGConnectingPoint num="21" id="2467" />
+<TGConnectingPoint num="22" id="2468" />
+<TGConnectingPoint num="23" id="2469" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
@@ -5321,7 +5040,17 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Signal value="out remoteStart(int value)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Signal value="out remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5329,25 +5058,25 @@ or by a maintenance station
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ObserverProp1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2701" >
+<CONNECTOR type="5102" id="2527" >
 <cdparam x="395" y="433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2700" />
-<P1  x="395" y="433" id="2814" />
-<P2  x="395" y="450" id="2773" />
+<TGConnectingPoint num="0" id="2526" />
+<P1  x="395" y="433" id="2640" />
+<P2  x="395" y="450" id="2599" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2699" >
-<father id="2701" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2525" >
+<father id="2527" num="0" />
 <cdparam x="395" y="473" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2695" />
-<TGConnectingPoint num="1" id="2696" />
-<TGConnectingPoint num="2" id="2697" />
-<TGConnectingPoint num="3" id="2698" />
+<TGConnectingPoint num="0" id="2521" />
+<TGConnectingPoint num="1" id="2522" />
+<TGConnectingPoint num="2" id="2523" />
+<TGConnectingPoint num="3" id="2524" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5357,25 +5086,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2708" >
+<CONNECTOR type="5102" id="2534" >
 <cdparam x="303" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2707" />
-<P1  x="303" y="356" id="2861" />
-<P2  x="395" y="403" id="2813" />
+<TGConnectingPoint num="0" id="2533" />
+<P1  x="303" y="356" id="2687" />
+<P2  x="395" y="403" id="2639" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2706" >
-<father id="2708" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2532" >
+<father id="2534" num="0" />
 <cdparam x="303" y="396" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2702" />
-<TGConnectingPoint num="1" id="2703" />
-<TGConnectingPoint num="2" id="2704" />
-<TGConnectingPoint num="3" id="2705" />
+<TGConnectingPoint num="0" id="2528" />
+<TGConnectingPoint num="1" id="2529" />
+<TGConnectingPoint num="2" id="2530" />
+<TGConnectingPoint num="3" id="2531" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5385,55 +5114,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2721" >
+<CONNECTOR type="5102" id="2547" >
 <cdparam x="436" y="285" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2717" />
-<TGConnectingPoint num="1" id="2718" />
-<TGConnectingPoint num="2" id="2719" />
-<TGConnectingPoint num="3" id="2720" />
-<P1  x="436" y="285" id="2825" />
-<P2  x="409" y="180" id="2909" />
+<TGConnectingPoint num="0" id="2543" />
+<TGConnectingPoint num="1" id="2544" />
+<TGConnectingPoint num="2" id="2545" />
+<TGConnectingPoint num="3" id="2546" />
+<P1  x="436" y="285" id="2651" />
+<P2  x="409" y="180" id="2735" />
 <Point x="436" y="302" />
 <Point x="554" y="302" />
 <Point x="554" y="180" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2709" >
-<father id="2721" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2535" >
+<father id="2547" num="0" />
 <cdparam x="436" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2710" >
-<father id="2721" num="1" />
+<SUBCOMPONENT type="-1" id="2536" >
+<father id="2547" num="1" />
 <cdparam x="554" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2711" >
-<father id="2721" num="2" />
+<SUBCOMPONENT type="-1" id="2537" >
+<father id="2547" num="2" />
 <cdparam x="554" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2716" >
-<father id="2721" num="3" />
+<SUBCOMPONENT type="-1" id="2542" >
+<father id="2547" num="3" />
 <cdparam x="436" y="325" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2712" />
-<TGConnectingPoint num="1" id="2713" />
-<TGConnectingPoint num="2" id="2714" />
-<TGConnectingPoint num="3" id="2715" />
+<TGConnectingPoint num="0" id="2538" />
+<TGConnectingPoint num="1" id="2539" />
+<TGConnectingPoint num="2" id="2540" />
+<TGConnectingPoint num="3" id="2541" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5443,25 +5172,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2728" >
+<CONNECTOR type="5102" id="2554" >
 <cdparam x="379" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2727" />
-<P1  x="379" y="218" id="2913" />
-<P2  x="436" y="255" id="2824" />
+<TGConnectingPoint num="0" id="2553" />
+<P1  x="379" y="218" id="2739" />
+<P2  x="436" y="255" id="2650" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2726" >
-<father id="2728" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2552" >
+<father id="2554" num="0" />
 <cdparam x="379" y="258" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2722" />
-<TGConnectingPoint num="1" id="2723" />
-<TGConnectingPoint num="2" id="2724" />
-<TGConnectingPoint num="3" id="2725" />
+<TGConnectingPoint num="0" id="2548" />
+<TGConnectingPoint num="1" id="2549" />
+<TGConnectingPoint num="2" id="2550" />
+<TGConnectingPoint num="3" id="2551" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5471,65 +5200,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2743" >
+<CONNECTOR type="5102" id="2569" >
 <cdparam x="228" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2738" />
-<TGConnectingPoint num="1" id="2739" />
-<TGConnectingPoint num="2" id="2740" />
-<TGConnectingPoint num="3" id="2741" />
-<TGConnectingPoint num="4" id="2742" />
-<P1  x="228" y="432" id="2836" />
-<P2  x="319" y="168" id="2906" />
+<TGConnectingPoint num="0" id="2564" />
+<TGConnectingPoint num="1" id="2565" />
+<TGConnectingPoint num="2" id="2566" />
+<TGConnectingPoint num="3" id="2567" />
+<TGConnectingPoint num="4" id="2568" />
+<P1  x="228" y="432" id="2662" />
+<P2  x="319" y="168" id="2732" />
 <Point x="228" y="452" />
 <Point x="165" y="452" />
 <Point x="165" y="136" />
 <Point x="320" y="136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2729" >
-<father id="2743" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2555" >
+<father id="2569" num="0" />
 <cdparam x="228" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2730" >
-<father id="2743" num="1" />
+<SUBCOMPONENT type="-1" id="2556" >
+<father id="2569" num="1" />
 <cdparam x="165" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2731" >
-<father id="2743" num="2" />
+<SUBCOMPONENT type="-1" id="2557" >
+<father id="2569" num="2" />
 <cdparam x="165" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2732" >
-<father id="2743" num="3" />
+<SUBCOMPONENT type="-1" id="2558" >
+<father id="2569" num="3" />
 <cdparam x="320" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2737" >
-<father id="2743" num="4" />
+<SUBCOMPONENT type="-1" id="2563" >
+<father id="2569" num="4" />
 <cdparam x="228" y="472" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2733" />
-<TGConnectingPoint num="1" id="2734" />
-<TGConnectingPoint num="2" id="2735" />
-<TGConnectingPoint num="3" id="2736" />
+<TGConnectingPoint num="0" id="2559" />
+<TGConnectingPoint num="1" id="2560" />
+<TGConnectingPoint num="2" id="2561" />
+<TGConnectingPoint num="3" id="2562" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5539,25 +5268,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2750" >
+<CONNECTOR type="5102" id="2576" >
 <cdparam x="252" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2749" />
-<P1  x="246" y="356" id="2860" />
-<P2  x="228" y="402" id="2835" />
+<TGConnectingPoint num="0" id="2575" />
+<P1  x="246" y="356" id="2686" />
+<P2  x="228" y="402" id="2661" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2748" >
-<father id="2750" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2574" >
+<father id="2576" num="0" />
 <cdparam x="252" y="408" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2744" />
-<TGConnectingPoint num="1" id="2745" />
-<TGConnectingPoint num="2" id="2746" />
-<TGConnectingPoint num="3" id="2747" />
+<TGConnectingPoint num="0" id="2570" />
+<TGConnectingPoint num="1" id="2571" />
+<TGConnectingPoint num="2" id="2572" />
+<TGConnectingPoint num="3" id="2573" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5567,25 +5296,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2757" >
+<CONNECTOR type="5102" id="2583" >
 <cdparam x="275" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2756" />
-<P1  x="275" y="286" id="2888" />
-<P2  x="275" y="306" id="2847" />
+<TGConnectingPoint num="0" id="2582" />
+<P1  x="275" y="286" id="2714" />
+<P2  x="275" y="306" id="2673" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2755" >
-<father id="2757" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2581" >
+<father id="2583" num="0" />
 <cdparam x="275" y="326" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2751" />
-<TGConnectingPoint num="1" id="2752" />
-<TGConnectingPoint num="2" id="2753" />
-<TGConnectingPoint num="3" id="2754" />
+<TGConnectingPoint num="0" id="2577" />
+<TGConnectingPoint num="1" id="2578" />
+<TGConnectingPoint num="2" id="2579" />
+<TGConnectingPoint num="3" id="2580" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5595,25 +5324,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2764" >
+<CONNECTOR type="5102" id="2590" >
 <cdparam x="319" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2763" />
-<P1  x="319" y="218" id="2912" />
-<P2  x="275" y="256" id="2887" />
+<TGConnectingPoint num="0" id="2589" />
+<P1  x="319" y="218" id="2738" />
+<P2  x="275" y="256" id="2713" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2762" >
-<father id="2764" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2588" >
+<father id="2590" num="0" />
 <cdparam x="319" y="245" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2758" />
-<TGConnectingPoint num="1" id="2759" />
-<TGConnectingPoint num="2" id="2760" />
-<TGConnectingPoint num="3" id="2761" />
+<TGConnectingPoint num="0" id="2584" />
+<TGConnectingPoint num="1" id="2585" />
+<TGConnectingPoint num="2" id="2586" />
+<TGConnectingPoint num="3" id="2587" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5623,25 +5352,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2771" >
+<CONNECTOR type="5102" id="2597" >
 <cdparam x="349" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2770" />
-<P1  x="349" y="143" id="2939" />
-<P2  x="349" y="168" id="2899" />
+<TGConnectingPoint num="0" id="2596" />
+<P1  x="349" y="143" id="2765" />
+<P2  x="349" y="168" id="2725" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2769" >
-<father id="2771" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2595" >
+<father id="2597" num="0" />
 <cdparam x="349" y="183" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2765" />
-<TGConnectingPoint num="1" id="2766" />
-<TGConnectingPoint num="2" id="2767" />
-<TGConnectingPoint num="3" id="2768" />
+<TGConnectingPoint num="0" id="2591" />
+<TGConnectingPoint num="1" id="2592" />
+<TGConnectingPoint num="2" id="2593" />
+<TGConnectingPoint num="3" id="2594" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5651,261 +5380,261 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2812" >
+<COMPONENT type="5106" id="2638" >
 <cdparam x="345" y="450" />
 <sizeparam width="100" height="54" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Error" />
-<TGConnectingPoint num="0" id="2772" />
-<TGConnectingPoint num="1" id="2773" />
-<TGConnectingPoint num="2" id="2774" />
-<TGConnectingPoint num="3" id="2775" />
-<TGConnectingPoint num="4" id="2776" />
-<TGConnectingPoint num="5" id="2777" />
-<TGConnectingPoint num="6" id="2778" />
-<TGConnectingPoint num="7" id="2779" />
-<TGConnectingPoint num="8" id="2780" />
-<TGConnectingPoint num="9" id="2781" />
-<TGConnectingPoint num="10" id="2782" />
-<TGConnectingPoint num="11" id="2783" />
-<TGConnectingPoint num="12" id="2784" />
-<TGConnectingPoint num="13" id="2785" />
-<TGConnectingPoint num="14" id="2786" />
-<TGConnectingPoint num="15" id="2787" />
-<TGConnectingPoint num="16" id="2788" />
-<TGConnectingPoint num="17" id="2789" />
-<TGConnectingPoint num="18" id="2790" />
-<TGConnectingPoint num="19" id="2791" />
-<TGConnectingPoint num="20" id="2792" />
-<TGConnectingPoint num="21" id="2793" />
-<TGConnectingPoint num="22" id="2794" />
-<TGConnectingPoint num="23" id="2795" />
-<TGConnectingPoint num="24" id="2796" />
-<TGConnectingPoint num="25" id="2797" />
-<TGConnectingPoint num="26" id="2798" />
-<TGConnectingPoint num="27" id="2799" />
-<TGConnectingPoint num="28" id="2800" />
-<TGConnectingPoint num="29" id="2801" />
-<TGConnectingPoint num="30" id="2802" />
-<TGConnectingPoint num="31" id="2803" />
-<TGConnectingPoint num="32" id="2804" />
-<TGConnectingPoint num="33" id="2805" />
-<TGConnectingPoint num="34" id="2806" />
-<TGConnectingPoint num="35" id="2807" />
-<TGConnectingPoint num="36" id="2808" />
-<TGConnectingPoint num="37" id="2809" />
-<TGConnectingPoint num="38" id="2810" />
-<TGConnectingPoint num="39" id="2811" />
+<TGConnectingPoint num="0" id="2598" />
+<TGConnectingPoint num="1" id="2599" />
+<TGConnectingPoint num="2" id="2600" />
+<TGConnectingPoint num="3" id="2601" />
+<TGConnectingPoint num="4" id="2602" />
+<TGConnectingPoint num="5" id="2603" />
+<TGConnectingPoint num="6" id="2604" />
+<TGConnectingPoint num="7" id="2605" />
+<TGConnectingPoint num="8" id="2606" />
+<TGConnectingPoint num="9" id="2607" />
+<TGConnectingPoint num="10" id="2608" />
+<TGConnectingPoint num="11" id="2609" />
+<TGConnectingPoint num="12" id="2610" />
+<TGConnectingPoint num="13" id="2611" />
+<TGConnectingPoint num="14" id="2612" />
+<TGConnectingPoint num="15" id="2613" />
+<TGConnectingPoint num="16" id="2614" />
+<TGConnectingPoint num="17" id="2615" />
+<TGConnectingPoint num="18" id="2616" />
+<TGConnectingPoint num="19" id="2617" />
+<TGConnectingPoint num="20" id="2618" />
+<TGConnectingPoint num="21" id="2619" />
+<TGConnectingPoint num="22" id="2620" />
+<TGConnectingPoint num="23" id="2621" />
+<TGConnectingPoint num="24" id="2622" />
+<TGConnectingPoint num="25" id="2623" />
+<TGConnectingPoint num="26" id="2624" />
+<TGConnectingPoint num="27" id="2625" />
+<TGConnectingPoint num="28" id="2626" />
+<TGConnectingPoint num="29" id="2627" />
+<TGConnectingPoint num="30" id="2628" />
+<TGConnectingPoint num="31" id="2629" />
+<TGConnectingPoint num="32" id="2630" />
+<TGConnectingPoint num="33" id="2631" />
+<TGConnectingPoint num="34" id="2632" />
+<TGConnectingPoint num="35" id="2633" />
+<TGConnectingPoint num="36" id="2634" />
+<TGConnectingPoint num="37" id="2635" />
+<TGConnectingPoint num="38" id="2636" />
+<TGConnectingPoint num="39" id="2637" />
 <accessibility />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="2823" >
+<COMPONENT type="5104" id="2649" >
 <cdparam x="325" y="408" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="2813" />
-<TGConnectingPoint num="1" id="2814" />
-<TGConnectingPoint num="2" id="2815" />
-<TGConnectingPoint num="3" id="2816" />
-<TGConnectingPoint num="4" id="2817" />
-<TGConnectingPoint num="5" id="2818" />
-<TGConnectingPoint num="6" id="2819" />
-<TGConnectingPoint num="7" id="2820" />
-<TGConnectingPoint num="8" id="2821" />
-<TGConnectingPoint num="9" id="2822" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2834" >
+<TGConnectingPoint num="0" id="2639" />
+<TGConnectingPoint num="1" id="2640" />
+<TGConnectingPoint num="2" id="2641" />
+<TGConnectingPoint num="3" id="2642" />
+<TGConnectingPoint num="4" id="2643" />
+<TGConnectingPoint num="5" id="2644" />
+<TGConnectingPoint num="6" id="2645" />
+<TGConnectingPoint num="7" id="2646" />
+<TGConnectingPoint num="8" id="2647" />
+<TGConnectingPoint num="9" id="2648" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="2660" >
 <cdparam x="366" y="260" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="2824" />
-<TGConnectingPoint num="1" id="2825" />
-<TGConnectingPoint num="2" id="2826" />
-<TGConnectingPoint num="3" id="2827" />
-<TGConnectingPoint num="4" id="2828" />
-<TGConnectingPoint num="5" id="2829" />
-<TGConnectingPoint num="6" id="2830" />
-<TGConnectingPoint num="7" id="2831" />
-<TGConnectingPoint num="8" id="2832" />
-<TGConnectingPoint num="9" id="2833" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2845" >
+<TGConnectingPoint num="0" id="2650" />
+<TGConnectingPoint num="1" id="2651" />
+<TGConnectingPoint num="2" id="2652" />
+<TGConnectingPoint num="3" id="2653" />
+<TGConnectingPoint num="4" id="2654" />
+<TGConnectingPoint num="5" id="2655" />
+<TGConnectingPoint num="6" id="2656" />
+<TGConnectingPoint num="7" id="2657" />
+<TGConnectingPoint num="8" id="2658" />
+<TGConnectingPoint num="9" id="2659" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="2671" >
 <cdparam x="183" y="407" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="2835" />
-<TGConnectingPoint num="1" id="2836" />
-<TGConnectingPoint num="2" id="2837" />
-<TGConnectingPoint num="3" id="2838" />
-<TGConnectingPoint num="4" id="2839" />
-<TGConnectingPoint num="5" id="2840" />
-<TGConnectingPoint num="6" id="2841" />
-<TGConnectingPoint num="7" id="2842" />
-<TGConnectingPoint num="8" id="2843" />
-<TGConnectingPoint num="9" id="2844" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2886" >
+<TGConnectingPoint num="0" id="2661" />
+<TGConnectingPoint num="1" id="2662" />
+<TGConnectingPoint num="2" id="2663" />
+<TGConnectingPoint num="3" id="2664" />
+<TGConnectingPoint num="4" id="2665" />
+<TGConnectingPoint num="5" id="2666" />
+<TGConnectingPoint num="6" id="2667" />
+<TGConnectingPoint num="7" id="2668" />
+<TGConnectingPoint num="8" id="2669" />
+<TGConnectingPoint num="9" id="2670" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2712" >
 <cdparam x="218" y="306" />
 <sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForClosed" />
-<TGConnectingPoint num="0" id="2846" />
-<TGConnectingPoint num="1" id="2847" />
-<TGConnectingPoint num="2" id="2848" />
-<TGConnectingPoint num="3" id="2849" />
-<TGConnectingPoint num="4" id="2850" />
-<TGConnectingPoint num="5" id="2851" />
-<TGConnectingPoint num="6" id="2852" />
-<TGConnectingPoint num="7" id="2853" />
-<TGConnectingPoint num="8" id="2854" />
-<TGConnectingPoint num="9" id="2855" />
-<TGConnectingPoint num="10" id="2856" />
-<TGConnectingPoint num="11" id="2857" />
-<TGConnectingPoint num="12" id="2858" />
-<TGConnectingPoint num="13" id="2859" />
-<TGConnectingPoint num="14" id="2860" />
-<TGConnectingPoint num="15" id="2861" />
-<TGConnectingPoint num="16" id="2862" />
-<TGConnectingPoint num="17" id="2863" />
-<TGConnectingPoint num="18" id="2864" />
-<TGConnectingPoint num="19" id="2865" />
-<TGConnectingPoint num="20" id="2866" />
-<TGConnectingPoint num="21" id="2867" />
-<TGConnectingPoint num="22" id="2868" />
-<TGConnectingPoint num="23" id="2869" />
-<TGConnectingPoint num="24" id="2870" />
-<TGConnectingPoint num="25" id="2871" />
-<TGConnectingPoint num="26" id="2872" />
-<TGConnectingPoint num="27" id="2873" />
-<TGConnectingPoint num="28" id="2874" />
-<TGConnectingPoint num="29" id="2875" />
-<TGConnectingPoint num="30" id="2876" />
-<TGConnectingPoint num="31" id="2877" />
-<TGConnectingPoint num="32" id="2878" />
-<TGConnectingPoint num="33" id="2879" />
-<TGConnectingPoint num="34" id="2880" />
-<TGConnectingPoint num="35" id="2881" />
-<TGConnectingPoint num="36" id="2882" />
-<TGConnectingPoint num="37" id="2883" />
-<TGConnectingPoint num="38" id="2884" />
-<TGConnectingPoint num="39" id="2885" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="2897" >
+<TGConnectingPoint num="0" id="2672" />
+<TGConnectingPoint num="1" id="2673" />
+<TGConnectingPoint num="2" id="2674" />
+<TGConnectingPoint num="3" id="2675" />
+<TGConnectingPoint num="4" id="2676" />
+<TGConnectingPoint num="5" id="2677" />
+<TGConnectingPoint num="6" id="2678" />
+<TGConnectingPoint num="7" id="2679" />
+<TGConnectingPoint num="8" id="2680" />
+<TGConnectingPoint num="9" id="2681" />
+<TGConnectingPoint num="10" id="2682" />
+<TGConnectingPoint num="11" id="2683" />
+<TGConnectingPoint num="12" id="2684" />
+<TGConnectingPoint num="13" id="2685" />
+<TGConnectingPoint num="14" id="2686" />
+<TGConnectingPoint num="15" id="2687" />
+<TGConnectingPoint num="16" id="2688" />
+<TGConnectingPoint num="17" id="2689" />
+<TGConnectingPoint num="18" id="2690" />
+<TGConnectingPoint num="19" id="2691" />
+<TGConnectingPoint num="20" id="2692" />
+<TGConnectingPoint num="21" id="2693" />
+<TGConnectingPoint num="22" id="2694" />
+<TGConnectingPoint num="23" id="2695" />
+<TGConnectingPoint num="24" id="2696" />
+<TGConnectingPoint num="25" id="2697" />
+<TGConnectingPoint num="26" id="2698" />
+<TGConnectingPoint num="27" id="2699" />
+<TGConnectingPoint num="28" id="2700" />
+<TGConnectingPoint num="29" id="2701" />
+<TGConnectingPoint num="30" id="2702" />
+<TGConnectingPoint num="31" id="2703" />
+<TGConnectingPoint num="32" id="2704" />
+<TGConnectingPoint num="33" id="2705" />
+<TGConnectingPoint num="34" id="2706" />
+<TGConnectingPoint num="35" id="2707" />
+<TGConnectingPoint num="36" id="2708" />
+<TGConnectingPoint num="37" id="2709" />
+<TGConnectingPoint num="38" id="2710" />
+<TGConnectingPoint num="39" id="2711" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2723" >
 <cdparam x="234" y="261" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="2887" />
-<TGConnectingPoint num="1" id="2888" />
-<TGConnectingPoint num="2" id="2889" />
-<TGConnectingPoint num="3" id="2890" />
-<TGConnectingPoint num="4" id="2891" />
-<TGConnectingPoint num="5" id="2892" />
-<TGConnectingPoint num="6" id="2893" />
-<TGConnectingPoint num="7" id="2894" />
-<TGConnectingPoint num="8" id="2895" />
-<TGConnectingPoint num="9" id="2896" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2938" >
+<TGConnectingPoint num="0" id="2713" />
+<TGConnectingPoint num="1" id="2714" />
+<TGConnectingPoint num="2" id="2715" />
+<TGConnectingPoint num="3" id="2716" />
+<TGConnectingPoint num="4" id="2717" />
+<TGConnectingPoint num="5" id="2718" />
+<TGConnectingPoint num="6" id="2719" />
+<TGConnectingPoint num="7" id="2720" />
+<TGConnectingPoint num="8" id="2721" />
+<TGConnectingPoint num="9" id="2722" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2764" >
 <cdparam x="289" y="168" />
 <sizeparam width="120" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForOpen" />
-<TGConnectingPoint num="0" id="2898" />
-<TGConnectingPoint num="1" id="2899" />
-<TGConnectingPoint num="2" id="2900" />
-<TGConnectingPoint num="3" id="2901" />
-<TGConnectingPoint num="4" id="2902" />
-<TGConnectingPoint num="5" id="2903" />
-<TGConnectingPoint num="6" id="2904" />
-<TGConnectingPoint num="7" id="2905" />
-<TGConnectingPoint num="8" id="2906" />
-<TGConnectingPoint num="9" id="2907" />
-<TGConnectingPoint num="10" id="2908" />
-<TGConnectingPoint num="11" id="2909" />
-<TGConnectingPoint num="12" id="2910" />
-<TGConnectingPoint num="13" id="2911" />
-<TGConnectingPoint num="14" id="2912" />
-<TGConnectingPoint num="15" id="2913" />
-<TGConnectingPoint num="16" id="2914" />
-<TGConnectingPoint num="17" id="2915" />
-<TGConnectingPoint num="18" id="2916" />
-<TGConnectingPoint num="19" id="2917" />
-<TGConnectingPoint num="20" id="2918" />
-<TGConnectingPoint num="21" id="2919" />
-<TGConnectingPoint num="22" id="2920" />
-<TGConnectingPoint num="23" id="2921" />
-<TGConnectingPoint num="24" id="2922" />
-<TGConnectingPoint num="25" id="2923" />
-<TGConnectingPoint num="26" id="2924" />
-<TGConnectingPoint num="27" id="2925" />
-<TGConnectingPoint num="28" id="2926" />
-<TGConnectingPoint num="29" id="2927" />
-<TGConnectingPoint num="30" id="2928" />
-<TGConnectingPoint num="31" id="2929" />
-<TGConnectingPoint num="32" id="2930" />
-<TGConnectingPoint num="33" id="2931" />
-<TGConnectingPoint num="34" id="2932" />
-<TGConnectingPoint num="35" id="2933" />
-<TGConnectingPoint num="36" id="2934" />
-<TGConnectingPoint num="37" id="2935" />
-<TGConnectingPoint num="38" id="2936" />
-<TGConnectingPoint num="39" id="2937" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2940" >
+<TGConnectingPoint num="0" id="2724" />
+<TGConnectingPoint num="1" id="2725" />
+<TGConnectingPoint num="2" id="2726" />
+<TGConnectingPoint num="3" id="2727" />
+<TGConnectingPoint num="4" id="2728" />
+<TGConnectingPoint num="5" id="2729" />
+<TGConnectingPoint num="6" id="2730" />
+<TGConnectingPoint num="7" id="2731" />
+<TGConnectingPoint num="8" id="2732" />
+<TGConnectingPoint num="9" id="2733" />
+<TGConnectingPoint num="10" id="2734" />
+<TGConnectingPoint num="11" id="2735" />
+<TGConnectingPoint num="12" id="2736" />
+<TGConnectingPoint num="13" id="2737" />
+<TGConnectingPoint num="14" id="2738" />
+<TGConnectingPoint num="15" id="2739" />
+<TGConnectingPoint num="16" id="2740" />
+<TGConnectingPoint num="17" id="2741" />
+<TGConnectingPoint num="18" id="2742" />
+<TGConnectingPoint num="19" id="2743" />
+<TGConnectingPoint num="20" id="2744" />
+<TGConnectingPoint num="21" id="2745" />
+<TGConnectingPoint num="22" id="2746" />
+<TGConnectingPoint num="23" id="2747" />
+<TGConnectingPoint num="24" id="2748" />
+<TGConnectingPoint num="25" id="2749" />
+<TGConnectingPoint num="26" id="2750" />
+<TGConnectingPoint num="27" id="2751" />
+<TGConnectingPoint num="28" id="2752" />
+<TGConnectingPoint num="29" id="2753" />
+<TGConnectingPoint num="30" id="2754" />
+<TGConnectingPoint num="31" id="2755" />
+<TGConnectingPoint num="32" id="2756" />
+<TGConnectingPoint num="33" id="2757" />
+<TGConnectingPoint num="34" id="2758" />
+<TGConnectingPoint num="35" id="2759" />
+<TGConnectingPoint num="36" id="2760" />
+<TGConnectingPoint num="37" id="2761" />
+<TGConnectingPoint num="38" id="2762" />
+<TGConnectingPoint num="39" id="2763" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2766" >
 <cdparam x="342" y="123" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2939" />
+<TGConnectingPoint num="0" id="2765" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemotelyControlledMicrowave" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2947" >
+<CONNECTOR type="5102" id="2773" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<TGConnectingPoint num="0" id="2946" />
-<P1  x="407" y="70" id="2950" />
-<P2  x="408" y="85" id="2948" />
+<TGConnectingPoint num="0" id="2772" />
+<P1  x="407" y="70" id="2776" />
+<P2  x="408" y="85" id="2774" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2945" >
-<father id="2947" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2771" >
+<father id="2773" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2941" />
-<TGConnectingPoint num="1" id="2942" />
-<TGConnectingPoint num="2" id="2943" />
-<TGConnectingPoint num="3" id="2944" />
+<TGConnectingPoint num="0" id="2767" />
+<TGConnectingPoint num="1" id="2768" />
+<TGConnectingPoint num="2" id="2769" />
+<TGConnectingPoint num="3" id="2770" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5915,47 +5644,47 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="2949" >
+<COMPONENT type="5101" id="2775" >
 <cdparam x="398" y="90" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2948" />
+<TGConnectingPoint num="0" id="2774" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="2951" >
+<COMPONENT type="5100" id="2777" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2950" />
+<TGConnectingPoint num="0" id="2776" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2958" >
+<CONNECTOR type="5102" id="2784" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2957" />
-<P1  x="407" y="70" id="3000" />
-<P2  x="451" y="106" id="2960" />
+<TGConnectingPoint num="0" id="2783" />
+<P1  x="407" y="70" id="2826" />
+<P2  x="451" y="106" id="2786" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2956" >
-<father id="2958" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2782" >
+<father id="2784" num="0" />
 <cdparam x="444" y="75" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2952" />
-<TGConnectingPoint num="1" id="2953" />
-<TGConnectingPoint num="2" id="2954" />
-<TGConnectingPoint num="3" id="2955" />
+<TGConnectingPoint num="0" id="2778" />
+<TGConnectingPoint num="1" id="2779" />
+<TGConnectingPoint num="2" id="2780" />
+<TGConnectingPoint num="3" id="2781" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5965,88 +5694,88 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2999" >
+<COMPONENT type="5106" id="2825" >
 <cdparam x="396" y="106" />
 <sizeparam width="111" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Running" />
-<TGConnectingPoint num="0" id="2959" />
-<TGConnectingPoint num="1" id="2960" />
-<TGConnectingPoint num="2" id="2961" />
-<TGConnectingPoint num="3" id="2962" />
-<TGConnectingPoint num="4" id="2963" />
-<TGConnectingPoint num="5" id="2964" />
-<TGConnectingPoint num="6" id="2965" />
-<TGConnectingPoint num="7" id="2966" />
-<TGConnectingPoint num="8" id="2967" />
-<TGConnectingPoint num="9" id="2968" />
-<TGConnectingPoint num="10" id="2969" />
-<TGConnectingPoint num="11" id="2970" />
-<TGConnectingPoint num="12" id="2971" />
-<TGConnectingPoint num="13" id="2972" />
-<TGConnectingPoint num="14" id="2973" />
-<TGConnectingPoint num="15" id="2974" />
-<TGConnectingPoint num="16" id="2975" />
-<TGConnectingPoint num="17" id="2976" />
-<TGConnectingPoint num="18" id="2977" />
-<TGConnectingPoint num="19" id="2978" />
-<TGConnectingPoint num="20" id="2979" />
-<TGConnectingPoint num="21" id="2980" />
-<TGConnectingPoint num="22" id="2981" />
-<TGConnectingPoint num="23" id="2982" />
-<TGConnectingPoint num="24" id="2983" />
-<TGConnectingPoint num="25" id="2984" />
-<TGConnectingPoint num="26" id="2985" />
-<TGConnectingPoint num="27" id="2986" />
-<TGConnectingPoint num="28" id="2987" />
-<TGConnectingPoint num="29" id="2988" />
-<TGConnectingPoint num="30" id="2989" />
-<TGConnectingPoint num="31" id="2990" />
-<TGConnectingPoint num="32" id="2991" />
-<TGConnectingPoint num="33" id="2992" />
-<TGConnectingPoint num="34" id="2993" />
-<TGConnectingPoint num="35" id="2994" />
-<TGConnectingPoint num="36" id="2995" />
-<TGConnectingPoint num="37" id="2996" />
-<TGConnectingPoint num="38" id="2997" />
-<TGConnectingPoint num="39" id="2998" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3001" >
+<TGConnectingPoint num="0" id="2785" />
+<TGConnectingPoint num="1" id="2786" />
+<TGConnectingPoint num="2" id="2787" />
+<TGConnectingPoint num="3" id="2788" />
+<TGConnectingPoint num="4" id="2789" />
+<TGConnectingPoint num="5" id="2790" />
+<TGConnectingPoint num="6" id="2791" />
+<TGConnectingPoint num="7" id="2792" />
+<TGConnectingPoint num="8" id="2793" />
+<TGConnectingPoint num="9" id="2794" />
+<TGConnectingPoint num="10" id="2795" />
+<TGConnectingPoint num="11" id="2796" />
+<TGConnectingPoint num="12" id="2797" />
+<TGConnectingPoint num="13" id="2798" />
+<TGConnectingPoint num="14" id="2799" />
+<TGConnectingPoint num="15" id="2800" />
+<TGConnectingPoint num="16" id="2801" />
+<TGConnectingPoint num="17" id="2802" />
+<TGConnectingPoint num="18" id="2803" />
+<TGConnectingPoint num="19" id="2804" />
+<TGConnectingPoint num="20" id="2805" />
+<TGConnectingPoint num="21" id="2806" />
+<TGConnectingPoint num="22" id="2807" />
+<TGConnectingPoint num="23" id="2808" />
+<TGConnectingPoint num="24" id="2809" />
+<TGConnectingPoint num="25" id="2810" />
+<TGConnectingPoint num="26" id="2811" />
+<TGConnectingPoint num="27" id="2812" />
+<TGConnectingPoint num="28" id="2813" />
+<TGConnectingPoint num="29" id="2814" />
+<TGConnectingPoint num="30" id="2815" />
+<TGConnectingPoint num="31" id="2816" />
+<TGConnectingPoint num="32" id="2817" />
+<TGConnectingPoint num="33" id="2818" />
+<TGConnectingPoint num="34" id="2819" />
+<TGConnectingPoint num="35" id="2820" />
+<TGConnectingPoint num="36" id="2821" />
+<TGConnectingPoint num="37" id="2822" />
+<TGConnectingPoint num="38" id="2823" />
+<TGConnectingPoint num="39" id="2824" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2827" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3000" />
+<TGConnectingPoint num="0" id="2826" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="WirelessInterface" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3008" >
+<CONNECTOR type="5102" id="2834" >
 <cdparam x="466" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="3007" />
-<P1  x="449" y="422" id="3031" />
-<P2  x="460" y="455" id="3082" />
+<TGConnectingPoint num="0" id="2833" />
+<P1  x="449" y="422" id="2857" />
+<P2  x="460" y="455" id="2908" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3006" >
-<father id="3008" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2832" >
+<father id="2834" num="0" />
 <cdparam x="466" y="459" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3002" />
-<TGConnectingPoint num="1" id="3003" />
-<TGConnectingPoint num="2" id="3004" />
-<TGConnectingPoint num="3" id="3005" />
+<TGConnectingPoint num="0" id="2828" />
+<TGConnectingPoint num="1" id="2829" />
+<TGConnectingPoint num="2" id="2830" />
+<TGConnectingPoint num="3" id="2831" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6056,25 +5785,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3015" >
+<CONNECTOR type="5102" id="2841" >
 <cdparam x="455" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="3014" />
-<P1  x="414" y="275" id="3047" />
-<P2  x="449" y="392" id="3030" />
+<TGConnectingPoint num="0" id="2840" />
+<P1  x="414" y="275" id="2873" />
+<P2  x="449" y="392" id="2856" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3013" >
-<father id="3015" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2839" >
+<father id="2841" num="0" />
 <cdparam x="441" y="319" />
 <sizeparam width="177" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3009" />
-<TGConnectingPoint num="1" id="3010" />
-<TGConnectingPoint num="2" id="3011" />
-<TGConnectingPoint num="3" id="3012" />
+<TGConnectingPoint num="0" id="2835" />
+<TGConnectingPoint num="1" id="2836" />
+<TGConnectingPoint num="2" id="2837" />
+<TGConnectingPoint num="3" id="2838" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6086,25 +5815,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3022" >
+<CONNECTOR type="5102" id="2848" >
 <cdparam x="386" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3021" />
-<P1  x="386" y="101" id="3095" />
-<P2  x="401" y="161" id="3084" />
+<TGConnectingPoint num="0" id="2847" />
+<P1  x="386" y="101" id="2921" />
+<P2  x="401" y="161" id="2910" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3020" >
-<father id="3022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2846" >
+<father id="2848" num="0" />
 <cdparam x="386" y="141" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3016" />
-<TGConnectingPoint num="1" id="3017" />
-<TGConnectingPoint num="2" id="3018" />
-<TGConnectingPoint num="3" id="3019" />
+<TGConnectingPoint num="0" id="2842" />
+<TGConnectingPoint num="1" id="2843" />
+<TGConnectingPoint num="2" id="2844" />
+<TGConnectingPoint num="3" id="2845" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6114,25 +5843,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3029" >
+<CONNECTOR type="5102" id="2855" >
 <cdparam x="401" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="3028" />
-<P1  x="401" y="191" id="3085" />
-<P2  x="414" y="225" id="3042" />
+<TGConnectingPoint num="0" id="2854" />
+<P1  x="401" y="191" id="2911" />
+<P2  x="414" y="225" id="2868" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3027" >
-<father id="3029" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2853" >
+<father id="2855" num="0" />
 <cdparam x="453" y="214" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3023" />
-<TGConnectingPoint num="1" id="3024" />
-<TGConnectingPoint num="2" id="3025" />
-<TGConnectingPoint num="3" id="3026" />
+<TGConnectingPoint num="0" id="2849" />
+<TGConnectingPoint num="1" id="2850" />
+<TGConnectingPoint num="2" id="2851" />
+<TGConnectingPoint num="3" id="2852" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6142,134 +5871,134 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3040" >
+<COMPONENT type="5103" id="2866" >
 <cdparam x="358" y="397" />
 <sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="remoteStart(selectedDuration)" />
-<TGConnectingPoint num="0" id="3030" />
-<TGConnectingPoint num="1" id="3031" />
-<TGConnectingPoint num="2" id="3032" />
-<TGConnectingPoint num="3" id="3033" />
-<TGConnectingPoint num="4" id="3034" />
-<TGConnectingPoint num="5" id="3035" />
-<TGConnectingPoint num="6" id="3036" />
-<TGConnectingPoint num="7" id="3037" />
-<TGConnectingPoint num="8" id="3038" />
-<TGConnectingPoint num="9" id="3039" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3081" >
+<TGConnectingPoint num="0" id="2856" />
+<TGConnectingPoint num="1" id="2857" />
+<TGConnectingPoint num="2" id="2858" />
+<TGConnectingPoint num="3" id="2859" />
+<TGConnectingPoint num="4" id="2860" />
+<TGConnectingPoint num="5" id="2861" />
+<TGConnectingPoint num="6" id="2862" />
+<TGConnectingPoint num="7" id="2863" />
+<TGConnectingPoint num="8" id="2864" />
+<TGConnectingPoint num="9" id="2865" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2907" >
 <cdparam x="348" y="225" />
 <sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="gotWirelessOrder" />
-<TGConnectingPoint num="0" id="3041" />
-<TGConnectingPoint num="1" id="3042" />
-<TGConnectingPoint num="2" id="3043" />
-<TGConnectingPoint num="3" id="3044" />
-<TGConnectingPoint num="4" id="3045" />
-<TGConnectingPoint num="5" id="3046" />
-<TGConnectingPoint num="6" id="3047" />
-<TGConnectingPoint num="7" id="3048" />
-<TGConnectingPoint num="8" id="3049" />
-<TGConnectingPoint num="9" id="3050" />
-<TGConnectingPoint num="10" id="3051" />
-<TGConnectingPoint num="11" id="3052" />
-<TGConnectingPoint num="12" id="3053" />
-<TGConnectingPoint num="13" id="3054" />
-<TGConnectingPoint num="14" id="3055" />
-<TGConnectingPoint num="15" id="3056" />
-<TGConnectingPoint num="16" id="3057" />
-<TGConnectingPoint num="17" id="3058" />
-<TGConnectingPoint num="18" id="3059" />
-<TGConnectingPoint num="19" id="3060" />
-<TGConnectingPoint num="20" id="3061" />
-<TGConnectingPoint num="21" id="3062" />
-<TGConnectingPoint num="22" id="3063" />
-<TGConnectingPoint num="23" id="3064" />
-<TGConnectingPoint num="24" id="3065" />
-<TGConnectingPoint num="25" id="3066" />
-<TGConnectingPoint num="26" id="3067" />
-<TGConnectingPoint num="27" id="3068" />
-<TGConnectingPoint num="28" id="3069" />
-<TGConnectingPoint num="29" id="3070" />
-<TGConnectingPoint num="30" id="3071" />
-<TGConnectingPoint num="31" id="3072" />
-<TGConnectingPoint num="32" id="3073" />
-<TGConnectingPoint num="33" id="3074" />
-<TGConnectingPoint num="34" id="3075" />
-<TGConnectingPoint num="35" id="3076" />
-<TGConnectingPoint num="36" id="3077" />
-<TGConnectingPoint num="37" id="3078" />
-<TGConnectingPoint num="38" id="3079" />
-<TGConnectingPoint num="39" id="3080" />
+<TGConnectingPoint num="0" id="2867" />
+<TGConnectingPoint num="1" id="2868" />
+<TGConnectingPoint num="2" id="2869" />
+<TGConnectingPoint num="3" id="2870" />
+<TGConnectingPoint num="4" id="2871" />
+<TGConnectingPoint num="5" id="2872" />
+<TGConnectingPoint num="6" id="2873" />
+<TGConnectingPoint num="7" id="2874" />
+<TGConnectingPoint num="8" id="2875" />
+<TGConnectingPoint num="9" id="2876" />
+<TGConnectingPoint num="10" id="2877" />
+<TGConnectingPoint num="11" id="2878" />
+<TGConnectingPoint num="12" id="2879" />
+<TGConnectingPoint num="13" id="2880" />
+<TGConnectingPoint num="14" id="2881" />
+<TGConnectingPoint num="15" id="2882" />
+<TGConnectingPoint num="16" id="2883" />
+<TGConnectingPoint num="17" id="2884" />
+<TGConnectingPoint num="18" id="2885" />
+<TGConnectingPoint num="19" id="2886" />
+<TGConnectingPoint num="20" id="2887" />
+<TGConnectingPoint num="21" id="2888" />
+<TGConnectingPoint num="22" id="2889" />
+<TGConnectingPoint num="23" id="2890" />
+<TGConnectingPoint num="24" id="2891" />
+<TGConnectingPoint num="25" id="2892" />
+<TGConnectingPoint num="26" id="2893" />
+<TGConnectingPoint num="27" id="2894" />
+<TGConnectingPoint num="28" id="2895" />
+<TGConnectingPoint num="29" id="2896" />
+<TGConnectingPoint num="30" id="2897" />
+<TGConnectingPoint num="31" id="2898" />
+<TGConnectingPoint num="32" id="2899" />
+<TGConnectingPoint num="33" id="2900" />
+<TGConnectingPoint num="34" id="2901" />
+<TGConnectingPoint num="35" id="2902" />
+<TGConnectingPoint num="36" id="2903" />
+<TGConnectingPoint num="37" id="2904" />
+<TGConnectingPoint num="38" id="2905" />
+<TGConnectingPoint num="39" id="2906" />
 <extraparam>
 <entryCode value="printf(&quot;Got duration from remote control :%d\n&quot;, msg2__data);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="3083" >
+<COMPONENT type="5101" id="2909" >
 <cdparam x="450" y="460" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="3082" />
+<TGConnectingPoint num="0" id="2908" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="3094" >
+<COMPONENT type="5104" id="2920" >
 <cdparam x="311" y="166" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="wirelessChannelRead(msg2)" />
-<TGConnectingPoint num="0" id="3084" />
-<TGConnectingPoint num="1" id="3085" />
-<TGConnectingPoint num="2" id="3086" />
-<TGConnectingPoint num="3" id="3087" />
-<TGConnectingPoint num="4" id="3088" />
-<TGConnectingPoint num="5" id="3089" />
-<TGConnectingPoint num="6" id="3090" />
-<TGConnectingPoint num="7" id="3091" />
-<TGConnectingPoint num="8" id="3092" />
-<TGConnectingPoint num="9" id="3093" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3096" >
+<TGConnectingPoint num="0" id="2910" />
+<TGConnectingPoint num="1" id="2911" />
+<TGConnectingPoint num="2" id="2912" />
+<TGConnectingPoint num="3" id="2913" />
+<TGConnectingPoint num="4" id="2914" />
+<TGConnectingPoint num="5" id="2915" />
+<TGConnectingPoint num="6" id="2916" />
+<TGConnectingPoint num="7" id="2917" />
+<TGConnectingPoint num="8" id="2918" />
+<TGConnectingPoint num="9" id="2919" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="2922" >
 <cdparam x="379" y="81" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3095" />
+<TGConnectingPoint num="0" id="2921" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3103" >
+<CONNECTOR type="5102" id="2929" >
 <cdparam x="407" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3102" />
-<P1  x="407" y="340" id="3162" />
-<P2  x="407" y="374" id="3197" />
+<TGConnectingPoint num="0" id="2928" />
+<P1  x="407" y="340" id="2988" />
+<P2  x="407" y="374" id="3023" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3101" >
-<father id="3103" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2927" >
+<father id="2929" num="0" />
 <cdparam x="414" y="365" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3097" />
-<TGConnectingPoint num="1" id="3098" />
-<TGConnectingPoint num="2" id="3099" />
-<TGConnectingPoint num="3" id="3100" />
+<TGConnectingPoint num="0" id="2923" />
+<TGConnectingPoint num="1" id="2924" />
+<TGConnectingPoint num="2" id="2925" />
+<TGConnectingPoint num="3" id="2926" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -6279,55 +6008,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3116" >
+<CONNECTOR type="5102" id="2942" >
 <cdparam x="407" y="277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3112" />
-<TGConnectingPoint num="1" id="3113" />
-<TGConnectingPoint num="2" id="3114" />
-<TGConnectingPoint num="3" id="3115" />
-<P1  x="407" y="404" id="3198" />
-<P2  x="357" y="125" id="3222" />
+<TGConnectingPoint num="0" id="2938" />
+<TGConnectingPoint num="1" id="2939" />
+<TGConnectingPoint num="2" id="2940" />
+<TGConnectingPoint num="3" id="2941" />
+<P1  x="407" y="404" id="3024" />
+<P2  x="357" y="125" id="3048" />
 <Point x="300" y="404" />
 <Point x="300" y="278" />
 <Point x="300" y="125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3104" >
-<father id="3116" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2930" >
+<father id="2942" num="0" />
 <cdparam x="300" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3105" >
-<father id="3116" num="1" />
+<SUBCOMPONENT type="-1" id="2931" >
+<father id="2942" num="1" />
 <cdparam x="300" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3106" >
-<father id="3116" num="2" />
+<SUBCOMPONENT type="-1" id="2932" >
+<father id="2942" num="2" />
 <cdparam x="300" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3111" >
-<father id="3116" num="3" />
+<SUBCOMPONENT type="-1" id="2937" >
+<father id="2942" num="3" />
 <cdparam x="246" y="301" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3107" />
-<TGConnectingPoint num="1" id="3108" />
-<TGConnectingPoint num="2" id="3109" />
-<TGConnectingPoint num="3" id="3110" />
+<TGConnectingPoint num="0" id="2933" />
+<TGConnectingPoint num="1" id="2934" />
+<TGConnectingPoint num="2" id="2935" />
+<TGConnectingPoint num="3" id="2936" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6338,25 +6067,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3123" >
+<CONNECTOR type="5102" id="2949" >
 <cdparam x="407" y="214" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3122" />
-<P1  x="407" y="209" id="3209" />
-<P2  x="406" y="240" id="3145" />
+<TGConnectingPoint num="0" id="2948" />
+<P1  x="407" y="209" id="3035" />
+<P2  x="406" y="240" id="2971" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3121" >
-<father id="3123" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2947" >
+<father id="2949" num="0" />
 <cdparam x="440" y="220" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3117" />
-<TGConnectingPoint num="1" id="3118" />
-<TGConnectingPoint num="2" id="3119" />
-<TGConnectingPoint num="3" id="3120" />
+<TGConnectingPoint num="0" id="2943" />
+<TGConnectingPoint num="1" id="2944" />
+<TGConnectingPoint num="2" id="2945" />
+<TGConnectingPoint num="3" id="2946" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6367,25 +6096,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3130" >
+<CONNECTOR type="5102" id="2956" >
 <cdparam x="407" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3129" />
-<P1  x="407" y="150" id="3225" />
-<P2  x="407" y="179" id="3208" />
+<TGConnectingPoint num="0" id="2955" />
+<P1  x="407" y="150" id="3051" />
+<P2  x="407" y="179" id="3034" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3128" >
-<father id="3130" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2954" >
+<father id="2956" num="0" />
 <cdparam x="412" y="172" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3124" />
-<TGConnectingPoint num="1" id="3125" />
-<TGConnectingPoint num="2" id="3126" />
-<TGConnectingPoint num="3" id="3127" />
+<TGConnectingPoint num="0" id="2950" />
+<TGConnectingPoint num="1" id="2951" />
+<TGConnectingPoint num="2" id="2952" />
+<TGConnectingPoint num="3" id="2953" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -6395,25 +6124,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3137" >
+<CONNECTOR type="5102" id="2963" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3136" />
-<P1  x="407" y="70" id="3260" />
-<P2  x="407" y="100" id="3220" />
+<TGConnectingPoint num="0" id="2962" />
+<P1  x="407" y="70" id="3086" />
+<P2  x="407" y="100" id="3046" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3135" >
-<father id="3137" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2961" >
+<father id="2963" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3131" />
-<TGConnectingPoint num="1" id="3132" />
-<TGConnectingPoint num="2" id="3133" />
-<TGConnectingPoint num="3" id="3134" />
+<TGConnectingPoint num="0" id="2957" />
+<TGConnectingPoint num="1" id="2958" />
+<TGConnectingPoint num="2" id="2959" />
+<TGConnectingPoint num="3" id="2960" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6423,25 +6152,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3144" >
+<CONNECTOR type="5102" id="2970" >
 <cdparam x="512" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3143" />
-<P1  x="406" y="270" id="3146" />
-<P2  x="407" y="290" id="3157" />
+<TGConnectingPoint num="0" id="2969" />
+<P1  x="406" y="270" id="2972" />
+<P2  x="407" y="290" id="2983" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3142" >
-<father id="3144" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2968" >
+<father id="2970" num="0" />
 <cdparam x="512" y="311" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3138" />
-<TGConnectingPoint num="1" id="3139" />
-<TGConnectingPoint num="2" id="3140" />
-<TGConnectingPoint num="3" id="3141" />
+<TGConnectingPoint num="0" id="2964" />
+<TGConnectingPoint num="1" id="2965" />
+<TGConnectingPoint num="2" id="2966" />
+<TGConnectingPoint num="3" id="2967" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6451,224 +6180,224 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="3155" >
+<COMPONENT type="5104" id="2981" >
 <cdparam x="361" y="245" />
 <sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="3145" />
-<TGConnectingPoint num="1" id="3146" />
-<TGConnectingPoint num="2" id="3147" />
-<TGConnectingPoint num="3" id="3148" />
-<TGConnectingPoint num="4" id="3149" />
-<TGConnectingPoint num="5" id="3150" />
-<TGConnectingPoint num="6" id="3151" />
-<TGConnectingPoint num="7" id="3152" />
-<TGConnectingPoint num="8" id="3153" />
-<TGConnectingPoint num="9" id="3154" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3196" >
+<TGConnectingPoint num="0" id="2971" />
+<TGConnectingPoint num="1" id="2972" />
+<TGConnectingPoint num="2" id="2973" />
+<TGConnectingPoint num="3" id="2974" />
+<TGConnectingPoint num="4" id="2975" />
+<TGConnectingPoint num="5" id="2976" />
+<TGConnectingPoint num="6" id="2977" />
+<TGConnectingPoint num="7" id="2978" />
+<TGConnectingPoint num="8" id="2979" />
+<TGConnectingPoint num="9" id="2980" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3022" >
 <cdparam x="357" y="290" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Opened" />
-<TGConnectingPoint num="0" id="3156" />
-<TGConnectingPoint num="1" id="3157" />
-<TGConnectingPoint num="2" id="3158" />
-<TGConnectingPoint num="3" id="3159" />
-<TGConnectingPoint num="4" id="3160" />
-<TGConnectingPoint num="5" id="3161" />
-<TGConnectingPoint num="6" id="3162" />
-<TGConnectingPoint num="7" id="3163" />
-<TGConnectingPoint num="8" id="3164" />
-<TGConnectingPoint num="9" id="3165" />
-<TGConnectingPoint num="10" id="3166" />
-<TGConnectingPoint num="11" id="3167" />
-<TGConnectingPoint num="12" id="3168" />
-<TGConnectingPoint num="13" id="3169" />
-<TGConnectingPoint num="14" id="3170" />
-<TGConnectingPoint num="15" id="3171" />
-<TGConnectingPoint num="16" id="3172" />
-<TGConnectingPoint num="17" id="3173" />
-<TGConnectingPoint num="18" id="3174" />
-<TGConnectingPoint num="19" id="3175" />
-<TGConnectingPoint num="20" id="3176" />
-<TGConnectingPoint num="21" id="3177" />
-<TGConnectingPoint num="22" id="3178" />
-<TGConnectingPoint num="23" id="3179" />
-<TGConnectingPoint num="24" id="3180" />
-<TGConnectingPoint num="25" id="3181" />
-<TGConnectingPoint num="26" id="3182" />
-<TGConnectingPoint num="27" id="3183" />
-<TGConnectingPoint num="28" id="3184" />
-<TGConnectingPoint num="29" id="3185" />
-<TGConnectingPoint num="30" id="3186" />
-<TGConnectingPoint num="31" id="3187" />
-<TGConnectingPoint num="32" id="3188" />
-<TGConnectingPoint num="33" id="3189" />
-<TGConnectingPoint num="34" id="3190" />
-<TGConnectingPoint num="35" id="3191" />
-<TGConnectingPoint num="36" id="3192" />
-<TGConnectingPoint num="37" id="3193" />
-<TGConnectingPoint num="38" id="3194" />
-<TGConnectingPoint num="39" id="3195" />
+<TGConnectingPoint num="0" id="2982" />
+<TGConnectingPoint num="1" id="2983" />
+<TGConnectingPoint num="2" id="2984" />
+<TGConnectingPoint num="3" id="2985" />
+<TGConnectingPoint num="4" id="2986" />
+<TGConnectingPoint num="5" id="2987" />
+<TGConnectingPoint num="6" id="2988" />
+<TGConnectingPoint num="7" id="2989" />
+<TGConnectingPoint num="8" id="2990" />
+<TGConnectingPoint num="9" id="2991" />
+<TGConnectingPoint num="10" id="2992" />
+<TGConnectingPoint num="11" id="2993" />
+<TGConnectingPoint num="12" id="2994" />
+<TGConnectingPoint num="13" id="2995" />
+<TGConnectingPoint num="14" id="2996" />
+<TGConnectingPoint num="15" id="2997" />
+<TGConnectingPoint num="16" id="2998" />
+<TGConnectingPoint num="17" id="2999" />
+<TGConnectingPoint num="18" id="3000" />
+<TGConnectingPoint num="19" id="3001" />
+<TGConnectingPoint num="20" id="3002" />
+<TGConnectingPoint num="21" id="3003" />
+<TGConnectingPoint num="22" id="3004" />
+<TGConnectingPoint num="23" id="3005" />
+<TGConnectingPoint num="24" id="3006" />
+<TGConnectingPoint num="25" id="3007" />
+<TGConnectingPoint num="26" id="3008" />
+<TGConnectingPoint num="27" id="3009" />
+<TGConnectingPoint num="28" id="3010" />
+<TGConnectingPoint num="29" id="3011" />
+<TGConnectingPoint num="30" id="3012" />
+<TGConnectingPoint num="31" id="3013" />
+<TGConnectingPoint num="32" id="3014" />
+<TGConnectingPoint num="33" id="3015" />
+<TGConnectingPoint num="34" id="3016" />
+<TGConnectingPoint num="35" id="3017" />
+<TGConnectingPoint num="36" id="3018" />
+<TGConnectingPoint num="37" id="3019" />
+<TGConnectingPoint num="38" id="3020" />
+<TGConnectingPoint num="39" id="3021" />
 <extraparam>
 <entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3207" >
+<COMPONENT type="5103" id="3033" >
 <cdparam x="380" y="379" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="3197" />
-<TGConnectingPoint num="1" id="3198" />
-<TGConnectingPoint num="2" id="3199" />
-<TGConnectingPoint num="3" id="3200" />
-<TGConnectingPoint num="4" id="3201" />
-<TGConnectingPoint num="5" id="3202" />
-<TGConnectingPoint num="6" id="3203" />
-<TGConnectingPoint num="7" id="3204" />
-<TGConnectingPoint num="8" id="3205" />
-<TGConnectingPoint num="9" id="3206" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3218" >
+<TGConnectingPoint num="0" id="3023" />
+<TGConnectingPoint num="1" id="3024" />
+<TGConnectingPoint num="2" id="3025" />
+<TGConnectingPoint num="3" id="3026" />
+<TGConnectingPoint num="4" id="3027" />
+<TGConnectingPoint num="5" id="3028" />
+<TGConnectingPoint num="6" id="3029" />
+<TGConnectingPoint num="7" id="3030" />
+<TGConnectingPoint num="8" id="3031" />
+<TGConnectingPoint num="9" id="3032" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3044" >
 <cdparam x="384" y="184" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="3208" />
-<TGConnectingPoint num="1" id="3209" />
-<TGConnectingPoint num="2" id="3210" />
-<TGConnectingPoint num="3" id="3211" />
-<TGConnectingPoint num="4" id="3212" />
-<TGConnectingPoint num="5" id="3213" />
-<TGConnectingPoint num="6" id="3214" />
-<TGConnectingPoint num="7" id="3215" />
-<TGConnectingPoint num="8" id="3216" />
-<TGConnectingPoint num="9" id="3217" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3259" >
+<TGConnectingPoint num="0" id="3034" />
+<TGConnectingPoint num="1" id="3035" />
+<TGConnectingPoint num="2" id="3036" />
+<TGConnectingPoint num="3" id="3037" />
+<TGConnectingPoint num="4" id="3038" />
+<TGConnectingPoint num="5" id="3039" />
+<TGConnectingPoint num="6" id="3040" />
+<TGConnectingPoint num="7" id="3041" />
+<TGConnectingPoint num="8" id="3042" />
+<TGConnectingPoint num="9" id="3043" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3085" >
 <cdparam x="357" y="100" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="3219" />
-<TGConnectingPoint num="1" id="3220" />
-<TGConnectingPoint num="2" id="3221" />
-<TGConnectingPoint num="3" id="3222" />
-<TGConnectingPoint num="4" id="3223" />
-<TGConnectingPoint num="5" id="3224" />
-<TGConnectingPoint num="6" id="3225" />
-<TGConnectingPoint num="7" id="3226" />
-<TGConnectingPoint num="8" id="3227" />
-<TGConnectingPoint num="9" id="3228" />
-<TGConnectingPoint num="10" id="3229" />
-<TGConnectingPoint num="11" id="3230" />
-<TGConnectingPoint num="12" id="3231" />
-<TGConnectingPoint num="13" id="3232" />
-<TGConnectingPoint num="14" id="3233" />
-<TGConnectingPoint num="15" id="3234" />
-<TGConnectingPoint num="16" id="3235" />
-<TGConnectingPoint num="17" id="3236" />
-<TGConnectingPoint num="18" id="3237" />
-<TGConnectingPoint num="19" id="3238" />
-<TGConnectingPoint num="20" id="3239" />
-<TGConnectingPoint num="21" id="3240" />
-<TGConnectingPoint num="22" id="3241" />
-<TGConnectingPoint num="23" id="3242" />
-<TGConnectingPoint num="24" id="3243" />
-<TGConnectingPoint num="25" id="3244" />
-<TGConnectingPoint num="26" id="3245" />
-<TGConnectingPoint num="27" id="3246" />
-<TGConnectingPoint num="28" id="3247" />
-<TGConnectingPoint num="29" id="3248" />
-<TGConnectingPoint num="30" id="3249" />
-<TGConnectingPoint num="31" id="3250" />
-<TGConnectingPoint num="32" id="3251" />
-<TGConnectingPoint num="33" id="3252" />
-<TGConnectingPoint num="34" id="3253" />
-<TGConnectingPoint num="35" id="3254" />
-<TGConnectingPoint num="36" id="3255" />
-<TGConnectingPoint num="37" id="3256" />
-<TGConnectingPoint num="38" id="3257" />
-<TGConnectingPoint num="39" id="3258" />
+<TGConnectingPoint num="0" id="3045" />
+<TGConnectingPoint num="1" id="3046" />
+<TGConnectingPoint num="2" id="3047" />
+<TGConnectingPoint num="3" id="3048" />
+<TGConnectingPoint num="4" id="3049" />
+<TGConnectingPoint num="5" id="3050" />
+<TGConnectingPoint num="6" id="3051" />
+<TGConnectingPoint num="7" id="3052" />
+<TGConnectingPoint num="8" id="3053" />
+<TGConnectingPoint num="9" id="3054" />
+<TGConnectingPoint num="10" id="3055" />
+<TGConnectingPoint num="11" id="3056" />
+<TGConnectingPoint num="12" id="3057" />
+<TGConnectingPoint num="13" id="3058" />
+<TGConnectingPoint num="14" id="3059" />
+<TGConnectingPoint num="15" id="3060" />
+<TGConnectingPoint num="16" id="3061" />
+<TGConnectingPoint num="17" id="3062" />
+<TGConnectingPoint num="18" id="3063" />
+<TGConnectingPoint num="19" id="3064" />
+<TGConnectingPoint num="20" id="3065" />
+<TGConnectingPoint num="21" id="3066" />
+<TGConnectingPoint num="22" id="3067" />
+<TGConnectingPoint num="23" id="3068" />
+<TGConnectingPoint num="24" id="3069" />
+<TGConnectingPoint num="25" id="3070" />
+<TGConnectingPoint num="26" id="3071" />
+<TGConnectingPoint num="27" id="3072" />
+<TGConnectingPoint num="28" id="3073" />
+<TGConnectingPoint num="29" id="3074" />
+<TGConnectingPoint num="30" id="3075" />
+<TGConnectingPoint num="31" id="3076" />
+<TGConnectingPoint num="32" id="3077" />
+<TGConnectingPoint num="33" id="3078" />
+<TGConnectingPoint num="34" id="3079" />
+<TGConnectingPoint num="35" id="3080" />
+<TGConnectingPoint num="36" id="3081" />
+<TGConnectingPoint num="37" id="3082" />
+<TGConnectingPoint num="38" id="3083" />
+<TGConnectingPoint num="39" id="3084" />
 <extraparam>
 <entryCode value="printf(&quot;Door is closed\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="3261" >
+<COMPONENT type="5100" id="3087" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3260" />
+<TGConnectingPoint num="0" id="3086" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3274" >
+<CONNECTOR type="5102" id="3100" >
 <cdparam x="407" y="380" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3270" />
-<TGConnectingPoint num="1" id="3271" />
-<TGConnectingPoint num="2" id="3272" />
-<TGConnectingPoint num="3" id="3273" />
-<P1  x="407" y="310" id="3304" />
-<P2  x="365" y="113" id="3371" />
+<TGConnectingPoint num="0" id="3096" />
+<TGConnectingPoint num="1" id="3097" />
+<TGConnectingPoint num="2" id="3098" />
+<TGConnectingPoint num="3" id="3099" />
+<P1  x="407" y="310" id="3130" />
+<P2  x="365" y="113" id="3197" />
 <Point x="407" y="327" />
 <Point x="323" y="327" />
 <Point x="323" y="113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3262" >
-<father id="3274" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3088" >
+<father id="3100" num="0" />
 <cdparam x="407" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3263" >
-<father id="3274" num="1" />
+<SUBCOMPONENT type="-1" id="3089" >
+<father id="3100" num="1" />
 <cdparam x="323" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3264" >
-<father id="3274" num="2" />
+<SUBCOMPONENT type="-1" id="3090" >
+<father id="3100" num="2" />
 <cdparam x="323" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3269" >
-<father id="3274" num="3" />
+<SUBCOMPONENT type="-1" id="3095" >
+<father id="3100" num="3" />
 <cdparam x="418" y="343" />
 <sizeparam width="29" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3265" />
-<TGConnectingPoint num="1" id="3266" />
-<TGConnectingPoint num="2" id="3267" />
-<TGConnectingPoint num="3" id="3268" />
+<TGConnectingPoint num="0" id="3091" />
+<TGConnectingPoint num="1" id="3092" />
+<TGConnectingPoint num="2" id="3093" />
+<TGConnectingPoint num="3" id="3094" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6679,25 +6408,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3281" >
+<CONNECTOR type="5102" id="3107" >
 <cdparam x="411" y="243" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3280" />
-<P1  x="408" y="242" id="3320" />
-<P2  x="407" y="280" id="3303" />
+<TGConnectingPoint num="0" id="3106" />
+<P1  x="408" y="242" id="3146" />
+<P2  x="407" y="280" id="3129" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3279" >
-<father id="3281" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3105" >
+<father id="3107" num="0" />
 <cdparam x="411" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3275" />
-<TGConnectingPoint num="1" id="3276" />
-<TGConnectingPoint num="2" id="3277" />
-<TGConnectingPoint num="3" id="3278" />
+<TGConnectingPoint num="0" id="3101" />
+<TGConnectingPoint num="1" id="3102" />
+<TGConnectingPoint num="2" id="3103" />
+<TGConnectingPoint num="3" id="3104" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6707,25 +6436,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3288" >
+<CONNECTOR type="5102" id="3114" >
 <cdparam x="398" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="3287" />
-<P1  x="407" y="183" id="3356" />
-<P2  x="408" y="202" id="3315" />
+<TGConnectingPoint num="0" id="3113" />
+<P1  x="407" y="183" id="3182" />
+<P2  x="408" y="202" id="3141" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3286" >
-<father id="3288" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3112" >
+<father id="3114" num="0" />
 <cdparam x="421" y="197" />
 <sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3282" />
-<TGConnectingPoint num="1" id="3283" />
-<TGConnectingPoint num="2" id="3284" />
-<TGConnectingPoint num="3" id="3285" />
+<TGConnectingPoint num="0" id="3108" />
+<TGConnectingPoint num="1" id="3109" />
+<TGConnectingPoint num="2" id="3110" />
+<TGConnectingPoint num="3" id="3111" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6736,25 +6465,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3295" >
+<CONNECTOR type="5102" id="3121" >
 <cdparam x="393" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3294" />
-<P1  x="407" y="131" id="3374" />
-<P2  x="407" y="153" id="3355" />
+<TGConnectingPoint num="0" id="3120" />
+<P1  x="407" y="131" id="3200" />
+<P2  x="407" y="153" id="3181" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3293" >
-<father id="3295" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3119" >
+<father id="3121" num="0" />
 <cdparam x="393" y="171" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3289" />
-<TGConnectingPoint num="1" id="3290" />
-<TGConnectingPoint num="2" id="3291" />
-<TGConnectingPoint num="3" id="3292" />
+<TGConnectingPoint num="0" id="3115" />
+<TGConnectingPoint num="1" id="3116" />
+<TGConnectingPoint num="2" id="3117" />
+<TGConnectingPoint num="3" id="3118" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6764,25 +6493,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3302" >
+<CONNECTOR type="5102" id="3128" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3301" />
-<P1  x="407" y="70" id="3366" />
-<P2  x="407" y="96" id="3369" />
+<TGConnectingPoint num="0" id="3127" />
+<P1  x="407" y="70" id="3192" />
+<P2  x="407" y="96" id="3195" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3300" >
-<father id="3302" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3126" >
+<father id="3128" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3296" />
-<TGConnectingPoint num="1" id="3297" />
-<TGConnectingPoint num="2" id="3298" />
-<TGConnectingPoint num="3" id="3299" />
+<TGConnectingPoint num="0" id="3122" />
+<TGConnectingPoint num="1" id="3123" />
+<TGConnectingPoint num="2" id="3124" />
+<TGConnectingPoint num="3" id="3125" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6792,148 +6521,148 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="3313" >
+<COMPONENT type="5104" id="3139" >
 <cdparam x="377" y="285" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopM()" />
-<TGConnectingPoint num="0" id="3303" />
-<TGConnectingPoint num="1" id="3304" />
-<TGConnectingPoint num="2" id="3305" />
-<TGConnectingPoint num="3" id="3306" />
-<TGConnectingPoint num="4" id="3307" />
-<TGConnectingPoint num="5" id="3308" />
-<TGConnectingPoint num="6" id="3309" />
-<TGConnectingPoint num="7" id="3310" />
-<TGConnectingPoint num="8" id="3311" />
-<TGConnectingPoint num="9" id="3312" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3354" >
+<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="1" id="3130" />
+<TGConnectingPoint num="2" id="3131" />
+<TGConnectingPoint num="3" id="3132" />
+<TGConnectingPoint num="4" id="3133" />
+<TGConnectingPoint num="5" id="3134" />
+<TGConnectingPoint num="6" id="3135" />
+<TGConnectingPoint num="7" id="3136" />
+<TGConnectingPoint num="8" id="3137" />
+<TGConnectingPoint num="9" id="3138" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3180" >
 <cdparam x="373" y="202" />
 <sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Running" />
-<TGConnectingPoint num="0" id="3314" />
-<TGConnectingPoint num="1" id="3315" />
-<TGConnectingPoint num="2" id="3316" />
-<TGConnectingPoint num="3" id="3317" />
-<TGConnectingPoint num="4" id="3318" />
-<TGConnectingPoint num="5" id="3319" />
-<TGConnectingPoint num="6" id="3320" />
-<TGConnectingPoint num="7" id="3321" />
-<TGConnectingPoint num="8" id="3322" />
-<TGConnectingPoint num="9" id="3323" />
-<TGConnectingPoint num="10" id="3324" />
-<TGConnectingPoint num="11" id="3325" />
-<TGConnectingPoint num="12" id="3326" />
-<TGConnectingPoint num="13" id="3327" />
-<TGConnectingPoint num="14" id="3328" />
-<TGConnectingPoint num="15" id="3329" />
-<TGConnectingPoint num="16" id="3330" />
-<TGConnectingPoint num="17" id="3331" />
-<TGConnectingPoint num="18" id="3332" />
-<TGConnectingPoint num="19" id="3333" />
-<TGConnectingPoint num="20" id="3334" />
-<TGConnectingPoint num="21" id="3335" />
-<TGConnectingPoint num="22" id="3336" />
-<TGConnectingPoint num="23" id="3337" />
-<TGConnectingPoint num="24" id="3338" />
-<TGConnectingPoint num="25" id="3339" />
-<TGConnectingPoint num="26" id="3340" />
-<TGConnectingPoint num="27" id="3341" />
-<TGConnectingPoint num="28" id="3342" />
-<TGConnectingPoint num="29" id="3343" />
-<TGConnectingPoint num="30" id="3344" />
-<TGConnectingPoint num="31" id="3345" />
-<TGConnectingPoint num="32" id="3346" />
-<TGConnectingPoint num="33" id="3347" />
-<TGConnectingPoint num="34" id="3348" />
-<TGConnectingPoint num="35" id="3349" />
-<TGConnectingPoint num="36" id="3350" />
-<TGConnectingPoint num="37" id="3351" />
-<TGConnectingPoint num="38" id="3352" />
-<TGConnectingPoint num="39" id="3353" />
+<TGConnectingPoint num="0" id="3140" />
+<TGConnectingPoint num="1" id="3141" />
+<TGConnectingPoint num="2" id="3142" />
+<TGConnectingPoint num="3" id="3143" />
+<TGConnectingPoint num="4" id="3144" />
+<TGConnectingPoint num="5" id="3145" />
+<TGConnectingPoint num="6" id="3146" />
+<TGConnectingPoint num="7" id="3147" />
+<TGConnectingPoint num="8" id="3148" />
+<TGConnectingPoint num="9" id="3149" />
+<TGConnectingPoint num="10" id="3150" />
+<TGConnectingPoint num="11" id="3151" />
+<TGConnectingPoint num="12" id="3152" />
+<TGConnectingPoint num="13" id="3153" />
+<TGConnectingPoint num="14" id="3154" />
+<TGConnectingPoint num="15" id="3155" />
+<TGConnectingPoint num="16" id="3156" />
+<TGConnectingPoint num="17" id="3157" />
+<TGConnectingPoint num="18" id="3158" />
+<TGConnectingPoint num="19" id="3159" />
+<TGConnectingPoint num="20" id="3160" />
+<TGConnectingPoint num="21" id="3161" />
+<TGConnectingPoint num="22" id="3162" />
+<TGConnectingPoint num="23" id="3163" />
+<TGConnectingPoint num="24" id="3164" />
+<TGConnectingPoint num="25" id="3165" />
+<TGConnectingPoint num="26" id="3166" />
+<TGConnectingPoint num="27" id="3167" />
+<TGConnectingPoint num="28" id="3168" />
+<TGConnectingPoint num="29" id="3169" />
+<TGConnectingPoint num="30" id="3170" />
+<TGConnectingPoint num="31" id="3171" />
+<TGConnectingPoint num="32" id="3172" />
+<TGConnectingPoint num="33" id="3173" />
+<TGConnectingPoint num="34" id="3174" />
+<TGConnectingPoint num="35" id="3175" />
+<TGConnectingPoint num="36" id="3176" />
+<TGConnectingPoint num="37" id="3177" />
+<TGConnectingPoint num="38" id="3178" />
+<TGConnectingPoint num="39" id="3179" />
 <extraparam>
 <entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3365" >
+<COMPONENT type="5104" id="3191" >
 <cdparam x="376" y="158" />
 <sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startM()" />
-<TGConnectingPoint num="0" id="3355" />
-<TGConnectingPoint num="1" id="3356" />
-<TGConnectingPoint num="2" id="3357" />
-<TGConnectingPoint num="3" id="3358" />
-<TGConnectingPoint num="4" id="3359" />
-<TGConnectingPoint num="5" id="3360" />
-<TGConnectingPoint num="6" id="3361" />
-<TGConnectingPoint num="7" id="3362" />
-<TGConnectingPoint num="8" id="3363" />
-<TGConnectingPoint num="9" id="3364" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3367" >
+<TGConnectingPoint num="0" id="3181" />
+<TGConnectingPoint num="1" id="3182" />
+<TGConnectingPoint num="2" id="3183" />
+<TGConnectingPoint num="3" id="3184" />
+<TGConnectingPoint num="4" id="3185" />
+<TGConnectingPoint num="5" id="3186" />
+<TGConnectingPoint num="6" id="3187" />
+<TGConnectingPoint num="7" id="3188" />
+<TGConnectingPoint num="8" id="3189" />
+<TGConnectingPoint num="9" id="3190" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3193" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3366" />
+<TGConnectingPoint num="0" id="3192" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3408" >
+<COMPONENT type="5106" id="3234" >
 <cdparam x="365" y="96" />
 <sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitForStart" />
-<TGConnectingPoint num="0" id="3368" />
-<TGConnectingPoint num="1" id="3369" />
-<TGConnectingPoint num="2" id="3370" />
-<TGConnectingPoint num="3" id="3371" />
-<TGConnectingPoint num="4" id="3372" />
-<TGConnectingPoint num="5" id="3373" />
-<TGConnectingPoint num="6" id="3374" />
-<TGConnectingPoint num="7" id="3375" />
-<TGConnectingPoint num="8" id="3376" />
-<TGConnectingPoint num="9" id="3377" />
-<TGConnectingPoint num="10" id="3378" />
-<TGConnectingPoint num="11" id="3379" />
-<TGConnectingPoint num="12" id="3380" />
-<TGConnectingPoint num="13" id="3381" />
-<TGConnectingPoint num="14" id="3382" />
-<TGConnectingPoint num="15" id="3383" />
-<TGConnectingPoint num="16" id="3384" />
-<TGConnectingPoint num="17" id="3385" />
-<TGConnectingPoint num="18" id="3386" />
-<TGConnectingPoint num="19" id="3387" />
-<TGConnectingPoint num="20" id="3388" />
-<TGConnectingPoint num="21" id="3389" />
-<TGConnectingPoint num="22" id="3390" />
-<TGConnectingPoint num="23" id="3391" />
-<TGConnectingPoint num="24" id="3392" />
-<TGConnectingPoint num="25" id="3393" />
-<TGConnectingPoint num="26" id="3394" />
-<TGConnectingPoint num="27" id="3395" />
-<TGConnectingPoint num="28" id="3396" />
-<TGConnectingPoint num="29" id="3397" />
-<TGConnectingPoint num="30" id="3398" />
-<TGConnectingPoint num="31" id="3399" />
-<TGConnectingPoint num="32" id="3400" />
-<TGConnectingPoint num="33" id="3401" />
-<TGConnectingPoint num="34" id="3402" />
-<TGConnectingPoint num="35" id="3403" />
-<TGConnectingPoint num="36" id="3404" />
-<TGConnectingPoint num="37" id="3405" />
-<TGConnectingPoint num="38" id="3406" />
-<TGConnectingPoint num="39" id="3407" />
+<TGConnectingPoint num="0" id="3194" />
+<TGConnectingPoint num="1" id="3195" />
+<TGConnectingPoint num="2" id="3196" />
+<TGConnectingPoint num="3" id="3197" />
+<TGConnectingPoint num="4" id="3198" />
+<TGConnectingPoint num="5" id="3199" />
+<TGConnectingPoint num="6" id="3200" />
+<TGConnectingPoint num="7" id="3201" />
+<TGConnectingPoint num="8" id="3202" />
+<TGConnectingPoint num="9" id="3203" />
+<TGConnectingPoint num="10" id="3204" />
+<TGConnectingPoint num="11" id="3205" />
+<TGConnectingPoint num="12" id="3206" />
+<TGConnectingPoint num="13" id="3207" />
+<TGConnectingPoint num="14" id="3208" />
+<TGConnectingPoint num="15" id="3209" />
+<TGConnectingPoint num="16" id="3210" />
+<TGConnectingPoint num="17" id="3211" />
+<TGConnectingPoint num="18" id="3212" />
+<TGConnectingPoint num="19" id="3213" />
+<TGConnectingPoint num="20" id="3214" />
+<TGConnectingPoint num="21" id="3215" />
+<TGConnectingPoint num="22" id="3216" />
+<TGConnectingPoint num="23" id="3217" />
+<TGConnectingPoint num="24" id="3218" />
+<TGConnectingPoint num="25" id="3219" />
+<TGConnectingPoint num="26" id="3220" />
+<TGConnectingPoint num="27" id="3221" />
+<TGConnectingPoint num="28" id="3222" />
+<TGConnectingPoint num="29" id="3223" />
+<TGConnectingPoint num="30" id="3224" />
+<TGConnectingPoint num="31" id="3225" />
+<TGConnectingPoint num="32" id="3226" />
+<TGConnectingPoint num="33" id="3227" />
+<TGConnectingPoint num="34" id="3228" />
+<TGConnectingPoint num="35" id="3229" />
+<TGConnectingPoint num="36" id="3230" />
+<TGConnectingPoint num="37" id="3231" />
+<TGConnectingPoint num="38" id="3232" />
+<TGConnectingPoint num="39" id="3233" />
 <extraparam>
 <entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
 </extraparam>
@@ -6943,25 +6672,25 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3415" >
+<CONNECTOR type="5102" id="3241" >
 <cdparam x="671" y="540" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3414" />
-<P1  x="671" y="540" id="3612" />
-<P2  x="671" y="551" id="3868" />
+<TGConnectingPoint num="0" id="3240" />
+<P1  x="671" y="540" id="3438" />
+<P2  x="671" y="551" id="3694" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3413" >
-<father id="3415" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3239" >
+<father id="3241" num="0" />
 <cdparam x="671" y="580" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3409" />
-<TGConnectingPoint num="1" id="3410" />
-<TGConnectingPoint num="2" id="3411" />
-<TGConnectingPoint num="3" id="3412" />
+<TGConnectingPoint num="0" id="3235" />
+<TGConnectingPoint num="1" id="3236" />
+<TGConnectingPoint num="2" id="3237" />
+<TGConnectingPoint num="3" id="3238" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6971,25 +6700,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3422" >
+<CONNECTOR type="5102" id="3248" >
 <cdparam x="671" y="332" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3421" />
-<P1  x="671" y="332" id="3623" />
-<P2  x="671" y="345" id="3846" />
+<TGConnectingPoint num="0" id="3247" />
+<P1  x="671" y="332" id="3449" />
+<P2  x="671" y="345" id="3672" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3420" >
-<father id="3422" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3246" >
+<father id="3248" num="0" />
 <cdparam x="671" y="372" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3416" />
-<TGConnectingPoint num="1" id="3417" />
-<TGConnectingPoint num="2" id="3418" />
-<TGConnectingPoint num="3" id="3419" />
+<TGConnectingPoint num="0" id="3242" />
+<TGConnectingPoint num="1" id="3243" />
+<TGConnectingPoint num="2" id="3244" />
+<TGConnectingPoint num="3" id="3245" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6999,25 +6728,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3429" >
+<CONNECTOR type="5102" id="3255" >
 <cdparam x="428" y="373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3428" />
-<P1  x="428" y="380" id="3634" />
-<P2  x="428" y="395" id="3730" />
+<TGConnectingPoint num="0" id="3254" />
+<P1  x="428" y="380" id="3460" />
+<P2  x="428" y="395" id="3556" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3427" >
-<father id="3429" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3253" >
+<father id="3255" num="0" />
 <cdparam x="428" y="413" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3423" />
-<TGConnectingPoint num="1" id="3424" />
-<TGConnectingPoint num="2" id="3425" />
-<TGConnectingPoint num="3" id="3426" />
+<TGConnectingPoint num="0" id="3249" />
+<TGConnectingPoint num="1" id="3250" />
+<TGConnectingPoint num="2" id="3251" />
+<TGConnectingPoint num="3" id="3252" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7027,25 +6756,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3436" >
+<CONNECTOR type="5102" id="3262" >
 <cdparam x="661" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3435" />
-<P1  x="661" y="175" id="3902" />
-<P2  x="661" y="180" id="3644" />
+<TGConnectingPoint num="0" id="3261" />
+<P1  x="661" y="175" id="3728" />
+<P2  x="661" y="180" id="3470" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3434" >
-<father id="3436" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3260" >
+<father id="3262" num="0" />
 <cdparam x="661" y="215" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3430" />
-<TGConnectingPoint num="1" id="3431" />
-<TGConnectingPoint num="2" id="3432" />
-<TGConnectingPoint num="3" id="3433" />
+<TGConnectingPoint num="0" id="3256" />
+<TGConnectingPoint num="1" id="3257" />
+<TGConnectingPoint num="2" id="3258" />
+<TGConnectingPoint num="3" id="3259" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7055,25 +6784,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3443" >
+<CONNECTOR type="5102" id="3269" >
 <cdparam x="661" y="95" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3442" />
-<P1  x="661" y="95" id="3656" />
-<P2  x="661" y="106" id="3913" />
+<TGConnectingPoint num="0" id="3268" />
+<P1  x="661" y="95" id="3482" />
+<P2  x="661" y="106" id="3739" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3441" >
-<father id="3443" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3267" >
+<father id="3269" num="0" />
 <cdparam x="661" y="135" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3437" />
-<TGConnectingPoint num="1" id="3438" />
-<TGConnectingPoint num="2" id="3439" />
-<TGConnectingPoint num="3" id="3440" />
+<TGConnectingPoint num="0" id="3263" />
+<TGConnectingPoint num="1" id="3264" />
+<TGConnectingPoint num="2" id="3265" />
+<TGConnectingPoint num="3" id="3266" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7083,25 +6812,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3450" >
+<CONNECTOR type="5102" id="3276" >
 <cdparam x="450" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3449" />
-<P1  x="492" y="208" id="3834" />
-<P2  x="453" y="262" id="3675" />
+<TGConnectingPoint num="0" id="3275" />
+<P1  x="492" y="208" id="3660" />
+<P2  x="453" y="262" id="3501" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3448" >
-<father id="3450" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3274" >
+<father id="3276" num="0" />
 <cdparam x="450" y="295" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3444" />
-<TGConnectingPoint num="1" id="3445" />
-<TGConnectingPoint num="2" id="3446" />
-<TGConnectingPoint num="3" id="3447" />
+<TGConnectingPoint num="0" id="3270" />
+<TGConnectingPoint num="1" id="3271" />
+<TGConnectingPoint num="2" id="3272" />
+<TGConnectingPoint num="3" id="3273" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7111,25 +6840,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3457" >
+<CONNECTOR type="5102" id="3283" >
 <cdparam x="304" y="257" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3456" />
-<P1  x="357" y="209" id="3708" />
-<P2  x="403" y="262" id="3674" />
+<TGConnectingPoint num="0" id="3282" />
+<P1  x="357" y="209" id="3534" />
+<P2  x="403" y="262" id="3500" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3455" >
-<father id="3457" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3281" >
+<father id="3283" num="0" />
 <cdparam x="304" y="297" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3451" />
-<TGConnectingPoint num="1" id="3452" />
-<TGConnectingPoint num="2" id="3453" />
-<TGConnectingPoint num="3" id="3454" />
+<TGConnectingPoint num="0" id="3277" />
+<TGConnectingPoint num="1" id="3278" />
+<TGConnectingPoint num="2" id="3279" />
+<TGConnectingPoint num="3" id="3280" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7139,25 +6868,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3464" >
+<CONNECTOR type="5102" id="3290" >
 <cdparam x="409" y="164" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3463" />
-<P1  x="409" y="164" id="3806" />
-<P2  x="357" y="179" id="3707" />
+<TGConnectingPoint num="0" id="3289" />
+<P1  x="409" y="164" id="3632" />
+<P2  x="357" y="179" id="3533" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3462" >
-<father id="3464" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3288" >
+<father id="3290" num="0" />
 <cdparam x="409" y="204" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3458" />
-<TGConnectingPoint num="1" id="3459" />
-<TGConnectingPoint num="2" id="3460" />
-<TGConnectingPoint num="3" id="3461" />
+<TGConnectingPoint num="0" id="3284" />
+<TGConnectingPoint num="1" id="3285" />
+<TGConnectingPoint num="2" id="3286" />
+<TGConnectingPoint num="3" id="3287" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7167,25 +6896,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3471" >
+<CONNECTOR type="5102" id="3297" >
 <cdparam x="646" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="3470" />
-<P1  x="661" y="210" id="3645" />
-<P2  x="471" y="152" id="3805" />
+<TGConnectingPoint num="0" id="3296" />
+<P1  x="661" y="210" id="3471" />
+<P2  x="471" y="152" id="3631" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3469" >
-<father id="3471" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3295" >
+<father id="3297" num="0" />
 <cdparam x="646" y="310" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3465" />
-<TGConnectingPoint num="1" id="3466" />
-<TGConnectingPoint num="2" id="3467" />
-<TGConnectingPoint num="3" id="3468" />
+<TGConnectingPoint num="0" id="3291" />
+<TGConnectingPoint num="1" id="3292" />
+<TGConnectingPoint num="2" id="3293" />
+<TGConnectingPoint num="3" id="3294" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7195,25 +6924,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3478" >
+<CONNECTOR type="5102" id="3304" >
 <cdparam x="660" y="178" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3477" />
-<P1  x="661" y="141" id="3918" />
-<P2  x="661" y="145" id="3901" />
+<TGConnectingPoint num="0" id="3303" />
+<P1  x="661" y="141" id="3744" />
+<P2  x="661" y="145" id="3727" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3476" >
-<father id="3478" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3302" >
+<father id="3304" num="0" />
 <cdparam x="660" y="218" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3472" />
-<TGConnectingPoint num="1" id="3473" />
-<TGConnectingPoint num="2" id="3474" />
-<TGConnectingPoint num="3" id="3475" />
+<TGConnectingPoint num="0" id="3298" />
+<TGConnectingPoint num="1" id="3299" />
+<TGConnectingPoint num="2" id="3300" />
+<TGConnectingPoint num="3" id="3301" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7223,25 +6952,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3485" >
+<CONNECTOR type="5102" id="3311" >
 <cdparam x="659" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3484" />
-<P1  x="661" y="61" id="3782" />
-<P2  x="661" y="65" id="3655" />
+<TGConnectingPoint num="0" id="3310" />
+<P1  x="661" y="61" id="3608" />
+<P2  x="661" y="65" id="3481" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3483" >
-<father id="3485" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3309" >
+<father id="3311" num="0" />
 <cdparam x="659" y="150" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3479" />
-<TGConnectingPoint num="1" id="3480" />
-<TGConnectingPoint num="2" id="3481" />
-<TGConnectingPoint num="3" id="3482" />
+<TGConnectingPoint num="0" id="3305" />
+<TGConnectingPoint num="1" id="3306" />
+<TGConnectingPoint num="2" id="3307" />
+<TGConnectingPoint num="3" id="3308" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7251,25 +6980,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3492" >
+<CONNECTOR type="5102" id="3318" >
 <cdparam x="739" y="573" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3491" />
-<P1  x="671" y="503" id="3891" />
-<P2  x="671" y="510" id="3611" />
+<TGConnectingPoint num="0" id="3317" />
+<P1  x="671" y="503" id="3717" />
+<P2  x="671" y="510" id="3437" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3490" >
-<father id="3492" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3316" >
+<father id="3318" num="0" />
 <cdparam x="739" y="613" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3486" />
-<TGConnectingPoint num="1" id="3487" />
-<TGConnectingPoint num="2" id="3488" />
-<TGConnectingPoint num="3" id="3489" />
+<TGConnectingPoint num="0" id="3312" />
+<TGConnectingPoint num="1" id="3313" />
+<TGConnectingPoint num="2" id="3314" />
+<TGConnectingPoint num="3" id="3315" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7279,25 +7008,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3499" >
+<CONNECTOR type="5102" id="3325" >
 <cdparam x="769" y="593" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3498" />
-<P1  x="671" y="443" id="3959" />
-<P2  x="671" y="473" id="3890" />
+<TGConnectingPoint num="0" id="3324" />
+<P1  x="671" y="443" id="3785" />
+<P2  x="671" y="473" id="3716" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3497" >
-<father id="3499" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3323" >
+<father id="3325" num="0" />
 <cdparam x="769" y="633" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3493" />
-<TGConnectingPoint num="1" id="3494" />
-<TGConnectingPoint num="2" id="3495" />
-<TGConnectingPoint num="3" id="3496" />
+<TGConnectingPoint num="0" id="3319" />
+<TGConnectingPoint num="1" id="3320" />
+<TGConnectingPoint num="2" id="3321" />
+<TGConnectingPoint num="3" id="3322" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7307,55 +7036,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3512" >
+<CONNECTOR type="5102" id="3338" >
 <cdparam x="656" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3508" />
-<TGConnectingPoint num="1" id="3509" />
-<TGConnectingPoint num="2" id="3510" />
-<TGConnectingPoint num="3" id="3511" />
-<P1  x="671" y="581" id="3869" />
-<P2  x="478" y="432" id="3742" />
+<TGConnectingPoint num="0" id="3334" />
+<TGConnectingPoint num="1" id="3335" />
+<TGConnectingPoint num="2" id="3336" />
+<TGConnectingPoint num="3" id="3337" />
+<P1  x="671" y="581" id="3695" />
+<P2  x="478" y="432" id="3568" />
 <Point x="671" y="595" />
 <Point x="548" y="595" />
 <Point x="548" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3500" >
-<father id="3512" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3326" >
+<father id="3338" num="0" />
 <cdparam x="671" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3501" >
-<father id="3512" num="1" />
+<SUBCOMPONENT type="-1" id="3327" >
+<father id="3338" num="1" />
 <cdparam x="548" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3502" >
-<father id="3512" num="2" />
+<SUBCOMPONENT type="-1" id="3328" >
+<father id="3338" num="2" />
 <cdparam x="548" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3507" >
-<father id="3512" num="3" />
+<SUBCOMPONENT type="-1" id="3333" >
+<father id="3338" num="3" />
 <cdparam x="656" y="648" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3503" />
-<TGConnectingPoint num="1" id="3504" />
-<TGConnectingPoint num="2" id="3505" />
-<TGConnectingPoint num="3" id="3506" />
+<TGConnectingPoint num="0" id="3329" />
+<TGConnectingPoint num="1" id="3330" />
+<TGConnectingPoint num="2" id="3331" />
+<TGConnectingPoint num="3" id="3332" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7365,25 +7094,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3519" >
+<CONNECTOR type="5102" id="3345" >
 <cdparam x="770" y="523" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3518" />
-<P1  x="671" y="375" id="3847" />
-<P2  x="671" y="393" id="3954" />
+<TGConnectingPoint num="0" id="3344" />
+<P1  x="671" y="375" id="3673" />
+<P2  x="671" y="393" id="3780" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3517" >
-<father id="3519" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3343" >
+<father id="3345" num="0" />
 <cdparam x="770" y="563" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3513" />
-<TGConnectingPoint num="1" id="3514" />
-<TGConnectingPoint num="2" id="3515" />
-<TGConnectingPoint num="3" id="3516" />
+<TGConnectingPoint num="0" id="3339" />
+<TGConnectingPoint num="1" id="3340" />
+<TGConnectingPoint num="2" id="3341" />
+<TGConnectingPoint num="3" id="3342" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7393,25 +7122,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3526" >
+<CONNECTOR type="5102" id="3352" >
 <cdparam x="642" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3525" />
-<P1  x="670" y="287" id="3719" />
-<P2  x="671" y="302" id="3622" />
+<TGConnectingPoint num="0" id="3351" />
+<P1  x="670" y="287" id="3545" />
+<P2  x="671" y="302" id="3448" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3524" >
-<father id="3526" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3350" >
+<father id="3352" num="0" />
 <cdparam x="654" y="379" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3520" />
-<TGConnectingPoint num="1" id="3521" />
-<TGConnectingPoint num="2" id="3522" />
-<TGConnectingPoint num="3" id="3523" />
+<TGConnectingPoint num="0" id="3346" />
+<TGConnectingPoint num="1" id="3347" />
+<TGConnectingPoint num="2" id="3348" />
+<TGConnectingPoint num="3" id="3349" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7421,55 +7150,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3539" >
+<CONNECTOR type="5102" id="3365" >
 <cdparam x="425" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3535" />
-<TGConnectingPoint num="1" id="3536" />
-<TGConnectingPoint num="2" id="3537" />
-<TGConnectingPoint num="3" id="3538" />
-<P1  x="403" y="445" id="3743" />
-<P2  x="378" y="432" id="3741" />
+<TGConnectingPoint num="0" id="3361" />
+<TGConnectingPoint num="1" id="3362" />
+<TGConnectingPoint num="2" id="3363" />
+<TGConnectingPoint num="3" id="3364" />
+<P1  x="403" y="445" id="3569" />
+<P2  x="378" y="432" id="3567" />
 <Point x="403" y="480" />
 <Point x="319" y="480" />
 <Point x="319" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3527" >
-<father id="3539" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3353" >
+<father id="3365" num="0" />
 <cdparam x="403" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3528" >
-<father id="3539" num="1" />
+<SUBCOMPONENT type="-1" id="3354" >
+<father id="3365" num="1" />
 <cdparam x="319" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3529" >
-<father id="3539" num="2" />
+<SUBCOMPONENT type="-1" id="3355" >
+<father id="3365" num="2" />
 <cdparam x="319" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3534" >
-<father id="3539" num="3" />
+<SUBCOMPONENT type="-1" id="3360" >
+<father id="3365" num="3" />
 <cdparam x="158" y="477" />
 <sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3530" />
-<TGConnectingPoint num="1" id="3531" />
-<TGConnectingPoint num="2" id="3532" />
-<TGConnectingPoint num="3" id="3533" />
+<TGConnectingPoint num="0" id="3356" />
+<TGConnectingPoint num="1" id="3357" />
+<TGConnectingPoint num="2" id="3358" />
+<TGConnectingPoint num="3" id="3359" />
 <extraparam>
 <guard value="[ remainingTime&gt;0 ]" />
 <afterMin value="1" />
@@ -7481,25 +7210,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3546" >
+<CONNECTOR type="5102" id="3372" >
 <cdparam x="499" y="496" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3545" />
-<P1  x="478" y="420" id="3733" />
-<P2  x="670" y="257" id="3718" />
+<TGConnectingPoint num="0" id="3371" />
+<P1  x="478" y="420" id="3559" />
+<P2  x="670" y="257" id="3544" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3544" >
-<father id="3546" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3370" >
+<father id="3372" num="0" />
 <cdparam x="513" y="302" />
 <sizeparam width="201" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3540" />
-<TGConnectingPoint num="1" id="3541" />
-<TGConnectingPoint num="2" id="3542" />
-<TGConnectingPoint num="3" id="3543" />
+<TGConnectingPoint num="0" id="3366" />
+<TGConnectingPoint num="1" id="3367" />
+<TGConnectingPoint num="2" id="3368" />
+<TGConnectingPoint num="3" id="3369" />
 <extraparam>
 <guard value="[remainingTime &gt; 0 ]" />
 <afterMin value="1" />
@@ -7511,25 +7240,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3553" >
+<CONNECTOR type="5102" id="3379" >
 <cdparam x="450" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3552" />
-<P1  x="428" y="445" id="3735" />
-<P2  x="428" y="507" id="3857" />
+<TGConnectingPoint num="0" id="3378" />
+<P1  x="428" y="445" id="3561" />
+<P2  x="428" y="507" id="3683" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3551" >
-<father id="3553" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3377" >
+<father id="3379" num="0" />
 <cdparam x="397" y="475" />
 <sizeparam width="139" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3547" />
-<TGConnectingPoint num="1" id="3548" />
-<TGConnectingPoint num="2" id="3549" />
-<TGConnectingPoint num="3" id="3550" />
+<TGConnectingPoint num="0" id="3373" />
+<TGConnectingPoint num="1" id="3374" />
+<TGConnectingPoint num="2" id="3375" />
+<TGConnectingPoint num="3" id="3376" />
 <extraparam>
 <guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
@@ -7539,25 +7268,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3560" >
+<CONNECTOR type="5102" id="3386" >
 <cdparam x="450" y="487" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3559" />
-<P1  x="428" y="334" id="3880" />
-<P2  x="428" y="350" id="3633" />
+<TGConnectingPoint num="0" id="3385" />
+<P1  x="428" y="334" id="3706" />
+<P2  x="428" y="350" id="3459" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3558" >
-<father id="3560" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3384" >
+<father id="3386" num="0" />
 <cdparam x="252" y="341" />
 <sizeparam width="166" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3554" />
-<TGConnectingPoint num="1" id="3555" />
-<TGConnectingPoint num="2" id="3556" />
-<TGConnectingPoint num="3" id="3557" />
+<TGConnectingPoint num="0" id="3380" />
+<TGConnectingPoint num="1" id="3381" />
+<TGConnectingPoint num="2" id="3382" />
+<TGConnectingPoint num="3" id="3383" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7569,65 +7298,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3575" >
+<CONNECTOR type="5102" id="3401" >
 <cdparam x="419" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="3570" />
-<TGConnectingPoint num="1" id="3571" />
-<TGConnectingPoint num="2" id="3572" />
-<TGConnectingPoint num="3" id="3573" />
-<TGConnectingPoint num="4" id="3574" />
-<P1  x="428" y="579" id="3771" />
-<P2  x="389" y="119" id="3792" />
+<TGConnectingPoint num="0" id="3396" />
+<TGConnectingPoint num="1" id="3397" />
+<TGConnectingPoint num="2" id="3398" />
+<TGConnectingPoint num="3" id="3399" />
+<TGConnectingPoint num="4" id="3400" />
+<P1  x="428" y="579" id="3597" />
+<P2  x="389" y="119" id="3618" />
 <Point x="428" y="603" />
 <Point x="220" y="603" />
 <Point x="220" y="83" />
 <Point x="389" y="83" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3561" >
-<father id="3575" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3387" >
+<father id="3401" num="0" />
 <cdparam x="428" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3562" >
-<father id="3575" num="1" />
+<SUBCOMPONENT type="-1" id="3388" >
+<father id="3401" num="1" />
 <cdparam x="220" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3563" >
-<father id="3575" num="2" />
+<SUBCOMPONENT type="-1" id="3389" >
+<father id="3401" num="2" />
 <cdparam x="220" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3564" >
-<father id="3575" num="3" />
+<SUBCOMPONENT type="-1" id="3390" >
+<father id="3401" num="3" />
 <cdparam x="389" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3569" >
-<father id="3575" num="4" />
+<SUBCOMPONENT type="-1" id="3395" >
+<father id="3401" num="4" />
 <cdparam x="419" y="587" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3565" />
-<TGConnectingPoint num="1" id="3566" />
-<TGConnectingPoint num="2" id="3567" />
-<TGConnectingPoint num="3" id="3568" />
+<TGConnectingPoint num="0" id="3391" />
+<TGConnectingPoint num="1" id="3392" />
+<TGConnectingPoint num="2" id="3393" />
+<TGConnectingPoint num="3" id="3394" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -7637,25 +7366,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3582" >
+<CONNECTOR type="5102" id="3408" >
 <cdparam x="419" y="633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3581" />
-<P1  x="428" y="537" id="3858" />
-<P2  x="428" y="549" id="3770" />
+<TGConnectingPoint num="0" id="3407" />
+<P1  x="428" y="537" id="3684" />
+<P2  x="428" y="549" id="3596" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3580" >
-<father id="3582" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3406" >
+<father id="3408" num="0" />
 <cdparam x="419" y="673" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3576" />
-<TGConnectingPoint num="1" id="3577" />
-<TGConnectingPoint num="2" id="3578" />
-<TGConnectingPoint num="3" id="3579" />
+<TGConnectingPoint num="0" id="3402" />
+<TGConnectingPoint num="1" id="3403" />
+<TGConnectingPoint num="2" id="3404" />
+<TGConnectingPoint num="3" id="3405" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7665,25 +7394,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3589" >
+<CONNECTOR type="5102" id="3415" >
 <cdparam x="471" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3588" />
-<P1  x="471" y="141" id="3796" />
-<P2  x="661" y="31" id="3781" />
+<TGConnectingPoint num="0" id="3414" />
+<P1  x="471" y="141" id="3622" />
+<P2  x="661" y="31" id="3607" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3587" >
-<father id="3589" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3413" >
+<father id="3415" num="0" />
 <cdparam x="471" y="223" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3583" />
-<TGConnectingPoint num="1" id="3584" />
-<TGConnectingPoint num="2" id="3585" />
-<TGConnectingPoint num="3" id="3586" />
+<TGConnectingPoint num="0" id="3409" />
+<TGConnectingPoint num="1" id="3410" />
+<TGConnectingPoint num="2" id="3411" />
+<TGConnectingPoint num="3" id="3412" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7693,25 +7422,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3596" >
+<CONNECTOR type="5102" id="3422" >
 <cdparam x="463" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3595" />
-<P1  x="450" y="164" id="3807" />
-<P2  x="492" y="178" id="3833" />
+<TGConnectingPoint num="0" id="3421" />
+<P1  x="450" y="164" id="3633" />
+<P2  x="492" y="178" id="3659" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3594" >
-<father id="3596" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3420" >
+<father id="3422" num="0" />
 <cdparam x="400" y="221" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3590" />
-<TGConnectingPoint num="1" id="3591" />
-<TGConnectingPoint num="2" id="3592" />
-<TGConnectingPoint num="3" id="3593" />
+<TGConnectingPoint num="0" id="3416" />
+<TGConnectingPoint num="1" id="3417" />
+<TGConnectingPoint num="2" id="3418" />
+<TGConnectingPoint num="3" id="3419" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7721,25 +7450,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3603" >
+<CONNECTOR type="5102" id="3429" >
 <cdparam x="438" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state1" value="null" />
-<TGConnectingPoint num="0" id="3602" />
-<P1  x="430" y="100" id="3844" />
-<P2  x="430" y="119" id="3793" />
+<TGConnectingPoint num="0" id="3428" />
+<P1  x="430" y="100" id="3670" />
+<P2  x="430" y="119" id="3619" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3601" >
-<father id="3603" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3427" >
+<father id="3429" num="0" />
 <cdparam x="442" y="129" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3597" />
-<TGConnectingPoint num="1" id="3598" />
-<TGConnectingPoint num="2" id="3599" />
-<TGConnectingPoint num="3" id="3600" />
+<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="1" id="3424" />
+<TGConnectingPoint num="2" id="3425" />
+<TGConnectingPoint num="3" id="3426" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7749,25 +7478,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3610" >
+<CONNECTOR type="5102" id="3436" >
 <cdparam x="449" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3609" />
-<P1  x="428" y="298" id="3672" />
-<P2  x="428" y="304" id="3879" />
+<TGConnectingPoint num="0" id="3435" />
+<P1  x="428" y="298" id="3498" />
+<P2  x="428" y="304" id="3705" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3608" >
-<father id="3610" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3434" >
+<father id="3436" num="0" />
 <cdparam x="449" y="428" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3604" />
-<TGConnectingPoint num="1" id="3605" />
-<TGConnectingPoint num="2" id="3606" />
-<TGConnectingPoint num="3" id="3607" />
+<TGConnectingPoint num="0" id="3430" />
+<TGConnectingPoint num="1" id="3431" />
+<TGConnectingPoint num="2" id="3432" />
+<TGConnectingPoint num="3" id="3433" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7777,602 +7506,602 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3621" >
+<COMPONENT type="5103" id="3447" >
 <cdparam x="630" y="515" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="3611" />
-<TGConnectingPoint num="1" id="3612" />
-<TGConnectingPoint num="2" id="3613" />
-<TGConnectingPoint num="3" id="3614" />
-<TGConnectingPoint num="4" id="3615" />
-<TGConnectingPoint num="5" id="3616" />
-<TGConnectingPoint num="6" id="3617" />
-<TGConnectingPoint num="7" id="3618" />
-<TGConnectingPoint num="8" id="3619" />
-<TGConnectingPoint num="9" id="3620" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3632" >
+<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="1" id="3438" />
+<TGConnectingPoint num="2" id="3439" />
+<TGConnectingPoint num="3" id="3440" />
+<TGConnectingPoint num="4" id="3441" />
+<TGConnectingPoint num="5" id="3442" />
+<TGConnectingPoint num="6" id="3443" />
+<TGConnectingPoint num="7" id="3444" />
+<TGConnectingPoint num="8" id="3445" />
+<TGConnectingPoint num="9" id="3446" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3458" >
 <cdparam x="634" y="307" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="3622" />
-<TGConnectingPoint num="1" id="3623" />
-<TGConnectingPoint num="2" id="3624" />
-<TGConnectingPoint num="3" id="3625" />
-<TGConnectingPoint num="4" id="3626" />
-<TGConnectingPoint num="5" id="3627" />
-<TGConnectingPoint num="6" id="3628" />
-<TGConnectingPoint num="7" id="3629" />
-<TGConnectingPoint num="8" id="3630" />
-<TGConnectingPoint num="9" id="3631" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3643" >
+<TGConnectingPoint num="0" id="3448" />
+<TGConnectingPoint num="1" id="3449" />
+<TGConnectingPoint num="2" id="3450" />
+<TGConnectingPoint num="3" id="3451" />
+<TGConnectingPoint num="4" id="3452" />
+<TGConnectingPoint num="5" id="3453" />
+<TGConnectingPoint num="6" id="3454" />
+<TGConnectingPoint num="7" id="3455" />
+<TGConnectingPoint num="8" id="3456" />
+<TGConnectingPoint num="9" id="3457" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3469" >
 <cdparam x="362" y="355" />
 <sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="3633" />
-<TGConnectingPoint num="1" id="3634" />
-<TGConnectingPoint num="2" id="3635" />
-<TGConnectingPoint num="3" id="3636" />
-<TGConnectingPoint num="4" id="3637" />
-<TGConnectingPoint num="5" id="3638" />
-<TGConnectingPoint num="6" id="3639" />
-<TGConnectingPoint num="7" id="3640" />
-<TGConnectingPoint num="8" id="3641" />
-<TGConnectingPoint num="9" id="3642" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3654" >
+<TGConnectingPoint num="0" id="3459" />
+<TGConnectingPoint num="1" id="3460" />
+<TGConnectingPoint num="2" id="3461" />
+<TGConnectingPoint num="3" id="3462" />
+<TGConnectingPoint num="4" id="3463" />
+<TGConnectingPoint num="5" id="3464" />
+<TGConnectingPoint num="6" id="3465" />
+<TGConnectingPoint num="7" id="3466" />
+<TGConnectingPoint num="8" id="3467" />
+<TGConnectingPoint num="9" id="3468" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3480" >
 <cdparam x="620" y="185" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="3644" />
-<TGConnectingPoint num="1" id="3645" />
-<TGConnectingPoint num="2" id="3646" />
-<TGConnectingPoint num="3" id="3647" />
-<TGConnectingPoint num="4" id="3648" />
-<TGConnectingPoint num="5" id="3649" />
-<TGConnectingPoint num="6" id="3650" />
-<TGConnectingPoint num="7" id="3651" />
-<TGConnectingPoint num="8" id="3652" />
-<TGConnectingPoint num="9" id="3653" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3665" >
+<TGConnectingPoint num="0" id="3470" />
+<TGConnectingPoint num="1" id="3471" />
+<TGConnectingPoint num="2" id="3472" />
+<TGConnectingPoint num="3" id="3473" />
+<TGConnectingPoint num="4" id="3474" />
+<TGConnectingPoint num="5" id="3475" />
+<TGConnectingPoint num="6" id="3476" />
+<TGConnectingPoint num="7" id="3477" />
+<TGConnectingPoint num="8" id="3478" />
+<TGConnectingPoint num="9" id="3479" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3491" >
 <cdparam x="624" y="70" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="3655" />
-<TGConnectingPoint num="1" id="3656" />
-<TGConnectingPoint num="2" id="3657" />
-<TGConnectingPoint num="3" id="3658" />
-<TGConnectingPoint num="4" id="3659" />
-<TGConnectingPoint num="5" id="3660" />
-<TGConnectingPoint num="6" id="3661" />
-<TGConnectingPoint num="7" id="3662" />
-<TGConnectingPoint num="8" id="3663" />
-<TGConnectingPoint num="9" id="3664" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3706" >
+<TGConnectingPoint num="0" id="3481" />
+<TGConnectingPoint num="1" id="3482" />
+<TGConnectingPoint num="2" id="3483" />
+<TGConnectingPoint num="3" id="3484" />
+<TGConnectingPoint num="4" id="3485" />
+<TGConnectingPoint num="5" id="3486" />
+<TGConnectingPoint num="6" id="3487" />
+<TGConnectingPoint num="7" id="3488" />
+<TGConnectingPoint num="8" id="3489" />
+<TGConnectingPoint num="9" id="3490" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3532" >
 <cdparam x="378" y="262" />
 <sizeparam width="100" height="36" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Starting" />
-<TGConnectingPoint num="0" id="3666" />
-<TGConnectingPoint num="1" id="3667" />
-<TGConnectingPoint num="2" id="3668" />
-<TGConnectingPoint num="3" id="3669" />
-<TGConnectingPoint num="4" id="3670" />
-<TGConnectingPoint num="5" id="3671" />
-<TGConnectingPoint num="6" id="3672" />
-<TGConnectingPoint num="7" id="3673" />
-<TGConnectingPoint num="8" id="3674" />
-<TGConnectingPoint num="9" id="3675" />
-<TGConnectingPoint num="10" id="3676" />
-<TGConnectingPoint num="11" id="3677" />
-<TGConnectingPoint num="12" id="3678" />
-<TGConnectingPoint num="13" id="3679" />
-<TGConnectingPoint num="14" id="3680" />
-<TGConnectingPoint num="15" id="3681" />
-<TGConnectingPoint num="16" id="3682" />
-<TGConnectingPoint num="17" id="3683" />
-<TGConnectingPoint num="18" id="3684" />
-<TGConnectingPoint num="19" id="3685" />
-<TGConnectingPoint num="20" id="3686" />
-<TGConnectingPoint num="21" id="3687" />
-<TGConnectingPoint num="22" id="3688" />
-<TGConnectingPoint num="23" id="3689" />
-<TGConnectingPoint num="24" id="3690" />
-<TGConnectingPoint num="25" id="3691" />
-<TGConnectingPoint num="26" id="3692" />
-<TGConnectingPoint num="27" id="3693" />
-<TGConnectingPoint num="28" id="3694" />
-<TGConnectingPoint num="29" id="3695" />
-<TGConnectingPoint num="30" id="3696" />
-<TGConnectingPoint num="31" id="3697" />
-<TGConnectingPoint num="32" id="3698" />
-<TGConnectingPoint num="33" id="3699" />
-<TGConnectingPoint num="34" id="3700" />
-<TGConnectingPoint num="35" id="3701" />
-<TGConnectingPoint num="36" id="3702" />
-<TGConnectingPoint num="37" id="3703" />
-<TGConnectingPoint num="38" id="3704" />
-<TGConnectingPoint num="39" id="3705" />
+<TGConnectingPoint num="0" id="3492" />
+<TGConnectingPoint num="1" id="3493" />
+<TGConnectingPoint num="2" id="3494" />
+<TGConnectingPoint num="3" id="3495" />
+<TGConnectingPoint num="4" id="3496" />
+<TGConnectingPoint num="5" id="3497" />
+<TGConnectingPoint num="6" id="3498" />
+<TGConnectingPoint num="7" id="3499" />
+<TGConnectingPoint num="8" id="3500" />
+<TGConnectingPoint num="9" id="3501" />
+<TGConnectingPoint num="10" id="3502" />
+<TGConnectingPoint num="11" id="3503" />
+<TGConnectingPoint num="12" id="3504" />
+<TGConnectingPoint num="13" id="3505" />
+<TGConnectingPoint num="14" id="3506" />
+<TGConnectingPoint num="15" id="3507" />
+<TGConnectingPoint num="16" id="3508" />
+<TGConnectingPoint num="17" id="3509" />
+<TGConnectingPoint num="18" id="3510" />
+<TGConnectingPoint num="19" id="3511" />
+<TGConnectingPoint num="20" id="3512" />
+<TGConnectingPoint num="21" id="3513" />
+<TGConnectingPoint num="22" id="3514" />
+<TGConnectingPoint num="23" id="3515" />
+<TGConnectingPoint num="24" id="3516" />
+<TGConnectingPoint num="25" id="3517" />
+<TGConnectingPoint num="26" id="3518" />
+<TGConnectingPoint num="27" id="3519" />
+<TGConnectingPoint num="28" id="3520" />
+<TGConnectingPoint num="29" id="3521" />
+<TGConnectingPoint num="30" id="3522" />
+<TGConnectingPoint num="31" id="3523" />
+<TGConnectingPoint num="32" id="3524" />
+<TGConnectingPoint num="33" id="3525" />
+<TGConnectingPoint num="34" id="3526" />
+<TGConnectingPoint num="35" id="3527" />
+<TGConnectingPoint num="36" id="3528" />
+<TGConnectingPoint num="37" id="3529" />
+<TGConnectingPoint num="38" id="3530" />
+<TGConnectingPoint num="39" id="3531" />
 <extraparam>
 <entryCode value="printf(&quot;Starting microwave, lets go!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3717" >
+<COMPONENT type="5104" id="3543" >
 <cdparam x="287" y="184" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="remoteStart(duration)" />
-<TGConnectingPoint num="0" id="3707" />
-<TGConnectingPoint num="1" id="3708" />
-<TGConnectingPoint num="2" id="3709" />
-<TGConnectingPoint num="3" id="3710" />
-<TGConnectingPoint num="4" id="3711" />
-<TGConnectingPoint num="5" id="3712" />
-<TGConnectingPoint num="6" id="3713" />
-<TGConnectingPoint num="7" id="3714" />
-<TGConnectingPoint num="8" id="3715" />
-<TGConnectingPoint num="9" id="3716" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3728" >
+<TGConnectingPoint num="0" id="3533" />
+<TGConnectingPoint num="1" id="3534" />
+<TGConnectingPoint num="2" id="3535" />
+<TGConnectingPoint num="3" id="3536" />
+<TGConnectingPoint num="4" id="3537" />
+<TGConnectingPoint num="5" id="3538" />
+<TGConnectingPoint num="6" id="3539" />
+<TGConnectingPoint num="7" id="3540" />
+<TGConnectingPoint num="8" id="3541" />
+<TGConnectingPoint num="9" id="3542" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3554" >
 <cdparam x="643" y="262" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="open()" />
-<TGConnectingPoint num="0" id="3718" />
-<TGConnectingPoint num="1" id="3719" />
-<TGConnectingPoint num="2" id="3720" />
-<TGConnectingPoint num="3" id="3721" />
-<TGConnectingPoint num="4" id="3722" />
-<TGConnectingPoint num="5" id="3723" />
-<TGConnectingPoint num="6" id="3724" />
-<TGConnectingPoint num="7" id="3725" />
-<TGConnectingPoint num="8" id="3726" />
-<TGConnectingPoint num="9" id="3727" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3769" >
+<TGConnectingPoint num="0" id="3544" />
+<TGConnectingPoint num="1" id="3545" />
+<TGConnectingPoint num="2" id="3546" />
+<TGConnectingPoint num="3" id="3547" />
+<TGConnectingPoint num="4" id="3548" />
+<TGConnectingPoint num="5" id="3549" />
+<TGConnectingPoint num="6" id="3550" />
+<TGConnectingPoint num="7" id="3551" />
+<TGConnectingPoint num="8" id="3552" />
+<TGConnectingPoint num="9" id="3553" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3595" >
 <cdparam x="378" y="395" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="3729" />
-<TGConnectingPoint num="1" id="3730" />
-<TGConnectingPoint num="2" id="3731" />
-<TGConnectingPoint num="3" id="3732" />
-<TGConnectingPoint num="4" id="3733" />
-<TGConnectingPoint num="5" id="3734" />
-<TGConnectingPoint num="6" id="3735" />
-<TGConnectingPoint num="7" id="3736" />
-<TGConnectingPoint num="8" id="3737" />
-<TGConnectingPoint num="9" id="3738" />
-<TGConnectingPoint num="10" id="3739" />
-<TGConnectingPoint num="11" id="3740" />
-<TGConnectingPoint num="12" id="3741" />
-<TGConnectingPoint num="13" id="3742" />
-<TGConnectingPoint num="14" id="3743" />
-<TGConnectingPoint num="15" id="3744" />
-<TGConnectingPoint num="16" id="3745" />
-<TGConnectingPoint num="17" id="3746" />
-<TGConnectingPoint num="18" id="3747" />
-<TGConnectingPoint num="19" id="3748" />
-<TGConnectingPoint num="20" id="3749" />
-<TGConnectingPoint num="21" id="3750" />
-<TGConnectingPoint num="22" id="3751" />
-<TGConnectingPoint num="23" id="3752" />
-<TGConnectingPoint num="24" id="3753" />
-<TGConnectingPoint num="25" id="3754" />
-<TGConnectingPoint num="26" id="3755" />
-<TGConnectingPoint num="27" id="3756" />
-<TGConnectingPoint num="28" id="3757" />
-<TGConnectingPoint num="29" id="3758" />
-<TGConnectingPoint num="30" id="3759" />
-<TGConnectingPoint num="31" id="3760" />
-<TGConnectingPoint num="32" id="3761" />
-<TGConnectingPoint num="33" id="3762" />
-<TGConnectingPoint num="34" id="3763" />
-<TGConnectingPoint num="35" id="3764" />
-<TGConnectingPoint num="36" id="3765" />
-<TGConnectingPoint num="37" id="3766" />
-<TGConnectingPoint num="38" id="3767" />
-<TGConnectingPoint num="39" id="3768" />
+<TGConnectingPoint num="0" id="3555" />
+<TGConnectingPoint num="1" id="3556" />
+<TGConnectingPoint num="2" id="3557" />
+<TGConnectingPoint num="3" id="3558" />
+<TGConnectingPoint num="4" id="3559" />
+<TGConnectingPoint num="5" id="3560" />
+<TGConnectingPoint num="6" id="3561" />
+<TGConnectingPoint num="7" id="3562" />
+<TGConnectingPoint num="8" id="3563" />
+<TGConnectingPoint num="9" id="3564" />
+<TGConnectingPoint num="10" id="3565" />
+<TGConnectingPoint num="11" id="3566" />
+<TGConnectingPoint num="12" id="3567" />
+<TGConnectingPoint num="13" id="3568" />
+<TGConnectingPoint num="14" id="3569" />
+<TGConnectingPoint num="15" id="3570" />
+<TGConnectingPoint num="16" id="3571" />
+<TGConnectingPoint num="17" id="3572" />
+<TGConnectingPoint num="18" id="3573" />
+<TGConnectingPoint num="19" id="3574" />
+<TGConnectingPoint num="20" id="3575" />
+<TGConnectingPoint num="21" id="3576" />
+<TGConnectingPoint num="22" id="3577" />
+<TGConnectingPoint num="23" id="3578" />
+<TGConnectingPoint num="24" id="3579" />
+<TGConnectingPoint num="25" id="3580" />
+<TGConnectingPoint num="26" id="3581" />
+<TGConnectingPoint num="27" id="3582" />
+<TGConnectingPoint num="28" id="3583" />
+<TGConnectingPoint num="29" id="3584" />
+<TGConnectingPoint num="30" id="3585" />
+<TGConnectingPoint num="31" id="3586" />
+<TGConnectingPoint num="32" id="3587" />
+<TGConnectingPoint num="33" id="3588" />
+<TGConnectingPoint num="34" id="3589" />
+<TGConnectingPoint num="35" id="3590" />
+<TGConnectingPoint num="36" id="3591" />
+<TGConnectingPoint num="37" id="3592" />
+<TGConnectingPoint num="38" id="3593" />
+<TGConnectingPoint num="39" id="3594" />
 <extraparam>
 <entryCode value="printf(&quot;Heating ; remaining time :%d\n&quot;, remainingTime);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3780" >
+<COMPONENT type="5103" id="3606" >
 <cdparam x="398" y="554" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ringBell()" />
-<TGConnectingPoint num="0" id="3770" />
-<TGConnectingPoint num="1" id="3771" />
-<TGConnectingPoint num="2" id="3772" />
-<TGConnectingPoint num="3" id="3773" />
-<TGConnectingPoint num="4" id="3774" />
-<TGConnectingPoint num="5" id="3775" />
-<TGConnectingPoint num="6" id="3776" />
-<TGConnectingPoint num="7" id="3777" />
-<TGConnectingPoint num="8" id="3778" />
-<TGConnectingPoint num="9" id="3779" />
+<TGConnectingPoint num="0" id="3596" />
+<TGConnectingPoint num="1" id="3597" />
+<TGConnectingPoint num="2" id="3598" />
+<TGConnectingPoint num="3" id="3599" />
+<TGConnectingPoint num="4" id="3600" />
+<TGConnectingPoint num="5" id="3601" />
+<TGConnectingPoint num="6" id="3602" />
+<TGConnectingPoint num="7" id="3603" />
+<TGConnectingPoint num="8" id="3604" />
+<TGConnectingPoint num="9" id="3605" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5104" id="3791" >
+<COMPONENT type="5104" id="3617" >
 <cdparam x="634" y="36" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="3781" />
-<TGConnectingPoint num="1" id="3782" />
-<TGConnectingPoint num="2" id="3783" />
-<TGConnectingPoint num="3" id="3784" />
-<TGConnectingPoint num="4" id="3785" />
-<TGConnectingPoint num="5" id="3786" />
-<TGConnectingPoint num="6" id="3787" />
-<TGConnectingPoint num="7" id="3788" />
-<TGConnectingPoint num="8" id="3789" />
-<TGConnectingPoint num="9" id="3790" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3832" >
+<TGConnectingPoint num="0" id="3607" />
+<TGConnectingPoint num="1" id="3608" />
+<TGConnectingPoint num="2" id="3609" />
+<TGConnectingPoint num="3" id="3610" />
+<TGConnectingPoint num="4" id="3611" />
+<TGConnectingPoint num="5" id="3612" />
+<TGConnectingPoint num="6" id="3613" />
+<TGConnectingPoint num="7" id="3614" />
+<TGConnectingPoint num="8" id="3615" />
+<TGConnectingPoint num="9" id="3616" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3658" >
 <cdparam x="389" y="119" />
 <sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Idle" />
-<TGConnectingPoint num="0" id="3792" />
-<TGConnectingPoint num="1" id="3793" />
-<TGConnectingPoint num="2" id="3794" />
-<TGConnectingPoint num="3" id="3795" />
-<TGConnectingPoint num="4" id="3796" />
-<TGConnectingPoint num="5" id="3797" />
-<TGConnectingPoint num="6" id="3798" />
-<TGConnectingPoint num="7" id="3799" />
-<TGConnectingPoint num="8" id="3800" />
-<TGConnectingPoint num="9" id="3801" />
-<TGConnectingPoint num="10" id="3802" />
-<TGConnectingPoint num="11" id="3803" />
-<TGConnectingPoint num="12" id="3804" />
-<TGConnectingPoint num="13" id="3805" />
-<TGConnectingPoint num="14" id="3806" />
-<TGConnectingPoint num="15" id="3807" />
-<TGConnectingPoint num="16" id="3808" />
-<TGConnectingPoint num="17" id="3809" />
-<TGConnectingPoint num="18" id="3810" />
-<TGConnectingPoint num="19" id="3811" />
-<TGConnectingPoint num="20" id="3812" />
-<TGConnectingPoint num="21" id="3813" />
-<TGConnectingPoint num="22" id="3814" />
-<TGConnectingPoint num="23" id="3815" />
-<TGConnectingPoint num="24" id="3816" />
-<TGConnectingPoint num="25" id="3817" />
-<TGConnectingPoint num="26" id="3818" />
-<TGConnectingPoint num="27" id="3819" />
-<TGConnectingPoint num="28" id="3820" />
-<TGConnectingPoint num="29" id="3821" />
-<TGConnectingPoint num="30" id="3822" />
-<TGConnectingPoint num="31" id="3823" />
-<TGConnectingPoint num="32" id="3824" />
-<TGConnectingPoint num="33" id="3825" />
-<TGConnectingPoint num="34" id="3826" />
-<TGConnectingPoint num="35" id="3827" />
-<TGConnectingPoint num="36" id="3828" />
-<TGConnectingPoint num="37" id="3829" />
-<TGConnectingPoint num="38" id="3830" />
-<TGConnectingPoint num="39" id="3831" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="3843" >
+<TGConnectingPoint num="0" id="3618" />
+<TGConnectingPoint num="1" id="3619" />
+<TGConnectingPoint num="2" id="3620" />
+<TGConnectingPoint num="3" id="3621" />
+<TGConnectingPoint num="4" id="3622" />
+<TGConnectingPoint num="5" id="3623" />
+<TGConnectingPoint num="6" id="3624" />
+<TGConnectingPoint num="7" id="3625" />
+<TGConnectingPoint num="8" id="3626" />
+<TGConnectingPoint num="9" id="3627" />
+<TGConnectingPoint num="10" id="3628" />
+<TGConnectingPoint num="11" id="3629" />
+<TGConnectingPoint num="12" id="3630" />
+<TGConnectingPoint num="13" id="3631" />
+<TGConnectingPoint num="14" id="3632" />
+<TGConnectingPoint num="15" id="3633" />
+<TGConnectingPoint num="16" id="3634" />
+<TGConnectingPoint num="17" id="3635" />
+<TGConnectingPoint num="18" id="3636" />
+<TGConnectingPoint num="19" id="3637" />
+<TGConnectingPoint num="20" id="3638" />
+<TGConnectingPoint num="21" id="3639" />
+<TGConnectingPoint num="22" id="3640" />
+<TGConnectingPoint num="23" id="3641" />
+<TGConnectingPoint num="24" id="3642" />
+<TGConnectingPoint num="25" id="3643" />
+<TGConnectingPoint num="26" id="3644" />
+<TGConnectingPoint num="27" id="3645" />
+<TGConnectingPoint num="28" id="3646" />
+<TGConnectingPoint num="29" id="3647" />
+<TGConnectingPoint num="30" id="3648" />
+<TGConnectingPoint num="31" id="3649" />
+<TGConnectingPoint num="32" id="3650" />
+<TGConnectingPoint num="33" id="3651" />
+<TGConnectingPoint num="34" id="3652" />
+<TGConnectingPoint num="35" id="3653" />
+<TGConnectingPoint num="36" id="3654" />
+<TGConnectingPoint num="37" id="3655" />
+<TGConnectingPoint num="38" id="3656" />
+<TGConnectingPoint num="39" id="3657" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="3669" >
 <cdparam x="442" y="183" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="start(duration)" />
-<TGConnectingPoint num="0" id="3833" />
-<TGConnectingPoint num="1" id="3834" />
-<TGConnectingPoint num="2" id="3835" />
-<TGConnectingPoint num="3" id="3836" />
-<TGConnectingPoint num="4" id="3837" />
-<TGConnectingPoint num="5" id="3838" />
-<TGConnectingPoint num="6" id="3839" />
-<TGConnectingPoint num="7" id="3840" />
-<TGConnectingPoint num="8" id="3841" />
-<TGConnectingPoint num="9" id="3842" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3845" >
+<TGConnectingPoint num="0" id="3659" />
+<TGConnectingPoint num="1" id="3660" />
+<TGConnectingPoint num="2" id="3661" />
+<TGConnectingPoint num="3" id="3662" />
+<TGConnectingPoint num="4" id="3663" />
+<TGConnectingPoint num="5" id="3664" />
+<TGConnectingPoint num="6" id="3665" />
+<TGConnectingPoint num="7" id="3666" />
+<TGConnectingPoint num="8" id="3667" />
+<TGConnectingPoint num="9" id="3668" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3671" >
 <cdparam x="423" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3844" />
+<TGConnectingPoint num="0" id="3670" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="3856" >
+<COMPONENT type="5103" id="3682" >
 <cdparam x="619" y="350" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="3846" />
-<TGConnectingPoint num="1" id="3847" />
-<TGConnectingPoint num="2" id="3848" />
-<TGConnectingPoint num="3" id="3849" />
-<TGConnectingPoint num="4" id="3850" />
-<TGConnectingPoint num="5" id="3851" />
-<TGConnectingPoint num="6" id="3852" />
-<TGConnectingPoint num="7" id="3853" />
-<TGConnectingPoint num="8" id="3854" />
-<TGConnectingPoint num="9" id="3855" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3867" >
+<TGConnectingPoint num="0" id="3672" />
+<TGConnectingPoint num="1" id="3673" />
+<TGConnectingPoint num="2" id="3674" />
+<TGConnectingPoint num="3" id="3675" />
+<TGConnectingPoint num="4" id="3676" />
+<TGConnectingPoint num="5" id="3677" />
+<TGConnectingPoint num="6" id="3678" />
+<TGConnectingPoint num="7" id="3679" />
+<TGConnectingPoint num="8" id="3680" />
+<TGConnectingPoint num="9" id="3681" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3693" >
 <cdparam x="376" y="512" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="3857" />
-<TGConnectingPoint num="1" id="3858" />
-<TGConnectingPoint num="2" id="3859" />
-<TGConnectingPoint num="3" id="3860" />
-<TGConnectingPoint num="4" id="3861" />
-<TGConnectingPoint num="5" id="3862" />
-<TGConnectingPoint num="6" id="3863" />
-<TGConnectingPoint num="7" id="3864" />
-<TGConnectingPoint num="8" id="3865" />
-<TGConnectingPoint num="9" id="3866" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3878" >
+<TGConnectingPoint num="0" id="3683" />
+<TGConnectingPoint num="1" id="3684" />
+<TGConnectingPoint num="2" id="3685" />
+<TGConnectingPoint num="3" id="3686" />
+<TGConnectingPoint num="4" id="3687" />
+<TGConnectingPoint num="5" id="3688" />
+<TGConnectingPoint num="6" id="3689" />
+<TGConnectingPoint num="7" id="3690" />
+<TGConnectingPoint num="8" id="3691" />
+<TGConnectingPoint num="9" id="3692" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3704" >
 <cdparam x="619" y="556" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="3868" />
-<TGConnectingPoint num="1" id="3869" />
-<TGConnectingPoint num="2" id="3870" />
-<TGConnectingPoint num="3" id="3871" />
-<TGConnectingPoint num="4" id="3872" />
-<TGConnectingPoint num="5" id="3873" />
-<TGConnectingPoint num="6" id="3874" />
-<TGConnectingPoint num="7" id="3875" />
-<TGConnectingPoint num="8" id="3876" />
-<TGConnectingPoint num="9" id="3877" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3889" >
+<TGConnectingPoint num="0" id="3694" />
+<TGConnectingPoint num="1" id="3695" />
+<TGConnectingPoint num="2" id="3696" />
+<TGConnectingPoint num="3" id="3697" />
+<TGConnectingPoint num="4" id="3698" />
+<TGConnectingPoint num="5" id="3699" />
+<TGConnectingPoint num="6" id="3700" />
+<TGConnectingPoint num="7" id="3701" />
+<TGConnectingPoint num="8" id="3702" />
+<TGConnectingPoint num="9" id="3703" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3715" >
 <cdparam x="376" y="309" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="3879" />
-<TGConnectingPoint num="1" id="3880" />
-<TGConnectingPoint num="2" id="3881" />
-<TGConnectingPoint num="3" id="3882" />
-<TGConnectingPoint num="4" id="3883" />
-<TGConnectingPoint num="5" id="3884" />
-<TGConnectingPoint num="6" id="3885" />
-<TGConnectingPoint num="7" id="3886" />
-<TGConnectingPoint num="8" id="3887" />
-<TGConnectingPoint num="9" id="3888" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3900" >
+<TGConnectingPoint num="0" id="3705" />
+<TGConnectingPoint num="1" id="3706" />
+<TGConnectingPoint num="2" id="3707" />
+<TGConnectingPoint num="3" id="3708" />
+<TGConnectingPoint num="4" id="3709" />
+<TGConnectingPoint num="5" id="3710" />
+<TGConnectingPoint num="6" id="3711" />
+<TGConnectingPoint num="7" id="3712" />
+<TGConnectingPoint num="8" id="3713" />
+<TGConnectingPoint num="9" id="3714" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3726" >
 <cdparam x="640" y="478" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="3890" />
-<TGConnectingPoint num="1" id="3891" />
-<TGConnectingPoint num="2" id="3892" />
-<TGConnectingPoint num="3" id="3893" />
-<TGConnectingPoint num="4" id="3894" />
-<TGConnectingPoint num="5" id="3895" />
-<TGConnectingPoint num="6" id="3896" />
-<TGConnectingPoint num="7" id="3897" />
-<TGConnectingPoint num="8" id="3898" />
-<TGConnectingPoint num="9" id="3899" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3911" >
+<TGConnectingPoint num="0" id="3716" />
+<TGConnectingPoint num="1" id="3717" />
+<TGConnectingPoint num="2" id="3718" />
+<TGConnectingPoint num="3" id="3719" />
+<TGConnectingPoint num="4" id="3720" />
+<TGConnectingPoint num="5" id="3721" />
+<TGConnectingPoint num="6" id="3722" />
+<TGConnectingPoint num="7" id="3723" />
+<TGConnectingPoint num="8" id="3724" />
+<TGConnectingPoint num="9" id="3725" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3737" >
 <cdparam x="630" y="150" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="3901" />
-<TGConnectingPoint num="1" id="3902" />
-<TGConnectingPoint num="2" id="3903" />
-<TGConnectingPoint num="3" id="3904" />
-<TGConnectingPoint num="4" id="3905" />
-<TGConnectingPoint num="5" id="3906" />
-<TGConnectingPoint num="6" id="3907" />
-<TGConnectingPoint num="7" id="3908" />
-<TGConnectingPoint num="8" id="3909" />
-<TGConnectingPoint num="9" id="3910" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3952" >
+<TGConnectingPoint num="0" id="3727" />
+<TGConnectingPoint num="1" id="3728" />
+<TGConnectingPoint num="2" id="3729" />
+<TGConnectingPoint num="3" id="3730" />
+<TGConnectingPoint num="4" id="3731" />
+<TGConnectingPoint num="5" id="3732" />
+<TGConnectingPoint num="6" id="3733" />
+<TGConnectingPoint num="7" id="3734" />
+<TGConnectingPoint num="8" id="3735" />
+<TGConnectingPoint num="9" id="3736" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3778" >
 <cdparam x="603" y="106" />
 <sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpened" />
-<TGConnectingPoint num="0" id="3912" />
-<TGConnectingPoint num="1" id="3913" />
-<TGConnectingPoint num="2" id="3914" />
-<TGConnectingPoint num="3" id="3915" />
-<TGConnectingPoint num="4" id="3916" />
-<TGConnectingPoint num="5" id="3917" />
-<TGConnectingPoint num="6" id="3918" />
-<TGConnectingPoint num="7" id="3919" />
-<TGConnectingPoint num="8" id="3920" />
-<TGConnectingPoint num="9" id="3921" />
-<TGConnectingPoint num="10" id="3922" />
-<TGConnectingPoint num="11" id="3923" />
-<TGConnectingPoint num="12" id="3924" />
-<TGConnectingPoint num="13" id="3925" />
-<TGConnectingPoint num="14" id="3926" />
-<TGConnectingPoint num="15" id="3927" />
-<TGConnectingPoint num="16" id="3928" />
-<TGConnectingPoint num="17" id="3929" />
-<TGConnectingPoint num="18" id="3930" />
-<TGConnectingPoint num="19" id="3931" />
-<TGConnectingPoint num="20" id="3932" />
-<TGConnectingPoint num="21" id="3933" />
-<TGConnectingPoint num="22" id="3934" />
-<TGConnectingPoint num="23" id="3935" />
-<TGConnectingPoint num="24" id="3936" />
-<TGConnectingPoint num="25" id="3937" />
-<TGConnectingPoint num="26" id="3938" />
-<TGConnectingPoint num="27" id="3939" />
-<TGConnectingPoint num="28" id="3940" />
-<TGConnectingPoint num="29" id="3941" />
-<TGConnectingPoint num="30" id="3942" />
-<TGConnectingPoint num="31" id="3943" />
-<TGConnectingPoint num="32" id="3944" />
-<TGConnectingPoint num="33" id="3945" />
-<TGConnectingPoint num="34" id="3946" />
-<TGConnectingPoint num="35" id="3947" />
-<TGConnectingPoint num="36" id="3948" />
-<TGConnectingPoint num="37" id="3949" />
-<TGConnectingPoint num="38" id="3950" />
-<TGConnectingPoint num="39" id="3951" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3993" >
+<TGConnectingPoint num="0" id="3738" />
+<TGConnectingPoint num="1" id="3739" />
+<TGConnectingPoint num="2" id="3740" />
+<TGConnectingPoint num="3" id="3741" />
+<TGConnectingPoint num="4" id="3742" />
+<TGConnectingPoint num="5" id="3743" />
+<TGConnectingPoint num="6" id="3744" />
+<TGConnectingPoint num="7" id="3745" />
+<TGConnectingPoint num="8" id="3746" />
+<TGConnectingPoint num="9" id="3747" />
+<TGConnectingPoint num="10" id="3748" />
+<TGConnectingPoint num="11" id="3749" />
+<TGConnectingPoint num="12" id="3750" />
+<TGConnectingPoint num="13" id="3751" />
+<TGConnectingPoint num="14" id="3752" />
+<TGConnectingPoint num="15" id="3753" />
+<TGConnectingPoint num="16" id="3754" />
+<TGConnectingPoint num="17" id="3755" />
+<TGConnectingPoint num="18" id="3756" />
+<TGConnectingPoint num="19" id="3757" />
+<TGConnectingPoint num="20" id="3758" />
+<TGConnectingPoint num="21" id="3759" />
+<TGConnectingPoint num="22" id="3760" />
+<TGConnectingPoint num="23" id="3761" />
+<TGConnectingPoint num="24" id="3762" />
+<TGConnectingPoint num="25" id="3763" />
+<TGConnectingPoint num="26" id="3764" />
+<TGConnectingPoint num="27" id="3765" />
+<TGConnectingPoint num="28" id="3766" />
+<TGConnectingPoint num="29" id="3767" />
+<TGConnectingPoint num="30" id="3768" />
+<TGConnectingPoint num="31" id="3769" />
+<TGConnectingPoint num="32" id="3770" />
+<TGConnectingPoint num="33" id="3771" />
+<TGConnectingPoint num="34" id="3772" />
+<TGConnectingPoint num="35" id="3773" />
+<TGConnectingPoint num="36" id="3774" />
+<TGConnectingPoint num="37" id="3775" />
+<TGConnectingPoint num="38" id="3776" />
+<TGConnectingPoint num="39" id="3777" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3819" >
 <cdparam x="571" y="393" />
 <sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpenedWhileHeating" />
-<TGConnectingPoint num="0" id="3953" />
-<TGConnectingPoint num="1" id="3954" />
-<TGConnectingPoint num="2" id="3955" />
-<TGConnectingPoint num="3" id="3956" />
-<TGConnectingPoint num="4" id="3957" />
-<TGConnectingPoint num="5" id="3958" />
-<TGConnectingPoint num="6" id="3959" />
-<TGConnectingPoint num="7" id="3960" />
-<TGConnectingPoint num="8" id="3961" />
-<TGConnectingPoint num="9" id="3962" />
-<TGConnectingPoint num="10" id="3963" />
-<TGConnectingPoint num="11" id="3964" />
-<TGConnectingPoint num="12" id="3965" />
-<TGConnectingPoint num="13" id="3966" />
-<TGConnectingPoint num="14" id="3967" />
-<TGConnectingPoint num="15" id="3968" />
-<TGConnectingPoint num="16" id="3969" />
-<TGConnectingPoint num="17" id="3970" />
-<TGConnectingPoint num="18" id="3971" />
-<TGConnectingPoint num="19" id="3972" />
-<TGConnectingPoint num="20" id="3973" />
-<TGConnectingPoint num="21" id="3974" />
-<TGConnectingPoint num="22" id="3975" />
-<TGConnectingPoint num="23" id="3976" />
-<TGConnectingPoint num="24" id="3977" />
-<TGConnectingPoint num="25" id="3978" />
-<TGConnectingPoint num="26" id="3979" />
-<TGConnectingPoint num="27" id="3980" />
-<TGConnectingPoint num="28" id="3981" />
-<TGConnectingPoint num="29" id="3982" />
-<TGConnectingPoint num="30" id="3983" />
-<TGConnectingPoint num="31" id="3984" />
-<TGConnectingPoint num="32" id="3985" />
-<TGConnectingPoint num="33" id="3986" />
-<TGConnectingPoint num="34" id="3987" />
-<TGConnectingPoint num="35" id="3988" />
-<TGConnectingPoint num="36" id="3989" />
-<TGConnectingPoint num="37" id="3990" />
-<TGConnectingPoint num="38" id="3991" />
-<TGConnectingPoint num="39" id="3992" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4034" >
+<TGConnectingPoint num="0" id="3779" />
+<TGConnectingPoint num="1" id="3780" />
+<TGConnectingPoint num="2" id="3781" />
+<TGConnectingPoint num="3" id="3782" />
+<TGConnectingPoint num="4" id="3783" />
+<TGConnectingPoint num="5" id="3784" />
+<TGConnectingPoint num="6" id="3785" />
+<TGConnectingPoint num="7" id="3786" />
+<TGConnectingPoint num="8" id="3787" />
+<TGConnectingPoint num="9" id="3788" />
+<TGConnectingPoint num="10" id="3789" />
+<TGConnectingPoint num="11" id="3790" />
+<TGConnectingPoint num="12" id="3791" />
+<TGConnectingPoint num="13" id="3792" />
+<TGConnectingPoint num="14" id="3793" />
+<TGConnectingPoint num="15" id="3794" />
+<TGConnectingPoint num="16" id="3795" />
+<TGConnectingPoint num="17" id="3796" />
+<TGConnectingPoint num="18" id="3797" />
+<TGConnectingPoint num="19" id="3798" />
+<TGConnectingPoint num="20" id="3799" />
+<TGConnectingPoint num="21" id="3800" />
+<TGConnectingPoint num="22" id="3801" />
+<TGConnectingPoint num="23" id="3802" />
+<TGConnectingPoint num="24" id="3803" />
+<TGConnectingPoint num="25" id="3804" />
+<TGConnectingPoint num="26" id="3805" />
+<TGConnectingPoint num="27" id="3806" />
+<TGConnectingPoint num="28" id="3807" />
+<TGConnectingPoint num="29" id="3808" />
+<TGConnectingPoint num="30" id="3809" />
+<TGConnectingPoint num="31" id="3810" />
+<TGConnectingPoint num="32" id="3811" />
+<TGConnectingPoint num="33" id="3812" />
+<TGConnectingPoint num="34" id="3813" />
+<TGConnectingPoint num="35" id="3814" />
+<TGConnectingPoint num="36" id="3815" />
+<TGConnectingPoint num="37" id="3816" />
+<TGConnectingPoint num="38" id="3817" />
+<TGConnectingPoint num="39" id="3818" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3860" >
 <cdparam x="251" y="240" />
 <sizeparam width="543" height="394" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="3994" />
-<TGConnectingPoint num="1" id="3995" />
-<TGConnectingPoint num="2" id="3996" />
-<TGConnectingPoint num="3" id="3997" />
-<TGConnectingPoint num="4" id="3998" />
-<TGConnectingPoint num="5" id="3999" />
-<TGConnectingPoint num="6" id="4000" />
-<TGConnectingPoint num="7" id="4001" />
-<TGConnectingPoint num="8" id="4002" />
-<TGConnectingPoint num="9" id="4003" />
-<TGConnectingPoint num="10" id="4004" />
-<TGConnectingPoint num="11" id="4005" />
-<TGConnectingPoint num="12" id="4006" />
-<TGConnectingPoint num="13" id="4007" />
-<TGConnectingPoint num="14" id="4008" />
-<TGConnectingPoint num="15" id="4009" />
-<TGConnectingPoint num="16" id="4010" />
-<TGConnectingPoint num="17" id="4011" />
-<TGConnectingPoint num="18" id="4012" />
-<TGConnectingPoint num="19" id="4013" />
-<TGConnectingPoint num="20" id="4014" />
-<TGConnectingPoint num="21" id="4015" />
-<TGConnectingPoint num="22" id="4016" />
-<TGConnectingPoint num="23" id="4017" />
-<TGConnectingPoint num="24" id="4018" />
-<TGConnectingPoint num="25" id="4019" />
-<TGConnectingPoint num="26" id="4020" />
-<TGConnectingPoint num="27" id="4021" />
-<TGConnectingPoint num="28" id="4022" />
-<TGConnectingPoint num="29" id="4023" />
-<TGConnectingPoint num="30" id="4024" />
-<TGConnectingPoint num="31" id="4025" />
-<TGConnectingPoint num="32" id="4026" />
-<TGConnectingPoint num="33" id="4027" />
-<TGConnectingPoint num="34" id="4028" />
-<TGConnectingPoint num="35" id="4029" />
-<TGConnectingPoint num="36" id="4030" />
-<TGConnectingPoint num="37" id="4031" />
-<TGConnectingPoint num="38" id="4032" />
-<TGConnectingPoint num="39" id="4033" />
+<TGConnectingPoint num="0" id="3820" />
+<TGConnectingPoint num="1" id="3821" />
+<TGConnectingPoint num="2" id="3822" />
+<TGConnectingPoint num="3" id="3823" />
+<TGConnectingPoint num="4" id="3824" />
+<TGConnectingPoint num="5" id="3825" />
+<TGConnectingPoint num="6" id="3826" />
+<TGConnectingPoint num="7" id="3827" />
+<TGConnectingPoint num="8" id="3828" />
+<TGConnectingPoint num="9" id="3829" />
+<TGConnectingPoint num="10" id="3830" />
+<TGConnectingPoint num="11" id="3831" />
+<TGConnectingPoint num="12" id="3832" />
+<TGConnectingPoint num="13" id="3833" />
+<TGConnectingPoint num="14" id="3834" />
+<TGConnectingPoint num="15" id="3835" />
+<TGConnectingPoint num="16" id="3836" />
+<TGConnectingPoint num="17" id="3837" />
+<TGConnectingPoint num="18" id="3838" />
+<TGConnectingPoint num="19" id="3839" />
+<TGConnectingPoint num="20" id="3840" />
+<TGConnectingPoint num="21" id="3841" />
+<TGConnectingPoint num="22" id="3842" />
+<TGConnectingPoint num="23" id="3843" />
+<TGConnectingPoint num="24" id="3844" />
+<TGConnectingPoint num="25" id="3845" />
+<TGConnectingPoint num="26" id="3846" />
+<TGConnectingPoint num="27" id="3847" />
+<TGConnectingPoint num="28" id="3848" />
+<TGConnectingPoint num="29" id="3849" />
+<TGConnectingPoint num="30" id="3850" />
+<TGConnectingPoint num="31" id="3851" />
+<TGConnectingPoint num="32" id="3852" />
+<TGConnectingPoint num="33" id="3853" />
+<TGConnectingPoint num="34" id="3854" />
+<TGConnectingPoint num="35" id="3855" />
+<TGConnectingPoint num="36" id="3856" />
+<TGConnectingPoint num="37" id="3857" />
+<TGConnectingPoint num="38" id="3858" />
+<TGConnectingPoint num="39" id="3859" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -8381,55 +8110,55 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4047" >
+<CONNECTOR type="5102" id="3873" >
 <cdparam x="504" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4043" />
-<TGConnectingPoint num="1" id="4044" />
-<TGConnectingPoint num="2" id="4045" />
-<TGConnectingPoint num="3" id="4046" />
-<P1  x="504" y="232" id="4106" />
-<P2  x="454" y="123" id="4067" />
+<TGConnectingPoint num="0" id="3869" />
+<TGConnectingPoint num="1" id="3870" />
+<TGConnectingPoint num="2" id="3871" />
+<TGConnectingPoint num="3" id="3872" />
+<P1  x="504" y="232" id="3932" />
+<P2  x="454" y="123" id="3893" />
 <Point x="503" y="254" />
 <Point x="425" y="254" />
 <Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4035" >
-<father id="4047" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3861" >
+<father id="3873" num="0" />
 <cdparam x="503" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4036" >
-<father id="4047" num="1" />
+<SUBCOMPONENT type="-1" id="3862" >
+<father id="3873" num="1" />
 <cdparam x="425" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4037" >
-<father id="4047" num="2" />
+<SUBCOMPONENT type="-1" id="3863" >
+<father id="3873" num="2" />
 <cdparam x="426" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4042" >
-<father id="4047" num="3" />
+<SUBCOMPONENT type="-1" id="3868" >
+<father id="3873" num="3" />
 <cdparam x="465" y="275" />
 <sizeparam width="100" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4038" />
-<TGConnectingPoint num="1" id="4039" />
-<TGConnectingPoint num="2" id="4040" />
-<TGConnectingPoint num="3" id="4041" />
+<TGConnectingPoint num="0" id="3864" />
+<TGConnectingPoint num="1" id="3865" />
+<TGConnectingPoint num="2" id="3866" />
+<TGConnectingPoint num="3" id="3867" />
 <extraparam>
 <guard value="[  ]" />
 <afterMin value="" />
@@ -8439,35 +8168,35 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4056" >
+<CONNECTOR type="5102" id="3882" >
 <cdparam x="504" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4054" />
-<TGConnectingPoint num="1" id="4055" />
-<P1  x="504" y="148" id="4070" />
-<P2  x="504" y="202" id="4105" />
+<TGConnectingPoint num="0" id="3880" />
+<TGConnectingPoint num="1" id="3881" />
+<P1  x="504" y="148" id="3896" />
+<P2  x="504" y="202" id="3931" />
 <Point x="504" y="175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4048" >
-<father id="4056" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3874" >
+<father id="3882" num="0" />
 <cdparam x="504" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4053" >
-<father id="4056" num="1" />
+<SUBCOMPONENT type="-1" id="3879" >
+<father id="3882" num="1" />
 <cdparam x="504" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4049" />
-<TGConnectingPoint num="1" id="4050" />
-<TGConnectingPoint num="2" id="4051" />
-<TGConnectingPoint num="3" id="4052" />
+<TGConnectingPoint num="0" id="3875" />
+<TGConnectingPoint num="1" id="3876" />
+<TGConnectingPoint num="2" id="3877" />
+<TGConnectingPoint num="3" id="3878" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8477,25 +8206,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4063" >
+<CONNECTOR type="5102" id="3889" >
 <cdparam x="385" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4062" />
-<P1  x="481" y="74" id="4116" />
-<P2  x="504" y="98" id="4065" />
+<TGConnectingPoint num="0" id="3888" />
+<P1  x="481" y="74" id="3942" />
+<P2  x="504" y="98" id="3891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4061" >
-<father id="4063" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3887" >
+<father id="3889" num="0" />
 <cdparam x="385" y="115" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4057" />
-<TGConnectingPoint num="1" id="4058" />
-<TGConnectingPoint num="2" id="4059" />
-<TGConnectingPoint num="3" id="4060" />
+<TGConnectingPoint num="0" id="3883" />
+<TGConnectingPoint num="1" id="3884" />
+<TGConnectingPoint num="2" id="3885" />
+<TGConnectingPoint num="3" id="3886" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8505,106 +8234,106 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4104" >
+<COMPONENT type="5106" id="3930" >
 <cdparam x="454" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="4064" />
-<TGConnectingPoint num="1" id="4065" />
-<TGConnectingPoint num="2" id="4066" />
-<TGConnectingPoint num="3" id="4067" />
-<TGConnectingPoint num="4" id="4068" />
-<TGConnectingPoint num="5" id="4069" />
-<TGConnectingPoint num="6" id="4070" />
-<TGConnectingPoint num="7" id="4071" />
-<TGConnectingPoint num="8" id="4072" />
-<TGConnectingPoint num="9" id="4073" />
-<TGConnectingPoint num="10" id="4074" />
-<TGConnectingPoint num="11" id="4075" />
-<TGConnectingPoint num="12" id="4076" />
-<TGConnectingPoint num="13" id="4077" />
-<TGConnectingPoint num="14" id="4078" />
-<TGConnectingPoint num="15" id="4079" />
-<TGConnectingPoint num="16" id="4080" />
-<TGConnectingPoint num="17" id="4081" />
-<TGConnectingPoint num="18" id="4082" />
-<TGConnectingPoint num="19" id="4083" />
-<TGConnectingPoint num="20" id="4084" />
-<TGConnectingPoint num="21" id="4085" />
-<TGConnectingPoint num="22" id="4086" />
-<TGConnectingPoint num="23" id="4087" />
-<TGConnectingPoint num="24" id="4088" />
-<TGConnectingPoint num="25" id="4089" />
-<TGConnectingPoint num="26" id="4090" />
-<TGConnectingPoint num="27" id="4091" />
-<TGConnectingPoint num="28" id="4092" />
-<TGConnectingPoint num="29" id="4093" />
-<TGConnectingPoint num="30" id="4094" />
-<TGConnectingPoint num="31" id="4095" />
-<TGConnectingPoint num="32" id="4096" />
-<TGConnectingPoint num="33" id="4097" />
-<TGConnectingPoint num="34" id="4098" />
-<TGConnectingPoint num="35" id="4099" />
-<TGConnectingPoint num="36" id="4100" />
-<TGConnectingPoint num="37" id="4101" />
-<TGConnectingPoint num="38" id="4102" />
-<TGConnectingPoint num="39" id="4103" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="4115" >
+<TGConnectingPoint num="0" id="3890" />
+<TGConnectingPoint num="1" id="3891" />
+<TGConnectingPoint num="2" id="3892" />
+<TGConnectingPoint num="3" id="3893" />
+<TGConnectingPoint num="4" id="3894" />
+<TGConnectingPoint num="5" id="3895" />
+<TGConnectingPoint num="6" id="3896" />
+<TGConnectingPoint num="7" id="3897" />
+<TGConnectingPoint num="8" id="3898" />
+<TGConnectingPoint num="9" id="3899" />
+<TGConnectingPoint num="10" id="3900" />
+<TGConnectingPoint num="11" id="3901" />
+<TGConnectingPoint num="12" id="3902" />
+<TGConnectingPoint num="13" id="3903" />
+<TGConnectingPoint num="14" id="3904" />
+<TGConnectingPoint num="15" id="3905" />
+<TGConnectingPoint num="16" id="3906" />
+<TGConnectingPoint num="17" id="3907" />
+<TGConnectingPoint num="18" id="3908" />
+<TGConnectingPoint num="19" id="3909" />
+<TGConnectingPoint num="20" id="3910" />
+<TGConnectingPoint num="21" id="3911" />
+<TGConnectingPoint num="22" id="3912" />
+<TGConnectingPoint num="23" id="3913" />
+<TGConnectingPoint num="24" id="3914" />
+<TGConnectingPoint num="25" id="3915" />
+<TGConnectingPoint num="26" id="3916" />
+<TGConnectingPoint num="27" id="3917" />
+<TGConnectingPoint num="28" id="3918" />
+<TGConnectingPoint num="29" id="3919" />
+<TGConnectingPoint num="30" id="3920" />
+<TGConnectingPoint num="31" id="3921" />
+<TGConnectingPoint num="32" id="3922" />
+<TGConnectingPoint num="33" id="3923" />
+<TGConnectingPoint num="34" id="3924" />
+<TGConnectingPoint num="35" id="3925" />
+<TGConnectingPoint num="36" id="3926" />
+<TGConnectingPoint num="37" id="3927" />
+<TGConnectingPoint num="38" id="3928" />
+<TGConnectingPoint num="39" id="3929" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3941" >
 <cdparam x="440" y="207" />
 <sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="4105" />
-<TGConnectingPoint num="1" id="4106" />
-<TGConnectingPoint num="2" id="4107" />
-<TGConnectingPoint num="3" id="4108" />
-<TGConnectingPoint num="4" id="4109" />
-<TGConnectingPoint num="5" id="4110" />
-<TGConnectingPoint num="6" id="4111" />
-<TGConnectingPoint num="7" id="4112" />
-<TGConnectingPoint num="8" id="4113" />
-<TGConnectingPoint num="9" id="4114" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4117" >
+<TGConnectingPoint num="0" id="3931" />
+<TGConnectingPoint num="1" id="3932" />
+<TGConnectingPoint num="2" id="3933" />
+<TGConnectingPoint num="3" id="3934" />
+<TGConnectingPoint num="4" id="3935" />
+<TGConnectingPoint num="5" id="3936" />
+<TGConnectingPoint num="6" id="3937" />
+<TGConnectingPoint num="7" id="3938" />
+<TGConnectingPoint num="8" id="3939" />
+<TGConnectingPoint num="9" id="3940" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3943" >
 <cdparam x="474" y="54" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4116" />
+<TGConnectingPoint num="0" id="3942" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4124" >
+<CONNECTOR type="5102" id="3950" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4123" />
-<P1  x="419" y="209" id="4194" />
-<P2  x="419" y="313" id="4153" />
+<TGConnectingPoint num="0" id="3949" />
+<P1  x="419" y="209" id="4020" />
+<P2  x="419" y="313" id="3979" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4122" >
-<father id="4124" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3948" >
+<father id="3950" num="0" />
 <cdparam x="429" y="249" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4118" />
-<TGConnectingPoint num="1" id="4119" />
-<TGConnectingPoint num="2" id="4120" />
-<TGConnectingPoint num="3" id="4121" />
+<TGConnectingPoint num="0" id="3944" />
+<TGConnectingPoint num="1" id="3945" />
+<TGConnectingPoint num="2" id="3946" />
+<TGConnectingPoint num="3" id="3947" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8615,55 +8344,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4137" >
+<CONNECTOR type="5102" id="3963" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4133" />
-<TGConnectingPoint num="1" id="4134" />
-<TGConnectingPoint num="2" id="4135" />
-<TGConnectingPoint num="3" id="4136" />
-<P1  x="419" y="363" id="4158" />
-<P2  x="369" y="123" id="4207" />
+<TGConnectingPoint num="0" id="3959" />
+<TGConnectingPoint num="1" id="3960" />
+<TGConnectingPoint num="2" id="3961" />
+<TGConnectingPoint num="3" id="3962" />
+<P1  x="419" y="363" id="3984" />
+<P2  x="369" y="123" id="4033" />
 <Point x="412" y="419" />
 <Point x="332" y="419" />
 <Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4125" >
-<father id="4137" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3951" >
+<father id="3963" num="0" />
 <cdparam x="412" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4126" >
-<father id="4137" num="1" />
+<SUBCOMPONENT type="-1" id="3952" >
+<father id="3963" num="1" />
 <cdparam x="332" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4127" >
-<father id="4137" num="2" />
+<SUBCOMPONENT type="-1" id="3953" >
+<father id="3963" num="2" />
 <cdparam x="332" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4132" >
-<father id="4137" num="3" />
+<SUBCOMPONENT type="-1" id="3958" >
+<father id="3963" num="3" />
 <cdparam x="430" y="402" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4128" />
-<TGConnectingPoint num="1" id="4129" />
-<TGConnectingPoint num="2" id="4130" />
-<TGConnectingPoint num="3" id="4131" />
+<TGConnectingPoint num="0" id="3954" />
+<TGConnectingPoint num="1" id="3955" />
+<TGConnectingPoint num="2" id="3956" />
+<TGConnectingPoint num="3" id="3957" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8673,25 +8402,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4144" >
+<CONNECTOR type="5102" id="3970" >
 <cdparam x="420" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4143" />
-<P1  x="419" y="148" id="4210" />
-<P2  x="419" y="179" id="4193" />
+<TGConnectingPoint num="0" id="3969" />
+<P1  x="419" y="148" id="4036" />
+<P2  x="419" y="179" id="4019" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4142" >
-<father id="4144" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3968" >
+<father id="3970" num="0" />
 <cdparam x="420" y="191" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4138" />
-<TGConnectingPoint num="1" id="4139" />
-<TGConnectingPoint num="2" id="4140" />
-<TGConnectingPoint num="3" id="4141" />
+<TGConnectingPoint num="0" id="3964" />
+<TGConnectingPoint num="1" id="3965" />
+<TGConnectingPoint num="2" id="3966" />
+<TGConnectingPoint num="3" id="3967" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8701,25 +8430,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4151" >
+<CONNECTOR type="5102" id="3977" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4150" />
-<P1  x="407" y="70" id="4245" />
-<P2  x="419" y="98" id="4205" />
+<TGConnectingPoint num="0" id="3976" />
+<P1  x="407" y="70" id="4071" />
+<P2  x="419" y="98" id="4031" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4149" >
-<father id="4151" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3975" >
+<father id="3977" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4145" />
-<TGConnectingPoint num="1" id="4146" />
-<TGConnectingPoint num="2" id="4147" />
-<TGConnectingPoint num="3" id="4148" />
+<TGConnectingPoint num="0" id="3971" />
+<TGConnectingPoint num="1" id="3972" />
+<TGConnectingPoint num="2" id="3973" />
+<TGConnectingPoint num="3" id="3974" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8729,166 +8458,166 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4192" >
+<COMPONENT type="5106" id="4018" >
 <cdparam x="369" y="313" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Ringing" />
-<TGConnectingPoint num="0" id="4152" />
-<TGConnectingPoint num="1" id="4153" />
-<TGConnectingPoint num="2" id="4154" />
-<TGConnectingPoint num="3" id="4155" />
-<TGConnectingPoint num="4" id="4156" />
-<TGConnectingPoint num="5" id="4157" />
-<TGConnectingPoint num="6" id="4158" />
-<TGConnectingPoint num="7" id="4159" />
-<TGConnectingPoint num="8" id="4160" />
-<TGConnectingPoint num="9" id="4161" />
-<TGConnectingPoint num="10" id="4162" />
-<TGConnectingPoint num="11" id="4163" />
-<TGConnectingPoint num="12" id="4164" />
-<TGConnectingPoint num="13" id="4165" />
-<TGConnectingPoint num="14" id="4166" />
-<TGConnectingPoint num="15" id="4167" />
-<TGConnectingPoint num="16" id="4168" />
-<TGConnectingPoint num="17" id="4169" />
-<TGConnectingPoint num="18" id="4170" />
-<TGConnectingPoint num="19" id="4171" />
-<TGConnectingPoint num="20" id="4172" />
-<TGConnectingPoint num="21" id="4173" />
-<TGConnectingPoint num="22" id="4174" />
-<TGConnectingPoint num="23" id="4175" />
-<TGConnectingPoint num="24" id="4176" />
-<TGConnectingPoint num="25" id="4177" />
-<TGConnectingPoint num="26" id="4178" />
-<TGConnectingPoint num="27" id="4179" />
-<TGConnectingPoint num="28" id="4180" />
-<TGConnectingPoint num="29" id="4181" />
-<TGConnectingPoint num="30" id="4182" />
-<TGConnectingPoint num="31" id="4183" />
-<TGConnectingPoint num="32" id="4184" />
-<TGConnectingPoint num="33" id="4185" />
-<TGConnectingPoint num="34" id="4186" />
-<TGConnectingPoint num="35" id="4187" />
-<TGConnectingPoint num="36" id="4188" />
-<TGConnectingPoint num="37" id="4189" />
-<TGConnectingPoint num="38" id="4190" />
-<TGConnectingPoint num="39" id="4191" />
+<TGConnectingPoint num="0" id="3978" />
+<TGConnectingPoint num="1" id="3979" />
+<TGConnectingPoint num="2" id="3980" />
+<TGConnectingPoint num="3" id="3981" />
+<TGConnectingPoint num="4" id="3982" />
+<TGConnectingPoint num="5" id="3983" />
+<TGConnectingPoint num="6" id="3984" />
+<TGConnectingPoint num="7" id="3985" />
+<TGConnectingPoint num="8" id="3986" />
+<TGConnectingPoint num="9" id="3987" />
+<TGConnectingPoint num="10" id="3988" />
+<TGConnectingPoint num="11" id="3989" />
+<TGConnectingPoint num="12" id="3990" />
+<TGConnectingPoint num="13" id="3991" />
+<TGConnectingPoint num="14" id="3992" />
+<TGConnectingPoint num="15" id="3993" />
+<TGConnectingPoint num="16" id="3994" />
+<TGConnectingPoint num="17" id="3995" />
+<TGConnectingPoint num="18" id="3996" />
+<TGConnectingPoint num="19" id="3997" />
+<TGConnectingPoint num="20" id="3998" />
+<TGConnectingPoint num="21" id="3999" />
+<TGConnectingPoint num="22" id="4000" />
+<TGConnectingPoint num="23" id="4001" />
+<TGConnectingPoint num="24" id="4002" />
+<TGConnectingPoint num="25" id="4003" />
+<TGConnectingPoint num="26" id="4004" />
+<TGConnectingPoint num="27" id="4005" />
+<TGConnectingPoint num="28" id="4006" />
+<TGConnectingPoint num="29" id="4007" />
+<TGConnectingPoint num="30" id="4008" />
+<TGConnectingPoint num="31" id="4009" />
+<TGConnectingPoint num="32" id="4010" />
+<TGConnectingPoint num="33" id="4011" />
+<TGConnectingPoint num="34" id="4012" />
+<TGConnectingPoint num="35" id="4013" />
+<TGConnectingPoint num="36" id="4014" />
+<TGConnectingPoint num="37" id="4015" />
+<TGConnectingPoint num="38" id="4016" />
+<TGConnectingPoint num="39" id="4017" />
 <extraparam>
 <entryCode value="" />
 <entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4203" >
+<COMPONENT type="5104" id="4029" >
 <cdparam x="395" y="184" />
 <sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ring()" />
-<TGConnectingPoint num="0" id="4193" />
-<TGConnectingPoint num="1" id="4194" />
-<TGConnectingPoint num="2" id="4195" />
-<TGConnectingPoint num="3" id="4196" />
-<TGConnectingPoint num="4" id="4197" />
-<TGConnectingPoint num="5" id="4198" />
-<TGConnectingPoint num="6" id="4199" />
-<TGConnectingPoint num="7" id="4200" />
-<TGConnectingPoint num="8" id="4201" />
-<TGConnectingPoint num="9" id="4202" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4244" >
+<TGConnectingPoint num="0" id="4019" />
+<TGConnectingPoint num="1" id="4020" />
+<TGConnectingPoint num="2" id="4021" />
+<TGConnectingPoint num="3" id="4022" />
+<TGConnectingPoint num="4" id="4023" />
+<TGConnectingPoint num="5" id="4024" />
+<TGConnectingPoint num="6" id="4025" />
+<TGConnectingPoint num="7" id="4026" />
+<TGConnectingPoint num="8" id="4027" />
+<TGConnectingPoint num="9" id="4028" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4070" >
 <cdparam x="369" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="4204" />
-<TGConnectingPoint num="1" id="4205" />
-<TGConnectingPoint num="2" id="4206" />
-<TGConnectingPoint num="3" id="4207" />
-<TGConnectingPoint num="4" id="4208" />
-<TGConnectingPoint num="5" id="4209" />
-<TGConnectingPoint num="6" id="4210" />
-<TGConnectingPoint num="7" id="4211" />
-<TGConnectingPoint num="8" id="4212" />
-<TGConnectingPoint num="9" id="4213" />
-<TGConnectingPoint num="10" id="4214" />
-<TGConnectingPoint num="11" id="4215" />
-<TGConnectingPoint num="12" id="4216" />
-<TGConnectingPoint num="13" id="4217" />
-<TGConnectingPoint num="14" id="4218" />
-<TGConnectingPoint num="15" id="4219" />
-<TGConnectingPoint num="16" id="4220" />
-<TGConnectingPoint num="17" id="4221" />
-<TGConnectingPoint num="18" id="4222" />
-<TGConnectingPoint num="19" id="4223" />
-<TGConnectingPoint num="20" id="4224" />
-<TGConnectingPoint num="21" id="4225" />
-<TGConnectingPoint num="22" id="4226" />
-<TGConnectingPoint num="23" id="4227" />
-<TGConnectingPoint num="24" id="4228" />
-<TGConnectingPoint num="25" id="4229" />
-<TGConnectingPoint num="26" id="4230" />
-<TGConnectingPoint num="27" id="4231" />
-<TGConnectingPoint num="28" id="4232" />
-<TGConnectingPoint num="29" id="4233" />
-<TGConnectingPoint num="30" id="4234" />
-<TGConnectingPoint num="31" id="4235" />
-<TGConnectingPoint num="32" id="4236" />
-<TGConnectingPoint num="33" id="4237" />
-<TGConnectingPoint num="34" id="4238" />
-<TGConnectingPoint num="35" id="4239" />
-<TGConnectingPoint num="36" id="4240" />
-<TGConnectingPoint num="37" id="4241" />
-<TGConnectingPoint num="38" id="4242" />
-<TGConnectingPoint num="39" id="4243" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4246" >
+<TGConnectingPoint num="0" id="4030" />
+<TGConnectingPoint num="1" id="4031" />
+<TGConnectingPoint num="2" id="4032" />
+<TGConnectingPoint num="3" id="4033" />
+<TGConnectingPoint num="4" id="4034" />
+<TGConnectingPoint num="5" id="4035" />
+<TGConnectingPoint num="6" id="4036" />
+<TGConnectingPoint num="7" id="4037" />
+<TGConnectingPoint num="8" id="4038" />
+<TGConnectingPoint num="9" id="4039" />
+<TGConnectingPoint num="10" id="4040" />
+<TGConnectingPoint num="11" id="4041" />
+<TGConnectingPoint num="12" id="4042" />
+<TGConnectingPoint num="13" id="4043" />
+<TGConnectingPoint num="14" id="4044" />
+<TGConnectingPoint num="15" id="4045" />
+<TGConnectingPoint num="16" id="4046" />
+<TGConnectingPoint num="17" id="4047" />
+<TGConnectingPoint num="18" id="4048" />
+<TGConnectingPoint num="19" id="4049" />
+<TGConnectingPoint num="20" id="4050" />
+<TGConnectingPoint num="21" id="4051" />
+<TGConnectingPoint num="22" id="4052" />
+<TGConnectingPoint num="23" id="4053" />
+<TGConnectingPoint num="24" id="4054" />
+<TGConnectingPoint num="25" id="4055" />
+<TGConnectingPoint num="26" id="4056" />
+<TGConnectingPoint num="27" id="4057" />
+<TGConnectingPoint num="28" id="4058" />
+<TGConnectingPoint num="29" id="4059" />
+<TGConnectingPoint num="30" id="4060" />
+<TGConnectingPoint num="31" id="4061" />
+<TGConnectingPoint num="32" id="4062" />
+<TGConnectingPoint num="33" id="4063" />
+<TGConnectingPoint num="34" id="4064" />
+<TGConnectingPoint num="35" id="4065" />
+<TGConnectingPoint num="36" id="4066" />
+<TGConnectingPoint num="37" id="4067" />
+<TGConnectingPoint num="38" id="4068" />
+<TGConnectingPoint num="39" id="4069" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4072" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4245" />
+<TGConnectingPoint num="0" id="4071" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemoteControl" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="118" id="4247" >
+<CONNECTOR type="118" id="4073" >
 <cdparam x="516" y="268" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from List of all parameters of an Avatar SMD transition to UML Note" value="null" />
-<P1  x="531" y="264" id="4264" />
-<P2  x="607" y="233" id="4272" />
+<P1  x="531" y="264" id="4090" />
+<P2  x="607" y="233" id="4098" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4254" >
+<CONNECTOR type="5102" id="4080" >
 <cdparam x="290" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4253" />
-<P1  x="309" y="119" id="4340" />
-<P2  x="325" y="163" id="4287" />
+<TGConnectingPoint num="0" id="4079" />
+<P1  x="309" y="119" id="4166" />
+<P2  x="325" y="163" id="4113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4252" >
-<father id="4254" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4078" >
+<father id="4080" num="0" />
 <cdparam x="290" y="180" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4248" />
-<TGConnectingPoint num="1" id="4249" />
-<TGConnectingPoint num="2" id="4250" />
-<TGConnectingPoint num="3" id="4251" />
+<TGConnectingPoint num="0" id="4074" />
+<TGConnectingPoint num="1" id="4075" />
+<TGConnectingPoint num="2" id="4076" />
+<TGConnectingPoint num="3" id="4077" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8898,25 +8627,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4261" >
+<CONNECTOR type="5102" id="4087" >
 <cdparam x="347" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="4260" />
-<P1  x="347" y="321" id="4330" />
-<P2  x="350" y="350" id="4327" />
+<TGConnectingPoint num="0" id="4086" />
+<P1  x="347" y="321" id="4156" />
+<P2  x="350" y="350" id="4153" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4259" >
-<father id="4261" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4085" >
+<father id="4087" num="0" />
 <cdparam x="347" y="361" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4255" />
-<TGConnectingPoint num="1" id="4256" />
-<TGConnectingPoint num="2" id="4257" />
-<TGConnectingPoint num="3" id="4258" />
+<TGConnectingPoint num="0" id="4081" />
+<TGConnectingPoint num="1" id="4082" />
+<TGConnectingPoint num="2" id="4083" />
+<TGConnectingPoint num="3" id="4084" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8926,25 +8655,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4268" >
+<CONNECTOR type="5102" id="4094" >
 <cdparam x="327" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4267" />
-<P1  x="325" y="213" id="4292" />
-<P2  x="347" y="291" id="4329" />
+<TGConnectingPoint num="0" id="4093" />
+<P1  x="325" y="213" id="4118" />
+<P2  x="347" y="291" id="4155" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4266" >
-<father id="4268" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4092" >
+<father id="4094" num="0" />
 <cdparam x="363" y="249" />
 <sizeparam width="168" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4262" />
-<TGConnectingPoint num="1" id="4263" />
-<TGConnectingPoint num="2" id="4264" />
-<TGConnectingPoint num="3" id="4265" />
+<TGConnectingPoint num="0" id="4088" />
+<TGConnectingPoint num="1" id="4089" />
+<TGConnectingPoint num="2" id="4090" />
+<TGConnectingPoint num="3" id="4091" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8956,118 +8685,118 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="4285" >
+<COMPONENT type="301" id="4111" >
 <cdparam x="607" y="216" />
 <sizeparam width="251" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Encrypting data with the pre shared key
 " />
-<TGConnectingPoint num="0" id="4269" />
-<TGConnectingPoint num="1" id="4270" />
-<TGConnectingPoint num="2" id="4271" />
-<TGConnectingPoint num="3" id="4272" />
-<TGConnectingPoint num="4" id="4273" />
-<TGConnectingPoint num="5" id="4274" />
-<TGConnectingPoint num="6" id="4275" />
-<TGConnectingPoint num="7" id="4276" />
-<TGConnectingPoint num="8" id="4277" />
-<TGConnectingPoint num="9" id="4278" />
-<TGConnectingPoint num="10" id="4279" />
-<TGConnectingPoint num="11" id="4280" />
-<TGConnectingPoint num="12" id="4281" />
-<TGConnectingPoint num="13" id="4282" />
-<TGConnectingPoint num="14" id="4283" />
-<TGConnectingPoint num="15" id="4284" />
+<TGConnectingPoint num="0" id="4095" />
+<TGConnectingPoint num="1" id="4096" />
+<TGConnectingPoint num="2" id="4097" />
+<TGConnectingPoint num="3" id="4098" />
+<TGConnectingPoint num="4" id="4099" />
+<TGConnectingPoint num="5" id="4100" />
+<TGConnectingPoint num="6" id="4101" />
+<TGConnectingPoint num="7" id="4102" />
+<TGConnectingPoint num="8" id="4103" />
+<TGConnectingPoint num="9" id="4104" />
+<TGConnectingPoint num="10" id="4105" />
+<TGConnectingPoint num="11" id="4106" />
+<TGConnectingPoint num="12" id="4107" />
+<TGConnectingPoint num="13" id="4108" />
+<TGConnectingPoint num="14" id="4109" />
+<TGConnectingPoint num="15" id="4110" />
 <extraparam>
 <Line value="Encrypting data with the pre shared key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4326" >
+<COMPONENT type="5106" id="4152" >
 <cdparam x="239" y="163" />
 <sizeparam width="172" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="SendingRemoteOrder" />
-<TGConnectingPoint num="0" id="4286" />
-<TGConnectingPoint num="1" id="4287" />
-<TGConnectingPoint num="2" id="4288" />
-<TGConnectingPoint num="3" id="4289" />
-<TGConnectingPoint num="4" id="4290" />
-<TGConnectingPoint num="5" id="4291" />
-<TGConnectingPoint num="6" id="4292" />
-<TGConnectingPoint num="7" id="4293" />
-<TGConnectingPoint num="8" id="4294" />
-<TGConnectingPoint num="9" id="4295" />
-<TGConnectingPoint num="10" id="4296" />
-<TGConnectingPoint num="11" id="4297" />
-<TGConnectingPoint num="12" id="4298" />
-<TGConnectingPoint num="13" id="4299" />
-<TGConnectingPoint num="14" id="4300" />
-<TGConnectingPoint num="15" id="4301" />
-<TGConnectingPoint num="16" id="4302" />
-<TGConnectingPoint num="17" id="4303" />
-<TGConnectingPoint num="18" id="4304" />
-<TGConnectingPoint num="19" id="4305" />
-<TGConnectingPoint num="20" id="4306" />
-<TGConnectingPoint num="21" id="4307" />
-<TGConnectingPoint num="22" id="4308" />
-<TGConnectingPoint num="23" id="4309" />
-<TGConnectingPoint num="24" id="4310" />
-<TGConnectingPoint num="25" id="4311" />
-<TGConnectingPoint num="26" id="4312" />
-<TGConnectingPoint num="27" id="4313" />
-<TGConnectingPoint num="28" id="4314" />
-<TGConnectingPoint num="29" id="4315" />
-<TGConnectingPoint num="30" id="4316" />
-<TGConnectingPoint num="31" id="4317" />
-<TGConnectingPoint num="32" id="4318" />
-<TGConnectingPoint num="33" id="4319" />
-<TGConnectingPoint num="34" id="4320" />
-<TGConnectingPoint num="35" id="4321" />
-<TGConnectingPoint num="36" id="4322" />
-<TGConnectingPoint num="37" id="4323" />
-<TGConnectingPoint num="38" id="4324" />
-<TGConnectingPoint num="39" id="4325" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="4328" >
+<TGConnectingPoint num="0" id="4112" />
+<TGConnectingPoint num="1" id="4113" />
+<TGConnectingPoint num="2" id="4114" />
+<TGConnectingPoint num="3" id="4115" />
+<TGConnectingPoint num="4" id="4116" />
+<TGConnectingPoint num="5" id="4117" />
+<TGConnectingPoint num="6" id="4118" />
+<TGConnectingPoint num="7" id="4119" />
+<TGConnectingPoint num="8" id="4120" />
+<TGConnectingPoint num="9" id="4121" />
+<TGConnectingPoint num="10" id="4122" />
+<TGConnectingPoint num="11" id="4123" />
+<TGConnectingPoint num="12" id="4124" />
+<TGConnectingPoint num="13" id="4125" />
+<TGConnectingPoint num="14" id="4126" />
+<TGConnectingPoint num="15" id="4127" />
+<TGConnectingPoint num="16" id="4128" />
+<TGConnectingPoint num="17" id="4129" />
+<TGConnectingPoint num="18" id="4130" />
+<TGConnectingPoint num="19" id="4131" />
+<TGConnectingPoint num="20" id="4132" />
+<TGConnectingPoint num="21" id="4133" />
+<TGConnectingPoint num="22" id="4134" />
+<TGConnectingPoint num="23" id="4135" />
+<TGConnectingPoint num="24" id="4136" />
+<TGConnectingPoint num="25" id="4137" />
+<TGConnectingPoint num="26" id="4138" />
+<TGConnectingPoint num="27" id="4139" />
+<TGConnectingPoint num="28" id="4140" />
+<TGConnectingPoint num="29" id="4141" />
+<TGConnectingPoint num="30" id="4142" />
+<TGConnectingPoint num="31" id="4143" />
+<TGConnectingPoint num="32" id="4144" />
+<TGConnectingPoint num="33" id="4145" />
+<TGConnectingPoint num="34" id="4146" />
+<TGConnectingPoint num="35" id="4147" />
+<TGConnectingPoint num="36" id="4148" />
+<TGConnectingPoint num="37" id="4149" />
+<TGConnectingPoint num="38" id="4150" />
+<TGConnectingPoint num="39" id="4151" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="4154" >
 <cdparam x="340" y="355" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4327" />
+<TGConnectingPoint num="0" id="4153" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="4339" >
+<COMPONENT type="5103" id="4165" >
 <cdparam x="262" y="296" />
 <sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="wirelessChannelWrite(msg1)" />
-<TGConnectingPoint num="0" id="4329" />
-<TGConnectingPoint num="1" id="4330" />
-<TGConnectingPoint num="2" id="4331" />
-<TGConnectingPoint num="3" id="4332" />
-<TGConnectingPoint num="4" id="4333" />
-<TGConnectingPoint num="5" id="4334" />
-<TGConnectingPoint num="6" id="4335" />
-<TGConnectingPoint num="7" id="4336" />
-<TGConnectingPoint num="8" id="4337" />
-<TGConnectingPoint num="9" id="4338" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4341" >
+<TGConnectingPoint num="0" id="4155" />
+<TGConnectingPoint num="1" id="4156" />
+<TGConnectingPoint num="2" id="4157" />
+<TGConnectingPoint num="3" id="4158" />
+<TGConnectingPoint num="4" id="4159" />
+<TGConnectingPoint num="5" id="4160" />
+<TGConnectingPoint num="6" id="4161" />
+<TGConnectingPoint num="7" id="4162" />
+<TGConnectingPoint num="8" id="4163" />
+<TGConnectingPoint num="9" id="4164" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="4167" >
 <cdparam x="302" y="99" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4340" />
+<TGConnectingPoint num="0" id="4166" />
 </COMPONENT>
 
 
@@ -9131,13 +8860,13 @@ or by a maintenance station
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="4343" >
+<CONNECTOR type="5002" id="4169" >
 <cdparam x="738" y="462" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4342" />
-<P1  x="562" y="710" id="4510" />
-<P2  x="622" y="736" id="4361" />
+<TGConnectingPoint num="0" id="4168" />
+<P1  x="562" y="710" id="4336" />
+<P2  x="622" y="736" id="4187" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obs_open()" />
@@ -9149,13 +8878,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4345" >
+<CONNECTOR type="5002" id="4171" >
 <cdparam x="344" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4344" />
-<P1  x="350" y="536" id="4428" />
-<P2  x="322" y="493" id="4578" />
+<TGConnectingPoint num="0" id="4170" />
+<P1  x="350" y="536" id="4254" />
+<P2  x="322" y="493" id="4404" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -9163,15 +8892,15 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4351" >
+<CONNECTOR type="5002" id="4177" >
 <cdparam x="800" y="441" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4348" />
-<TGConnectingPoint num="1" id="4349" />
-<TGConnectingPoint num="2" id="4350" />
-<P1  x="312" y="345" id="4628" />
-<P2  x="641" y="345" id="4629" />
+<TGConnectingPoint num="0" id="4174" />
+<TGConnectingPoint num="1" id="4175" />
+<TGConnectingPoint num="2" id="4176" />
+<P1  x="312" y="345" id="4454" />
+<P2  x="641" y="345" id="4455" />
 <Point x="312" y="327" />
 <Point x="640" y="327" />
 <AutomaticDrawing  data="true" />
@@ -9180,16 +8909,16 @@ or by a maintenance station
 <osd value="out wirelessChannelWrite(Message msg)" />
 <FIFOType asynchronous="true" size="5" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="4346" >
-<father id="4351" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4172" >
+<father id="4177" num="0" />
 <cdparam x="312" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4347" >
-<father id="4351" num="1" />
+<SUBCOMPONENT type="-1" id="4173" >
+<father id="4177" num="1" />
 <cdparam x="640" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9197,13 +8926,13 @@ or by a maintenance station
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="4353" >
+<CONNECTOR type="5002" id="4179" >
 <cdparam x="687" y="482" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4352" />
-<P1  x="316" y="678" id="4507" />
-<P2  x="296" y="680" id="4549" />
+<TGConnectingPoint num="0" id="4178" />
+<P1  x="316" y="678" id="4333" />
+<P2  x="296" y="680" id="4375" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -9211,13 +8940,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4355" >
+<CONNECTOR type="5002" id="4181" >
 <cdparam x="390" y="504" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4354" />
-<P1  x="672" y="696" id="4457" />
-<P2  x="644" y="678" id="4508" />
+<TGConnectingPoint num="0" id="4180" />
+<P1  x="672" y="696" id="4283" />
+<P2  x="644" y="678" id="4334" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in open()" />
@@ -9227,13 +8956,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4357" >
+<CONNECTOR type="5002" id="4183" >
 <cdparam x="682" y="410" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4356" />
-<P1  x="644" y="616" id="4506" />
-<P2  x="671" y="592" id="4473" />
+<TGConnectingPoint num="0" id="4182" />
+<P1  x="644" y="616" id="4332" />
+<P2  x="671" y="592" id="4299" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -9243,13 +8972,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4359" >
+<CONNECTOR type="5002" id="4185" >
 <cdparam x="362" y="431" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="4358" />
-<P1  x="294" y="601" id="4524" />
-<P2  x="316" y="647" id="4498" />
+<TGConnectingPoint num="0" id="4184" />
+<P1  x="294" y="601" id="4350" />
+<P2  x="316" y="647" id="4324" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in LEDOn()" />
@@ -9261,83 +8990,83 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="4384" >
+<COMPONENT type="5000" id="4210" >
 <cdparam x="510" y="736" />
 <sizeparam width="225" height="45" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="ObserverProp1" />
-<TGConnectingPoint num="0" id="4360" />
-<TGConnectingPoint num="1" id="4361" />
-<TGConnectingPoint num="2" id="4362" />
-<TGConnectingPoint num="3" id="4363" />
-<TGConnectingPoint num="4" id="4364" />
-<TGConnectingPoint num="5" id="4365" />
-<TGConnectingPoint num="6" id="4366" />
-<TGConnectingPoint num="7" id="4367" />
-<TGConnectingPoint num="8" id="4368" />
-<TGConnectingPoint num="9" id="4369" />
-<TGConnectingPoint num="10" id="4370" />
-<TGConnectingPoint num="11" id="4371" />
-<TGConnectingPoint num="12" id="4372" />
-<TGConnectingPoint num="13" id="4373" />
-<TGConnectingPoint num="14" id="4374" />
-<TGConnectingPoint num="15" id="4375" />
-<TGConnectingPoint num="16" id="4376" />
-<TGConnectingPoint num="17" id="4377" />
-<TGConnectingPoint num="18" id="4378" />
-<TGConnectingPoint num="19" id="4379" />
-<TGConnectingPoint num="20" id="4380" />
-<TGConnectingPoint num="21" id="4381" />
-<TGConnectingPoint num="22" id="4382" />
-<TGConnectingPoint num="23" id="4383" />
+<TGConnectingPoint num="0" id="4186" />
+<TGConnectingPoint num="1" id="4187" />
+<TGConnectingPoint num="2" id="4188" />
+<TGConnectingPoint num="3" id="4189" />
+<TGConnectingPoint num="4" id="4190" />
+<TGConnectingPoint num="5" id="4191" />
+<TGConnectingPoint num="6" id="4192" />
+<TGConnectingPoint num="7" id="4193" />
+<TGConnectingPoint num="8" id="4194" />
+<TGConnectingPoint num="9" id="4195" />
+<TGConnectingPoint num="10" id="4196" />
+<TGConnectingPoint num="11" id="4197" />
+<TGConnectingPoint num="12" id="4198" />
+<TGConnectingPoint num="13" id="4199" />
+<TGConnectingPoint num="14" id="4200" />
+<TGConnectingPoint num="15" id="4201" />
+<TGConnectingPoint num="16" id="4202" />
+<TGConnectingPoint num="17" id="4203" />
+<TGConnectingPoint num="18" id="4204" />
+<TGConnectingPoint num="19" id="4205" />
+<TGConnectingPoint num="20" id="4206" />
+<TGConnectingPoint num="21" id="4207" />
+<TGConnectingPoint num="22" id="4208" />
+<TGConnectingPoint num="23" id="4209" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in obs_open()" />
-<Signal value="in obs_closed()" />
-<Signal value="in obs_magnetronStart()" />
+<Signal value="in obs_open()" attached="false" />
+<Signal value="in obs_closed()" attached="false" />
+<Signal value="in obs_magnetronStart()" attached="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="4393" >
+<COMPONENT type="5003" id="4219" >
 <cdparam x="148" y="736" />
 <sizeparam width="184" height="58" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="4385" />
-<TGConnectingPoint num="1" id="4386" />
-<TGConnectingPoint num="2" id="4387" />
-<TGConnectingPoint num="3" id="4388" />
-<TGConnectingPoint num="4" id="4389" />
-<TGConnectingPoint num="5" id="4390" />
-<TGConnectingPoint num="6" id="4391" />
-<TGConnectingPoint num="7" id="4392" />
+<TGConnectingPoint num="0" id="4211" />
+<TGConnectingPoint num="1" id="4212" />
+<TGConnectingPoint num="2" id="4213" />
+<TGConnectingPoint num="3" id="4214" />
+<TGConnectingPoint num="4" id="4215" />
+<TGConnectingPoint num="5" id="4216" />
+<TGConnectingPoint num="6" id="4217" />
+<TGConnectingPoint num="7" id="4218" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="4402" >
+<COMPONENT type="5003" id="4228" >
 <cdparam x="340" y="735" />
 <sizeparam width="162" height="54" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="4394" />
-<TGConnectingPoint num="1" id="4395" />
-<TGConnectingPoint num="2" id="4396" />
-<TGConnectingPoint num="3" id="4397" />
-<TGConnectingPoint num="4" id="4398" />
-<TGConnectingPoint num="5" id="4399" />
-<TGConnectingPoint num="6" id="4400" />
-<TGConnectingPoint num="7" id="4401" />
+<TGConnectingPoint num="0" id="4220" />
+<TGConnectingPoint num="1" id="4221" />
+<TGConnectingPoint num="2" id="4222" />
+<TGConnectingPoint num="3" id="4223" />
+<TGConnectingPoint num="4" id="4224" />
+<TGConnectingPoint num="5" id="4225" />
+<TGConnectingPoint num="6" id="4226" />
+<TGConnectingPoint num="7" id="4227" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4419" >
+<COMPONENT type="301" id="4245" >
 <cdparam x="220" y="244" />
 <sizeparam width="586" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9347,22 +9076,22 @@ or by a maintenance station
 
 #InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK
 " />
-<TGConnectingPoint num="0" id="4403" />
-<TGConnectingPoint num="1" id="4404" />
-<TGConnectingPoint num="2" id="4405" />
-<TGConnectingPoint num="3" id="4406" />
-<TGConnectingPoint num="4" id="4407" />
-<TGConnectingPoint num="5" id="4408" />
-<TGConnectingPoint num="6" id="4409" />
-<TGConnectingPoint num="7" id="4410" />
-<TGConnectingPoint num="8" id="4411" />
-<TGConnectingPoint num="9" id="4412" />
-<TGConnectingPoint num="10" id="4413" />
-<TGConnectingPoint num="11" id="4414" />
-<TGConnectingPoint num="12" id="4415" />
-<TGConnectingPoint num="13" id="4416" />
-<TGConnectingPoint num="14" id="4417" />
-<TGConnectingPoint num="15" id="4418" />
+<TGConnectingPoint num="0" id="4229" />
+<TGConnectingPoint num="1" id="4230" />
+<TGConnectingPoint num="2" id="4231" />
+<TGConnectingPoint num="3" id="4232" />
+<TGConnectingPoint num="4" id="4233" />
+<TGConnectingPoint num="5" id="4234" />
+<TGConnectingPoint num="6" id="4235" />
+<TGConnectingPoint num="7" id="4236" />
+<TGConnectingPoint num="8" id="4237" />
+<TGConnectingPoint num="9" id="4238" />
+<TGConnectingPoint num="10" id="4239" />
+<TGConnectingPoint num="11" id="4240" />
+<TGConnectingPoint num="12" id="4241" />
+<TGConnectingPoint num="13" id="4242" />
+<TGConnectingPoint num="14" id="4243" />
+<TGConnectingPoint num="15" id="4244" />
 <extraparam>
 <Line value="#Confidentiality RemoteControl.duration" />
 <Line value="#Authenticity RemoteControl.SendingRemoteOrder.msg1 WirelessInterface.gotWirelessOrder.msg2" />
@@ -9371,111 +9100,111 @@ or by a maintenance station
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="4644" >
+<COMPONENT type="5000" id="4470" >
 <cdparam x="148" y="345" />
 <sizeparam width="658" height="382" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="RemotelyControlledMicrowave" />
-<TGConnectingPoint num="0" id="4620" />
-<TGConnectingPoint num="1" id="4621" />
-<TGConnectingPoint num="2" id="4622" />
-<TGConnectingPoint num="3" id="4623" />
-<TGConnectingPoint num="4" id="4624" />
-<TGConnectingPoint num="5" id="4625" />
-<TGConnectingPoint num="6" id="4626" />
-<TGConnectingPoint num="7" id="4627" />
-<TGConnectingPoint num="8" id="4628" />
-<TGConnectingPoint num="9" id="4629" />
-<TGConnectingPoint num="10" id="4630" />
-<TGConnectingPoint num="11" id="4631" />
-<TGConnectingPoint num="12" id="4632" />
-<TGConnectingPoint num="13" id="4633" />
-<TGConnectingPoint num="14" id="4634" />
-<TGConnectingPoint num="15" id="4635" />
-<TGConnectingPoint num="16" id="4636" />
-<TGConnectingPoint num="17" id="4637" />
-<TGConnectingPoint num="18" id="4638" />
-<TGConnectingPoint num="19" id="4639" />
-<TGConnectingPoint num="20" id="4640" />
-<TGConnectingPoint num="21" id="4641" />
-<TGConnectingPoint num="22" id="4642" />
-<TGConnectingPoint num="23" id="4643" />
+<TGConnectingPoint num="0" id="4446" />
+<TGConnectingPoint num="1" id="4447" />
+<TGConnectingPoint num="2" id="4448" />
+<TGConnectingPoint num="3" id="4449" />
+<TGConnectingPoint num="4" id="4450" />
+<TGConnectingPoint num="5" id="4451" />
+<TGConnectingPoint num="6" id="4452" />
+<TGConnectingPoint num="7" id="4453" />
+<TGConnectingPoint num="8" id="4454" />
+<TGConnectingPoint num="9" id="4455" />
+<TGConnectingPoint num="10" id="4456" />
+<TGConnectingPoint num="11" id="4457" />
+<TGConnectingPoint num="12" id="4458" />
+<TGConnectingPoint num="13" id="4459" />
+<TGConnectingPoint num="14" id="4460" />
+<TGConnectingPoint num="15" id="4461" />
+<TGConnectingPoint num="16" id="4462" />
+<TGConnectingPoint num="17" id="4463" />
+<TGConnectingPoint num="18" id="4464" />
+<TGConnectingPoint num="19" id="4465" />
+<TGConnectingPoint num="20" id="4466" />
+<TGConnectingPoint num="21" id="4467" />
+<TGConnectingPoint num="22" id="4468" />
+<TGConnectingPoint num="23" id="4469" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in wirelessChannelRead(Message msg)" />
-<Signal value="out wirelessChannelWrite(Message msg)" />
+<Signal value="in wirelessChannelRead(Message msg)" attached="false" />
+<Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="4594" >
-<father id="4644" num="0" />
+<SUBCOMPONENT type="5000" id="4420" >
+<father id="4470" num="0" />
 <cdparam x="163" y="493" />
 <sizeparam width="637" height="230" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="21" minY="0" maxY="152" />
 <infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="4570" />
-<TGConnectingPoint num="1" id="4571" />
-<TGConnectingPoint num="2" id="4572" />
-<TGConnectingPoint num="3" id="4573" />
-<TGConnectingPoint num="4" id="4574" />
-<TGConnectingPoint num="5" id="4575" />
-<TGConnectingPoint num="6" id="4576" />
-<TGConnectingPoint num="7" id="4577" />
-<TGConnectingPoint num="8" id="4578" />
-<TGConnectingPoint num="9" id="4579" />
-<TGConnectingPoint num="10" id="4580" />
-<TGConnectingPoint num="11" id="4581" />
-<TGConnectingPoint num="12" id="4582" />
-<TGConnectingPoint num="13" id="4583" />
-<TGConnectingPoint num="14" id="4584" />
-<TGConnectingPoint num="15" id="4585" />
-<TGConnectingPoint num="16" id="4586" />
-<TGConnectingPoint num="17" id="4587" />
-<TGConnectingPoint num="18" id="4588" />
-<TGConnectingPoint num="19" id="4589" />
-<TGConnectingPoint num="20" id="4590" />
-<TGConnectingPoint num="21" id="4591" />
-<TGConnectingPoint num="22" id="4592" />
-<TGConnectingPoint num="23" id="4593" />
+<TGConnectingPoint num="0" id="4396" />
+<TGConnectingPoint num="1" id="4397" />
+<TGConnectingPoint num="2" id="4398" />
+<TGConnectingPoint num="3" id="4399" />
+<TGConnectingPoint num="4" id="4400" />
+<TGConnectingPoint num="5" id="4401" />
+<TGConnectingPoint num="6" id="4402" />
+<TGConnectingPoint num="7" id="4403" />
+<TGConnectingPoint num="8" id="4404" />
+<TGConnectingPoint num="9" id="4405" />
+<TGConnectingPoint num="10" id="4406" />
+<TGConnectingPoint num="11" id="4407" />
+<TGConnectingPoint num="12" id="4408" />
+<TGConnectingPoint num="13" id="4409" />
+<TGConnectingPoint num="14" id="4410" />
+<TGConnectingPoint num="15" id="4411" />
+<TGConnectingPoint num="16" id="4412" />
+<TGConnectingPoint num="17" id="4413" />
+<TGConnectingPoint num="18" id="4414" />
+<TGConnectingPoint num="19" id="4415" />
+<TGConnectingPoint num="20" id="4416" />
+<TGConnectingPoint num="21" id="4417" />
+<TGConnectingPoint num="22" id="4418" />
+<TGConnectingPoint num="23" id="4419" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" />
+<Signal value="in remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4444" >
-<father id="4594" num="0" />
+<SUBCOMPONENT type="5000" id="4270" >
+<father id="4420" num="0" />
 <cdparam x="314" y="536" />
 <sizeparam width="146" height="45" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="491" minY="0" maxY="185" />
 <infoparam name="Block0" value="WirelessInterface" />
-<TGConnectingPoint num="0" id="4420" />
-<TGConnectingPoint num="1" id="4421" />
-<TGConnectingPoint num="2" id="4422" />
-<TGConnectingPoint num="3" id="4423" />
-<TGConnectingPoint num="4" id="4424" />
-<TGConnectingPoint num="5" id="4425" />
-<TGConnectingPoint num="6" id="4426" />
-<TGConnectingPoint num="7" id="4427" />
-<TGConnectingPoint num="8" id="4428" />
-<TGConnectingPoint num="9" id="4429" />
-<TGConnectingPoint num="10" id="4430" />
-<TGConnectingPoint num="11" id="4431" />
-<TGConnectingPoint num="12" id="4432" />
-<TGConnectingPoint num="13" id="4433" />
-<TGConnectingPoint num="14" id="4434" />
-<TGConnectingPoint num="15" id="4435" />
-<TGConnectingPoint num="16" id="4436" />
-<TGConnectingPoint num="17" id="4437" />
-<TGConnectingPoint num="18" id="4438" />
-<TGConnectingPoint num="19" id="4439" />
-<TGConnectingPoint num="20" id="4440" />
-<TGConnectingPoint num="21" id="4441" />
-<TGConnectingPoint num="22" id="4442" />
-<TGConnectingPoint num="23" id="4443" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="4246" />
+<TGConnectingPoint num="1" id="4247" />
+<TGConnectingPoint num="2" id="4248" />
+<TGConnectingPoint num="3" id="4249" />
+<TGConnectingPoint num="4" id="4250" />
+<TGConnectingPoint num="5" id="4251" />
+<TGConnectingPoint num="6" id="4252" />
+<TGConnectingPoint num="7" id="4253" />
+<TGConnectingPoint num="8" id="4254" />
+<TGConnectingPoint num="9" id="4255" />
+<TGConnectingPoint num="10" id="4256" />
+<TGConnectingPoint num="11" id="4257" />
+<TGConnectingPoint num="12" id="4258" />
+<TGConnectingPoint num="13" id="4259" />
+<TGConnectingPoint num="14" id="4260" />
+<TGConnectingPoint num="15" id="4261" />
+<TGConnectingPoint num="16" id="4262" />
+<TGConnectingPoint num="17" id="4263" />
+<TGConnectingPoint num="18" id="4264" />
+<TGConnectingPoint num="19" id="4265" />
+<TGConnectingPoint num="20" id="4266" />
+<TGConnectingPoint num="21" id="4267" />
+<TGConnectingPoint num="22" id="4268" />
+<TGConnectingPoint num="23" id="4269" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
@@ -9491,46 +9220,56 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Signal value="out remoteStart(int value)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4469" >
-<father id="4594" num="1" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Signal value="out remoteStart(int value)" attached="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="4295" >
+<father id="4420" num="1" />
 <cdparam x="672" y="654" />
 <sizeparam width="118" height="56" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="519" minY="0" maxY="174" />
 <infoparam name="Block0" value="Door" />
-<TGConnectingPoint num="0" id="4445" />
-<TGConnectingPoint num="1" id="4446" />
-<TGConnectingPoint num="2" id="4447" />
-<TGConnectingPoint num="3" id="4448" />
-<TGConnectingPoint num="4" id="4449" />
-<TGConnectingPoint num="5" id="4450" />
-<TGConnectingPoint num="6" id="4451" />
-<TGConnectingPoint num="7" id="4452" />
-<TGConnectingPoint num="8" id="4453" />
-<TGConnectingPoint num="9" id="4454" />
-<TGConnectingPoint num="10" id="4455" />
-<TGConnectingPoint num="11" id="4456" />
-<TGConnectingPoint num="12" id="4457" />
-<TGConnectingPoint num="13" id="4458" />
-<TGConnectingPoint num="14" id="4459" />
-<TGConnectingPoint num="15" id="4460" />
-<TGConnectingPoint num="16" id="4461" />
-<TGConnectingPoint num="17" id="4462" />
-<TGConnectingPoint num="18" id="4463" />
-<TGConnectingPoint num="19" id="4464" />
-<TGConnectingPoint num="20" id="4465" />
-<TGConnectingPoint num="21" id="4466" />
-<TGConnectingPoint num="22" id="4467" />
-<TGConnectingPoint num="23" id="4468" />
+<TGConnectingPoint num="0" id="4271" />
+<TGConnectingPoint num="1" id="4272" />
+<TGConnectingPoint num="2" id="4273" />
+<TGConnectingPoint num="3" id="4274" />
+<TGConnectingPoint num="4" id="4275" />
+<TGConnectingPoint num="5" id="4276" />
+<TGConnectingPoint num="6" id="4277" />
+<TGConnectingPoint num="7" id="4278" />
+<TGConnectingPoint num="8" id="4279" />
+<TGConnectingPoint num="9" id="4280" />
+<TGConnectingPoint num="10" id="4281" />
+<TGConnectingPoint num="11" id="4282" />
+<TGConnectingPoint num="12" id="4283" />
+<TGConnectingPoint num="13" id="4284" />
+<TGConnectingPoint num="14" id="4285" />
+<TGConnectingPoint num="15" id="4286" />
+<TGConnectingPoint num="16" id="4287" />
+<TGConnectingPoint num="17" id="4288" />
+<TGConnectingPoint num="18" id="4289" />
+<TGConnectingPoint num="19" id="4290" />
+<TGConnectingPoint num="20" id="4291" />
+<TGConnectingPoint num="21" id="4292" />
+<TGConnectingPoint num="22" id="4293" />
+<TGConnectingPoint num="23" id="4294" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$openM()" />
 <Method value="$closeM()" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
 <globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
@@ -9546,44 +9285,44 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4494" >
-<father id="4594" num="2" />
+<SUBCOMPONENT type="5000" id="4320" >
+<father id="4420" num="2" />
 <cdparam x="671" y="536" />
 <sizeparam width="117" height="112" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="520" minY="0" maxY="118" />
 <infoparam name="Block0" value="Magnetron" />
-<TGConnectingPoint num="0" id="4470" />
-<TGConnectingPoint num="1" id="4471" />
-<TGConnectingPoint num="2" id="4472" />
-<TGConnectingPoint num="3" id="4473" />
-<TGConnectingPoint num="4" id="4474" />
-<TGConnectingPoint num="5" id="4475" />
-<TGConnectingPoint num="6" id="4476" />
-<TGConnectingPoint num="7" id="4477" />
-<TGConnectingPoint num="8" id="4478" />
-<TGConnectingPoint num="9" id="4479" />
-<TGConnectingPoint num="10" id="4480" />
-<TGConnectingPoint num="11" id="4481" />
-<TGConnectingPoint num="12" id="4482" />
-<TGConnectingPoint num="13" id="4483" />
-<TGConnectingPoint num="14" id="4484" />
-<TGConnectingPoint num="15" id="4485" />
-<TGConnectingPoint num="16" id="4486" />
-<TGConnectingPoint num="17" id="4487" />
-<TGConnectingPoint num="18" id="4488" />
-<TGConnectingPoint num="19" id="4489" />
-<TGConnectingPoint num="20" id="4490" />
-<TGConnectingPoint num="21" id="4491" />
-<TGConnectingPoint num="22" id="4492" />
-<TGConnectingPoint num="23" id="4493" />
+<TGConnectingPoint num="0" id="4296" />
+<TGConnectingPoint num="1" id="4297" />
+<TGConnectingPoint num="2" id="4298" />
+<TGConnectingPoint num="3" id="4299" />
+<TGConnectingPoint num="4" id="4300" />
+<TGConnectingPoint num="5" id="4301" />
+<TGConnectingPoint num="6" id="4302" />
+<TGConnectingPoint num="7" id="4303" />
+<TGConnectingPoint num="8" id="4304" />
+<TGConnectingPoint num="9" id="4305" />
+<TGConnectingPoint num="10" id="4306" />
+<TGConnectingPoint num="11" id="4307" />
+<TGConnectingPoint num="12" id="4308" />
+<TGConnectingPoint num="13" id="4309" />
+<TGConnectingPoint num="14" id="4310" />
+<TGConnectingPoint num="15" id="4311" />
+<TGConnectingPoint num="16" id="4312" />
+<TGConnectingPoint num="17" id="4313" />
+<TGConnectingPoint num="18" id="4314" />
+<TGConnectingPoint num="19" id="4315" />
+<TGConnectingPoint num="20" id="4316" />
+<TGConnectingPoint num="21" id="4317" />
+<TGConnectingPoint num="22" id="4318" />
+<TGConnectingPoint num="23" id="4319" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="power" value="0" type="8" typeOther="" />
 <Method value="$ON()" />
 <Method value="$OFF()" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="" />
@@ -9596,54 +9335,54 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4519" >
-<father id="4594" num="3" />
+<SUBCOMPONENT type="5000" id="4345" >
+<father id="4420" num="3" />
 <cdparam x="316" y="585" />
 <sizeparam width="328" height="125" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="309" minY="0" maxY="105" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="4495" />
-<TGConnectingPoint num="1" id="4496" />
-<TGConnectingPoint num="2" id="4497" />
-<TGConnectingPoint num="3" id="4498" />
-<TGConnectingPoint num="4" id="4499" />
-<TGConnectingPoint num="5" id="4500" />
-<TGConnectingPoint num="6" id="4501" />
-<TGConnectingPoint num="7" id="4502" />
-<TGConnectingPoint num="8" id="4503" />
-<TGConnectingPoint num="9" id="4504" />
-<TGConnectingPoint num="10" id="4505" />
-<TGConnectingPoint num="11" id="4506" />
-<TGConnectingPoint num="12" id="4507" />
-<TGConnectingPoint num="13" id="4508" />
-<TGConnectingPoint num="14" id="4509" />
-<TGConnectingPoint num="15" id="4510" />
-<TGConnectingPoint num="16" id="4511" />
-<TGConnectingPoint num="17" id="4512" />
-<TGConnectingPoint num="18" id="4513" />
-<TGConnectingPoint num="19" id="4514" />
-<TGConnectingPoint num="20" id="4515" />
-<TGConnectingPoint num="21" id="4516" />
-<TGConnectingPoint num="22" id="4517" />
-<TGConnectingPoint num="23" id="4518" />
+<TGConnectingPoint num="0" id="4321" />
+<TGConnectingPoint num="1" id="4322" />
+<TGConnectingPoint num="2" id="4323" />
+<TGConnectingPoint num="3" id="4324" />
+<TGConnectingPoint num="4" id="4325" />
+<TGConnectingPoint num="5" id="4326" />
+<TGConnectingPoint num="6" id="4327" />
+<TGConnectingPoint num="7" id="4328" />
+<TGConnectingPoint num="8" id="4329" />
+<TGConnectingPoint num="9" id="4330" />
+<TGConnectingPoint num="10" id="4331" />
+<TGConnectingPoint num="11" id="4332" />
+<TGConnectingPoint num="12" id="4333" />
+<TGConnectingPoint num="13" id="4334" />
+<TGConnectingPoint num="14" id="4335" />
+<TGConnectingPoint num="15" id="4336" />
+<TGConnectingPoint num="16" id="4337" />
+<TGConnectingPoint num="17" id="4338" />
+<TGConnectingPoint num="18" id="4339" />
+<TGConnectingPoint num="19" id="4340" />
+<TGConnectingPoint num="20" id="4341" />
+<TGConnectingPoint num="21" id="4342" />
+<TGConnectingPoint num="22" id="4343" />
+<TGConnectingPoint num="23" id="4344" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
 <Method value="$startCooking(int duration)" />
 <Method value="$durationModified(int duration)" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out obs_open()" />
-<Signal value="out obs_closed()" />
-<Signal value="out obs_magnetronStart()" />
+<Signal value="in start(int duration)" attached="false" />
+<Signal value="in closed()" attached="false" />
+<Signal value="in open()" attached="false" />
+<Signal value="out ringBell()" attached="false" />
+<Signal value="out startMagnetron()" attached="false" />
+<Signal value="out stopMagnetron()" attached="false" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out obs_open()" attached="false" />
+<Signal value="out obs_closed()" attached="false" />
+<Signal value="out obs_magnetronStart()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dur = &quot;Duration&quot;;" />
@@ -9674,80 +9413,80 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4544" >
-<father id="4594" num="4" />
+<SUBCOMPONENT type="5000" id="4370" >
+<father id="4420" num="4" />
 <cdparam x="170" y="555" />
 <sizeparam width="124" height="92" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="513" minY="0" maxY="138" />
 <infoparam name="Block0" value="ControlPanel" />
-<TGConnectingPoint num="0" id="4520" />
-<TGConnectingPoint num="1" id="4521" />
-<TGConnectingPoint num="2" id="4522" />
-<TGConnectingPoint num="3" id="4523" />
-<TGConnectingPoint num="4" id="4524" />
-<TGConnectingPoint num="5" id="4525" />
-<TGConnectingPoint num="6" id="4526" />
-<TGConnectingPoint num="7" id="4527" />
-<TGConnectingPoint num="8" id="4528" />
-<TGConnectingPoint num="9" id="4529" />
-<TGConnectingPoint num="10" id="4530" />
-<TGConnectingPoint num="11" id="4531" />
-<TGConnectingPoint num="12" id="4532" />
-<TGConnectingPoint num="13" id="4533" />
-<TGConnectingPoint num="14" id="4534" />
-<TGConnectingPoint num="15" id="4535" />
-<TGConnectingPoint num="16" id="4536" />
-<TGConnectingPoint num="17" id="4537" />
-<TGConnectingPoint num="18" id="4538" />
-<TGConnectingPoint num="19" id="4539" />
-<TGConnectingPoint num="20" id="4540" />
-<TGConnectingPoint num="21" id="4541" />
-<TGConnectingPoint num="22" id="4542" />
-<TGConnectingPoint num="23" id="4543" />
+<TGConnectingPoint num="0" id="4346" />
+<TGConnectingPoint num="1" id="4347" />
+<TGConnectingPoint num="2" id="4348" />
+<TGConnectingPoint num="3" id="4349" />
+<TGConnectingPoint num="4" id="4350" />
+<TGConnectingPoint num="5" id="4351" />
+<TGConnectingPoint num="6" id="4352" />
+<TGConnectingPoint num="7" id="4353" />
+<TGConnectingPoint num="8" id="4354" />
+<TGConnectingPoint num="9" id="4355" />
+<TGConnectingPoint num="10" id="4356" />
+<TGConnectingPoint num="11" id="4357" />
+<TGConnectingPoint num="12" id="4358" />
+<TGConnectingPoint num="13" id="4359" />
+<TGConnectingPoint num="14" id="4360" />
+<TGConnectingPoint num="15" id="4361" />
+<TGConnectingPoint num="16" id="4362" />
+<TGConnectingPoint num="17" id="4363" />
+<TGConnectingPoint num="18" id="4364" />
+<TGConnectingPoint num="19" id="4365" />
+<TGConnectingPoint num="20" id="4366" />
+<TGConnectingPoint num="21" id="4367" />
+<TGConnectingPoint num="22" id="4368" />
+<TGConnectingPoint num="23" id="4369" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4569" >
-<father id="4594" num="5" />
+<SUBCOMPONENT type="5000" id="4395" >
+<father id="4420" num="5" />
 <cdparam x="169" y="653" />
 <sizeparam width="127" height="54" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="510" minY="0" maxY="176" />
 <infoparam name="Block0" value="Bell" />
-<TGConnectingPoint num="0" id="4545" />
-<TGConnectingPoint num="1" id="4546" />
-<TGConnectingPoint num="2" id="4547" />
-<TGConnectingPoint num="3" id="4548" />
-<TGConnectingPoint num="4" id="4549" />
-<TGConnectingPoint num="5" id="4550" />
-<TGConnectingPoint num="6" id="4551" />
-<TGConnectingPoint num="7" id="4552" />
-<TGConnectingPoint num="8" id="4553" />
-<TGConnectingPoint num="9" id="4554" />
-<TGConnectingPoint num="10" id="4555" />
-<TGConnectingPoint num="11" id="4556" />
-<TGConnectingPoint num="12" id="4557" />
-<TGConnectingPoint num="13" id="4558" />
-<TGConnectingPoint num="14" id="4559" />
-<TGConnectingPoint num="15" id="4560" />
-<TGConnectingPoint num="16" id="4561" />
-<TGConnectingPoint num="17" id="4562" />
-<TGConnectingPoint num="18" id="4563" />
-<TGConnectingPoint num="19" id="4564" />
-<TGConnectingPoint num="20" id="4565" />
-<TGConnectingPoint num="21" id="4566" />
-<TGConnectingPoint num="22" id="4567" />
-<TGConnectingPoint num="23" id="4568" />
+<TGConnectingPoint num="0" id="4371" />
+<TGConnectingPoint num="1" id="4372" />
+<TGConnectingPoint num="2" id="4373" />
+<TGConnectingPoint num="3" id="4374" />
+<TGConnectingPoint num="4" id="4375" />
+<TGConnectingPoint num="5" id="4376" />
+<TGConnectingPoint num="6" id="4377" />
+<TGConnectingPoint num="7" id="4378" />
+<TGConnectingPoint num="8" id="4379" />
+<TGConnectingPoint num="9" id="4380" />
+<TGConnectingPoint num="10" id="4381" />
+<TGConnectingPoint num="11" id="4382" />
+<TGConnectingPoint num="12" id="4383" />
+<TGConnectingPoint num="13" id="4384" />
+<TGConnectingPoint num="14" id="4385" />
+<TGConnectingPoint num="15" id="4386" />
+<TGConnectingPoint num="16" id="4387" />
+<TGConnectingPoint num="17" id="4388" />
+<TGConnectingPoint num="18" id="4389" />
+<TGConnectingPoint num="19" id="4390" />
+<TGConnectingPoint num="20" id="4391" />
+<TGConnectingPoint num="21" id="4392" />
+<TGConnectingPoint num="22" id="4393" />
+<TGConnectingPoint num="23" id="4394" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$runBell()" />
-<Signal value="in ring()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
@@ -9757,39 +9496,39 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4619" >
-<father id="4644" num="1" />
+<SUBCOMPONENT type="5000" id="4445" >
+<father id="4470" num="1" />
 <cdparam x="381" y="389" />
 <sizeparam width="414" height="96" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="244" minY="0" maxY="286" />
 <infoparam name="Block0" value="RemoteControl" />
-<TGConnectingPoint num="0" id="4595" />
-<TGConnectingPoint num="1" id="4596" />
-<TGConnectingPoint num="2" id="4597" />
-<TGConnectingPoint num="3" id="4598" />
-<TGConnectingPoint num="4" id="4599" />
-<TGConnectingPoint num="5" id="4600" />
-<TGConnectingPoint num="6" id="4601" />
-<TGConnectingPoint num="7" id="4602" />
-<TGConnectingPoint num="8" id="4603" />
-<TGConnectingPoint num="9" id="4604" />
-<TGConnectingPoint num="10" id="4605" />
-<TGConnectingPoint num="11" id="4606" />
-<TGConnectingPoint num="12" id="4607" />
-<TGConnectingPoint num="13" id="4608" />
-<TGConnectingPoint num="14" id="4609" />
-<TGConnectingPoint num="15" id="4610" />
-<TGConnectingPoint num="16" id="4611" />
-<TGConnectingPoint num="17" id="4612" />
-<TGConnectingPoint num="18" id="4613" />
-<TGConnectingPoint num="19" id="4614" />
-<TGConnectingPoint num="20" id="4615" />
-<TGConnectingPoint num="21" id="4616" />
-<TGConnectingPoint num="22" id="4617" />
-<TGConnectingPoint num="23" id="4618" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="4421" />
+<TGConnectingPoint num="1" id="4422" />
+<TGConnectingPoint num="2" id="4423" />
+<TGConnectingPoint num="3" id="4424" />
+<TGConnectingPoint num="4" id="4425" />
+<TGConnectingPoint num="5" id="4426" />
+<TGConnectingPoint num="6" id="4427" />
+<TGConnectingPoint num="7" id="4428" />
+<TGConnectingPoint num="8" id="4429" />
+<TGConnectingPoint num="9" id="4430" />
+<TGConnectingPoint num="10" id="4431" />
+<TGConnectingPoint num="11" id="4432" />
+<TGConnectingPoint num="12" id="4433" />
+<TGConnectingPoint num="13" id="4434" />
+<TGConnectingPoint num="14" id="4435" />
+<TGConnectingPoint num="15" id="4436" />
+<TGConnectingPoint num="16" id="4437" />
+<TGConnectingPoint num="17" id="4438" />
+<TGConnectingPoint num="18" id="4439" />
+<TGConnectingPoint num="19" id="4440" />
+<TGConnectingPoint num="20" id="4441" />
+<TGConnectingPoint num="21" id="4442" />
+<TGConnectingPoint num="22" id="4443" />
+<TGConnectingPoint num="23" id="4444" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="duration" value="12" type="8" typeOther="" />
 <Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
@@ -9805,6 +9544,16 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 <globalCode value="" />
 <globalCode value="/* This is my global code !!!! */" />
 </extraparam>
@@ -9814,25 +9563,25 @@ or by a maintenance station
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ObserverProp1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4651" >
+<CONNECTOR type="5102" id="4477" >
 <cdparam x="395" y="433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4650" />
-<P1  x="395" y="433" id="4764" />
-<P2  x="395" y="450" id="4723" />
+<TGConnectingPoint num="0" id="4476" />
+<P1  x="395" y="433" id="4590" />
+<P2  x="395" y="450" id="4549" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4649" >
-<father id="4651" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4475" >
+<father id="4477" num="0" />
 <cdparam x="395" y="473" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4645" />
-<TGConnectingPoint num="1" id="4646" />
-<TGConnectingPoint num="2" id="4647" />
-<TGConnectingPoint num="3" id="4648" />
+<TGConnectingPoint num="0" id="4471" />
+<TGConnectingPoint num="1" id="4472" />
+<TGConnectingPoint num="2" id="4473" />
+<TGConnectingPoint num="3" id="4474" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9842,25 +9591,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4658" >
+<CONNECTOR type="5102" id="4484" >
 <cdparam x="303" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4657" />
-<P1  x="303" y="356" id="4811" />
-<P2  x="395" y="403" id="4763" />
+<TGConnectingPoint num="0" id="4483" />
+<P1  x="303" y="356" id="4637" />
+<P2  x="395" y="403" id="4589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4656" >
-<father id="4658" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4482" >
+<father id="4484" num="0" />
 <cdparam x="303" y="396" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4652" />
-<TGConnectingPoint num="1" id="4653" />
-<TGConnectingPoint num="2" id="4654" />
-<TGConnectingPoint num="3" id="4655" />
+<TGConnectingPoint num="0" id="4478" />
+<TGConnectingPoint num="1" id="4479" />
+<TGConnectingPoint num="2" id="4480" />
+<TGConnectingPoint num="3" id="4481" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9870,55 +9619,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4671" >
+<CONNECTOR type="5102" id="4497" >
 <cdparam x="436" y="285" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4667" />
-<TGConnectingPoint num="1" id="4668" />
-<TGConnectingPoint num="2" id="4669" />
-<TGConnectingPoint num="3" id="4670" />
-<P1  x="436" y="285" id="4775" />
-<P2  x="409" y="180" id="4859" />
+<TGConnectingPoint num="0" id="4493" />
+<TGConnectingPoint num="1" id="4494" />
+<TGConnectingPoint num="2" id="4495" />
+<TGConnectingPoint num="3" id="4496" />
+<P1  x="436" y="285" id="4601" />
+<P2  x="409" y="180" id="4685" />
 <Point x="436" y="302" />
 <Point x="554" y="302" />
 <Point x="554" y="180" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4659" >
-<father id="4671" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4485" >
+<father id="4497" num="0" />
 <cdparam x="436" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4660" >
-<father id="4671" num="1" />
+<SUBCOMPONENT type="-1" id="4486" >
+<father id="4497" num="1" />
 <cdparam x="554" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4661" >
-<father id="4671" num="2" />
+<SUBCOMPONENT type="-1" id="4487" >
+<father id="4497" num="2" />
 <cdparam x="554" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4666" >
-<father id="4671" num="3" />
+<SUBCOMPONENT type="-1" id="4492" >
+<father id="4497" num="3" />
 <cdparam x="436" y="325" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4662" />
-<TGConnectingPoint num="1" id="4663" />
-<TGConnectingPoint num="2" id="4664" />
-<TGConnectingPoint num="3" id="4665" />
+<TGConnectingPoint num="0" id="4488" />
+<TGConnectingPoint num="1" id="4489" />
+<TGConnectingPoint num="2" id="4490" />
+<TGConnectingPoint num="3" id="4491" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9928,25 +9677,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4678" >
+<CONNECTOR type="5102" id="4504" >
 <cdparam x="379" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4677" />
-<P1  x="379" y="218" id="4863" />
-<P2  x="436" y="255" id="4774" />
+<TGConnectingPoint num="0" id="4503" />
+<P1  x="379" y="218" id="4689" />
+<P2  x="436" y="255" id="4600" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4676" >
-<father id="4678" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4502" >
+<father id="4504" num="0" />
 <cdparam x="379" y="258" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4672" />
-<TGConnectingPoint num="1" id="4673" />
-<TGConnectingPoint num="2" id="4674" />
-<TGConnectingPoint num="3" id="4675" />
+<TGConnectingPoint num="0" id="4498" />
+<TGConnectingPoint num="1" id="4499" />
+<TGConnectingPoint num="2" id="4500" />
+<TGConnectingPoint num="3" id="4501" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9956,65 +9705,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4693" >
+<CONNECTOR type="5102" id="4519" >
 <cdparam x="228" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4688" />
-<TGConnectingPoint num="1" id="4689" />
-<TGConnectingPoint num="2" id="4690" />
-<TGConnectingPoint num="3" id="4691" />
-<TGConnectingPoint num="4" id="4692" />
-<P1  x="228" y="432" id="4786" />
-<P2  x="319" y="168" id="4856" />
+<TGConnectingPoint num="0" id="4514" />
+<TGConnectingPoint num="1" id="4515" />
+<TGConnectingPoint num="2" id="4516" />
+<TGConnectingPoint num="3" id="4517" />
+<TGConnectingPoint num="4" id="4518" />
+<P1  x="228" y="432" id="4612" />
+<P2  x="319" y="168" id="4682" />
 <Point x="228" y="452" />
 <Point x="165" y="452" />
 <Point x="165" y="136" />
 <Point x="320" y="136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4679" >
-<father id="4693" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4505" >
+<father id="4519" num="0" />
 <cdparam x="228" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4680" >
-<father id="4693" num="1" />
+<SUBCOMPONENT type="-1" id="4506" >
+<father id="4519" num="1" />
 <cdparam x="165" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4681" >
-<father id="4693" num="2" />
+<SUBCOMPONENT type="-1" id="4507" >
+<father id="4519" num="2" />
 <cdparam x="165" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4682" >
-<father id="4693" num="3" />
+<SUBCOMPONENT type="-1" id="4508" >
+<father id="4519" num="3" />
 <cdparam x="320" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4687" >
-<father id="4693" num="4" />
+<SUBCOMPONENT type="-1" id="4513" >
+<father id="4519" num="4" />
 <cdparam x="228" y="472" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4683" />
-<TGConnectingPoint num="1" id="4684" />
-<TGConnectingPoint num="2" id="4685" />
-<TGConnectingPoint num="3" id="4686" />
+<TGConnectingPoint num="0" id="4509" />
+<TGConnectingPoint num="1" id="4510" />
+<TGConnectingPoint num="2" id="4511" />
+<TGConnectingPoint num="3" id="4512" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10024,25 +9773,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4700" >
+<CONNECTOR type="5102" id="4526" >
 <cdparam x="252" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4699" />
-<P1  x="246" y="356" id="4810" />
-<P2  x="228" y="402" id="4785" />
+<TGConnectingPoint num="0" id="4525" />
+<P1  x="246" y="356" id="4636" />
+<P2  x="228" y="402" id="4611" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4698" >
-<father id="4700" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4524" >
+<father id="4526" num="0" />
 <cdparam x="252" y="408" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4694" />
-<TGConnectingPoint num="1" id="4695" />
-<TGConnectingPoint num="2" id="4696" />
-<TGConnectingPoint num="3" id="4697" />
+<TGConnectingPoint num="0" id="4520" />
+<TGConnectingPoint num="1" id="4521" />
+<TGConnectingPoint num="2" id="4522" />
+<TGConnectingPoint num="3" id="4523" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10052,25 +9801,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4707" >
+<CONNECTOR type="5102" id="4533" >
 <cdparam x="275" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4706" />
-<P1  x="275" y="286" id="4838" />
-<P2  x="275" y="306" id="4797" />
+<TGConnectingPoint num="0" id="4532" />
+<P1  x="275" y="286" id="4664" />
+<P2  x="275" y="306" id="4623" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4705" >
-<father id="4707" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4531" >
+<father id="4533" num="0" />
 <cdparam x="275" y="326" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4701" />
-<TGConnectingPoint num="1" id="4702" />
-<TGConnectingPoint num="2" id="4703" />
-<TGConnectingPoint num="3" id="4704" />
+<TGConnectingPoint num="0" id="4527" />
+<TGConnectingPoint num="1" id="4528" />
+<TGConnectingPoint num="2" id="4529" />
+<TGConnectingPoint num="3" id="4530" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10080,25 +9829,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4714" >
+<CONNECTOR type="5102" id="4540" >
 <cdparam x="319" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4713" />
-<P1  x="319" y="218" id="4862" />
-<P2  x="275" y="256" id="4837" />
+<TGConnectingPoint num="0" id="4539" />
+<P1  x="319" y="218" id="4688" />
+<P2  x="275" y="256" id="4663" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4712" >
-<father id="4714" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4538" >
+<father id="4540" num="0" />
 <cdparam x="319" y="245" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4708" />
-<TGConnectingPoint num="1" id="4709" />
-<TGConnectingPoint num="2" id="4710" />
-<TGConnectingPoint num="3" id="4711" />
+<TGConnectingPoint num="0" id="4534" />
+<TGConnectingPoint num="1" id="4535" />
+<TGConnectingPoint num="2" id="4536" />
+<TGConnectingPoint num="3" id="4537" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10108,25 +9857,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4721" >
+<CONNECTOR type="5102" id="4547" >
 <cdparam x="349" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4720" />
-<P1  x="349" y="143" id="4889" />
-<P2  x="349" y="168" id="4849" />
+<TGConnectingPoint num="0" id="4546" />
+<P1  x="349" y="143" id="4715" />
+<P2  x="349" y="168" id="4675" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4719" >
-<father id="4721" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4545" >
+<father id="4547" num="0" />
 <cdparam x="349" y="183" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4715" />
-<TGConnectingPoint num="1" id="4716" />
-<TGConnectingPoint num="2" id="4717" />
-<TGConnectingPoint num="3" id="4718" />
+<TGConnectingPoint num="0" id="4541" />
+<TGConnectingPoint num="1" id="4542" />
+<TGConnectingPoint num="2" id="4543" />
+<TGConnectingPoint num="3" id="4544" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10136,261 +9885,261 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4762" >
+<COMPONENT type="5106" id="4588" >
 <cdparam x="345" y="450" />
 <sizeparam width="100" height="54" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Error" />
-<TGConnectingPoint num="0" id="4722" />
-<TGConnectingPoint num="1" id="4723" />
-<TGConnectingPoint num="2" id="4724" />
-<TGConnectingPoint num="3" id="4725" />
-<TGConnectingPoint num="4" id="4726" />
-<TGConnectingPoint num="5" id="4727" />
-<TGConnectingPoint num="6" id="4728" />
-<TGConnectingPoint num="7" id="4729" />
-<TGConnectingPoint num="8" id="4730" />
-<TGConnectingPoint num="9" id="4731" />
-<TGConnectingPoint num="10" id="4732" />
-<TGConnectingPoint num="11" id="4733" />
-<TGConnectingPoint num="12" id="4734" />
-<TGConnectingPoint num="13" id="4735" />
-<TGConnectingPoint num="14" id="4736" />
-<TGConnectingPoint num="15" id="4737" />
-<TGConnectingPoint num="16" id="4738" />
-<TGConnectingPoint num="17" id="4739" />
-<TGConnectingPoint num="18" id="4740" />
-<TGConnectingPoint num="19" id="4741" />
-<TGConnectingPoint num="20" id="4742" />
-<TGConnectingPoint num="21" id="4743" />
-<TGConnectingPoint num="22" id="4744" />
-<TGConnectingPoint num="23" id="4745" />
-<TGConnectingPoint num="24" id="4746" />
-<TGConnectingPoint num="25" id="4747" />
-<TGConnectingPoint num="26" id="4748" />
-<TGConnectingPoint num="27" id="4749" />
-<TGConnectingPoint num="28" id="4750" />
-<TGConnectingPoint num="29" id="4751" />
-<TGConnectingPoint num="30" id="4752" />
-<TGConnectingPoint num="31" id="4753" />
-<TGConnectingPoint num="32" id="4754" />
-<TGConnectingPoint num="33" id="4755" />
-<TGConnectingPoint num="34" id="4756" />
-<TGConnectingPoint num="35" id="4757" />
-<TGConnectingPoint num="36" id="4758" />
-<TGConnectingPoint num="37" id="4759" />
-<TGConnectingPoint num="38" id="4760" />
-<TGConnectingPoint num="39" id="4761" />
+<TGConnectingPoint num="0" id="4548" />
+<TGConnectingPoint num="1" id="4549" />
+<TGConnectingPoint num="2" id="4550" />
+<TGConnectingPoint num="3" id="4551" />
+<TGConnectingPoint num="4" id="4552" />
+<TGConnectingPoint num="5" id="4553" />
+<TGConnectingPoint num="6" id="4554" />
+<TGConnectingPoint num="7" id="4555" />
+<TGConnectingPoint num="8" id="4556" />
+<TGConnectingPoint num="9" id="4557" />
+<TGConnectingPoint num="10" id="4558" />
+<TGConnectingPoint num="11" id="4559" />
+<TGConnectingPoint num="12" id="4560" />
+<TGConnectingPoint num="13" id="4561" />
+<TGConnectingPoint num="14" id="4562" />
+<TGConnectingPoint num="15" id="4563" />
+<TGConnectingPoint num="16" id="4564" />
+<TGConnectingPoint num="17" id="4565" />
+<TGConnectingPoint num="18" id="4566" />
+<TGConnectingPoint num="19" id="4567" />
+<TGConnectingPoint num="20" id="4568" />
+<TGConnectingPoint num="21" id="4569" />
+<TGConnectingPoint num="22" id="4570" />
+<TGConnectingPoint num="23" id="4571" />
+<TGConnectingPoint num="24" id="4572" />
+<TGConnectingPoint num="25" id="4573" />
+<TGConnectingPoint num="26" id="4574" />
+<TGConnectingPoint num="27" id="4575" />
+<TGConnectingPoint num="28" id="4576" />
+<TGConnectingPoint num="29" id="4577" />
+<TGConnectingPoint num="30" id="4578" />
+<TGConnectingPoint num="31" id="4579" />
+<TGConnectingPoint num="32" id="4580" />
+<TGConnectingPoint num="33" id="4581" />
+<TGConnectingPoint num="34" id="4582" />
+<TGConnectingPoint num="35" id="4583" />
+<TGConnectingPoint num="36" id="4584" />
+<TGConnectingPoint num="37" id="4585" />
+<TGConnectingPoint num="38" id="4586" />
+<TGConnectingPoint num="39" id="4587" />
 <accessibility />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4773" >
+<COMPONENT type="5104" id="4599" >
 <cdparam x="325" y="408" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="4763" />
-<TGConnectingPoint num="1" id="4764" />
-<TGConnectingPoint num="2" id="4765" />
-<TGConnectingPoint num="3" id="4766" />
-<TGConnectingPoint num="4" id="4767" />
-<TGConnectingPoint num="5" id="4768" />
-<TGConnectingPoint num="6" id="4769" />
-<TGConnectingPoint num="7" id="4770" />
-<TGConnectingPoint num="8" id="4771" />
-<TGConnectingPoint num="9" id="4772" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4784" >
+<TGConnectingPoint num="0" id="4589" />
+<TGConnectingPoint num="1" id="4590" />
+<TGConnectingPoint num="2" id="4591" />
+<TGConnectingPoint num="3" id="4592" />
+<TGConnectingPoint num="4" id="4593" />
+<TGConnectingPoint num="5" id="4594" />
+<TGConnectingPoint num="6" id="4595" />
+<TGConnectingPoint num="7" id="4596" />
+<TGConnectingPoint num="8" id="4597" />
+<TGConnectingPoint num="9" id="4598" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4610" >
 <cdparam x="366" y="260" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="4774" />
-<TGConnectingPoint num="1" id="4775" />
-<TGConnectingPoint num="2" id="4776" />
-<TGConnectingPoint num="3" id="4777" />
-<TGConnectingPoint num="4" id="4778" />
-<TGConnectingPoint num="5" id="4779" />
-<TGConnectingPoint num="6" id="4780" />
-<TGConnectingPoint num="7" id="4781" />
-<TGConnectingPoint num="8" id="4782" />
-<TGConnectingPoint num="9" id="4783" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4795" >
+<TGConnectingPoint num="0" id="4600" />
+<TGConnectingPoint num="1" id="4601" />
+<TGConnectingPoint num="2" id="4602" />
+<TGConnectingPoint num="3" id="4603" />
+<TGConnectingPoint num="4" id="4604" />
+<TGConnectingPoint num="5" id="4605" />
+<TGConnectingPoint num="6" id="4606" />
+<TGConnectingPoint num="7" id="4607" />
+<TGConnectingPoint num="8" id="4608" />
+<TGConnectingPoint num="9" id="4609" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4621" >
 <cdparam x="183" y="407" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="4785" />
-<TGConnectingPoint num="1" id="4786" />
-<TGConnectingPoint num="2" id="4787" />
-<TGConnectingPoint num="3" id="4788" />
-<TGConnectingPoint num="4" id="4789" />
-<TGConnectingPoint num="5" id="4790" />
-<TGConnectingPoint num="6" id="4791" />
-<TGConnectingPoint num="7" id="4792" />
-<TGConnectingPoint num="8" id="4793" />
-<TGConnectingPoint num="9" id="4794" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4836" >
+<TGConnectingPoint num="0" id="4611" />
+<TGConnectingPoint num="1" id="4612" />
+<TGConnectingPoint num="2" id="4613" />
+<TGConnectingPoint num="3" id="4614" />
+<TGConnectingPoint num="4" id="4615" />
+<TGConnectingPoint num="5" id="4616" />
+<TGConnectingPoint num="6" id="4617" />
+<TGConnectingPoint num="7" id="4618" />
+<TGConnectingPoint num="8" id="4619" />
+<TGConnectingPoint num="9" id="4620" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4662" >
 <cdparam x="218" y="306" />
 <sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForClosed" />
-<TGConnectingPoint num="0" id="4796" />
-<TGConnectingPoint num="1" id="4797" />
-<TGConnectingPoint num="2" id="4798" />
-<TGConnectingPoint num="3" id="4799" />
-<TGConnectingPoint num="4" id="4800" />
-<TGConnectingPoint num="5" id="4801" />
-<TGConnectingPoint num="6" id="4802" />
-<TGConnectingPoint num="7" id="4803" />
-<TGConnectingPoint num="8" id="4804" />
-<TGConnectingPoint num="9" id="4805" />
-<TGConnectingPoint num="10" id="4806" />
-<TGConnectingPoint num="11" id="4807" />
-<TGConnectingPoint num="12" id="4808" />
-<TGConnectingPoint num="13" id="4809" />
-<TGConnectingPoint num="14" id="4810" />
-<TGConnectingPoint num="15" id="4811" />
-<TGConnectingPoint num="16" id="4812" />
-<TGConnectingPoint num="17" id="4813" />
-<TGConnectingPoint num="18" id="4814" />
-<TGConnectingPoint num="19" id="4815" />
-<TGConnectingPoint num="20" id="4816" />
-<TGConnectingPoint num="21" id="4817" />
-<TGConnectingPoint num="22" id="4818" />
-<TGConnectingPoint num="23" id="4819" />
-<TGConnectingPoint num="24" id="4820" />
-<TGConnectingPoint num="25" id="4821" />
-<TGConnectingPoint num="26" id="4822" />
-<TGConnectingPoint num="27" id="4823" />
-<TGConnectingPoint num="28" id="4824" />
-<TGConnectingPoint num="29" id="4825" />
-<TGConnectingPoint num="30" id="4826" />
-<TGConnectingPoint num="31" id="4827" />
-<TGConnectingPoint num="32" id="4828" />
-<TGConnectingPoint num="33" id="4829" />
-<TGConnectingPoint num="34" id="4830" />
-<TGConnectingPoint num="35" id="4831" />
-<TGConnectingPoint num="36" id="4832" />
-<TGConnectingPoint num="37" id="4833" />
-<TGConnectingPoint num="38" id="4834" />
-<TGConnectingPoint num="39" id="4835" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="4847" >
+<TGConnectingPoint num="0" id="4622" />
+<TGConnectingPoint num="1" id="4623" />
+<TGConnectingPoint num="2" id="4624" />
+<TGConnectingPoint num="3" id="4625" />
+<TGConnectingPoint num="4" id="4626" />
+<TGConnectingPoint num="5" id="4627" />
+<TGConnectingPoint num="6" id="4628" />
+<TGConnectingPoint num="7" id="4629" />
+<TGConnectingPoint num="8" id="4630" />
+<TGConnectingPoint num="9" id="4631" />
+<TGConnectingPoint num="10" id="4632" />
+<TGConnectingPoint num="11" id="4633" />
+<TGConnectingPoint num="12" id="4634" />
+<TGConnectingPoint num="13" id="4635" />
+<TGConnectingPoint num="14" id="4636" />
+<TGConnectingPoint num="15" id="4637" />
+<TGConnectingPoint num="16" id="4638" />
+<TGConnectingPoint num="17" id="4639" />
+<TGConnectingPoint num="18" id="4640" />
+<TGConnectingPoint num="19" id="4641" />
+<TGConnectingPoint num="20" id="4642" />
+<TGConnectingPoint num="21" id="4643" />
+<TGConnectingPoint num="22" id="4644" />
+<TGConnectingPoint num="23" id="4645" />
+<TGConnectingPoint num="24" id="4646" />
+<TGConnectingPoint num="25" id="4647" />
+<TGConnectingPoint num="26" id="4648" />
+<TGConnectingPoint num="27" id="4649" />
+<TGConnectingPoint num="28" id="4650" />
+<TGConnectingPoint num="29" id="4651" />
+<TGConnectingPoint num="30" id="4652" />
+<TGConnectingPoint num="31" id="4653" />
+<TGConnectingPoint num="32" id="4654" />
+<TGConnectingPoint num="33" id="4655" />
+<TGConnectingPoint num="34" id="4656" />
+<TGConnectingPoint num="35" id="4657" />
+<TGConnectingPoint num="36" id="4658" />
+<TGConnectingPoint num="37" id="4659" />
+<TGConnectingPoint num="38" id="4660" />
+<TGConnectingPoint num="39" id="4661" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="4673" >
 <cdparam x="234" y="261" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="4837" />
-<TGConnectingPoint num="1" id="4838" />
-<TGConnectingPoint num="2" id="4839" />
-<TGConnectingPoint num="3" id="4840" />
-<TGConnectingPoint num="4" id="4841" />
-<TGConnectingPoint num="5" id="4842" />
-<TGConnectingPoint num="6" id="4843" />
-<TGConnectingPoint num="7" id="4844" />
-<TGConnectingPoint num="8" id="4845" />
-<TGConnectingPoint num="9" id="4846" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4888" >
+<TGConnectingPoint num="0" id="4663" />
+<TGConnectingPoint num="1" id="4664" />
+<TGConnectingPoint num="2" id="4665" />
+<TGConnectingPoint num="3" id="4666" />
+<TGConnectingPoint num="4" id="4667" />
+<TGConnectingPoint num="5" id="4668" />
+<TGConnectingPoint num="6" id="4669" />
+<TGConnectingPoint num="7" id="4670" />
+<TGConnectingPoint num="8" id="4671" />
+<TGConnectingPoint num="9" id="4672" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4714" >
 <cdparam x="289" y="168" />
 <sizeparam width="120" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForOpen" />
-<TGConnectingPoint num="0" id="4848" />
-<TGConnectingPoint num="1" id="4849" />
-<TGConnectingPoint num="2" id="4850" />
-<TGConnectingPoint num="3" id="4851" />
-<TGConnectingPoint num="4" id="4852" />
-<TGConnectingPoint num="5" id="4853" />
-<TGConnectingPoint num="6" id="4854" />
-<TGConnectingPoint num="7" id="4855" />
-<TGConnectingPoint num="8" id="4856" />
-<TGConnectingPoint num="9" id="4857" />
-<TGConnectingPoint num="10" id="4858" />
-<TGConnectingPoint num="11" id="4859" />
-<TGConnectingPoint num="12" id="4860" />
-<TGConnectingPoint num="13" id="4861" />
-<TGConnectingPoint num="14" id="4862" />
-<TGConnectingPoint num="15" id="4863" />
-<TGConnectingPoint num="16" id="4864" />
-<TGConnectingPoint num="17" id="4865" />
-<TGConnectingPoint num="18" id="4866" />
-<TGConnectingPoint num="19" id="4867" />
-<TGConnectingPoint num="20" id="4868" />
-<TGConnectingPoint num="21" id="4869" />
-<TGConnectingPoint num="22" id="4870" />
-<TGConnectingPoint num="23" id="4871" />
-<TGConnectingPoint num="24" id="4872" />
-<TGConnectingPoint num="25" id="4873" />
-<TGConnectingPoint num="26" id="4874" />
-<TGConnectingPoint num="27" id="4875" />
-<TGConnectingPoint num="28" id="4876" />
-<TGConnectingPoint num="29" id="4877" />
-<TGConnectingPoint num="30" id="4878" />
-<TGConnectingPoint num="31" id="4879" />
-<TGConnectingPoint num="32" id="4880" />
-<TGConnectingPoint num="33" id="4881" />
-<TGConnectingPoint num="34" id="4882" />
-<TGConnectingPoint num="35" id="4883" />
-<TGConnectingPoint num="36" id="4884" />
-<TGConnectingPoint num="37" id="4885" />
-<TGConnectingPoint num="38" id="4886" />
-<TGConnectingPoint num="39" id="4887" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4890" >
+<TGConnectingPoint num="0" id="4674" />
+<TGConnectingPoint num="1" id="4675" />
+<TGConnectingPoint num="2" id="4676" />
+<TGConnectingPoint num="3" id="4677" />
+<TGConnectingPoint num="4" id="4678" />
+<TGConnectingPoint num="5" id="4679" />
+<TGConnectingPoint num="6" id="4680" />
+<TGConnectingPoint num="7" id="4681" />
+<TGConnectingPoint num="8" id="4682" />
+<TGConnectingPoint num="9" id="4683" />
+<TGConnectingPoint num="10" id="4684" />
+<TGConnectingPoint num="11" id="4685" />
+<TGConnectingPoint num="12" id="4686" />
+<TGConnectingPoint num="13" id="4687" />
+<TGConnectingPoint num="14" id="4688" />
+<TGConnectingPoint num="15" id="4689" />
+<TGConnectingPoint num="16" id="4690" />
+<TGConnectingPoint num="17" id="4691" />
+<TGConnectingPoint num="18" id="4692" />
+<TGConnectingPoint num="19" id="4693" />
+<TGConnectingPoint num="20" id="4694" />
+<TGConnectingPoint num="21" id="4695" />
+<TGConnectingPoint num="22" id="4696" />
+<TGConnectingPoint num="23" id="4697" />
+<TGConnectingPoint num="24" id="4698" />
+<TGConnectingPoint num="25" id="4699" />
+<TGConnectingPoint num="26" id="4700" />
+<TGConnectingPoint num="27" id="4701" />
+<TGConnectingPoint num="28" id="4702" />
+<TGConnectingPoint num="29" id="4703" />
+<TGConnectingPoint num="30" id="4704" />
+<TGConnectingPoint num="31" id="4705" />
+<TGConnectingPoint num="32" id="4706" />
+<TGConnectingPoint num="33" id="4707" />
+<TGConnectingPoint num="34" id="4708" />
+<TGConnectingPoint num="35" id="4709" />
+<TGConnectingPoint num="36" id="4710" />
+<TGConnectingPoint num="37" id="4711" />
+<TGConnectingPoint num="38" id="4712" />
+<TGConnectingPoint num="39" id="4713" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4716" >
 <cdparam x="342" y="123" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4889" />
+<TGConnectingPoint num="0" id="4715" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemotelyControlledMicrowave" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4897" >
+<CONNECTOR type="5102" id="4723" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<TGConnectingPoint num="0" id="4896" />
-<P1  x="407" y="70" id="4900" />
-<P2  x="408" y="85" id="4898" />
+<TGConnectingPoint num="0" id="4722" />
+<P1  x="407" y="70" id="4726" />
+<P2  x="408" y="85" id="4724" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4895" >
-<father id="4897" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4721" >
+<father id="4723" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4891" />
-<TGConnectingPoint num="1" id="4892" />
-<TGConnectingPoint num="2" id="4893" />
-<TGConnectingPoint num="3" id="4894" />
+<TGConnectingPoint num="0" id="4717" />
+<TGConnectingPoint num="1" id="4718" />
+<TGConnectingPoint num="2" id="4719" />
+<TGConnectingPoint num="3" id="4720" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10400,55 +10149,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="4899" >
+<COMPONENT type="5101" id="4725" >
 <cdparam x="398" y="90" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4898" />
+<TGConnectingPoint num="0" id="4724" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="4901" >
+<COMPONENT type="5100" id="4727" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4900" />
+<TGConnectingPoint num="0" id="4726" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemoteControl" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="118" id="4902" >
+<CONNECTOR type="118" id="4728" >
 <cdparam x="516" y="268" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from List of all parameters of an Avatar SMD transition to UML Note" value="null" />
-<P1  x="531" y="264" id="4919" />
-<P2  x="607" y="233" id="4927" />
+<P1  x="531" y="264" id="4745" />
+<P2  x="607" y="233" id="4753" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4909" >
+<CONNECTOR type="5102" id="4735" >
 <cdparam x="290" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4908" />
-<P1  x="309" y="119" id="4995" />
-<P2  x="325" y="163" id="4942" />
+<TGConnectingPoint num="0" id="4734" />
+<P1  x="309" y="119" id="4821" />
+<P2  x="325" y="163" id="4768" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4907" >
-<father id="4909" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4733" >
+<father id="4735" num="0" />
 <cdparam x="290" y="180" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4903" />
-<TGConnectingPoint num="1" id="4904" />
-<TGConnectingPoint num="2" id="4905" />
-<TGConnectingPoint num="3" id="4906" />
+<TGConnectingPoint num="0" id="4729" />
+<TGConnectingPoint num="1" id="4730" />
+<TGConnectingPoint num="2" id="4731" />
+<TGConnectingPoint num="3" id="4732" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10458,25 +10207,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4916" >
+<CONNECTOR type="5102" id="4742" >
 <cdparam x="347" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="4915" />
-<P1  x="347" y="321" id="4985" />
-<P2  x="350" y="350" id="4982" />
+<TGConnectingPoint num="0" id="4741" />
+<P1  x="347" y="321" id="4811" />
+<P2  x="350" y="350" id="4808" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4914" >
-<father id="4916" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4740" >
+<father id="4742" num="0" />
 <cdparam x="347" y="361" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4910" />
-<TGConnectingPoint num="1" id="4911" />
-<TGConnectingPoint num="2" id="4912" />
-<TGConnectingPoint num="3" id="4913" />
+<TGConnectingPoint num="0" id="4736" />
+<TGConnectingPoint num="1" id="4737" />
+<TGConnectingPoint num="2" id="4738" />
+<TGConnectingPoint num="3" id="4739" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10486,25 +10235,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4923" >
+<CONNECTOR type="5102" id="4749" >
 <cdparam x="327" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4922" />
-<P1  x="325" y="213" id="4947" />
-<P2  x="347" y="291" id="4984" />
+<TGConnectingPoint num="0" id="4748" />
+<P1  x="325" y="213" id="4773" />
+<P2  x="347" y="291" id="4810" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4921" >
-<father id="4923" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4747" >
+<father id="4749" num="0" />
 <cdparam x="363" y="249" />
 <sizeparam width="168" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4917" />
-<TGConnectingPoint num="1" id="4918" />
-<TGConnectingPoint num="2" id="4919" />
-<TGConnectingPoint num="3" id="4920" />
+<TGConnectingPoint num="0" id="4743" />
+<TGConnectingPoint num="1" id="4744" />
+<TGConnectingPoint num="2" id="4745" />
+<TGConnectingPoint num="3" id="4746" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10516,143 +10265,143 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="4940" >
+<COMPONENT type="301" id="4766" >
 <cdparam x="607" y="216" />
 <sizeparam width="251" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Encrypting data with the pre shared key
 " />
-<TGConnectingPoint num="0" id="4924" />
-<TGConnectingPoint num="1" id="4925" />
-<TGConnectingPoint num="2" id="4926" />
-<TGConnectingPoint num="3" id="4927" />
-<TGConnectingPoint num="4" id="4928" />
-<TGConnectingPoint num="5" id="4929" />
-<TGConnectingPoint num="6" id="4930" />
-<TGConnectingPoint num="7" id="4931" />
-<TGConnectingPoint num="8" id="4932" />
-<TGConnectingPoint num="9" id="4933" />
-<TGConnectingPoint num="10" id="4934" />
-<TGConnectingPoint num="11" id="4935" />
-<TGConnectingPoint num="12" id="4936" />
-<TGConnectingPoint num="13" id="4937" />
-<TGConnectingPoint num="14" id="4938" />
-<TGConnectingPoint num="15" id="4939" />
+<TGConnectingPoint num="0" id="4750" />
+<TGConnectingPoint num="1" id="4751" />
+<TGConnectingPoint num="2" id="4752" />
+<TGConnectingPoint num="3" id="4753" />
+<TGConnectingPoint num="4" id="4754" />
+<TGConnectingPoint num="5" id="4755" />
+<TGConnectingPoint num="6" id="4756" />
+<TGConnectingPoint num="7" id="4757" />
+<TGConnectingPoint num="8" id="4758" />
+<TGConnectingPoint num="9" id="4759" />
+<TGConnectingPoint num="10" id="4760" />
+<TGConnectingPoint num="11" id="4761" />
+<TGConnectingPoint num="12" id="4762" />
+<TGConnectingPoint num="13" id="4763" />
+<TGConnectingPoint num="14" id="4764" />
+<TGConnectingPoint num="15" id="4765" />
 <extraparam>
 <Line value="Encrypting data with the pre shared key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4981" >
+<COMPONENT type="5106" id="4807" >
 <cdparam x="239" y="163" />
 <sizeparam width="172" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="SendingRemoteOrder" />
-<TGConnectingPoint num="0" id="4941" />
-<TGConnectingPoint num="1" id="4942" />
-<TGConnectingPoint num="2" id="4943" />
-<TGConnectingPoint num="3" id="4944" />
-<TGConnectingPoint num="4" id="4945" />
-<TGConnectingPoint num="5" id="4946" />
-<TGConnectingPoint num="6" id="4947" />
-<TGConnectingPoint num="7" id="4948" />
-<TGConnectingPoint num="8" id="4949" />
-<TGConnectingPoint num="9" id="4950" />
-<TGConnectingPoint num="10" id="4951" />
-<TGConnectingPoint num="11" id="4952" />
-<TGConnectingPoint num="12" id="4953" />
-<TGConnectingPoint num="13" id="4954" />
-<TGConnectingPoint num="14" id="4955" />
-<TGConnectingPoint num="15" id="4956" />
-<TGConnectingPoint num="16" id="4957" />
-<TGConnectingPoint num="17" id="4958" />
-<TGConnectingPoint num="18" id="4959" />
-<TGConnectingPoint num="19" id="4960" />
-<TGConnectingPoint num="20" id="4961" />
-<TGConnectingPoint num="21" id="4962" />
-<TGConnectingPoint num="22" id="4963" />
-<TGConnectingPoint num="23" id="4964" />
-<TGConnectingPoint num="24" id="4965" />
-<TGConnectingPoint num="25" id="4966" />
-<TGConnectingPoint num="26" id="4967" />
-<TGConnectingPoint num="27" id="4968" />
-<TGConnectingPoint num="28" id="4969" />
-<TGConnectingPoint num="29" id="4970" />
-<TGConnectingPoint num="30" id="4971" />
-<TGConnectingPoint num="31" id="4972" />
-<TGConnectingPoint num="32" id="4973" />
-<TGConnectingPoint num="33" id="4974" />
-<TGConnectingPoint num="34" id="4975" />
-<TGConnectingPoint num="35" id="4976" />
-<TGConnectingPoint num="36" id="4977" />
-<TGConnectingPoint num="37" id="4978" />
-<TGConnectingPoint num="38" id="4979" />
-<TGConnectingPoint num="39" id="4980" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="4983" >
+<TGConnectingPoint num="0" id="4767" />
+<TGConnectingPoint num="1" id="4768" />
+<TGConnectingPoint num="2" id="4769" />
+<TGConnectingPoint num="3" id="4770" />
+<TGConnectingPoint num="4" id="4771" />
+<TGConnectingPoint num="5" id="4772" />
+<TGConnectingPoint num="6" id="4773" />
+<TGConnectingPoint num="7" id="4774" />
+<TGConnectingPoint num="8" id="4775" />
+<TGConnectingPoint num="9" id="4776" />
+<TGConnectingPoint num="10" id="4777" />
+<TGConnectingPoint num="11" id="4778" />
+<TGConnectingPoint num="12" id="4779" />
+<TGConnectingPoint num="13" id="4780" />
+<TGConnectingPoint num="14" id="4781" />
+<TGConnectingPoint num="15" id="4782" />
+<TGConnectingPoint num="16" id="4783" />
+<TGConnectingPoint num="17" id="4784" />
+<TGConnectingPoint num="18" id="4785" />
+<TGConnectingPoint num="19" id="4786" />
+<TGConnectingPoint num="20" id="4787" />
+<TGConnectingPoint num="21" id="4788" />
+<TGConnectingPoint num="22" id="4789" />
+<TGConnectingPoint num="23" id="4790" />
+<TGConnectingPoint num="24" id="4791" />
+<TGConnectingPoint num="25" id="4792" />
+<TGConnectingPoint num="26" id="4793" />
+<TGConnectingPoint num="27" id="4794" />
+<TGConnectingPoint num="28" id="4795" />
+<TGConnectingPoint num="29" id="4796" />
+<TGConnectingPoint num="30" id="4797" />
+<TGConnectingPoint num="31" id="4798" />
+<TGConnectingPoint num="32" id="4799" />
+<TGConnectingPoint num="33" id="4800" />
+<TGConnectingPoint num="34" id="4801" />
+<TGConnectingPoint num="35" id="4802" />
+<TGConnectingPoint num="36" id="4803" />
+<TGConnectingPoint num="37" id="4804" />
+<TGConnectingPoint num="38" id="4805" />
+<TGConnectingPoint num="39" id="4806" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="4809" >
 <cdparam x="340" y="355" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="4982" />
+<TGConnectingPoint num="0" id="4808" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="4994" >
+<COMPONENT type="5103" id="4820" >
 <cdparam x="262" y="296" />
 <sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="wirelessChannelWrite(msg1)" />
-<TGConnectingPoint num="0" id="4984" />
-<TGConnectingPoint num="1" id="4985" />
-<TGConnectingPoint num="2" id="4986" />
-<TGConnectingPoint num="3" id="4987" />
-<TGConnectingPoint num="4" id="4988" />
-<TGConnectingPoint num="5" id="4989" />
-<TGConnectingPoint num="6" id="4990" />
-<TGConnectingPoint num="7" id="4991" />
-<TGConnectingPoint num="8" id="4992" />
-<TGConnectingPoint num="9" id="4993" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4996" >
+<TGConnectingPoint num="0" id="4810" />
+<TGConnectingPoint num="1" id="4811" />
+<TGConnectingPoint num="2" id="4812" />
+<TGConnectingPoint num="3" id="4813" />
+<TGConnectingPoint num="4" id="4814" />
+<TGConnectingPoint num="5" id="4815" />
+<TGConnectingPoint num="6" id="4816" />
+<TGConnectingPoint num="7" id="4817" />
+<TGConnectingPoint num="8" id="4818" />
+<TGConnectingPoint num="9" id="4819" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="4822" >
 <cdparam x="302" y="99" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4995" />
+<TGConnectingPoint num="0" id="4821" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5003" >
+<CONNECTOR type="5102" id="4829" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5002" />
-<P1  x="407" y="70" id="5045" />
-<P2  x="451" y="106" id="5005" />
+<TGConnectingPoint num="0" id="4828" />
+<P1  x="407" y="70" id="4871" />
+<P2  x="451" y="106" id="4831" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5001" >
-<father id="5003" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4827" >
+<father id="4829" num="0" />
 <cdparam x="444" y="75" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4997" />
-<TGConnectingPoint num="1" id="4998" />
-<TGConnectingPoint num="2" id="4999" />
-<TGConnectingPoint num="3" id="5000" />
+<TGConnectingPoint num="0" id="4823" />
+<TGConnectingPoint num="1" id="4824" />
+<TGConnectingPoint num="2" id="4825" />
+<TGConnectingPoint num="3" id="4826" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10662,88 +10411,88 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="5044" >
+<COMPONENT type="5106" id="4870" >
 <cdparam x="396" y="106" />
 <sizeparam width="111" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Running" />
-<TGConnectingPoint num="0" id="5004" />
-<TGConnectingPoint num="1" id="5005" />
-<TGConnectingPoint num="2" id="5006" />
-<TGConnectingPoint num="3" id="5007" />
-<TGConnectingPoint num="4" id="5008" />
-<TGConnectingPoint num="5" id="5009" />
-<TGConnectingPoint num="6" id="5010" />
-<TGConnectingPoint num="7" id="5011" />
-<TGConnectingPoint num="8" id="5012" />
-<TGConnectingPoint num="9" id="5013" />
-<TGConnectingPoint num="10" id="5014" />
-<TGConnectingPoint num="11" id="5015" />
-<TGConnectingPoint num="12" id="5016" />
-<TGConnectingPoint num="13" id="5017" />
-<TGConnectingPoint num="14" id="5018" />
-<TGConnectingPoint num="15" id="5019" />
-<TGConnectingPoint num="16" id="5020" />
-<TGConnectingPoint num="17" id="5021" />
-<TGConnectingPoint num="18" id="5022" />
-<TGConnectingPoint num="19" id="5023" />
-<TGConnectingPoint num="20" id="5024" />
-<TGConnectingPoint num="21" id="5025" />
-<TGConnectingPoint num="22" id="5026" />
-<TGConnectingPoint num="23" id="5027" />
-<TGConnectingPoint num="24" id="5028" />
-<TGConnectingPoint num="25" id="5029" />
-<TGConnectingPoint num="26" id="5030" />
-<TGConnectingPoint num="27" id="5031" />
-<TGConnectingPoint num="28" id="5032" />
-<TGConnectingPoint num="29" id="5033" />
-<TGConnectingPoint num="30" id="5034" />
-<TGConnectingPoint num="31" id="5035" />
-<TGConnectingPoint num="32" id="5036" />
-<TGConnectingPoint num="33" id="5037" />
-<TGConnectingPoint num="34" id="5038" />
-<TGConnectingPoint num="35" id="5039" />
-<TGConnectingPoint num="36" id="5040" />
-<TGConnectingPoint num="37" id="5041" />
-<TGConnectingPoint num="38" id="5042" />
-<TGConnectingPoint num="39" id="5043" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="5046" >
+<TGConnectingPoint num="0" id="4830" />
+<TGConnectingPoint num="1" id="4831" />
+<TGConnectingPoint num="2" id="4832" />
+<TGConnectingPoint num="3" id="4833" />
+<TGConnectingPoint num="4" id="4834" />
+<TGConnectingPoint num="5" id="4835" />
+<TGConnectingPoint num="6" id="4836" />
+<TGConnectingPoint num="7" id="4837" />
+<TGConnectingPoint num="8" id="4838" />
+<TGConnectingPoint num="9" id="4839" />
+<TGConnectingPoint num="10" id="4840" />
+<TGConnectingPoint num="11" id="4841" />
+<TGConnectingPoint num="12" id="4842" />
+<TGConnectingPoint num="13" id="4843" />
+<TGConnectingPoint num="14" id="4844" />
+<TGConnectingPoint num="15" id="4845" />
+<TGConnectingPoint num="16" id="4846" />
+<TGConnectingPoint num="17" id="4847" />
+<TGConnectingPoint num="18" id="4848" />
+<TGConnectingPoint num="19" id="4849" />
+<TGConnectingPoint num="20" id="4850" />
+<TGConnectingPoint num="21" id="4851" />
+<TGConnectingPoint num="22" id="4852" />
+<TGConnectingPoint num="23" id="4853" />
+<TGConnectingPoint num="24" id="4854" />
+<TGConnectingPoint num="25" id="4855" />
+<TGConnectingPoint num="26" id="4856" />
+<TGConnectingPoint num="27" id="4857" />
+<TGConnectingPoint num="28" id="4858" />
+<TGConnectingPoint num="29" id="4859" />
+<TGConnectingPoint num="30" id="4860" />
+<TGConnectingPoint num="31" id="4861" />
+<TGConnectingPoint num="32" id="4862" />
+<TGConnectingPoint num="33" id="4863" />
+<TGConnectingPoint num="34" id="4864" />
+<TGConnectingPoint num="35" id="4865" />
+<TGConnectingPoint num="36" id="4866" />
+<TGConnectingPoint num="37" id="4867" />
+<TGConnectingPoint num="38" id="4868" />
+<TGConnectingPoint num="39" id="4869" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4872" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5045" />
+<TGConnectingPoint num="0" id="4871" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5053" >
+<CONNECTOR type="5102" id="4879" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5052" />
-<P1  x="419" y="209" id="5123" />
-<P2  x="419" y="313" id="5082" />
+<TGConnectingPoint num="0" id="4878" />
+<P1  x="419" y="209" id="4949" />
+<P2  x="419" y="313" id="4908" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5051" >
-<father id="5053" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4877" >
+<father id="4879" num="0" />
 <cdparam x="429" y="249" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5047" />
-<TGConnectingPoint num="1" id="5048" />
-<TGConnectingPoint num="2" id="5049" />
-<TGConnectingPoint num="3" id="5050" />
+<TGConnectingPoint num="0" id="4873" />
+<TGConnectingPoint num="1" id="4874" />
+<TGConnectingPoint num="2" id="4875" />
+<TGConnectingPoint num="3" id="4876" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10754,55 +10503,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5066" >
+<CONNECTOR type="5102" id="4892" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5062" />
-<TGConnectingPoint num="1" id="5063" />
-<TGConnectingPoint num="2" id="5064" />
-<TGConnectingPoint num="3" id="5065" />
-<P1  x="419" y="363" id="5087" />
-<P2  x="369" y="123" id="5136" />
+<TGConnectingPoint num="0" id="4888" />
+<TGConnectingPoint num="1" id="4889" />
+<TGConnectingPoint num="2" id="4890" />
+<TGConnectingPoint num="3" id="4891" />
+<P1  x="419" y="363" id="4913" />
+<P2  x="369" y="123" id="4962" />
 <Point x="412" y="419" />
 <Point x="332" y="419" />
 <Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5054" >
-<father id="5066" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4880" >
+<father id="4892" num="0" />
 <cdparam x="412" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5055" >
-<father id="5066" num="1" />
+<SUBCOMPONENT type="-1" id="4881" >
+<father id="4892" num="1" />
 <cdparam x="332" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5056" >
-<father id="5066" num="2" />
+<SUBCOMPONENT type="-1" id="4882" >
+<father id="4892" num="2" />
 <cdparam x="332" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5061" >
-<father id="5066" num="3" />
+<SUBCOMPONENT type="-1" id="4887" >
+<father id="4892" num="3" />
 <cdparam x="430" y="402" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5057" />
-<TGConnectingPoint num="1" id="5058" />
-<TGConnectingPoint num="2" id="5059" />
-<TGConnectingPoint num="3" id="5060" />
+<TGConnectingPoint num="0" id="4883" />
+<TGConnectingPoint num="1" id="4884" />
+<TGConnectingPoint num="2" id="4885" />
+<TGConnectingPoint num="3" id="4886" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10812,25 +10561,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5073" >
+<CONNECTOR type="5102" id="4899" >
 <cdparam x="420" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5072" />
-<P1  x="419" y="148" id="5139" />
-<P2  x="419" y="179" id="5122" />
+<TGConnectingPoint num="0" id="4898" />
+<P1  x="419" y="148" id="4965" />
+<P2  x="419" y="179" id="4948" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5071" >
-<father id="5073" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4897" >
+<father id="4899" num="0" />
 <cdparam x="420" y="191" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5067" />
-<TGConnectingPoint num="1" id="5068" />
-<TGConnectingPoint num="2" id="5069" />
-<TGConnectingPoint num="3" id="5070" />
+<TGConnectingPoint num="0" id="4893" />
+<TGConnectingPoint num="1" id="4894" />
+<TGConnectingPoint num="2" id="4895" />
+<TGConnectingPoint num="3" id="4896" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10840,25 +10589,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5080" >
+<CONNECTOR type="5102" id="4906" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5079" />
-<P1  x="407" y="70" id="5174" />
-<P2  x="419" y="98" id="5134" />
+<TGConnectingPoint num="0" id="4905" />
+<P1  x="407" y="70" id="5000" />
+<P2  x="419" y="98" id="4960" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5078" >
-<father id="5080" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4904" >
+<father id="4906" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5074" />
-<TGConnectingPoint num="1" id="5075" />
-<TGConnectingPoint num="2" id="5076" />
-<TGConnectingPoint num="3" id="5077" />
+<TGConnectingPoint num="0" id="4900" />
+<TGConnectingPoint num="1" id="4901" />
+<TGConnectingPoint num="2" id="4902" />
+<TGConnectingPoint num="3" id="4903" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10868,188 +10617,188 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="5121" >
+<COMPONENT type="5106" id="4947" >
 <cdparam x="369" y="313" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Ringing" />
-<TGConnectingPoint num="0" id="5081" />
-<TGConnectingPoint num="1" id="5082" />
-<TGConnectingPoint num="2" id="5083" />
-<TGConnectingPoint num="3" id="5084" />
-<TGConnectingPoint num="4" id="5085" />
-<TGConnectingPoint num="5" id="5086" />
-<TGConnectingPoint num="6" id="5087" />
-<TGConnectingPoint num="7" id="5088" />
-<TGConnectingPoint num="8" id="5089" />
-<TGConnectingPoint num="9" id="5090" />
-<TGConnectingPoint num="10" id="5091" />
-<TGConnectingPoint num="11" id="5092" />
-<TGConnectingPoint num="12" id="5093" />
-<TGConnectingPoint num="13" id="5094" />
-<TGConnectingPoint num="14" id="5095" />
-<TGConnectingPoint num="15" id="5096" />
-<TGConnectingPoint num="16" id="5097" />
-<TGConnectingPoint num="17" id="5098" />
-<TGConnectingPoint num="18" id="5099" />
-<TGConnectingPoint num="19" id="5100" />
-<TGConnectingPoint num="20" id="5101" />
-<TGConnectingPoint num="21" id="5102" />
-<TGConnectingPoint num="22" id="5103" />
-<TGConnectingPoint num="23" id="5104" />
-<TGConnectingPoint num="24" id="5105" />
-<TGConnectingPoint num="25" id="5106" />
-<TGConnectingPoint num="26" id="5107" />
-<TGConnectingPoint num="27" id="5108" />
-<TGConnectingPoint num="28" id="5109" />
-<TGConnectingPoint num="29" id="5110" />
-<TGConnectingPoint num="30" id="5111" />
-<TGConnectingPoint num="31" id="5112" />
-<TGConnectingPoint num="32" id="5113" />
-<TGConnectingPoint num="33" id="5114" />
-<TGConnectingPoint num="34" id="5115" />
-<TGConnectingPoint num="35" id="5116" />
-<TGConnectingPoint num="36" id="5117" />
-<TGConnectingPoint num="37" id="5118" />
-<TGConnectingPoint num="38" id="5119" />
-<TGConnectingPoint num="39" id="5120" />
+<TGConnectingPoint num="0" id="4907" />
+<TGConnectingPoint num="1" id="4908" />
+<TGConnectingPoint num="2" id="4909" />
+<TGConnectingPoint num="3" id="4910" />
+<TGConnectingPoint num="4" id="4911" />
+<TGConnectingPoint num="5" id="4912" />
+<TGConnectingPoint num="6" id="4913" />
+<TGConnectingPoint num="7" id="4914" />
+<TGConnectingPoint num="8" id="4915" />
+<TGConnectingPoint num="9" id="4916" />
+<TGConnectingPoint num="10" id="4917" />
+<TGConnectingPoint num="11" id="4918" />
+<TGConnectingPoint num="12" id="4919" />
+<TGConnectingPoint num="13" id="4920" />
+<TGConnectingPoint num="14" id="4921" />
+<TGConnectingPoint num="15" id="4922" />
+<TGConnectingPoint num="16" id="4923" />
+<TGConnectingPoint num="17" id="4924" />
+<TGConnectingPoint num="18" id="4925" />
+<TGConnectingPoint num="19" id="4926" />
+<TGConnectingPoint num="20" id="4927" />
+<TGConnectingPoint num="21" id="4928" />
+<TGConnectingPoint num="22" id="4929" />
+<TGConnectingPoint num="23" id="4930" />
+<TGConnectingPoint num="24" id="4931" />
+<TGConnectingPoint num="25" id="4932" />
+<TGConnectingPoint num="26" id="4933" />
+<TGConnectingPoint num="27" id="4934" />
+<TGConnectingPoint num="28" id="4935" />
+<TGConnectingPoint num="29" id="4936" />
+<TGConnectingPoint num="30" id="4937" />
+<TGConnectingPoint num="31" id="4938" />
+<TGConnectingPoint num="32" id="4939" />
+<TGConnectingPoint num="33" id="4940" />
+<TGConnectingPoint num="34" id="4941" />
+<TGConnectingPoint num="35" id="4942" />
+<TGConnectingPoint num="36" id="4943" />
+<TGConnectingPoint num="37" id="4944" />
+<TGConnectingPoint num="38" id="4945" />
+<TGConnectingPoint num="39" id="4946" />
 <extraparam>
 <entryCode value="" />
 <entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5132" >
+<COMPONENT type="5104" id="4958" >
 <cdparam x="395" y="184" />
 <sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ring()" />
-<TGConnectingPoint num="0" id="5122" />
-<TGConnectingPoint num="1" id="5123" />
-<TGConnectingPoint num="2" id="5124" />
-<TGConnectingPoint num="3" id="5125" />
-<TGConnectingPoint num="4" id="5126" />
-<TGConnectingPoint num="5" id="5127" />
-<TGConnectingPoint num="6" id="5128" />
-<TGConnectingPoint num="7" id="5129" />
-<TGConnectingPoint num="8" id="5130" />
-<TGConnectingPoint num="9" id="5131" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5173" >
+<TGConnectingPoint num="0" id="4948" />
+<TGConnectingPoint num="1" id="4949" />
+<TGConnectingPoint num="2" id="4950" />
+<TGConnectingPoint num="3" id="4951" />
+<TGConnectingPoint num="4" id="4952" />
+<TGConnectingPoint num="5" id="4953" />
+<TGConnectingPoint num="6" id="4954" />
+<TGConnectingPoint num="7" id="4955" />
+<TGConnectingPoint num="8" id="4956" />
+<TGConnectingPoint num="9" id="4957" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4999" >
 <cdparam x="369" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="5133" />
-<TGConnectingPoint num="1" id="5134" />
-<TGConnectingPoint num="2" id="5135" />
-<TGConnectingPoint num="3" id="5136" />
-<TGConnectingPoint num="4" id="5137" />
-<TGConnectingPoint num="5" id="5138" />
-<TGConnectingPoint num="6" id="5139" />
-<TGConnectingPoint num="7" id="5140" />
-<TGConnectingPoint num="8" id="5141" />
-<TGConnectingPoint num="9" id="5142" />
-<TGConnectingPoint num="10" id="5143" />
-<TGConnectingPoint num="11" id="5144" />
-<TGConnectingPoint num="12" id="5145" />
-<TGConnectingPoint num="13" id="5146" />
-<TGConnectingPoint num="14" id="5147" />
-<TGConnectingPoint num="15" id="5148" />
-<TGConnectingPoint num="16" id="5149" />
-<TGConnectingPoint num="17" id="5150" />
-<TGConnectingPoint num="18" id="5151" />
-<TGConnectingPoint num="19" id="5152" />
-<TGConnectingPoint num="20" id="5153" />
-<TGConnectingPoint num="21" id="5154" />
-<TGConnectingPoint num="22" id="5155" />
-<TGConnectingPoint num="23" id="5156" />
-<TGConnectingPoint num="24" id="5157" />
-<TGConnectingPoint num="25" id="5158" />
-<TGConnectingPoint num="26" id="5159" />
-<TGConnectingPoint num="27" id="5160" />
-<TGConnectingPoint num="28" id="5161" />
-<TGConnectingPoint num="29" id="5162" />
-<TGConnectingPoint num="30" id="5163" />
-<TGConnectingPoint num="31" id="5164" />
-<TGConnectingPoint num="32" id="5165" />
-<TGConnectingPoint num="33" id="5166" />
-<TGConnectingPoint num="34" id="5167" />
-<TGConnectingPoint num="35" id="5168" />
-<TGConnectingPoint num="36" id="5169" />
-<TGConnectingPoint num="37" id="5170" />
-<TGConnectingPoint num="38" id="5171" />
-<TGConnectingPoint num="39" id="5172" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="5175" >
+<TGConnectingPoint num="0" id="4959" />
+<TGConnectingPoint num="1" id="4960" />
+<TGConnectingPoint num="2" id="4961" />
+<TGConnectingPoint num="3" id="4962" />
+<TGConnectingPoint num="4" id="4963" />
+<TGConnectingPoint num="5" id="4964" />
+<TGConnectingPoint num="6" id="4965" />
+<TGConnectingPoint num="7" id="4966" />
+<TGConnectingPoint num="8" id="4967" />
+<TGConnectingPoint num="9" id="4968" />
+<TGConnectingPoint num="10" id="4969" />
+<TGConnectingPoint num="11" id="4970" />
+<TGConnectingPoint num="12" id="4971" />
+<TGConnectingPoint num="13" id="4972" />
+<TGConnectingPoint num="14" id="4973" />
+<TGConnectingPoint num="15" id="4974" />
+<TGConnectingPoint num="16" id="4975" />
+<TGConnectingPoint num="17" id="4976" />
+<TGConnectingPoint num="18" id="4977" />
+<TGConnectingPoint num="19" id="4978" />
+<TGConnectingPoint num="20" id="4979" />
+<TGConnectingPoint num="21" id="4980" />
+<TGConnectingPoint num="22" id="4981" />
+<TGConnectingPoint num="23" id="4982" />
+<TGConnectingPoint num="24" id="4983" />
+<TGConnectingPoint num="25" id="4984" />
+<TGConnectingPoint num="26" id="4985" />
+<TGConnectingPoint num="27" id="4986" />
+<TGConnectingPoint num="28" id="4987" />
+<TGConnectingPoint num="29" id="4988" />
+<TGConnectingPoint num="30" id="4989" />
+<TGConnectingPoint num="31" id="4990" />
+<TGConnectingPoint num="32" id="4991" />
+<TGConnectingPoint num="33" id="4992" />
+<TGConnectingPoint num="34" id="4993" />
+<TGConnectingPoint num="35" id="4994" />
+<TGConnectingPoint num="36" id="4995" />
+<TGConnectingPoint num="37" id="4996" />
+<TGConnectingPoint num="38" id="4997" />
+<TGConnectingPoint num="39" id="4998" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="5001" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5174" />
+<TGConnectingPoint num="0" id="5000" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5188" >
+<CONNECTOR type="5102" id="5014" >
 <cdparam x="504" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5184" />
-<TGConnectingPoint num="1" id="5185" />
-<TGConnectingPoint num="2" id="5186" />
-<TGConnectingPoint num="3" id="5187" />
-<P1  x="504" y="232" id="5247" />
-<P2  x="454" y="123" id="5208" />
+<TGConnectingPoint num="0" id="5010" />
+<TGConnectingPoint num="1" id="5011" />
+<TGConnectingPoint num="2" id="5012" />
+<TGConnectingPoint num="3" id="5013" />
+<P1  x="504" y="232" id="5073" />
+<P2  x="454" y="123" id="5034" />
 <Point x="503" y="254" />
 <Point x="425" y="254" />
 <Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5176" >
-<father id="5188" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5002" >
+<father id="5014" num="0" />
 <cdparam x="503" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5177" >
-<father id="5188" num="1" />
+<SUBCOMPONENT type="-1" id="5003" >
+<father id="5014" num="1" />
 <cdparam x="425" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5178" >
-<father id="5188" num="2" />
+<SUBCOMPONENT type="-1" id="5004" >
+<father id="5014" num="2" />
 <cdparam x="426" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5183" >
-<father id="5188" num="3" />
+<SUBCOMPONENT type="-1" id="5009" >
+<father id="5014" num="3" />
 <cdparam x="465" y="275" />
 <sizeparam width="100" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5179" />
-<TGConnectingPoint num="1" id="5180" />
-<TGConnectingPoint num="2" id="5181" />
-<TGConnectingPoint num="3" id="5182" />
+<TGConnectingPoint num="0" id="5005" />
+<TGConnectingPoint num="1" id="5006" />
+<TGConnectingPoint num="2" id="5007" />
+<TGConnectingPoint num="3" id="5008" />
 <extraparam>
 <guard value="[  ]" />
 <afterMin value="" />
@@ -11059,35 +10808,35 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5197" >
+<CONNECTOR type="5102" id="5023" >
 <cdparam x="504" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5195" />
-<TGConnectingPoint num="1" id="5196" />
-<P1  x="504" y="148" id="5211" />
-<P2  x="504" y="202" id="5246" />
+<TGConnectingPoint num="0" id="5021" />
+<TGConnectingPoint num="1" id="5022" />
+<P1  x="504" y="148" id="5037" />
+<P2  x="504" y="202" id="5072" />
 <Point x="504" y="175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5189" >
-<father id="5197" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5015" >
+<father id="5023" num="0" />
 <cdparam x="504" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5194" >
-<father id="5197" num="1" />
+<SUBCOMPONENT type="-1" id="5020" >
+<father id="5023" num="1" />
 <cdparam x="504" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5190" />
-<TGConnectingPoint num="1" id="5191" />
-<TGConnectingPoint num="2" id="5192" />
-<TGConnectingPoint num="3" id="5193" />
+<TGConnectingPoint num="0" id="5016" />
+<TGConnectingPoint num="1" id="5017" />
+<TGConnectingPoint num="2" id="5018" />
+<TGConnectingPoint num="3" id="5019" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11097,25 +10846,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5204" >
+<CONNECTOR type="5102" id="5030" >
 <cdparam x="385" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5203" />
-<P1  x="481" y="74" id="5257" />
-<P2  x="504" y="98" id="5206" />
+<TGConnectingPoint num="0" id="5029" />
+<P1  x="481" y="74" id="5083" />
+<P2  x="504" y="98" id="5032" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5202" >
-<father id="5204" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5028" >
+<father id="5030" num="0" />
 <cdparam x="385" y="115" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5198" />
-<TGConnectingPoint num="1" id="5199" />
-<TGConnectingPoint num="2" id="5200" />
-<TGConnectingPoint num="3" id="5201" />
+<TGConnectingPoint num="0" id="5024" />
+<TGConnectingPoint num="1" id="5025" />
+<TGConnectingPoint num="2" id="5026" />
+<TGConnectingPoint num="3" id="5027" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11125,106 +10874,106 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="5245" >
+<COMPONENT type="5106" id="5071" >
 <cdparam x="454" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="5205" />
-<TGConnectingPoint num="1" id="5206" />
-<TGConnectingPoint num="2" id="5207" />
-<TGConnectingPoint num="3" id="5208" />
-<TGConnectingPoint num="4" id="5209" />
-<TGConnectingPoint num="5" id="5210" />
-<TGConnectingPoint num="6" id="5211" />
-<TGConnectingPoint num="7" id="5212" />
-<TGConnectingPoint num="8" id="5213" />
-<TGConnectingPoint num="9" id="5214" />
-<TGConnectingPoint num="10" id="5215" />
-<TGConnectingPoint num="11" id="5216" />
-<TGConnectingPoint num="12" id="5217" />
-<TGConnectingPoint num="13" id="5218" />
-<TGConnectingPoint num="14" id="5219" />
-<TGConnectingPoint num="15" id="5220" />
-<TGConnectingPoint num="16" id="5221" />
-<TGConnectingPoint num="17" id="5222" />
-<TGConnectingPoint num="18" id="5223" />
-<TGConnectingPoint num="19" id="5224" />
-<TGConnectingPoint num="20" id="5225" />
-<TGConnectingPoint num="21" id="5226" />
-<TGConnectingPoint num="22" id="5227" />
-<TGConnectingPoint num="23" id="5228" />
-<TGConnectingPoint num="24" id="5229" />
-<TGConnectingPoint num="25" id="5230" />
-<TGConnectingPoint num="26" id="5231" />
-<TGConnectingPoint num="27" id="5232" />
-<TGConnectingPoint num="28" id="5233" />
-<TGConnectingPoint num="29" id="5234" />
-<TGConnectingPoint num="30" id="5235" />
-<TGConnectingPoint num="31" id="5236" />
-<TGConnectingPoint num="32" id="5237" />
-<TGConnectingPoint num="33" id="5238" />
-<TGConnectingPoint num="34" id="5239" />
-<TGConnectingPoint num="35" id="5240" />
-<TGConnectingPoint num="36" id="5241" />
-<TGConnectingPoint num="37" id="5242" />
-<TGConnectingPoint num="38" id="5243" />
-<TGConnectingPoint num="39" id="5244" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="5256" >
+<TGConnectingPoint num="0" id="5031" />
+<TGConnectingPoint num="1" id="5032" />
+<TGConnectingPoint num="2" id="5033" />
+<TGConnectingPoint num="3" id="5034" />
+<TGConnectingPoint num="4" id="5035" />
+<TGConnectingPoint num="5" id="5036" />
+<TGConnectingPoint num="6" id="5037" />
+<TGConnectingPoint num="7" id="5038" />
+<TGConnectingPoint num="8" id="5039" />
+<TGConnectingPoint num="9" id="5040" />
+<TGConnectingPoint num="10" id="5041" />
+<TGConnectingPoint num="11" id="5042" />
+<TGConnectingPoint num="12" id="5043" />
+<TGConnectingPoint num="13" id="5044" />
+<TGConnectingPoint num="14" id="5045" />
+<TGConnectingPoint num="15" id="5046" />
+<TGConnectingPoint num="16" id="5047" />
+<TGConnectingPoint num="17" id="5048" />
+<TGConnectingPoint num="18" id="5049" />
+<TGConnectingPoint num="19" id="5050" />
+<TGConnectingPoint num="20" id="5051" />
+<TGConnectingPoint num="21" id="5052" />
+<TGConnectingPoint num="22" id="5053" />
+<TGConnectingPoint num="23" id="5054" />
+<TGConnectingPoint num="24" id="5055" />
+<TGConnectingPoint num="25" id="5056" />
+<TGConnectingPoint num="26" id="5057" />
+<TGConnectingPoint num="27" id="5058" />
+<TGConnectingPoint num="28" id="5059" />
+<TGConnectingPoint num="29" id="5060" />
+<TGConnectingPoint num="30" id="5061" />
+<TGConnectingPoint num="31" id="5062" />
+<TGConnectingPoint num="32" id="5063" />
+<TGConnectingPoint num="33" id="5064" />
+<TGConnectingPoint num="34" id="5065" />
+<TGConnectingPoint num="35" id="5066" />
+<TGConnectingPoint num="36" id="5067" />
+<TGConnectingPoint num="37" id="5068" />
+<TGConnectingPoint num="38" id="5069" />
+<TGConnectingPoint num="39" id="5070" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="5082" >
 <cdparam x="440" y="207" />
 <sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="5246" />
-<TGConnectingPoint num="1" id="5247" />
-<TGConnectingPoint num="2" id="5248" />
-<TGConnectingPoint num="3" id="5249" />
-<TGConnectingPoint num="4" id="5250" />
-<TGConnectingPoint num="5" id="5251" />
-<TGConnectingPoint num="6" id="5252" />
-<TGConnectingPoint num="7" id="5253" />
-<TGConnectingPoint num="8" id="5254" />
-<TGConnectingPoint num="9" id="5255" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="5258" >
+<TGConnectingPoint num="0" id="5072" />
+<TGConnectingPoint num="1" id="5073" />
+<TGConnectingPoint num="2" id="5074" />
+<TGConnectingPoint num="3" id="5075" />
+<TGConnectingPoint num="4" id="5076" />
+<TGConnectingPoint num="5" id="5077" />
+<TGConnectingPoint num="6" id="5078" />
+<TGConnectingPoint num="7" id="5079" />
+<TGConnectingPoint num="8" id="5080" />
+<TGConnectingPoint num="9" id="5081" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="5084" >
 <cdparam x="474" y="54" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5257" />
+<TGConnectingPoint num="0" id="5083" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5265" >
+<CONNECTOR type="5102" id="5091" >
 <cdparam x="671" y="540" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5264" />
-<P1  x="671" y="540" id="5462" />
-<P2  x="671" y="551" id="5718" />
+<TGConnectingPoint num="0" id="5090" />
+<P1  x="671" y="540" id="5288" />
+<P2  x="671" y="551" id="5544" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5263" >
-<father id="5265" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5089" >
+<father id="5091" num="0" />
 <cdparam x="671" y="580" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5259" />
-<TGConnectingPoint num="1" id="5260" />
-<TGConnectingPoint num="2" id="5261" />
-<TGConnectingPoint num="3" id="5262" />
+<TGConnectingPoint num="0" id="5085" />
+<TGConnectingPoint num="1" id="5086" />
+<TGConnectingPoint num="2" id="5087" />
+<TGConnectingPoint num="3" id="5088" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11234,25 +10983,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5272" >
+<CONNECTOR type="5102" id="5098" >
 <cdparam x="671" y="332" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5271" />
-<P1  x="671" y="332" id="5473" />
-<P2  x="671" y="345" id="5696" />
+<TGConnectingPoint num="0" id="5097" />
+<P1  x="671" y="332" id="5299" />
+<P2  x="671" y="345" id="5522" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5270" >
-<father id="5272" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5096" >
+<father id="5098" num="0" />
 <cdparam x="671" y="372" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5266" />
-<TGConnectingPoint num="1" id="5267" />
-<TGConnectingPoint num="2" id="5268" />
-<TGConnectingPoint num="3" id="5269" />
+<TGConnectingPoint num="0" id="5092" />
+<TGConnectingPoint num="1" id="5093" />
+<TGConnectingPoint num="2" id="5094" />
+<TGConnectingPoint num="3" id="5095" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11262,25 +11011,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5279" >
+<CONNECTOR type="5102" id="5105" >
 <cdparam x="428" y="373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5278" />
-<P1  x="428" y="380" id="5484" />
-<P2  x="428" y="395" id="5580" />
+<TGConnectingPoint num="0" id="5104" />
+<P1  x="428" y="380" id="5310" />
+<P2  x="428" y="395" id="5406" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5277" >
-<father id="5279" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5103" >
+<father id="5105" num="0" />
 <cdparam x="428" y="413" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5273" />
-<TGConnectingPoint num="1" id="5274" />
-<TGConnectingPoint num="2" id="5275" />
-<TGConnectingPoint num="3" id="5276" />
+<TGConnectingPoint num="0" id="5099" />
+<TGConnectingPoint num="1" id="5100" />
+<TGConnectingPoint num="2" id="5101" />
+<TGConnectingPoint num="3" id="5102" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11290,25 +11039,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5286" >
+<CONNECTOR type="5102" id="5112" >
 <cdparam x="661" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5285" />
-<P1  x="661" y="175" id="5752" />
-<P2  x="661" y="180" id="5494" />
+<TGConnectingPoint num="0" id="5111" />
+<P1  x="661" y="175" id="5578" />
+<P2  x="661" y="180" id="5320" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5284" >
-<father id="5286" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5110" >
+<father id="5112" num="0" />
 <cdparam x="661" y="215" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5280" />
-<TGConnectingPoint num="1" id="5281" />
-<TGConnectingPoint num="2" id="5282" />
-<TGConnectingPoint num="3" id="5283" />
+<TGConnectingPoint num="0" id="5106" />
+<TGConnectingPoint num="1" id="5107" />
+<TGConnectingPoint num="2" id="5108" />
+<TGConnectingPoint num="3" id="5109" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11318,25 +11067,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5293" >
+<CONNECTOR type="5102" id="5119" >
 <cdparam x="661" y="95" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5292" />
-<P1  x="661" y="95" id="5506" />
-<P2  x="661" y="106" id="5763" />
+<TGConnectingPoint num="0" id="5118" />
+<P1  x="661" y="95" id="5332" />
+<P2  x="661" y="106" id="5589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5291" >
-<father id="5293" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5117" >
+<father id="5119" num="0" />
 <cdparam x="661" y="135" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5287" />
-<TGConnectingPoint num="1" id="5288" />
-<TGConnectingPoint num="2" id="5289" />
-<TGConnectingPoint num="3" id="5290" />
+<TGConnectingPoint num="0" id="5113" />
+<TGConnectingPoint num="1" id="5114" />
+<TGConnectingPoint num="2" id="5115" />
+<TGConnectingPoint num="3" id="5116" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11346,25 +11095,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5300" >
+<CONNECTOR type="5102" id="5126" >
 <cdparam x="450" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5299" />
-<P1  x="492" y="208" id="5684" />
-<P2  x="453" y="262" id="5525" />
+<TGConnectingPoint num="0" id="5125" />
+<P1  x="492" y="208" id="5510" />
+<P2  x="453" y="262" id="5351" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5298" >
-<father id="5300" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5124" >
+<father id="5126" num="0" />
 <cdparam x="450" y="295" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5294" />
-<TGConnectingPoint num="1" id="5295" />
-<TGConnectingPoint num="2" id="5296" />
-<TGConnectingPoint num="3" id="5297" />
+<TGConnectingPoint num="0" id="5120" />
+<TGConnectingPoint num="1" id="5121" />
+<TGConnectingPoint num="2" id="5122" />
+<TGConnectingPoint num="3" id="5123" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11374,25 +11123,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5307" >
+<CONNECTOR type="5102" id="5133" >
 <cdparam x="304" y="257" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5306" />
-<P1  x="357" y="209" id="5558" />
-<P2  x="403" y="262" id="5524" />
+<TGConnectingPoint num="0" id="5132" />
+<P1  x="357" y="209" id="5384" />
+<P2  x="403" y="262" id="5350" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5305" >
-<father id="5307" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5131" >
+<father id="5133" num="0" />
 <cdparam x="304" y="297" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5301" />
-<TGConnectingPoint num="1" id="5302" />
-<TGConnectingPoint num="2" id="5303" />
-<TGConnectingPoint num="3" id="5304" />
+<TGConnectingPoint num="0" id="5127" />
+<TGConnectingPoint num="1" id="5128" />
+<TGConnectingPoint num="2" id="5129" />
+<TGConnectingPoint num="3" id="5130" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11402,25 +11151,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5314" >
+<CONNECTOR type="5102" id="5140" >
 <cdparam x="409" y="164" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5313" />
-<P1  x="409" y="164" id="5656" />
-<P2  x="357" y="179" id="5557" />
+<TGConnectingPoint num="0" id="5139" />
+<P1  x="409" y="164" id="5482" />
+<P2  x="357" y="179" id="5383" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5312" >
-<father id="5314" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5138" >
+<father id="5140" num="0" />
 <cdparam x="409" y="204" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5308" />
-<TGConnectingPoint num="1" id="5309" />
-<TGConnectingPoint num="2" id="5310" />
-<TGConnectingPoint num="3" id="5311" />
+<TGConnectingPoint num="0" id="5134" />
+<TGConnectingPoint num="1" id="5135" />
+<TGConnectingPoint num="2" id="5136" />
+<TGConnectingPoint num="3" id="5137" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11430,25 +11179,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5321" >
+<CONNECTOR type="5102" id="5147" >
 <cdparam x="646" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="5320" />
-<P1  x="661" y="210" id="5495" />
-<P2  x="471" y="152" id="5655" />
+<TGConnectingPoint num="0" id="5146" />
+<P1  x="661" y="210" id="5321" />
+<P2  x="471" y="152" id="5481" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5319" >
-<father id="5321" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5145" >
+<father id="5147" num="0" />
 <cdparam x="646" y="310" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5315" />
-<TGConnectingPoint num="1" id="5316" />
-<TGConnectingPoint num="2" id="5317" />
-<TGConnectingPoint num="3" id="5318" />
+<TGConnectingPoint num="0" id="5141" />
+<TGConnectingPoint num="1" id="5142" />
+<TGConnectingPoint num="2" id="5143" />
+<TGConnectingPoint num="3" id="5144" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11458,25 +11207,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5328" >
+<CONNECTOR type="5102" id="5154" >
 <cdparam x="660" y="178" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5327" />
-<P1  x="661" y="141" id="5768" />
-<P2  x="661" y="145" id="5751" />
+<TGConnectingPoint num="0" id="5153" />
+<P1  x="661" y="141" id="5594" />
+<P2  x="661" y="145" id="5577" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5326" >
-<father id="5328" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5152" >
+<father id="5154" num="0" />
 <cdparam x="660" y="218" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5322" />
-<TGConnectingPoint num="1" id="5323" />
-<TGConnectingPoint num="2" id="5324" />
-<TGConnectingPoint num="3" id="5325" />
+<TGConnectingPoint num="0" id="5148" />
+<TGConnectingPoint num="1" id="5149" />
+<TGConnectingPoint num="2" id="5150" />
+<TGConnectingPoint num="3" id="5151" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11486,25 +11235,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5335" >
+<CONNECTOR type="5102" id="5161" >
 <cdparam x="659" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5334" />
-<P1  x="661" y="61" id="5632" />
-<P2  x="661" y="65" id="5505" />
+<TGConnectingPoint num="0" id="5160" />
+<P1  x="661" y="61" id="5458" />
+<P2  x="661" y="65" id="5331" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5333" >
-<father id="5335" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5159" >
+<father id="5161" num="0" />
 <cdparam x="659" y="150" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5329" />
-<TGConnectingPoint num="1" id="5330" />
-<TGConnectingPoint num="2" id="5331" />
-<TGConnectingPoint num="3" id="5332" />
+<TGConnectingPoint num="0" id="5155" />
+<TGConnectingPoint num="1" id="5156" />
+<TGConnectingPoint num="2" id="5157" />
+<TGConnectingPoint num="3" id="5158" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11514,25 +11263,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5342" >
+<CONNECTOR type="5102" id="5168" >
 <cdparam x="739" y="573" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5341" />
-<P1  x="671" y="503" id="5741" />
-<P2  x="671" y="510" id="5461" />
+<TGConnectingPoint num="0" id="5167" />
+<P1  x="671" y="503" id="5567" />
+<P2  x="671" y="510" id="5287" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5340" >
-<father id="5342" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5166" >
+<father id="5168" num="0" />
 <cdparam x="739" y="613" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5336" />
-<TGConnectingPoint num="1" id="5337" />
-<TGConnectingPoint num="2" id="5338" />
-<TGConnectingPoint num="3" id="5339" />
+<TGConnectingPoint num="0" id="5162" />
+<TGConnectingPoint num="1" id="5163" />
+<TGConnectingPoint num="2" id="5164" />
+<TGConnectingPoint num="3" id="5165" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11542,25 +11291,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5349" >
+<CONNECTOR type="5102" id="5175" >
 <cdparam x="769" y="593" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5348" />
-<P1  x="671" y="443" id="5809" />
-<P2  x="671" y="473" id="5740" />
+<TGConnectingPoint num="0" id="5174" />
+<P1  x="671" y="443" id="5635" />
+<P2  x="671" y="473" id="5566" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5347" >
-<father id="5349" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5173" >
+<father id="5175" num="0" />
 <cdparam x="769" y="633" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5343" />
-<TGConnectingPoint num="1" id="5344" />
-<TGConnectingPoint num="2" id="5345" />
-<TGConnectingPoint num="3" id="5346" />
+<TGConnectingPoint num="0" id="5169" />
+<TGConnectingPoint num="1" id="5170" />
+<TGConnectingPoint num="2" id="5171" />
+<TGConnectingPoint num="3" id="5172" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11570,55 +11319,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5362" >
+<CONNECTOR type="5102" id="5188" >
 <cdparam x="656" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5358" />
-<TGConnectingPoint num="1" id="5359" />
-<TGConnectingPoint num="2" id="5360" />
-<TGConnectingPoint num="3" id="5361" />
-<P1  x="671" y="581" id="5719" />
-<P2  x="478" y="432" id="5592" />
+<TGConnectingPoint num="0" id="5184" />
+<TGConnectingPoint num="1" id="5185" />
+<TGConnectingPoint num="2" id="5186" />
+<TGConnectingPoint num="3" id="5187" />
+<P1  x="671" y="581" id="5545" />
+<P2  x="478" y="432" id="5418" />
 <Point x="671" y="595" />
 <Point x="548" y="595" />
 <Point x="548" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5350" >
-<father id="5362" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5176" >
+<father id="5188" num="0" />
 <cdparam x="671" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5351" >
-<father id="5362" num="1" />
+<SUBCOMPONENT type="-1" id="5177" >
+<father id="5188" num="1" />
 <cdparam x="548" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5352" >
-<father id="5362" num="2" />
+<SUBCOMPONENT type="-1" id="5178" >
+<father id="5188" num="2" />
 <cdparam x="548" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5357" >
-<father id="5362" num="3" />
+<SUBCOMPONENT type="-1" id="5183" >
+<father id="5188" num="3" />
 <cdparam x="656" y="648" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5353" />
-<TGConnectingPoint num="1" id="5354" />
-<TGConnectingPoint num="2" id="5355" />
-<TGConnectingPoint num="3" id="5356" />
+<TGConnectingPoint num="0" id="5179" />
+<TGConnectingPoint num="1" id="5180" />
+<TGConnectingPoint num="2" id="5181" />
+<TGConnectingPoint num="3" id="5182" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11628,25 +11377,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5369" >
+<CONNECTOR type="5102" id="5195" >
 <cdparam x="770" y="523" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5368" />
-<P1  x="671" y="375" id="5697" />
-<P2  x="671" y="393" id="5804" />
+<TGConnectingPoint num="0" id="5194" />
+<P1  x="671" y="375" id="5523" />
+<P2  x="671" y="393" id="5630" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5367" >
-<father id="5369" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5193" >
+<father id="5195" num="0" />
 <cdparam x="770" y="563" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5363" />
-<TGConnectingPoint num="1" id="5364" />
-<TGConnectingPoint num="2" id="5365" />
-<TGConnectingPoint num="3" id="5366" />
+<TGConnectingPoint num="0" id="5189" />
+<TGConnectingPoint num="1" id="5190" />
+<TGConnectingPoint num="2" id="5191" />
+<TGConnectingPoint num="3" id="5192" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11656,25 +11405,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5376" >
+<CONNECTOR type="5102" id="5202" >
 <cdparam x="642" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5375" />
-<P1  x="670" y="287" id="5569" />
-<P2  x="671" y="302" id="5472" />
+<TGConnectingPoint num="0" id="5201" />
+<P1  x="670" y="287" id="5395" />
+<P2  x="671" y="302" id="5298" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5374" >
-<father id="5376" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5200" >
+<father id="5202" num="0" />
 <cdparam x="654" y="379" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5370" />
-<TGConnectingPoint num="1" id="5371" />
-<TGConnectingPoint num="2" id="5372" />
-<TGConnectingPoint num="3" id="5373" />
+<TGConnectingPoint num="0" id="5196" />
+<TGConnectingPoint num="1" id="5197" />
+<TGConnectingPoint num="2" id="5198" />
+<TGConnectingPoint num="3" id="5199" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11684,55 +11433,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5389" >
+<CONNECTOR type="5102" id="5215" >
 <cdparam x="425" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5385" />
-<TGConnectingPoint num="1" id="5386" />
-<TGConnectingPoint num="2" id="5387" />
-<TGConnectingPoint num="3" id="5388" />
-<P1  x="403" y="445" id="5593" />
-<P2  x="378" y="432" id="5591" />
+<TGConnectingPoint num="0" id="5211" />
+<TGConnectingPoint num="1" id="5212" />
+<TGConnectingPoint num="2" id="5213" />
+<TGConnectingPoint num="3" id="5214" />
+<P1  x="403" y="445" id="5419" />
+<P2  x="378" y="432" id="5417" />
 <Point x="403" y="480" />
 <Point x="319" y="480" />
 <Point x="319" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5377" >
-<father id="5389" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5203" >
+<father id="5215" num="0" />
 <cdparam x="403" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5378" >
-<father id="5389" num="1" />
+<SUBCOMPONENT type="-1" id="5204" >
+<father id="5215" num="1" />
 <cdparam x="319" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5379" >
-<father id="5389" num="2" />
+<SUBCOMPONENT type="-1" id="5205" >
+<father id="5215" num="2" />
 <cdparam x="319" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5384" >
-<father id="5389" num="3" />
+<SUBCOMPONENT type="-1" id="5210" >
+<father id="5215" num="3" />
 <cdparam x="158" y="477" />
 <sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5380" />
-<TGConnectingPoint num="1" id="5381" />
-<TGConnectingPoint num="2" id="5382" />
-<TGConnectingPoint num="3" id="5383" />
+<TGConnectingPoint num="0" id="5206" />
+<TGConnectingPoint num="1" id="5207" />
+<TGConnectingPoint num="2" id="5208" />
+<TGConnectingPoint num="3" id="5209" />
 <extraparam>
 <guard value="[ remainingTime&gt;0 ]" />
 <afterMin value="1" />
@@ -11744,25 +11493,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5396" >
+<CONNECTOR type="5102" id="5222" >
 <cdparam x="499" y="496" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5395" />
-<P1  x="478" y="420" id="5583" />
-<P2  x="670" y="257" id="5568" />
+<TGConnectingPoint num="0" id="5221" />
+<P1  x="478" y="420" id="5409" />
+<P2  x="670" y="257" id="5394" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5394" >
-<father id="5396" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5220" >
+<father id="5222" num="0" />
 <cdparam x="513" y="302" />
 <sizeparam width="201" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5390" />
-<TGConnectingPoint num="1" id="5391" />
-<TGConnectingPoint num="2" id="5392" />
-<TGConnectingPoint num="3" id="5393" />
+<TGConnectingPoint num="0" id="5216" />
+<TGConnectingPoint num="1" id="5217" />
+<TGConnectingPoint num="2" id="5218" />
+<TGConnectingPoint num="3" id="5219" />
 <extraparam>
 <guard value="[remainingTime &gt; 0 ]" />
 <afterMin value="1" />
@@ -11774,25 +11523,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5403" >
+<CONNECTOR type="5102" id="5229" >
 <cdparam x="450" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5402" />
-<P1  x="428" y="445" id="5585" />
-<P2  x="428" y="507" id="5707" />
+<TGConnectingPoint num="0" id="5228" />
+<P1  x="428" y="445" id="5411" />
+<P2  x="428" y="507" id="5533" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5401" >
-<father id="5403" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5227" >
+<father id="5229" num="0" />
 <cdparam x="397" y="475" />
 <sizeparam width="139" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5397" />
-<TGConnectingPoint num="1" id="5398" />
-<TGConnectingPoint num="2" id="5399" />
-<TGConnectingPoint num="3" id="5400" />
+<TGConnectingPoint num="0" id="5223" />
+<TGConnectingPoint num="1" id="5224" />
+<TGConnectingPoint num="2" id="5225" />
+<TGConnectingPoint num="3" id="5226" />
 <extraparam>
 <guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
@@ -11802,25 +11551,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5410" >
+<CONNECTOR type="5102" id="5236" >
 <cdparam x="450" y="487" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5409" />
-<P1  x="428" y="334" id="5730" />
-<P2  x="428" y="350" id="5483" />
+<TGConnectingPoint num="0" id="5235" />
+<P1  x="428" y="334" id="5556" />
+<P2  x="428" y="350" id="5309" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5408" >
-<father id="5410" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5234" >
+<father id="5236" num="0" />
 <cdparam x="252" y="341" />
 <sizeparam width="166" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5404" />
-<TGConnectingPoint num="1" id="5405" />
-<TGConnectingPoint num="2" id="5406" />
-<TGConnectingPoint num="3" id="5407" />
+<TGConnectingPoint num="0" id="5230" />
+<TGConnectingPoint num="1" id="5231" />
+<TGConnectingPoint num="2" id="5232" />
+<TGConnectingPoint num="3" id="5233" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11832,65 +11581,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5425" >
+<CONNECTOR type="5102" id="5251" >
 <cdparam x="419" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="5420" />
-<TGConnectingPoint num="1" id="5421" />
-<TGConnectingPoint num="2" id="5422" />
-<TGConnectingPoint num="3" id="5423" />
-<TGConnectingPoint num="4" id="5424" />
-<P1  x="428" y="579" id="5621" />
-<P2  x="389" y="119" id="5642" />
+<TGConnectingPoint num="0" id="5246" />
+<TGConnectingPoint num="1" id="5247" />
+<TGConnectingPoint num="2" id="5248" />
+<TGConnectingPoint num="3" id="5249" />
+<TGConnectingPoint num="4" id="5250" />
+<P1  x="428" y="579" id="5447" />
+<P2  x="389" y="119" id="5468" />
 <Point x="428" y="603" />
 <Point x="220" y="603" />
 <Point x="220" y="83" />
 <Point x="389" y="83" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5411" >
-<father id="5425" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5237" >
+<father id="5251" num="0" />
 <cdparam x="428" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5412" >
-<father id="5425" num="1" />
+<SUBCOMPONENT type="-1" id="5238" >
+<father id="5251" num="1" />
 <cdparam x="220" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5413" >
-<father id="5425" num="2" />
+<SUBCOMPONENT type="-1" id="5239" >
+<father id="5251" num="2" />
 <cdparam x="220" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5414" >
-<father id="5425" num="3" />
+<SUBCOMPONENT type="-1" id="5240" >
+<father id="5251" num="3" />
 <cdparam x="389" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5419" >
-<father id="5425" num="4" />
+<SUBCOMPONENT type="-1" id="5245" >
+<father id="5251" num="4" />
 <cdparam x="419" y="587" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5415" />
-<TGConnectingPoint num="1" id="5416" />
-<TGConnectingPoint num="2" id="5417" />
-<TGConnectingPoint num="3" id="5418" />
+<TGConnectingPoint num="0" id="5241" />
+<TGConnectingPoint num="1" id="5242" />
+<TGConnectingPoint num="2" id="5243" />
+<TGConnectingPoint num="3" id="5244" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -11900,25 +11649,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5432" >
+<CONNECTOR type="5102" id="5258" >
 <cdparam x="419" y="633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5431" />
-<P1  x="428" y="537" id="5708" />
-<P2  x="428" y="549" id="5620" />
+<TGConnectingPoint num="0" id="5257" />
+<P1  x="428" y="537" id="5534" />
+<P2  x="428" y="549" id="5446" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5430" >
-<father id="5432" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5256" >
+<father id="5258" num="0" />
 <cdparam x="419" y="673" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5426" />
-<TGConnectingPoint num="1" id="5427" />
-<TGConnectingPoint num="2" id="5428" />
-<TGConnectingPoint num="3" id="5429" />
+<TGConnectingPoint num="0" id="5252" />
+<TGConnectingPoint num="1" id="5253" />
+<TGConnectingPoint num="2" id="5254" />
+<TGConnectingPoint num="3" id="5255" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11928,25 +11677,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5439" >
+<CONNECTOR type="5102" id="5265" >
 <cdparam x="471" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5438" />
-<P1  x="471" y="141" id="5646" />
-<P2  x="661" y="31" id="5631" />
+<TGConnectingPoint num="0" id="5264" />
+<P1  x="471" y="141" id="5472" />
+<P2  x="661" y="31" id="5457" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5437" >
-<father id="5439" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5263" >
+<father id="5265" num="0" />
 <cdparam x="471" y="223" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5433" />
-<TGConnectingPoint num="1" id="5434" />
-<TGConnectingPoint num="2" id="5435" />
-<TGConnectingPoint num="3" id="5436" />
+<TGConnectingPoint num="0" id="5259" />
+<TGConnectingPoint num="1" id="5260" />
+<TGConnectingPoint num="2" id="5261" />
+<TGConnectingPoint num="3" id="5262" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11956,25 +11705,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5446" >
+<CONNECTOR type="5102" id="5272" >
 <cdparam x="463" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5445" />
-<P1  x="450" y="164" id="5657" />
-<P2  x="492" y="178" id="5683" />
+<TGConnectingPoint num="0" id="5271" />
+<P1  x="450" y="164" id="5483" />
+<P2  x="492" y="178" id="5509" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5444" >
-<father id="5446" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5270" >
+<father id="5272" num="0" />
 <cdparam x="400" y="221" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5440" />
-<TGConnectingPoint num="1" id="5441" />
-<TGConnectingPoint num="2" id="5442" />
-<TGConnectingPoint num="3" id="5443" />
+<TGConnectingPoint num="0" id="5266" />
+<TGConnectingPoint num="1" id="5267" />
+<TGConnectingPoint num="2" id="5268" />
+<TGConnectingPoint num="3" id="5269" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11984,25 +11733,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5453" >
+<CONNECTOR type="5102" id="5279" >
 <cdparam x="438" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state1" value="null" />
-<TGConnectingPoint num="0" id="5452" />
-<P1  x="430" y="100" id="5694" />
-<P2  x="430" y="119" id="5643" />
+<TGConnectingPoint num="0" id="5278" />
+<P1  x="430" y="100" id="5520" />
+<P2  x="430" y="119" id="5469" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5451" >
-<father id="5453" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5277" >
+<father id="5279" num="0" />
 <cdparam x="442" y="129" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5447" />
-<TGConnectingPoint num="1" id="5448" />
-<TGConnectingPoint num="2" id="5449" />
-<TGConnectingPoint num="3" id="5450" />
+<TGConnectingPoint num="0" id="5273" />
+<TGConnectingPoint num="1" id="5274" />
+<TGConnectingPoint num="2" id="5275" />
+<TGConnectingPoint num="3" id="5276" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12012,25 +11761,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5460" >
+<CONNECTOR type="5102" id="5286" >
 <cdparam x="449" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5459" />
-<P1  x="428" y="298" id="5522" />
-<P2  x="428" y="304" id="5729" />
+<TGConnectingPoint num="0" id="5285" />
+<P1  x="428" y="298" id="5348" />
+<P2  x="428" y="304" id="5555" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5458" >
-<father id="5460" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5284" >
+<father id="5286" num="0" />
 <cdparam x="449" y="428" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5454" />
-<TGConnectingPoint num="1" id="5455" />
-<TGConnectingPoint num="2" id="5456" />
-<TGConnectingPoint num="3" id="5457" />
+<TGConnectingPoint num="0" id="5280" />
+<TGConnectingPoint num="1" id="5281" />
+<TGConnectingPoint num="2" id="5282" />
+<TGConnectingPoint num="3" id="5283" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12040,602 +11789,602 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="5471" >
+<COMPONENT type="5103" id="5297" >
 <cdparam x="630" y="515" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="5461" />
-<TGConnectingPoint num="1" id="5462" />
-<TGConnectingPoint num="2" id="5463" />
-<TGConnectingPoint num="3" id="5464" />
-<TGConnectingPoint num="4" id="5465" />
-<TGConnectingPoint num="5" id="5466" />
-<TGConnectingPoint num="6" id="5467" />
-<TGConnectingPoint num="7" id="5468" />
-<TGConnectingPoint num="8" id="5469" />
-<TGConnectingPoint num="9" id="5470" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5482" >
+<TGConnectingPoint num="0" id="5287" />
+<TGConnectingPoint num="1" id="5288" />
+<TGConnectingPoint num="2" id="5289" />
+<TGConnectingPoint num="3" id="5290" />
+<TGConnectingPoint num="4" id="5291" />
+<TGConnectingPoint num="5" id="5292" />
+<TGConnectingPoint num="6" id="5293" />
+<TGConnectingPoint num="7" id="5294" />
+<TGConnectingPoint num="8" id="5295" />
+<TGConnectingPoint num="9" id="5296" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5308" >
 <cdparam x="634" y="307" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="5472" />
-<TGConnectingPoint num="1" id="5473" />
-<TGConnectingPoint num="2" id="5474" />
-<TGConnectingPoint num="3" id="5475" />
-<TGConnectingPoint num="4" id="5476" />
-<TGConnectingPoint num="5" id="5477" />
-<TGConnectingPoint num="6" id="5478" />
-<TGConnectingPoint num="7" id="5479" />
-<TGConnectingPoint num="8" id="5480" />
-<TGConnectingPoint num="9" id="5481" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5493" >
+<TGConnectingPoint num="0" id="5298" />
+<TGConnectingPoint num="1" id="5299" />
+<TGConnectingPoint num="2" id="5300" />
+<TGConnectingPoint num="3" id="5301" />
+<TGConnectingPoint num="4" id="5302" />
+<TGConnectingPoint num="5" id="5303" />
+<TGConnectingPoint num="6" id="5304" />
+<TGConnectingPoint num="7" id="5305" />
+<TGConnectingPoint num="8" id="5306" />
+<TGConnectingPoint num="9" id="5307" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5319" >
 <cdparam x="362" y="355" />
 <sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="5483" />
-<TGConnectingPoint num="1" id="5484" />
-<TGConnectingPoint num="2" id="5485" />
-<TGConnectingPoint num="3" id="5486" />
-<TGConnectingPoint num="4" id="5487" />
-<TGConnectingPoint num="5" id="5488" />
-<TGConnectingPoint num="6" id="5489" />
-<TGConnectingPoint num="7" id="5490" />
-<TGConnectingPoint num="8" id="5491" />
-<TGConnectingPoint num="9" id="5492" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5504" >
+<TGConnectingPoint num="0" id="5309" />
+<TGConnectingPoint num="1" id="5310" />
+<TGConnectingPoint num="2" id="5311" />
+<TGConnectingPoint num="3" id="5312" />
+<TGConnectingPoint num="4" id="5313" />
+<TGConnectingPoint num="5" id="5314" />
+<TGConnectingPoint num="6" id="5315" />
+<TGConnectingPoint num="7" id="5316" />
+<TGConnectingPoint num="8" id="5317" />
+<TGConnectingPoint num="9" id="5318" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5330" >
 <cdparam x="620" y="185" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="5494" />
-<TGConnectingPoint num="1" id="5495" />
-<TGConnectingPoint num="2" id="5496" />
-<TGConnectingPoint num="3" id="5497" />
-<TGConnectingPoint num="4" id="5498" />
-<TGConnectingPoint num="5" id="5499" />
-<TGConnectingPoint num="6" id="5500" />
-<TGConnectingPoint num="7" id="5501" />
-<TGConnectingPoint num="8" id="5502" />
-<TGConnectingPoint num="9" id="5503" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5515" >
+<TGConnectingPoint num="0" id="5320" />
+<TGConnectingPoint num="1" id="5321" />
+<TGConnectingPoint num="2" id="5322" />
+<TGConnectingPoint num="3" id="5323" />
+<TGConnectingPoint num="4" id="5324" />
+<TGConnectingPoint num="5" id="5325" />
+<TGConnectingPoint num="6" id="5326" />
+<TGConnectingPoint num="7" id="5327" />
+<TGConnectingPoint num="8" id="5328" />
+<TGConnectingPoint num="9" id="5329" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5341" >
 <cdparam x="624" y="70" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="5505" />
-<TGConnectingPoint num="1" id="5506" />
-<TGConnectingPoint num="2" id="5507" />
-<TGConnectingPoint num="3" id="5508" />
-<TGConnectingPoint num="4" id="5509" />
-<TGConnectingPoint num="5" id="5510" />
-<TGConnectingPoint num="6" id="5511" />
-<TGConnectingPoint num="7" id="5512" />
-<TGConnectingPoint num="8" id="5513" />
-<TGConnectingPoint num="9" id="5514" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5556" >
+<TGConnectingPoint num="0" id="5331" />
+<TGConnectingPoint num="1" id="5332" />
+<TGConnectingPoint num="2" id="5333" />
+<TGConnectingPoint num="3" id="5334" />
+<TGConnectingPoint num="4" id="5335" />
+<TGConnectingPoint num="5" id="5336" />
+<TGConnectingPoint num="6" id="5337" />
+<TGConnectingPoint num="7" id="5338" />
+<TGConnectingPoint num="8" id="5339" />
+<TGConnectingPoint num="9" id="5340" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5382" >
 <cdparam x="378" y="262" />
 <sizeparam width="100" height="36" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Starting" />
-<TGConnectingPoint num="0" id="5516" />
-<TGConnectingPoint num="1" id="5517" />
-<TGConnectingPoint num="2" id="5518" />
-<TGConnectingPoint num="3" id="5519" />
-<TGConnectingPoint num="4" id="5520" />
-<TGConnectingPoint num="5" id="5521" />
-<TGConnectingPoint num="6" id="5522" />
-<TGConnectingPoint num="7" id="5523" />
-<TGConnectingPoint num="8" id="5524" />
-<TGConnectingPoint num="9" id="5525" />
-<TGConnectingPoint num="10" id="5526" />
-<TGConnectingPoint num="11" id="5527" />
-<TGConnectingPoint num="12" id="5528" />
-<TGConnectingPoint num="13" id="5529" />
-<TGConnectingPoint num="14" id="5530" />
-<TGConnectingPoint num="15" id="5531" />
-<TGConnectingPoint num="16" id="5532" />
-<TGConnectingPoint num="17" id="5533" />
-<TGConnectingPoint num="18" id="5534" />
-<TGConnectingPoint num="19" id="5535" />
-<TGConnectingPoint num="20" id="5536" />
-<TGConnectingPoint num="21" id="5537" />
-<TGConnectingPoint num="22" id="5538" />
-<TGConnectingPoint num="23" id="5539" />
-<TGConnectingPoint num="24" id="5540" />
-<TGConnectingPoint num="25" id="5541" />
-<TGConnectingPoint num="26" id="5542" />
-<TGConnectingPoint num="27" id="5543" />
-<TGConnectingPoint num="28" id="5544" />
-<TGConnectingPoint num="29" id="5545" />
-<TGConnectingPoint num="30" id="5546" />
-<TGConnectingPoint num="31" id="5547" />
-<TGConnectingPoint num="32" id="5548" />
-<TGConnectingPoint num="33" id="5549" />
-<TGConnectingPoint num="34" id="5550" />
-<TGConnectingPoint num="35" id="5551" />
-<TGConnectingPoint num="36" id="5552" />
-<TGConnectingPoint num="37" id="5553" />
-<TGConnectingPoint num="38" id="5554" />
-<TGConnectingPoint num="39" id="5555" />
+<TGConnectingPoint num="0" id="5342" />
+<TGConnectingPoint num="1" id="5343" />
+<TGConnectingPoint num="2" id="5344" />
+<TGConnectingPoint num="3" id="5345" />
+<TGConnectingPoint num="4" id="5346" />
+<TGConnectingPoint num="5" id="5347" />
+<TGConnectingPoint num="6" id="5348" />
+<TGConnectingPoint num="7" id="5349" />
+<TGConnectingPoint num="8" id="5350" />
+<TGConnectingPoint num="9" id="5351" />
+<TGConnectingPoint num="10" id="5352" />
+<TGConnectingPoint num="11" id="5353" />
+<TGConnectingPoint num="12" id="5354" />
+<TGConnectingPoint num="13" id="5355" />
+<TGConnectingPoint num="14" id="5356" />
+<TGConnectingPoint num="15" id="5357" />
+<TGConnectingPoint num="16" id="5358" />
+<TGConnectingPoint num="17" id="5359" />
+<TGConnectingPoint num="18" id="5360" />
+<TGConnectingPoint num="19" id="5361" />
+<TGConnectingPoint num="20" id="5362" />
+<TGConnectingPoint num="21" id="5363" />
+<TGConnectingPoint num="22" id="5364" />
+<TGConnectingPoint num="23" id="5365" />
+<TGConnectingPoint num="24" id="5366" />
+<TGConnectingPoint num="25" id="5367" />
+<TGConnectingPoint num="26" id="5368" />
+<TGConnectingPoint num="27" id="5369" />
+<TGConnectingPoint num="28" id="5370" />
+<TGConnectingPoint num="29" id="5371" />
+<TGConnectingPoint num="30" id="5372" />
+<TGConnectingPoint num="31" id="5373" />
+<TGConnectingPoint num="32" id="5374" />
+<TGConnectingPoint num="33" id="5375" />
+<TGConnectingPoint num="34" id="5376" />
+<TGConnectingPoint num="35" id="5377" />
+<TGConnectingPoint num="36" id="5378" />
+<TGConnectingPoint num="37" id="5379" />
+<TGConnectingPoint num="38" id="5380" />
+<TGConnectingPoint num="39" id="5381" />
 <extraparam>
 <entryCode value="printf(&quot;Starting microwave, lets go!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5567" >
+<COMPONENT type="5104" id="5393" >
 <cdparam x="287" y="184" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="remoteStart(duration)" />
-<TGConnectingPoint num="0" id="5557" />
-<TGConnectingPoint num="1" id="5558" />
-<TGConnectingPoint num="2" id="5559" />
-<TGConnectingPoint num="3" id="5560" />
-<TGConnectingPoint num="4" id="5561" />
-<TGConnectingPoint num="5" id="5562" />
-<TGConnectingPoint num="6" id="5563" />
-<TGConnectingPoint num="7" id="5564" />
-<TGConnectingPoint num="8" id="5565" />
-<TGConnectingPoint num="9" id="5566" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="5578" >
+<TGConnectingPoint num="0" id="5383" />
+<TGConnectingPoint num="1" id="5384" />
+<TGConnectingPoint num="2" id="5385" />
+<TGConnectingPoint num="3" id="5386" />
+<TGConnectingPoint num="4" id="5387" />
+<TGConnectingPoint num="5" id="5388" />
+<TGConnectingPoint num="6" id="5389" />
+<TGConnectingPoint num="7" id="5390" />
+<TGConnectingPoint num="8" id="5391" />
+<TGConnectingPoint num="9" id="5392" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5404" >
 <cdparam x="643" y="262" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="open()" />
-<TGConnectingPoint num="0" id="5568" />
-<TGConnectingPoint num="1" id="5569" />
-<TGConnectingPoint num="2" id="5570" />
-<TGConnectingPoint num="3" id="5571" />
-<TGConnectingPoint num="4" id="5572" />
-<TGConnectingPoint num="5" id="5573" />
-<TGConnectingPoint num="6" id="5574" />
-<TGConnectingPoint num="7" id="5575" />
-<TGConnectingPoint num="8" id="5576" />
-<TGConnectingPoint num="9" id="5577" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5619" >
+<TGConnectingPoint num="0" id="5394" />
+<TGConnectingPoint num="1" id="5395" />
+<TGConnectingPoint num="2" id="5396" />
+<TGConnectingPoint num="3" id="5397" />
+<TGConnectingPoint num="4" id="5398" />
+<TGConnectingPoint num="5" id="5399" />
+<TGConnectingPoint num="6" id="5400" />
+<TGConnectingPoint num="7" id="5401" />
+<TGConnectingPoint num="8" id="5402" />
+<TGConnectingPoint num="9" id="5403" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5445" >
 <cdparam x="378" y="395" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="5579" />
-<TGConnectingPoint num="1" id="5580" />
-<TGConnectingPoint num="2" id="5581" />
-<TGConnectingPoint num="3" id="5582" />
-<TGConnectingPoint num="4" id="5583" />
-<TGConnectingPoint num="5" id="5584" />
-<TGConnectingPoint num="6" id="5585" />
-<TGConnectingPoint num="7" id="5586" />
-<TGConnectingPoint num="8" id="5587" />
-<TGConnectingPoint num="9" id="5588" />
-<TGConnectingPoint num="10" id="5589" />
-<TGConnectingPoint num="11" id="5590" />
-<TGConnectingPoint num="12" id="5591" />
-<TGConnectingPoint num="13" id="5592" />
-<TGConnectingPoint num="14" id="5593" />
-<TGConnectingPoint num="15" id="5594" />
-<TGConnectingPoint num="16" id="5595" />
-<TGConnectingPoint num="17" id="5596" />
-<TGConnectingPoint num="18" id="5597" />
-<TGConnectingPoint num="19" id="5598" />
-<TGConnectingPoint num="20" id="5599" />
-<TGConnectingPoint num="21" id="5600" />
-<TGConnectingPoint num="22" id="5601" />
-<TGConnectingPoint num="23" id="5602" />
-<TGConnectingPoint num="24" id="5603" />
-<TGConnectingPoint num="25" id="5604" />
-<TGConnectingPoint num="26" id="5605" />
-<TGConnectingPoint num="27" id="5606" />
-<TGConnectingPoint num="28" id="5607" />
-<TGConnectingPoint num="29" id="5608" />
-<TGConnectingPoint num="30" id="5609" />
-<TGConnectingPoint num="31" id="5610" />
-<TGConnectingPoint num="32" id="5611" />
-<TGConnectingPoint num="33" id="5612" />
-<TGConnectingPoint num="34" id="5613" />
-<TGConnectingPoint num="35" id="5614" />
-<TGConnectingPoint num="36" id="5615" />
-<TGConnectingPoint num="37" id="5616" />
-<TGConnectingPoint num="38" id="5617" />
-<TGConnectingPoint num="39" id="5618" />
+<TGConnectingPoint num="0" id="5405" />
+<TGConnectingPoint num="1" id="5406" />
+<TGConnectingPoint num="2" id="5407" />
+<TGConnectingPoint num="3" id="5408" />
+<TGConnectingPoint num="4" id="5409" />
+<TGConnectingPoint num="5" id="5410" />
+<TGConnectingPoint num="6" id="5411" />
+<TGConnectingPoint num="7" id="5412" />
+<TGConnectingPoint num="8" id="5413" />
+<TGConnectingPoint num="9" id="5414" />
+<TGConnectingPoint num="10" id="5415" />
+<TGConnectingPoint num="11" id="5416" />
+<TGConnectingPoint num="12" id="5417" />
+<TGConnectingPoint num="13" id="5418" />
+<TGConnectingPoint num="14" id="5419" />
+<TGConnectingPoint num="15" id="5420" />
+<TGConnectingPoint num="16" id="5421" />
+<TGConnectingPoint num="17" id="5422" />
+<TGConnectingPoint num="18" id="5423" />
+<TGConnectingPoint num="19" id="5424" />
+<TGConnectingPoint num="20" id="5425" />
+<TGConnectingPoint num="21" id="5426" />
+<TGConnectingPoint num="22" id="5427" />
+<TGConnectingPoint num="23" id="5428" />
+<TGConnectingPoint num="24" id="5429" />
+<TGConnectingPoint num="25" id="5430" />
+<TGConnectingPoint num="26" id="5431" />
+<TGConnectingPoint num="27" id="5432" />
+<TGConnectingPoint num="28" id="5433" />
+<TGConnectingPoint num="29" id="5434" />
+<TGConnectingPoint num="30" id="5435" />
+<TGConnectingPoint num="31" id="5436" />
+<TGConnectingPoint num="32" id="5437" />
+<TGConnectingPoint num="33" id="5438" />
+<TGConnectingPoint num="34" id="5439" />
+<TGConnectingPoint num="35" id="5440" />
+<TGConnectingPoint num="36" id="5441" />
+<TGConnectingPoint num="37" id="5442" />
+<TGConnectingPoint num="38" id="5443" />
+<TGConnectingPoint num="39" id="5444" />
 <extraparam>
 <entryCode value="printf(&quot;Heating ; remaining time :%d\n&quot;, remainingTime);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="5630" >
+<COMPONENT type="5103" id="5456" >
 <cdparam x="398" y="554" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ringBell()" />
-<TGConnectingPoint num="0" id="5620" />
-<TGConnectingPoint num="1" id="5621" />
-<TGConnectingPoint num="2" id="5622" />
-<TGConnectingPoint num="3" id="5623" />
-<TGConnectingPoint num="4" id="5624" />
-<TGConnectingPoint num="5" id="5625" />
-<TGConnectingPoint num="6" id="5626" />
-<TGConnectingPoint num="7" id="5627" />
-<TGConnectingPoint num="8" id="5628" />
-<TGConnectingPoint num="9" id="5629" />
+<TGConnectingPoint num="0" id="5446" />
+<TGConnectingPoint num="1" id="5447" />
+<TGConnectingPoint num="2" id="5448" />
+<TGConnectingPoint num="3" id="5449" />
+<TGConnectingPoint num="4" id="5450" />
+<TGConnectingPoint num="5" id="5451" />
+<TGConnectingPoint num="6" id="5452" />
+<TGConnectingPoint num="7" id="5453" />
+<TGConnectingPoint num="8" id="5454" />
+<TGConnectingPoint num="9" id="5455" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5104" id="5641" >
+<COMPONENT type="5104" id="5467" >
 <cdparam x="634" y="36" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="5631" />
-<TGConnectingPoint num="1" id="5632" />
-<TGConnectingPoint num="2" id="5633" />
-<TGConnectingPoint num="3" id="5634" />
-<TGConnectingPoint num="4" id="5635" />
-<TGConnectingPoint num="5" id="5636" />
-<TGConnectingPoint num="6" id="5637" />
-<TGConnectingPoint num="7" id="5638" />
-<TGConnectingPoint num="8" id="5639" />
-<TGConnectingPoint num="9" id="5640" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5682" >
+<TGConnectingPoint num="0" id="5457" />
+<TGConnectingPoint num="1" id="5458" />
+<TGConnectingPoint num="2" id="5459" />
+<TGConnectingPoint num="3" id="5460" />
+<TGConnectingPoint num="4" id="5461" />
+<TGConnectingPoint num="5" id="5462" />
+<TGConnectingPoint num="6" id="5463" />
+<TGConnectingPoint num="7" id="5464" />
+<TGConnectingPoint num="8" id="5465" />
+<TGConnectingPoint num="9" id="5466" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5508" >
 <cdparam x="389" y="119" />
 <sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Idle" />
-<TGConnectingPoint num="0" id="5642" />
-<TGConnectingPoint num="1" id="5643" />
-<TGConnectingPoint num="2" id="5644" />
-<TGConnectingPoint num="3" id="5645" />
-<TGConnectingPoint num="4" id="5646" />
-<TGConnectingPoint num="5" id="5647" />
-<TGConnectingPoint num="6" id="5648" />
-<TGConnectingPoint num="7" id="5649" />
-<TGConnectingPoint num="8" id="5650" />
-<TGConnectingPoint num="9" id="5651" />
-<TGConnectingPoint num="10" id="5652" />
-<TGConnectingPoint num="11" id="5653" />
-<TGConnectingPoint num="12" id="5654" />
-<TGConnectingPoint num="13" id="5655" />
-<TGConnectingPoint num="14" id="5656" />
-<TGConnectingPoint num="15" id="5657" />
-<TGConnectingPoint num="16" id="5658" />
-<TGConnectingPoint num="17" id="5659" />
-<TGConnectingPoint num="18" id="5660" />
-<TGConnectingPoint num="19" id="5661" />
-<TGConnectingPoint num="20" id="5662" />
-<TGConnectingPoint num="21" id="5663" />
-<TGConnectingPoint num="22" id="5664" />
-<TGConnectingPoint num="23" id="5665" />
-<TGConnectingPoint num="24" id="5666" />
-<TGConnectingPoint num="25" id="5667" />
-<TGConnectingPoint num="26" id="5668" />
-<TGConnectingPoint num="27" id="5669" />
-<TGConnectingPoint num="28" id="5670" />
-<TGConnectingPoint num="29" id="5671" />
-<TGConnectingPoint num="30" id="5672" />
-<TGConnectingPoint num="31" id="5673" />
-<TGConnectingPoint num="32" id="5674" />
-<TGConnectingPoint num="33" id="5675" />
-<TGConnectingPoint num="34" id="5676" />
-<TGConnectingPoint num="35" id="5677" />
-<TGConnectingPoint num="36" id="5678" />
-<TGConnectingPoint num="37" id="5679" />
-<TGConnectingPoint num="38" id="5680" />
-<TGConnectingPoint num="39" id="5681" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="5693" >
+<TGConnectingPoint num="0" id="5468" />
+<TGConnectingPoint num="1" id="5469" />
+<TGConnectingPoint num="2" id="5470" />
+<TGConnectingPoint num="3" id="5471" />
+<TGConnectingPoint num="4" id="5472" />
+<TGConnectingPoint num="5" id="5473" />
+<TGConnectingPoint num="6" id="5474" />
+<TGConnectingPoint num="7" id="5475" />
+<TGConnectingPoint num="8" id="5476" />
+<TGConnectingPoint num="9" id="5477" />
+<TGConnectingPoint num="10" id="5478" />
+<TGConnectingPoint num="11" id="5479" />
+<TGConnectingPoint num="12" id="5480" />
+<TGConnectingPoint num="13" id="5481" />
+<TGConnectingPoint num="14" id="5482" />
+<TGConnectingPoint num="15" id="5483" />
+<TGConnectingPoint num="16" id="5484" />
+<TGConnectingPoint num="17" id="5485" />
+<TGConnectingPoint num="18" id="5486" />
+<TGConnectingPoint num="19" id="5487" />
+<TGConnectingPoint num="20" id="5488" />
+<TGConnectingPoint num="21" id="5489" />
+<TGConnectingPoint num="22" id="5490" />
+<TGConnectingPoint num="23" id="5491" />
+<TGConnectingPoint num="24" id="5492" />
+<TGConnectingPoint num="25" id="5493" />
+<TGConnectingPoint num="26" id="5494" />
+<TGConnectingPoint num="27" id="5495" />
+<TGConnectingPoint num="28" id="5496" />
+<TGConnectingPoint num="29" id="5497" />
+<TGConnectingPoint num="30" id="5498" />
+<TGConnectingPoint num="31" id="5499" />
+<TGConnectingPoint num="32" id="5500" />
+<TGConnectingPoint num="33" id="5501" />
+<TGConnectingPoint num="34" id="5502" />
+<TGConnectingPoint num="35" id="5503" />
+<TGConnectingPoint num="36" id="5504" />
+<TGConnectingPoint num="37" id="5505" />
+<TGConnectingPoint num="38" id="5506" />
+<TGConnectingPoint num="39" id="5507" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="5519" >
 <cdparam x="442" y="183" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="start(duration)" />
-<TGConnectingPoint num="0" id="5683" />
-<TGConnectingPoint num="1" id="5684" />
-<TGConnectingPoint num="2" id="5685" />
-<TGConnectingPoint num="3" id="5686" />
-<TGConnectingPoint num="4" id="5687" />
-<TGConnectingPoint num="5" id="5688" />
-<TGConnectingPoint num="6" id="5689" />
-<TGConnectingPoint num="7" id="5690" />
-<TGConnectingPoint num="8" id="5691" />
-<TGConnectingPoint num="9" id="5692" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="5695" >
+<TGConnectingPoint num="0" id="5509" />
+<TGConnectingPoint num="1" id="5510" />
+<TGConnectingPoint num="2" id="5511" />
+<TGConnectingPoint num="3" id="5512" />
+<TGConnectingPoint num="4" id="5513" />
+<TGConnectingPoint num="5" id="5514" />
+<TGConnectingPoint num="6" id="5515" />
+<TGConnectingPoint num="7" id="5516" />
+<TGConnectingPoint num="8" id="5517" />
+<TGConnectingPoint num="9" id="5518" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="5521" >
 <cdparam x="423" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5694" />
+<TGConnectingPoint num="0" id="5520" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="5706" >
+<COMPONENT type="5103" id="5532" >
 <cdparam x="619" y="350" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="5696" />
-<TGConnectingPoint num="1" id="5697" />
-<TGConnectingPoint num="2" id="5698" />
-<TGConnectingPoint num="3" id="5699" />
-<TGConnectingPoint num="4" id="5700" />
-<TGConnectingPoint num="5" id="5701" />
-<TGConnectingPoint num="6" id="5702" />
-<TGConnectingPoint num="7" id="5703" />
-<TGConnectingPoint num="8" id="5704" />
-<TGConnectingPoint num="9" id="5705" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5717" >
+<TGConnectingPoint num="0" id="5522" />
+<TGConnectingPoint num="1" id="5523" />
+<TGConnectingPoint num="2" id="5524" />
+<TGConnectingPoint num="3" id="5525" />
+<TGConnectingPoint num="4" id="5526" />
+<TGConnectingPoint num="5" id="5527" />
+<TGConnectingPoint num="6" id="5528" />
+<TGConnectingPoint num="7" id="5529" />
+<TGConnectingPoint num="8" id="5530" />
+<TGConnectingPoint num="9" id="5531" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5543" >
 <cdparam x="376" y="512" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="5707" />
-<TGConnectingPoint num="1" id="5708" />
-<TGConnectingPoint num="2" id="5709" />
-<TGConnectingPoint num="3" id="5710" />
-<TGConnectingPoint num="4" id="5711" />
-<TGConnectingPoint num="5" id="5712" />
-<TGConnectingPoint num="6" id="5713" />
-<TGConnectingPoint num="7" id="5714" />
-<TGConnectingPoint num="8" id="5715" />
-<TGConnectingPoint num="9" id="5716" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5728" >
+<TGConnectingPoint num="0" id="5533" />
+<TGConnectingPoint num="1" id="5534" />
+<TGConnectingPoint num="2" id="5535" />
+<TGConnectingPoint num="3" id="5536" />
+<TGConnectingPoint num="4" id="5537" />
+<TGConnectingPoint num="5" id="5538" />
+<TGConnectingPoint num="6" id="5539" />
+<TGConnectingPoint num="7" id="5540" />
+<TGConnectingPoint num="8" id="5541" />
+<TGConnectingPoint num="9" id="5542" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5554" >
 <cdparam x="619" y="556" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="5718" />
-<TGConnectingPoint num="1" id="5719" />
-<TGConnectingPoint num="2" id="5720" />
-<TGConnectingPoint num="3" id="5721" />
-<TGConnectingPoint num="4" id="5722" />
-<TGConnectingPoint num="5" id="5723" />
-<TGConnectingPoint num="6" id="5724" />
-<TGConnectingPoint num="7" id="5725" />
-<TGConnectingPoint num="8" id="5726" />
-<TGConnectingPoint num="9" id="5727" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5739" >
+<TGConnectingPoint num="0" id="5544" />
+<TGConnectingPoint num="1" id="5545" />
+<TGConnectingPoint num="2" id="5546" />
+<TGConnectingPoint num="3" id="5547" />
+<TGConnectingPoint num="4" id="5548" />
+<TGConnectingPoint num="5" id="5549" />
+<TGConnectingPoint num="6" id="5550" />
+<TGConnectingPoint num="7" id="5551" />
+<TGConnectingPoint num="8" id="5552" />
+<TGConnectingPoint num="9" id="5553" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5565" >
 <cdparam x="376" y="309" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="5729" />
-<TGConnectingPoint num="1" id="5730" />
-<TGConnectingPoint num="2" id="5731" />
-<TGConnectingPoint num="3" id="5732" />
-<TGConnectingPoint num="4" id="5733" />
-<TGConnectingPoint num="5" id="5734" />
-<TGConnectingPoint num="6" id="5735" />
-<TGConnectingPoint num="7" id="5736" />
-<TGConnectingPoint num="8" id="5737" />
-<TGConnectingPoint num="9" id="5738" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="5750" >
+<TGConnectingPoint num="0" id="5555" />
+<TGConnectingPoint num="1" id="5556" />
+<TGConnectingPoint num="2" id="5557" />
+<TGConnectingPoint num="3" id="5558" />
+<TGConnectingPoint num="4" id="5559" />
+<TGConnectingPoint num="5" id="5560" />
+<TGConnectingPoint num="6" id="5561" />
+<TGConnectingPoint num="7" id="5562" />
+<TGConnectingPoint num="8" id="5563" />
+<TGConnectingPoint num="9" id="5564" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5576" >
 <cdparam x="640" y="478" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="5740" />
-<TGConnectingPoint num="1" id="5741" />
-<TGConnectingPoint num="2" id="5742" />
-<TGConnectingPoint num="3" id="5743" />
-<TGConnectingPoint num="4" id="5744" />
-<TGConnectingPoint num="5" id="5745" />
-<TGConnectingPoint num="6" id="5746" />
-<TGConnectingPoint num="7" id="5747" />
-<TGConnectingPoint num="8" id="5748" />
-<TGConnectingPoint num="9" id="5749" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="5761" >
+<TGConnectingPoint num="0" id="5566" />
+<TGConnectingPoint num="1" id="5567" />
+<TGConnectingPoint num="2" id="5568" />
+<TGConnectingPoint num="3" id="5569" />
+<TGConnectingPoint num="4" id="5570" />
+<TGConnectingPoint num="5" id="5571" />
+<TGConnectingPoint num="6" id="5572" />
+<TGConnectingPoint num="7" id="5573" />
+<TGConnectingPoint num="8" id="5574" />
+<TGConnectingPoint num="9" id="5575" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5587" >
 <cdparam x="630" y="150" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="5751" />
-<TGConnectingPoint num="1" id="5752" />
-<TGConnectingPoint num="2" id="5753" />
-<TGConnectingPoint num="3" id="5754" />
-<TGConnectingPoint num="4" id="5755" />
-<TGConnectingPoint num="5" id="5756" />
-<TGConnectingPoint num="6" id="5757" />
-<TGConnectingPoint num="7" id="5758" />
-<TGConnectingPoint num="8" id="5759" />
-<TGConnectingPoint num="9" id="5760" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5802" >
+<TGConnectingPoint num="0" id="5577" />
+<TGConnectingPoint num="1" id="5578" />
+<TGConnectingPoint num="2" id="5579" />
+<TGConnectingPoint num="3" id="5580" />
+<TGConnectingPoint num="4" id="5581" />
+<TGConnectingPoint num="5" id="5582" />
+<TGConnectingPoint num="6" id="5583" />
+<TGConnectingPoint num="7" id="5584" />
+<TGConnectingPoint num="8" id="5585" />
+<TGConnectingPoint num="9" id="5586" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5628" >
 <cdparam x="603" y="106" />
 <sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpened" />
-<TGConnectingPoint num="0" id="5762" />
-<TGConnectingPoint num="1" id="5763" />
-<TGConnectingPoint num="2" id="5764" />
-<TGConnectingPoint num="3" id="5765" />
-<TGConnectingPoint num="4" id="5766" />
-<TGConnectingPoint num="5" id="5767" />
-<TGConnectingPoint num="6" id="5768" />
-<TGConnectingPoint num="7" id="5769" />
-<TGConnectingPoint num="8" id="5770" />
-<TGConnectingPoint num="9" id="5771" />
-<TGConnectingPoint num="10" id="5772" />
-<TGConnectingPoint num="11" id="5773" />
-<TGConnectingPoint num="12" id="5774" />
-<TGConnectingPoint num="13" id="5775" />
-<TGConnectingPoint num="14" id="5776" />
-<TGConnectingPoint num="15" id="5777" />
-<TGConnectingPoint num="16" id="5778" />
-<TGConnectingPoint num="17" id="5779" />
-<TGConnectingPoint num="18" id="5780" />
-<TGConnectingPoint num="19" id="5781" />
-<TGConnectingPoint num="20" id="5782" />
-<TGConnectingPoint num="21" id="5783" />
-<TGConnectingPoint num="22" id="5784" />
-<TGConnectingPoint num="23" id="5785" />
-<TGConnectingPoint num="24" id="5786" />
-<TGConnectingPoint num="25" id="5787" />
-<TGConnectingPoint num="26" id="5788" />
-<TGConnectingPoint num="27" id="5789" />
-<TGConnectingPoint num="28" id="5790" />
-<TGConnectingPoint num="29" id="5791" />
-<TGConnectingPoint num="30" id="5792" />
-<TGConnectingPoint num="31" id="5793" />
-<TGConnectingPoint num="32" id="5794" />
-<TGConnectingPoint num="33" id="5795" />
-<TGConnectingPoint num="34" id="5796" />
-<TGConnectingPoint num="35" id="5797" />
-<TGConnectingPoint num="36" id="5798" />
-<TGConnectingPoint num="37" id="5799" />
-<TGConnectingPoint num="38" id="5800" />
-<TGConnectingPoint num="39" id="5801" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="5843" >
+<TGConnectingPoint num="0" id="5588" />
+<TGConnectingPoint num="1" id="5589" />
+<TGConnectingPoint num="2" id="5590" />
+<TGConnectingPoint num="3" id="5591" />
+<TGConnectingPoint num="4" id="5592" />
+<TGConnectingPoint num="5" id="5593" />
+<TGConnectingPoint num="6" id="5594" />
+<TGConnectingPoint num="7" id="5595" />
+<TGConnectingPoint num="8" id="5596" />
+<TGConnectingPoint num="9" id="5597" />
+<TGConnectingPoint num="10" id="5598" />
+<TGConnectingPoint num="11" id="5599" />
+<TGConnectingPoint num="12" id="5600" />
+<TGConnectingPoint num="13" id="5601" />
+<TGConnectingPoint num="14" id="5602" />
+<TGConnectingPoint num="15" id="5603" />
+<TGConnectingPoint num="16" id="5604" />
+<TGConnectingPoint num="17" id="5605" />
+<TGConnectingPoint num="18" id="5606" />
+<TGConnectingPoint num="19" id="5607" />
+<TGConnectingPoint num="20" id="5608" />
+<TGConnectingPoint num="21" id="5609" />
+<TGConnectingPoint num="22" id="5610" />
+<TGConnectingPoint num="23" id="5611" />
+<TGConnectingPoint num="24" id="5612" />
+<TGConnectingPoint num="25" id="5613" />
+<TGConnectingPoint num="26" id="5614" />
+<TGConnectingPoint num="27" id="5615" />
+<TGConnectingPoint num="28" id="5616" />
+<TGConnectingPoint num="29" id="5617" />
+<TGConnectingPoint num="30" id="5618" />
+<TGConnectingPoint num="31" id="5619" />
+<TGConnectingPoint num="32" id="5620" />
+<TGConnectingPoint num="33" id="5621" />
+<TGConnectingPoint num="34" id="5622" />
+<TGConnectingPoint num="35" id="5623" />
+<TGConnectingPoint num="36" id="5624" />
+<TGConnectingPoint num="37" id="5625" />
+<TGConnectingPoint num="38" id="5626" />
+<TGConnectingPoint num="39" id="5627" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5669" >
 <cdparam x="571" y="393" />
 <sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpenedWhileHeating" />
-<TGConnectingPoint num="0" id="5803" />
-<TGConnectingPoint num="1" id="5804" />
-<TGConnectingPoint num="2" id="5805" />
-<TGConnectingPoint num="3" id="5806" />
-<TGConnectingPoint num="4" id="5807" />
-<TGConnectingPoint num="5" id="5808" />
-<TGConnectingPoint num="6" id="5809" />
-<TGConnectingPoint num="7" id="5810" />
-<TGConnectingPoint num="8" id="5811" />
-<TGConnectingPoint num="9" id="5812" />
-<TGConnectingPoint num="10" id="5813" />
-<TGConnectingPoint num="11" id="5814" />
-<TGConnectingPoint num="12" id="5815" />
-<TGConnectingPoint num="13" id="5816" />
-<TGConnectingPoint num="14" id="5817" />
-<TGConnectingPoint num="15" id="5818" />
-<TGConnectingPoint num="16" id="5819" />
-<TGConnectingPoint num="17" id="5820" />
-<TGConnectingPoint num="18" id="5821" />
-<TGConnectingPoint num="19" id="5822" />
-<TGConnectingPoint num="20" id="5823" />
-<TGConnectingPoint num="21" id="5824" />
-<TGConnectingPoint num="22" id="5825" />
-<TGConnectingPoint num="23" id="5826" />
-<TGConnectingPoint num="24" id="5827" />
-<TGConnectingPoint num="25" id="5828" />
-<TGConnectingPoint num="26" id="5829" />
-<TGConnectingPoint num="27" id="5830" />
-<TGConnectingPoint num="28" id="5831" />
-<TGConnectingPoint num="29" id="5832" />
-<TGConnectingPoint num="30" id="5833" />
-<TGConnectingPoint num="31" id="5834" />
-<TGConnectingPoint num="32" id="5835" />
-<TGConnectingPoint num="33" id="5836" />
-<TGConnectingPoint num="34" id="5837" />
-<TGConnectingPoint num="35" id="5838" />
-<TGConnectingPoint num="36" id="5839" />
-<TGConnectingPoint num="37" id="5840" />
-<TGConnectingPoint num="38" id="5841" />
-<TGConnectingPoint num="39" id="5842" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="5884" >
+<TGConnectingPoint num="0" id="5629" />
+<TGConnectingPoint num="1" id="5630" />
+<TGConnectingPoint num="2" id="5631" />
+<TGConnectingPoint num="3" id="5632" />
+<TGConnectingPoint num="4" id="5633" />
+<TGConnectingPoint num="5" id="5634" />
+<TGConnectingPoint num="6" id="5635" />
+<TGConnectingPoint num="7" id="5636" />
+<TGConnectingPoint num="8" id="5637" />
+<TGConnectingPoint num="9" id="5638" />
+<TGConnectingPoint num="10" id="5639" />
+<TGConnectingPoint num="11" id="5640" />
+<TGConnectingPoint num="12" id="5641" />
+<TGConnectingPoint num="13" id="5642" />
+<TGConnectingPoint num="14" id="5643" />
+<TGConnectingPoint num="15" id="5644" />
+<TGConnectingPoint num="16" id="5645" />
+<TGConnectingPoint num="17" id="5646" />
+<TGConnectingPoint num="18" id="5647" />
+<TGConnectingPoint num="19" id="5648" />
+<TGConnectingPoint num="20" id="5649" />
+<TGConnectingPoint num="21" id="5650" />
+<TGConnectingPoint num="22" id="5651" />
+<TGConnectingPoint num="23" id="5652" />
+<TGConnectingPoint num="24" id="5653" />
+<TGConnectingPoint num="25" id="5654" />
+<TGConnectingPoint num="26" id="5655" />
+<TGConnectingPoint num="27" id="5656" />
+<TGConnectingPoint num="28" id="5657" />
+<TGConnectingPoint num="29" id="5658" />
+<TGConnectingPoint num="30" id="5659" />
+<TGConnectingPoint num="31" id="5660" />
+<TGConnectingPoint num="32" id="5661" />
+<TGConnectingPoint num="33" id="5662" />
+<TGConnectingPoint num="34" id="5663" />
+<TGConnectingPoint num="35" id="5664" />
+<TGConnectingPoint num="36" id="5665" />
+<TGConnectingPoint num="37" id="5666" />
+<TGConnectingPoint num="38" id="5667" />
+<TGConnectingPoint num="39" id="5668" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5710" >
 <cdparam x="251" y="240" />
 <sizeparam width="543" height="394" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="5844" />
-<TGConnectingPoint num="1" id="5845" />
-<TGConnectingPoint num="2" id="5846" />
-<TGConnectingPoint num="3" id="5847" />
-<TGConnectingPoint num="4" id="5848" />
-<TGConnectingPoint num="5" id="5849" />
-<TGConnectingPoint num="6" id="5850" />
-<TGConnectingPoint num="7" id="5851" />
-<TGConnectingPoint num="8" id="5852" />
-<TGConnectingPoint num="9" id="5853" />
-<TGConnectingPoint num="10" id="5854" />
-<TGConnectingPoint num="11" id="5855" />
-<TGConnectingPoint num="12" id="5856" />
-<TGConnectingPoint num="13" id="5857" />
-<TGConnectingPoint num="14" id="5858" />
-<TGConnectingPoint num="15" id="5859" />
-<TGConnectingPoint num="16" id="5860" />
-<TGConnectingPoint num="17" id="5861" />
-<TGConnectingPoint num="18" id="5862" />
-<TGConnectingPoint num="19" id="5863" />
-<TGConnectingPoint num="20" id="5864" />
-<TGConnectingPoint num="21" id="5865" />
-<TGConnectingPoint num="22" id="5866" />
-<TGConnectingPoint num="23" id="5867" />
-<TGConnectingPoint num="24" id="5868" />
-<TGConnectingPoint num="25" id="5869" />
-<TGConnectingPoint num="26" id="5870" />
-<TGConnectingPoint num="27" id="5871" />
-<TGConnectingPoint num="28" id="5872" />
-<TGConnectingPoint num="29" id="5873" />
-<TGConnectingPoint num="30" id="5874" />
-<TGConnectingPoint num="31" id="5875" />
-<TGConnectingPoint num="32" id="5876" />
-<TGConnectingPoint num="33" id="5877" />
-<TGConnectingPoint num="34" id="5878" />
-<TGConnectingPoint num="35" id="5879" />
-<TGConnectingPoint num="36" id="5880" />
-<TGConnectingPoint num="37" id="5881" />
-<TGConnectingPoint num="38" id="5882" />
-<TGConnectingPoint num="39" id="5883" />
+<TGConnectingPoint num="0" id="5670" />
+<TGConnectingPoint num="1" id="5671" />
+<TGConnectingPoint num="2" id="5672" />
+<TGConnectingPoint num="3" id="5673" />
+<TGConnectingPoint num="4" id="5674" />
+<TGConnectingPoint num="5" id="5675" />
+<TGConnectingPoint num="6" id="5676" />
+<TGConnectingPoint num="7" id="5677" />
+<TGConnectingPoint num="8" id="5678" />
+<TGConnectingPoint num="9" id="5679" />
+<TGConnectingPoint num="10" id="5680" />
+<TGConnectingPoint num="11" id="5681" />
+<TGConnectingPoint num="12" id="5682" />
+<TGConnectingPoint num="13" id="5683" />
+<TGConnectingPoint num="14" id="5684" />
+<TGConnectingPoint num="15" id="5685" />
+<TGConnectingPoint num="16" id="5686" />
+<TGConnectingPoint num="17" id="5687" />
+<TGConnectingPoint num="18" id="5688" />
+<TGConnectingPoint num="19" id="5689" />
+<TGConnectingPoint num="20" id="5690" />
+<TGConnectingPoint num="21" id="5691" />
+<TGConnectingPoint num="22" id="5692" />
+<TGConnectingPoint num="23" id="5693" />
+<TGConnectingPoint num="24" id="5694" />
+<TGConnectingPoint num="25" id="5695" />
+<TGConnectingPoint num="26" id="5696" />
+<TGConnectingPoint num="27" id="5697" />
+<TGConnectingPoint num="28" id="5698" />
+<TGConnectingPoint num="29" id="5699" />
+<TGConnectingPoint num="30" id="5700" />
+<TGConnectingPoint num="31" id="5701" />
+<TGConnectingPoint num="32" id="5702" />
+<TGConnectingPoint num="33" id="5703" />
+<TGConnectingPoint num="34" id="5704" />
+<TGConnectingPoint num="35" id="5705" />
+<TGConnectingPoint num="36" id="5706" />
+<TGConnectingPoint num="37" id="5707" />
+<TGConnectingPoint num="38" id="5708" />
+<TGConnectingPoint num="39" id="5709" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -12644,55 +12393,55 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5897" >
+<CONNECTOR type="5102" id="5723" >
 <cdparam x="407" y="380" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5893" />
-<TGConnectingPoint num="1" id="5894" />
-<TGConnectingPoint num="2" id="5895" />
-<TGConnectingPoint num="3" id="5896" />
-<P1  x="407" y="310" id="5927" />
-<P2  x="365" y="113" id="5994" />
+<TGConnectingPoint num="0" id="5719" />
+<TGConnectingPoint num="1" id="5720" />
+<TGConnectingPoint num="2" id="5721" />
+<TGConnectingPoint num="3" id="5722" />
+<P1  x="407" y="310" id="5753" />
+<P2  x="365" y="113" id="5820" />
 <Point x="407" y="327" />
 <Point x="323" y="327" />
 <Point x="323" y="113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5885" >
-<father id="5897" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5711" >
+<father id="5723" num="0" />
 <cdparam x="407" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5886" >
-<father id="5897" num="1" />
+<SUBCOMPONENT type="-1" id="5712" >
+<father id="5723" num="1" />
 <cdparam x="323" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5887" >
-<father id="5897" num="2" />
+<SUBCOMPONENT type="-1" id="5713" >
+<father id="5723" num="2" />
 <cdparam x="323" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5892" >
-<father id="5897" num="3" />
+<SUBCOMPONENT type="-1" id="5718" >
+<father id="5723" num="3" />
 <cdparam x="418" y="343" />
 <sizeparam width="29" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5888" />
-<TGConnectingPoint num="1" id="5889" />
-<TGConnectingPoint num="2" id="5890" />
-<TGConnectingPoint num="3" id="5891" />
+<TGConnectingPoint num="0" id="5714" />
+<TGConnectingPoint num="1" id="5715" />
+<TGConnectingPoint num="2" id="5716" />
+<TGConnectingPoint num="3" id="5717" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12703,25 +12452,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5904" >
+<CONNECTOR type="5102" id="5730" >
 <cdparam x="411" y="243" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5903" />
-<P1  x="408" y="242" id="5943" />
-<P2  x="407" y="280" id="5926" />
+<TGConnectingPoint num="0" id="5729" />
+<P1  x="408" y="242" id="5769" />
+<P2  x="407" y="280" id="5752" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5902" >
-<father id="5904" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5728" >
+<father id="5730" num="0" />
 <cdparam x="411" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5898" />
-<TGConnectingPoint num="1" id="5899" />
-<TGConnectingPoint num="2" id="5900" />
-<TGConnectingPoint num="3" id="5901" />
+<TGConnectingPoint num="0" id="5724" />
+<TGConnectingPoint num="1" id="5725" />
+<TGConnectingPoint num="2" id="5726" />
+<TGConnectingPoint num="3" id="5727" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12731,25 +12480,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5911" >
+<CONNECTOR type="5102" id="5737" >
 <cdparam x="398" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="5910" />
-<P1  x="407" y="183" id="5979" />
-<P2  x="408" y="202" id="5938" />
+<TGConnectingPoint num="0" id="5736" />
+<P1  x="407" y="183" id="5805" />
+<P2  x="408" y="202" id="5764" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5909" >
-<father id="5911" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5735" >
+<father id="5737" num="0" />
 <cdparam x="421" y="197" />
 <sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5905" />
-<TGConnectingPoint num="1" id="5906" />
-<TGConnectingPoint num="2" id="5907" />
-<TGConnectingPoint num="3" id="5908" />
+<TGConnectingPoint num="0" id="5731" />
+<TGConnectingPoint num="1" id="5732" />
+<TGConnectingPoint num="2" id="5733" />
+<TGConnectingPoint num="3" id="5734" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12760,25 +12509,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5918" >
+<CONNECTOR type="5102" id="5744" >
 <cdparam x="393" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5917" />
-<P1  x="407" y="131" id="5997" />
-<P2  x="407" y="153" id="5978" />
+<TGConnectingPoint num="0" id="5743" />
+<P1  x="407" y="131" id="5823" />
+<P2  x="407" y="153" id="5804" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5916" >
-<father id="5918" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5742" >
+<father id="5744" num="0" />
 <cdparam x="393" y="171" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5912" />
-<TGConnectingPoint num="1" id="5913" />
-<TGConnectingPoint num="2" id="5914" />
-<TGConnectingPoint num="3" id="5915" />
+<TGConnectingPoint num="0" id="5738" />
+<TGConnectingPoint num="1" id="5739" />
+<TGConnectingPoint num="2" id="5740" />
+<TGConnectingPoint num="3" id="5741" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12788,25 +12537,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5925" >
+<CONNECTOR type="5102" id="5751" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5924" />
-<P1  x="407" y="70" id="5989" />
-<P2  x="407" y="96" id="5992" />
+<TGConnectingPoint num="0" id="5750" />
+<P1  x="407" y="70" id="5815" />
+<P2  x="407" y="96" id="5818" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5923" >
-<father id="5925" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5749" >
+<father id="5751" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5919" />
-<TGConnectingPoint num="1" id="5920" />
-<TGConnectingPoint num="2" id="5921" />
-<TGConnectingPoint num="3" id="5922" />
+<TGConnectingPoint num="0" id="5745" />
+<TGConnectingPoint num="1" id="5746" />
+<TGConnectingPoint num="2" id="5747" />
+<TGConnectingPoint num="3" id="5748" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12816,148 +12565,148 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="5936" >
+<COMPONENT type="5104" id="5762" >
 <cdparam x="377" y="285" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopM()" />
-<TGConnectingPoint num="0" id="5926" />
-<TGConnectingPoint num="1" id="5927" />
-<TGConnectingPoint num="2" id="5928" />
-<TGConnectingPoint num="3" id="5929" />
-<TGConnectingPoint num="4" id="5930" />
-<TGConnectingPoint num="5" id="5931" />
-<TGConnectingPoint num="6" id="5932" />
-<TGConnectingPoint num="7" id="5933" />
-<TGConnectingPoint num="8" id="5934" />
-<TGConnectingPoint num="9" id="5935" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5977" >
+<TGConnectingPoint num="0" id="5752" />
+<TGConnectingPoint num="1" id="5753" />
+<TGConnectingPoint num="2" id="5754" />
+<TGConnectingPoint num="3" id="5755" />
+<TGConnectingPoint num="4" id="5756" />
+<TGConnectingPoint num="5" id="5757" />
+<TGConnectingPoint num="6" id="5758" />
+<TGConnectingPoint num="7" id="5759" />
+<TGConnectingPoint num="8" id="5760" />
+<TGConnectingPoint num="9" id="5761" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5803" >
 <cdparam x="373" y="202" />
 <sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Running" />
-<TGConnectingPoint num="0" id="5937" />
-<TGConnectingPoint num="1" id="5938" />
-<TGConnectingPoint num="2" id="5939" />
-<TGConnectingPoint num="3" id="5940" />
-<TGConnectingPoint num="4" id="5941" />
-<TGConnectingPoint num="5" id="5942" />
-<TGConnectingPoint num="6" id="5943" />
-<TGConnectingPoint num="7" id="5944" />
-<TGConnectingPoint num="8" id="5945" />
-<TGConnectingPoint num="9" id="5946" />
-<TGConnectingPoint num="10" id="5947" />
-<TGConnectingPoint num="11" id="5948" />
-<TGConnectingPoint num="12" id="5949" />
-<TGConnectingPoint num="13" id="5950" />
-<TGConnectingPoint num="14" id="5951" />
-<TGConnectingPoint num="15" id="5952" />
-<TGConnectingPoint num="16" id="5953" />
-<TGConnectingPoint num="17" id="5954" />
-<TGConnectingPoint num="18" id="5955" />
-<TGConnectingPoint num="19" id="5956" />
-<TGConnectingPoint num="20" id="5957" />
-<TGConnectingPoint num="21" id="5958" />
-<TGConnectingPoint num="22" id="5959" />
-<TGConnectingPoint num="23" id="5960" />
-<TGConnectingPoint num="24" id="5961" />
-<TGConnectingPoint num="25" id="5962" />
-<TGConnectingPoint num="26" id="5963" />
-<TGConnectingPoint num="27" id="5964" />
-<TGConnectingPoint num="28" id="5965" />
-<TGConnectingPoint num="29" id="5966" />
-<TGConnectingPoint num="30" id="5967" />
-<TGConnectingPoint num="31" id="5968" />
-<TGConnectingPoint num="32" id="5969" />
-<TGConnectingPoint num="33" id="5970" />
-<TGConnectingPoint num="34" id="5971" />
-<TGConnectingPoint num="35" id="5972" />
-<TGConnectingPoint num="36" id="5973" />
-<TGConnectingPoint num="37" id="5974" />
-<TGConnectingPoint num="38" id="5975" />
-<TGConnectingPoint num="39" id="5976" />
+<TGConnectingPoint num="0" id="5763" />
+<TGConnectingPoint num="1" id="5764" />
+<TGConnectingPoint num="2" id="5765" />
+<TGConnectingPoint num="3" id="5766" />
+<TGConnectingPoint num="4" id="5767" />
+<TGConnectingPoint num="5" id="5768" />
+<TGConnectingPoint num="6" id="5769" />
+<TGConnectingPoint num="7" id="5770" />
+<TGConnectingPoint num="8" id="5771" />
+<TGConnectingPoint num="9" id="5772" />
+<TGConnectingPoint num="10" id="5773" />
+<TGConnectingPoint num="11" id="5774" />
+<TGConnectingPoint num="12" id="5775" />
+<TGConnectingPoint num="13" id="5776" />
+<TGConnectingPoint num="14" id="5777" />
+<TGConnectingPoint num="15" id="5778" />
+<TGConnectingPoint num="16" id="5779" />
+<TGConnectingPoint num="17" id="5780" />
+<TGConnectingPoint num="18" id="5781" />
+<TGConnectingPoint num="19" id="5782" />
+<TGConnectingPoint num="20" id="5783" />
+<TGConnectingPoint num="21" id="5784" />
+<TGConnectingPoint num="22" id="5785" />
+<TGConnectingPoint num="23" id="5786" />
+<TGConnectingPoint num="24" id="5787" />
+<TGConnectingPoint num="25" id="5788" />
+<TGConnectingPoint num="26" id="5789" />
+<TGConnectingPoint num="27" id="5790" />
+<TGConnectingPoint num="28" id="5791" />
+<TGConnectingPoint num="29" id="5792" />
+<TGConnectingPoint num="30" id="5793" />
+<TGConnectingPoint num="31" id="5794" />
+<TGConnectingPoint num="32" id="5795" />
+<TGConnectingPoint num="33" id="5796" />
+<TGConnectingPoint num="34" id="5797" />
+<TGConnectingPoint num="35" id="5798" />
+<TGConnectingPoint num="36" id="5799" />
+<TGConnectingPoint num="37" id="5800" />
+<TGConnectingPoint num="38" id="5801" />
+<TGConnectingPoint num="39" id="5802" />
 <extraparam>
 <entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5988" >
+<COMPONENT type="5104" id="5814" >
 <cdparam x="376" y="158" />
 <sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startM()" />
-<TGConnectingPoint num="0" id="5978" />
-<TGConnectingPoint num="1" id="5979" />
-<TGConnectingPoint num="2" id="5980" />
-<TGConnectingPoint num="3" id="5981" />
-<TGConnectingPoint num="4" id="5982" />
-<TGConnectingPoint num="5" id="5983" />
-<TGConnectingPoint num="6" id="5984" />
-<TGConnectingPoint num="7" id="5985" />
-<TGConnectingPoint num="8" id="5986" />
-<TGConnectingPoint num="9" id="5987" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="5990" >
+<TGConnectingPoint num="0" id="5804" />
+<TGConnectingPoint num="1" id="5805" />
+<TGConnectingPoint num="2" id="5806" />
+<TGConnectingPoint num="3" id="5807" />
+<TGConnectingPoint num="4" id="5808" />
+<TGConnectingPoint num="5" id="5809" />
+<TGConnectingPoint num="6" id="5810" />
+<TGConnectingPoint num="7" id="5811" />
+<TGConnectingPoint num="8" id="5812" />
+<TGConnectingPoint num="9" id="5813" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="5816" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5989" />
+<TGConnectingPoint num="0" id="5815" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="6031" >
+<COMPONENT type="5106" id="5857" >
 <cdparam x="365" y="96" />
 <sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitForStart" />
-<TGConnectingPoint num="0" id="5991" />
-<TGConnectingPoint num="1" id="5992" />
-<TGConnectingPoint num="2" id="5993" />
-<TGConnectingPoint num="3" id="5994" />
-<TGConnectingPoint num="4" id="5995" />
-<TGConnectingPoint num="5" id="5996" />
-<TGConnectingPoint num="6" id="5997" />
-<TGConnectingPoint num="7" id="5998" />
-<TGConnectingPoint num="8" id="5999" />
-<TGConnectingPoint num="9" id="6000" />
-<TGConnectingPoint num="10" id="6001" />
-<TGConnectingPoint num="11" id="6002" />
-<TGConnectingPoint num="12" id="6003" />
-<TGConnectingPoint num="13" id="6004" />
-<TGConnectingPoint num="14" id="6005" />
-<TGConnectingPoint num="15" id="6006" />
-<TGConnectingPoint num="16" id="6007" />
-<TGConnectingPoint num="17" id="6008" />
-<TGConnectingPoint num="18" id="6009" />
-<TGConnectingPoint num="19" id="6010" />
-<TGConnectingPoint num="20" id="6011" />
-<TGConnectingPoint num="21" id="6012" />
-<TGConnectingPoint num="22" id="6013" />
-<TGConnectingPoint num="23" id="6014" />
-<TGConnectingPoint num="24" id="6015" />
-<TGConnectingPoint num="25" id="6016" />
-<TGConnectingPoint num="26" id="6017" />
-<TGConnectingPoint num="27" id="6018" />
-<TGConnectingPoint num="28" id="6019" />
-<TGConnectingPoint num="29" id="6020" />
-<TGConnectingPoint num="30" id="6021" />
-<TGConnectingPoint num="31" id="6022" />
-<TGConnectingPoint num="32" id="6023" />
-<TGConnectingPoint num="33" id="6024" />
-<TGConnectingPoint num="34" id="6025" />
-<TGConnectingPoint num="35" id="6026" />
-<TGConnectingPoint num="36" id="6027" />
-<TGConnectingPoint num="37" id="6028" />
-<TGConnectingPoint num="38" id="6029" />
-<TGConnectingPoint num="39" id="6030" />
+<TGConnectingPoint num="0" id="5817" />
+<TGConnectingPoint num="1" id="5818" />
+<TGConnectingPoint num="2" id="5819" />
+<TGConnectingPoint num="3" id="5820" />
+<TGConnectingPoint num="4" id="5821" />
+<TGConnectingPoint num="5" id="5822" />
+<TGConnectingPoint num="6" id="5823" />
+<TGConnectingPoint num="7" id="5824" />
+<TGConnectingPoint num="8" id="5825" />
+<TGConnectingPoint num="9" id="5826" />
+<TGConnectingPoint num="10" id="5827" />
+<TGConnectingPoint num="11" id="5828" />
+<TGConnectingPoint num="12" id="5829" />
+<TGConnectingPoint num="13" id="5830" />
+<TGConnectingPoint num="14" id="5831" />
+<TGConnectingPoint num="15" id="5832" />
+<TGConnectingPoint num="16" id="5833" />
+<TGConnectingPoint num="17" id="5834" />
+<TGConnectingPoint num="18" id="5835" />
+<TGConnectingPoint num="19" id="5836" />
+<TGConnectingPoint num="20" id="5837" />
+<TGConnectingPoint num="21" id="5838" />
+<TGConnectingPoint num="22" id="5839" />
+<TGConnectingPoint num="23" id="5840" />
+<TGConnectingPoint num="24" id="5841" />
+<TGConnectingPoint num="25" id="5842" />
+<TGConnectingPoint num="26" id="5843" />
+<TGConnectingPoint num="27" id="5844" />
+<TGConnectingPoint num="28" id="5845" />
+<TGConnectingPoint num="29" id="5846" />
+<TGConnectingPoint num="30" id="5847" />
+<TGConnectingPoint num="31" id="5848" />
+<TGConnectingPoint num="32" id="5849" />
+<TGConnectingPoint num="33" id="5850" />
+<TGConnectingPoint num="34" id="5851" />
+<TGConnectingPoint num="35" id="5852" />
+<TGConnectingPoint num="36" id="5853" />
+<TGConnectingPoint num="37" id="5854" />
+<TGConnectingPoint num="38" id="5855" />
+<TGConnectingPoint num="39" id="5856" />
 <extraparam>
 <entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
 </extraparam>
@@ -12967,25 +12716,25 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6038" >
+<CONNECTOR type="5102" id="5864" >
 <cdparam x="407" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="6037" />
-<P1  x="407" y="300" id="6079" />
-<P2  x="407" y="374" id="6114" />
+<TGConnectingPoint num="0" id="5863" />
+<P1  x="407" y="300" id="5905" />
+<P2  x="407" y="374" id="5940" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6036" >
-<father id="6038" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5862" >
+<father id="5864" num="0" />
 <cdparam x="407" y="340" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6032" />
-<TGConnectingPoint num="1" id="6033" />
-<TGConnectingPoint num="2" id="6034" />
-<TGConnectingPoint num="3" id="6035" />
+<TGConnectingPoint num="0" id="5858" />
+<TGConnectingPoint num="1" id="5859" />
+<TGConnectingPoint num="2" id="5860" />
+<TGConnectingPoint num="3" id="5861" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -12995,55 +12744,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6051" >
+<CONNECTOR type="5102" id="5877" >
 <cdparam x="407" y="277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6047" />
-<TGConnectingPoint num="1" id="6048" />
-<TGConnectingPoint num="2" id="6049" />
-<TGConnectingPoint num="3" id="6050" />
-<P1  x="407" y="404" id="6115" />
-<P2  x="357" y="125" id="6139" />
+<TGConnectingPoint num="0" id="5873" />
+<TGConnectingPoint num="1" id="5874" />
+<TGConnectingPoint num="2" id="5875" />
+<TGConnectingPoint num="3" id="5876" />
+<P1  x="407" y="404" id="5941" />
+<P2  x="357" y="125" id="5965" />
 <Point x="300" y="404" />
 <Point x="300" y="278" />
 <Point x="300" y="125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6039" >
-<father id="6051" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5865" >
+<father id="5877" num="0" />
 <cdparam x="300" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6040" >
-<father id="6051" num="1" />
+<SUBCOMPONENT type="-1" id="5866" >
+<father id="5877" num="1" />
 <cdparam x="300" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6041" >
-<father id="6051" num="2" />
+<SUBCOMPONENT type="-1" id="5867" >
+<father id="5877" num="2" />
 <cdparam x="300" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6046" >
-<father id="6051" num="3" />
+<SUBCOMPONENT type="-1" id="5872" >
+<father id="5877" num="3" />
 <cdparam x="246" y="301" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6042" />
-<TGConnectingPoint num="1" id="6043" />
-<TGConnectingPoint num="2" id="6044" />
-<TGConnectingPoint num="3" id="6045" />
+<TGConnectingPoint num="0" id="5868" />
+<TGConnectingPoint num="1" id="5869" />
+<TGConnectingPoint num="2" id="5870" />
+<TGConnectingPoint num="3" id="5871" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13054,25 +12803,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6058" >
+<CONNECTOR type="5102" id="5884" >
 <cdparam x="407" y="214" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="6057" />
-<P1  x="407" y="209" id="6126" />
-<P2  x="407" y="250" id="6074" />
+<TGConnectingPoint num="0" id="5883" />
+<P1  x="407" y="209" id="5952" />
+<P2  x="407" y="250" id="5900" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6056" >
-<father id="6058" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5882" >
+<father id="5884" num="0" />
 <cdparam x="471" y="206" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6052" />
-<TGConnectingPoint num="1" id="6053" />
-<TGConnectingPoint num="2" id="6054" />
-<TGConnectingPoint num="3" id="6055" />
+<TGConnectingPoint num="0" id="5878" />
+<TGConnectingPoint num="1" id="5879" />
+<TGConnectingPoint num="2" id="5880" />
+<TGConnectingPoint num="3" id="5881" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13083,25 +12832,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6065" >
+<CONNECTOR type="5102" id="5891" >
 <cdparam x="407" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="6064" />
-<P1  x="407" y="150" id="6142" />
-<P2  x="407" y="179" id="6125" />
+<TGConnectingPoint num="0" id="5890" />
+<P1  x="407" y="150" id="5968" />
+<P2  x="407" y="179" id="5951" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6063" >
-<father id="6065" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5889" >
+<father id="5891" num="0" />
 <cdparam x="412" y="172" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6059" />
-<TGConnectingPoint num="1" id="6060" />
-<TGConnectingPoint num="2" id="6061" />
-<TGConnectingPoint num="3" id="6062" />
+<TGConnectingPoint num="0" id="5885" />
+<TGConnectingPoint num="1" id="5886" />
+<TGConnectingPoint num="2" id="5887" />
+<TGConnectingPoint num="3" id="5888" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -13111,25 +12860,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6072" >
+<CONNECTOR type="5102" id="5898" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="6071" />
-<P1  x="407" y="70" id="6177" />
-<P2  x="407" y="100" id="6137" />
+<TGConnectingPoint num="0" id="5897" />
+<P1  x="407" y="70" id="6003" />
+<P2  x="407" y="100" id="5963" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6070" >
-<father id="6072" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5896" >
+<father id="5898" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6066" />
-<TGConnectingPoint num="1" id="6067" />
-<TGConnectingPoint num="2" id="6068" />
-<TGConnectingPoint num="3" id="6069" />
+<TGConnectingPoint num="0" id="5892" />
+<TGConnectingPoint num="1" id="5893" />
+<TGConnectingPoint num="2" id="5894" />
+<TGConnectingPoint num="3" id="5895" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13139,176 +12888,176 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="6113" >
+<COMPONENT type="5106" id="5939" >
 <cdparam x="357" y="250" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Opened" />
-<TGConnectingPoint num="0" id="6073" />
-<TGConnectingPoint num="1" id="6074" />
-<TGConnectingPoint num="2" id="6075" />
-<TGConnectingPoint num="3" id="6076" />
-<TGConnectingPoint num="4" id="6077" />
-<TGConnectingPoint num="5" id="6078" />
-<TGConnectingPoint num="6" id="6079" />
-<TGConnectingPoint num="7" id="6080" />
-<TGConnectingPoint num="8" id="6081" />
-<TGConnectingPoint num="9" id="6082" />
-<TGConnectingPoint num="10" id="6083" />
-<TGConnectingPoint num="11" id="6084" />
-<TGConnectingPoint num="12" id="6085" />
-<TGConnectingPoint num="13" id="6086" />
-<TGConnectingPoint num="14" id="6087" />
-<TGConnectingPoint num="15" id="6088" />
-<TGConnectingPoint num="16" id="6089" />
-<TGConnectingPoint num="17" id="6090" />
-<TGConnectingPoint num="18" id="6091" />
-<TGConnectingPoint num="19" id="6092" />
-<TGConnectingPoint num="20" id="6093" />
-<TGConnectingPoint num="21" id="6094" />
-<TGConnectingPoint num="22" id="6095" />
-<TGConnectingPoint num="23" id="6096" />
-<TGConnectingPoint num="24" id="6097" />
-<TGConnectingPoint num="25" id="6098" />
-<TGConnectingPoint num="26" id="6099" />
-<TGConnectingPoint num="27" id="6100" />
-<TGConnectingPoint num="28" id="6101" />
-<TGConnectingPoint num="29" id="6102" />
-<TGConnectingPoint num="30" id="6103" />
-<TGConnectingPoint num="31" id="6104" />
-<TGConnectingPoint num="32" id="6105" />
-<TGConnectingPoint num="33" id="6106" />
-<TGConnectingPoint num="34" id="6107" />
-<TGConnectingPoint num="35" id="6108" />
-<TGConnectingPoint num="36" id="6109" />
-<TGConnectingPoint num="37" id="6110" />
-<TGConnectingPoint num="38" id="6111" />
-<TGConnectingPoint num="39" id="6112" />
+<TGConnectingPoint num="0" id="5899" />
+<TGConnectingPoint num="1" id="5900" />
+<TGConnectingPoint num="2" id="5901" />
+<TGConnectingPoint num="3" id="5902" />
+<TGConnectingPoint num="4" id="5903" />
+<TGConnectingPoint num="5" id="5904" />
+<TGConnectingPoint num="6" id="5905" />
+<TGConnectingPoint num="7" id="5906" />
+<TGConnectingPoint num="8" id="5907" />
+<TGConnectingPoint num="9" id="5908" />
+<TGConnectingPoint num="10" id="5909" />
+<TGConnectingPoint num="11" id="5910" />
+<TGConnectingPoint num="12" id="5911" />
+<TGConnectingPoint num="13" id="5912" />
+<TGConnectingPoint num="14" id="5913" />
+<TGConnectingPoint num="15" id="5914" />
+<TGConnectingPoint num="16" id="5915" />
+<TGConnectingPoint num="17" id="5916" />
+<TGConnectingPoint num="18" id="5917" />
+<TGConnectingPoint num="19" id="5918" />
+<TGConnectingPoint num="20" id="5919" />
+<TGConnectingPoint num="21" id="5920" />
+<TGConnectingPoint num="22" id="5921" />
+<TGConnectingPoint num="23" id="5922" />
+<TGConnectingPoint num="24" id="5923" />
+<TGConnectingPoint num="25" id="5924" />
+<TGConnectingPoint num="26" id="5925" />
+<TGConnectingPoint num="27" id="5926" />
+<TGConnectingPoint num="28" id="5927" />
+<TGConnectingPoint num="29" id="5928" />
+<TGConnectingPoint num="30" id="5929" />
+<TGConnectingPoint num="31" id="5930" />
+<TGConnectingPoint num="32" id="5931" />
+<TGConnectingPoint num="33" id="5932" />
+<TGConnectingPoint num="34" id="5933" />
+<TGConnectingPoint num="35" id="5934" />
+<TGConnectingPoint num="36" id="5935" />
+<TGConnectingPoint num="37" id="5936" />
+<TGConnectingPoint num="38" id="5937" />
+<TGConnectingPoint num="39" id="5938" />
 <extraparam>
 <entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="6124" >
+<COMPONENT type="5103" id="5950" >
 <cdparam x="380" y="379" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="6114" />
-<TGConnectingPoint num="1" id="6115" />
-<TGConnectingPoint num="2" id="6116" />
-<TGConnectingPoint num="3" id="6117" />
-<TGConnectingPoint num="4" id="6118" />
-<TGConnectingPoint num="5" id="6119" />
-<TGConnectingPoint num="6" id="6120" />
-<TGConnectingPoint num="7" id="6121" />
-<TGConnectingPoint num="8" id="6122" />
-<TGConnectingPoint num="9" id="6123" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="6135" >
+<TGConnectingPoint num="0" id="5940" />
+<TGConnectingPoint num="1" id="5941" />
+<TGConnectingPoint num="2" id="5942" />
+<TGConnectingPoint num="3" id="5943" />
+<TGConnectingPoint num="4" id="5944" />
+<TGConnectingPoint num="5" id="5945" />
+<TGConnectingPoint num="6" id="5946" />
+<TGConnectingPoint num="7" id="5947" />
+<TGConnectingPoint num="8" id="5948" />
+<TGConnectingPoint num="9" id="5949" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5961" >
 <cdparam x="384" y="184" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="6125" />
-<TGConnectingPoint num="1" id="6126" />
-<TGConnectingPoint num="2" id="6127" />
-<TGConnectingPoint num="3" id="6128" />
-<TGConnectingPoint num="4" id="6129" />
-<TGConnectingPoint num="5" id="6130" />
-<TGConnectingPoint num="6" id="6131" />
-<TGConnectingPoint num="7" id="6132" />
-<TGConnectingPoint num="8" id="6133" />
-<TGConnectingPoint num="9" id="6134" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="6176" >
+<TGConnectingPoint num="0" id="5951" />
+<TGConnectingPoint num="1" id="5952" />
+<TGConnectingPoint num="2" id="5953" />
+<TGConnectingPoint num="3" id="5954" />
+<TGConnectingPoint num="4" id="5955" />
+<TGConnectingPoint num="5" id="5956" />
+<TGConnectingPoint num="6" id="5957" />
+<TGConnectingPoint num="7" id="5958" />
+<TGConnectingPoint num="8" id="5959" />
+<TGConnectingPoint num="9" id="5960" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6002" >
 <cdparam x="357" y="100" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="6136" />
-<TGConnectingPoint num="1" id="6137" />
-<TGConnectingPoint num="2" id="6138" />
-<TGConnectingPoint num="3" id="6139" />
-<TGConnectingPoint num="4" id="6140" />
-<TGConnectingPoint num="5" id="6141" />
-<TGConnectingPoint num="6" id="6142" />
-<TGConnectingPoint num="7" id="6143" />
-<TGConnectingPoint num="8" id="6144" />
-<TGConnectingPoint num="9" id="6145" />
-<TGConnectingPoint num="10" id="6146" />
-<TGConnectingPoint num="11" id="6147" />
-<TGConnectingPoint num="12" id="6148" />
-<TGConnectingPoint num="13" id="6149" />
-<TGConnectingPoint num="14" id="6150" />
-<TGConnectingPoint num="15" id="6151" />
-<TGConnectingPoint num="16" id="6152" />
-<TGConnectingPoint num="17" id="6153" />
-<TGConnectingPoint num="18" id="6154" />
-<TGConnectingPoint num="19" id="6155" />
-<TGConnectingPoint num="20" id="6156" />
-<TGConnectingPoint num="21" id="6157" />
-<TGConnectingPoint num="22" id="6158" />
-<TGConnectingPoint num="23" id="6159" />
-<TGConnectingPoint num="24" id="6160" />
-<TGConnectingPoint num="25" id="6161" />
-<TGConnectingPoint num="26" id="6162" />
-<TGConnectingPoint num="27" id="6163" />
-<TGConnectingPoint num="28" id="6164" />
-<TGConnectingPoint num="29" id="6165" />
-<TGConnectingPoint num="30" id="6166" />
-<TGConnectingPoint num="31" id="6167" />
-<TGConnectingPoint num="32" id="6168" />
-<TGConnectingPoint num="33" id="6169" />
-<TGConnectingPoint num="34" id="6170" />
-<TGConnectingPoint num="35" id="6171" />
-<TGConnectingPoint num="36" id="6172" />
-<TGConnectingPoint num="37" id="6173" />
-<TGConnectingPoint num="38" id="6174" />
-<TGConnectingPoint num="39" id="6175" />
+<TGConnectingPoint num="0" id="5962" />
+<TGConnectingPoint num="1" id="5963" />
+<TGConnectingPoint num="2" id="5964" />
+<TGConnectingPoint num="3" id="5965" />
+<TGConnectingPoint num="4" id="5966" />
+<TGConnectingPoint num="5" id="5967" />
+<TGConnectingPoint num="6" id="5968" />
+<TGConnectingPoint num="7" id="5969" />
+<TGConnectingPoint num="8" id="5970" />
+<TGConnectingPoint num="9" id="5971" />
+<TGConnectingPoint num="10" id="5972" />
+<TGConnectingPoint num="11" id="5973" />
+<TGConnectingPoint num="12" id="5974" />
+<TGConnectingPoint num="13" id="5975" />
+<TGConnectingPoint num="14" id="5976" />
+<TGConnectingPoint num="15" id="5977" />
+<TGConnectingPoint num="16" id="5978" />
+<TGConnectingPoint num="17" id="5979" />
+<TGConnectingPoint num="18" id="5980" />
+<TGConnectingPoint num="19" id="5981" />
+<TGConnectingPoint num="20" id="5982" />
+<TGConnectingPoint num="21" id="5983" />
+<TGConnectingPoint num="22" id="5984" />
+<TGConnectingPoint num="23" id="5985" />
+<TGConnectingPoint num="24" id="5986" />
+<TGConnectingPoint num="25" id="5987" />
+<TGConnectingPoint num="26" id="5988" />
+<TGConnectingPoint num="27" id="5989" />
+<TGConnectingPoint num="28" id="5990" />
+<TGConnectingPoint num="29" id="5991" />
+<TGConnectingPoint num="30" id="5992" />
+<TGConnectingPoint num="31" id="5993" />
+<TGConnectingPoint num="32" id="5994" />
+<TGConnectingPoint num="33" id="5995" />
+<TGConnectingPoint num="34" id="5996" />
+<TGConnectingPoint num="35" id="5997" />
+<TGConnectingPoint num="36" id="5998" />
+<TGConnectingPoint num="37" id="5999" />
+<TGConnectingPoint num="38" id="6000" />
+<TGConnectingPoint num="39" id="6001" />
 <extraparam>
 <entryCode value="printf(&quot;Door is closed\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="6178" >
+<COMPONENT type="5100" id="6004" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6177" />
+<TGConnectingPoint num="0" id="6003" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="WirelessInterface" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6185" >
+<CONNECTOR type="5102" id="6011" >
 <cdparam x="466" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="6184" />
-<P1  x="449" y="422" id="6208" />
-<P2  x="460" y="455" id="6259" />
+<TGConnectingPoint num="0" id="6010" />
+<P1  x="449" y="422" id="6034" />
+<P2  x="460" y="455" id="6085" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6183" >
-<father id="6185" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6009" >
+<father id="6011" num="0" />
 <cdparam x="466" y="459" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6179" />
-<TGConnectingPoint num="1" id="6180" />
-<TGConnectingPoint num="2" id="6181" />
-<TGConnectingPoint num="3" id="6182" />
+<TGConnectingPoint num="0" id="6005" />
+<TGConnectingPoint num="1" id="6006" />
+<TGConnectingPoint num="2" id="6007" />
+<TGConnectingPoint num="3" id="6008" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13318,25 +13067,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6192" >
+<CONNECTOR type="5102" id="6018" >
 <cdparam x="455" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="6191" />
-<P1  x="414" y="275" id="6224" />
-<P2  x="449" y="392" id="6207" />
+<TGConnectingPoint num="0" id="6017" />
+<P1  x="414" y="275" id="6050" />
+<P2  x="449" y="392" id="6033" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6190" >
-<father id="6192" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6016" >
+<father id="6018" num="0" />
 <cdparam x="441" y="319" />
 <sizeparam width="177" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6186" />
-<TGConnectingPoint num="1" id="6187" />
-<TGConnectingPoint num="2" id="6188" />
-<TGConnectingPoint num="3" id="6189" />
+<TGConnectingPoint num="0" id="6012" />
+<TGConnectingPoint num="1" id="6013" />
+<TGConnectingPoint num="2" id="6014" />
+<TGConnectingPoint num="3" id="6015" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13348,25 +13097,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6199" >
+<CONNECTOR type="5102" id="6025" >
 <cdparam x="386" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6198" />
-<P1  x="386" y="101" id="6272" />
-<P2  x="401" y="161" id="6261" />
+<TGConnectingPoint num="0" id="6024" />
+<P1  x="386" y="101" id="6098" />
+<P2  x="401" y="161" id="6087" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6197" >
-<father id="6199" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6023" >
+<father id="6025" num="0" />
 <cdparam x="386" y="141" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6193" />
-<TGConnectingPoint num="1" id="6194" />
-<TGConnectingPoint num="2" id="6195" />
-<TGConnectingPoint num="3" id="6196" />
+<TGConnectingPoint num="0" id="6019" />
+<TGConnectingPoint num="1" id="6020" />
+<TGConnectingPoint num="2" id="6021" />
+<TGConnectingPoint num="3" id="6022" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13376,25 +13125,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6206" >
+<CONNECTOR type="5102" id="6032" >
 <cdparam x="401" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="6205" />
-<P1  x="401" y="191" id="6262" />
-<P2  x="414" y="225" id="6219" />
+<TGConnectingPoint num="0" id="6031" />
+<P1  x="401" y="191" id="6088" />
+<P2  x="414" y="225" id="6045" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6204" >
-<father id="6206" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6030" >
+<father id="6032" num="0" />
 <cdparam x="453" y="214" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6200" />
-<TGConnectingPoint num="1" id="6201" />
-<TGConnectingPoint num="2" id="6202" />
-<TGConnectingPoint num="3" id="6203" />
+<TGConnectingPoint num="0" id="6026" />
+<TGConnectingPoint num="1" id="6027" />
+<TGConnectingPoint num="2" id="6028" />
+<TGConnectingPoint num="3" id="6029" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13404,109 +13153,109 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="6217" >
+<COMPONENT type="5103" id="6043" >
 <cdparam x="358" y="397" />
 <sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="remoteStart(selectedDuration)" />
-<TGConnectingPoint num="0" id="6207" />
-<TGConnectingPoint num="1" id="6208" />
-<TGConnectingPoint num="2" id="6209" />
-<TGConnectingPoint num="3" id="6210" />
-<TGConnectingPoint num="4" id="6211" />
-<TGConnectingPoint num="5" id="6212" />
-<TGConnectingPoint num="6" id="6213" />
-<TGConnectingPoint num="7" id="6214" />
-<TGConnectingPoint num="8" id="6215" />
-<TGConnectingPoint num="9" id="6216" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="6258" >
+<TGConnectingPoint num="0" id="6033" />
+<TGConnectingPoint num="1" id="6034" />
+<TGConnectingPoint num="2" id="6035" />
+<TGConnectingPoint num="3" id="6036" />
+<TGConnectingPoint num="4" id="6037" />
+<TGConnectingPoint num="5" id="6038" />
+<TGConnectingPoint num="6" id="6039" />
+<TGConnectingPoint num="7" id="6040" />
+<TGConnectingPoint num="8" id="6041" />
+<TGConnectingPoint num="9" id="6042" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6084" >
 <cdparam x="348" y="225" />
 <sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="gotWirelessOrder" />
-<TGConnectingPoint num="0" id="6218" />
-<TGConnectingPoint num="1" id="6219" />
-<TGConnectingPoint num="2" id="6220" />
-<TGConnectingPoint num="3" id="6221" />
-<TGConnectingPoint num="4" id="6222" />
-<TGConnectingPoint num="5" id="6223" />
-<TGConnectingPoint num="6" id="6224" />
-<TGConnectingPoint num="7" id="6225" />
-<TGConnectingPoint num="8" id="6226" />
-<TGConnectingPoint num="9" id="6227" />
-<TGConnectingPoint num="10" id="6228" />
-<TGConnectingPoint num="11" id="6229" />
-<TGConnectingPoint num="12" id="6230" />
-<TGConnectingPoint num="13" id="6231" />
-<TGConnectingPoint num="14" id="6232" />
-<TGConnectingPoint num="15" id="6233" />
-<TGConnectingPoint num="16" id="6234" />
-<TGConnectingPoint num="17" id="6235" />
-<TGConnectingPoint num="18" id="6236" />
-<TGConnectingPoint num="19" id="6237" />
-<TGConnectingPoint num="20" id="6238" />
-<TGConnectingPoint num="21" id="6239" />
-<TGConnectingPoint num="22" id="6240" />
-<TGConnectingPoint num="23" id="6241" />
-<TGConnectingPoint num="24" id="6242" />
-<TGConnectingPoint num="25" id="6243" />
-<TGConnectingPoint num="26" id="6244" />
-<TGConnectingPoint num="27" id="6245" />
-<TGConnectingPoint num="28" id="6246" />
-<TGConnectingPoint num="29" id="6247" />
-<TGConnectingPoint num="30" id="6248" />
-<TGConnectingPoint num="31" id="6249" />
-<TGConnectingPoint num="32" id="6250" />
-<TGConnectingPoint num="33" id="6251" />
-<TGConnectingPoint num="34" id="6252" />
-<TGConnectingPoint num="35" id="6253" />
-<TGConnectingPoint num="36" id="6254" />
-<TGConnectingPoint num="37" id="6255" />
-<TGConnectingPoint num="38" id="6256" />
-<TGConnectingPoint num="39" id="6257" />
+<TGConnectingPoint num="0" id="6044" />
+<TGConnectingPoint num="1" id="6045" />
+<TGConnectingPoint num="2" id="6046" />
+<TGConnectingPoint num="3" id="6047" />
+<TGConnectingPoint num="4" id="6048" />
+<TGConnectingPoint num="5" id="6049" />
+<TGConnectingPoint num="6" id="6050" />
+<TGConnectingPoint num="7" id="6051" />
+<TGConnectingPoint num="8" id="6052" />
+<TGConnectingPoint num="9" id="6053" />
+<TGConnectingPoint num="10" id="6054" />
+<TGConnectingPoint num="11" id="6055" />
+<TGConnectingPoint num="12" id="6056" />
+<TGConnectingPoint num="13" id="6057" />
+<TGConnectingPoint num="14" id="6058" />
+<TGConnectingPoint num="15" id="6059" />
+<TGConnectingPoint num="16" id="6060" />
+<TGConnectingPoint num="17" id="6061" />
+<TGConnectingPoint num="18" id="6062" />
+<TGConnectingPoint num="19" id="6063" />
+<TGConnectingPoint num="20" id="6064" />
+<TGConnectingPoint num="21" id="6065" />
+<TGConnectingPoint num="22" id="6066" />
+<TGConnectingPoint num="23" id="6067" />
+<TGConnectingPoint num="24" id="6068" />
+<TGConnectingPoint num="25" id="6069" />
+<TGConnectingPoint num="26" id="6070" />
+<TGConnectingPoint num="27" id="6071" />
+<TGConnectingPoint num="28" id="6072" />
+<TGConnectingPoint num="29" id="6073" />
+<TGConnectingPoint num="30" id="6074" />
+<TGConnectingPoint num="31" id="6075" />
+<TGConnectingPoint num="32" id="6076" />
+<TGConnectingPoint num="33" id="6077" />
+<TGConnectingPoint num="34" id="6078" />
+<TGConnectingPoint num="35" id="6079" />
+<TGConnectingPoint num="36" id="6080" />
+<TGConnectingPoint num="37" id="6081" />
+<TGConnectingPoint num="38" id="6082" />
+<TGConnectingPoint num="39" id="6083" />
 <extraparam>
 <entryCode value="printf(&quot;Got duration from remote control :%d\n&quot;, msg2__data);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="6260" >
+<COMPONENT type="5101" id="6086" >
 <cdparam x="450" y="460" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="6259" />
+<TGConnectingPoint num="0" id="6085" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="6271" >
+<COMPONENT type="5104" id="6097" >
 <cdparam x="311" y="166" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="wirelessChannelRead(msg2)" />
-<TGConnectingPoint num="0" id="6261" />
-<TGConnectingPoint num="1" id="6262" />
-<TGConnectingPoint num="2" id="6263" />
-<TGConnectingPoint num="3" id="6264" />
-<TGConnectingPoint num="4" id="6265" />
-<TGConnectingPoint num="5" id="6266" />
-<TGConnectingPoint num="6" id="6267" />
-<TGConnectingPoint num="7" id="6268" />
-<TGConnectingPoint num="8" id="6269" />
-<TGConnectingPoint num="9" id="6270" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="6273" >
+<TGConnectingPoint num="0" id="6087" />
+<TGConnectingPoint num="1" id="6088" />
+<TGConnectingPoint num="2" id="6089" />
+<TGConnectingPoint num="3" id="6090" />
+<TGConnectingPoint num="4" id="6091" />
+<TGConnectingPoint num="5" id="6092" />
+<TGConnectingPoint num="6" id="6093" />
+<TGConnectingPoint num="7" id="6094" />
+<TGConnectingPoint num="8" id="6095" />
+<TGConnectingPoint num="9" id="6096" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="6099" >
 <cdparam x="379" y="81" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6272" />
+<TGConnectingPoint num="0" id="6098" />
 </COMPONENT>
 
 
@@ -13570,13 +13319,13 @@ or by a maintenance station
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="6275" >
+<CONNECTOR type="5002" id="6101" >
 <cdparam x="770" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6274" />
-<P1  x="722" y="954" id="6442" />
-<P2  x="727" y="996" id="6293" />
+<TGConnectingPoint num="0" id="6100" />
+<P1  x="722" y="954" id="6268" />
+<P2  x="727" y="996" id="6119" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obs_open()" />
@@ -13588,13 +13337,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="6277" >
+<CONNECTOR type="5002" id="6103" >
 <cdparam x="344" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6276" />
-<P1  x="468" y="658" id="6362" />
-<P2  x="173" y="657" id="6512" />
+<TGConnectingPoint num="0" id="6102" />
+<P1  x="468" y="658" id="6188" />
+<P2  x="173" y="657" id="6338" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -13602,15 +13351,15 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="6283" >
+<CONNECTOR type="5002" id="6109" >
 <cdparam x="800" y="441" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6280" />
-<TGConnectingPoint num="1" id="6281" />
-<TGConnectingPoint num="2" id="6282" />
-<P1  x="389" y="343" id="6560" />
-<P2  x="873" y="343" id="6561" />
+<TGConnectingPoint num="0" id="6106" />
+<TGConnectingPoint num="1" id="6107" />
+<TGConnectingPoint num="2" id="6108" />
+<P1  x="389" y="343" id="6386" />
+<P2  x="873" y="343" id="6387" />
 <Point x="395" y="310" />
 <Point x="878" y="310" />
 <AutomaticDrawing  data="true" />
@@ -13619,16 +13368,16 @@ or by a maintenance station
 <osd value="out wirelessChannelWrite(Message msg)" />
 <FIFOType asynchronous="true" size="5" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="6278" >
-<father id="6283" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6104" >
+<father id="6109" num="0" />
 <cdparam x="395" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6279" >
-<father id="6283" num="1" />
+<SUBCOMPONENT type="-1" id="6105" >
+<father id="6109" num="1" />
 <cdparam x="878" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -13636,13 +13385,13 @@ or by a maintenance station
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="6285" >
+<CONNECTOR type="5002" id="6111" >
 <cdparam x="719" y="481" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6284" />
-<P1  x="476" y="912" id="6439" />
-<P2  x="377" y="911" id="6481" />
+<TGConnectingPoint num="0" id="6110" />
+<P1  x="476" y="912" id="6265" />
+<P2  x="377" y="911" id="6307" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -13650,13 +13399,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="6287" >
+<CONNECTOR type="5002" id="6113" >
 <cdparam x="422" y="503" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6286" />
-<P1  x="850" y="926" id="6389" />
-<P2  x="804" y="912" id="6440" />
+<TGConnectingPoint num="0" id="6112" />
+<P1  x="850" y="926" id="6215" />
+<P2  x="804" y="912" id="6266" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in unlockDoor()" />
@@ -13668,13 +13417,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="6289" >
+<CONNECTOR type="5002" id="6115" >
 <cdparam x="714" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6288" />
-<P1  x="804" y="787" id="6429" />
-<P2  x="835" y="698" id="6405" />
+<TGConnectingPoint num="0" id="6114" />
+<P1  x="804" y="787" id="6255" />
+<P2  x="835" y="698" id="6231" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -13684,13 +13433,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="6291" >
+<CONNECTOR type="5002" id="6117" >
 <cdparam x="394" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="6290" />
-<P1  x="443" y="757" id="6456" />
-<P2  x="476" y="870" id="6430" />
+<TGConnectingPoint num="0" id="6116" />
+<P1  x="443" y="757" id="6282" />
+<P2  x="476" y="870" id="6256" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in LEDOn()" />
@@ -13702,83 +13451,83 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="6316" >
+<COMPONENT type="5000" id="6142" >
 <cdparam x="615" y="996" />
 <sizeparam width="225" height="131" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="ObserverProp1" />
-<TGConnectingPoint num="0" id="6292" />
-<TGConnectingPoint num="1" id="6293" />
-<TGConnectingPoint num="2" id="6294" />
-<TGConnectingPoint num="3" id="6295" />
-<TGConnectingPoint num="4" id="6296" />
-<TGConnectingPoint num="5" id="6297" />
-<TGConnectingPoint num="6" id="6298" />
-<TGConnectingPoint num="7" id="6299" />
-<TGConnectingPoint num="8" id="6300" />
-<TGConnectingPoint num="9" id="6301" />
-<TGConnectingPoint num="10" id="6302" />
-<TGConnectingPoint num="11" id="6303" />
-<TGConnectingPoint num="12" id="6304" />
-<TGConnectingPoint num="13" id="6305" />
-<TGConnectingPoint num="14" id="6306" />
-<TGConnectingPoint num="15" id="6307" />
-<TGConnectingPoint num="16" id="6308" />
-<TGConnectingPoint num="17" id="6309" />
-<TGConnectingPoint num="18" id="6310" />
-<TGConnectingPoint num="19" id="6311" />
-<TGConnectingPoint num="20" id="6312" />
-<TGConnectingPoint num="21" id="6313" />
-<TGConnectingPoint num="22" id="6314" />
-<TGConnectingPoint num="23" id="6315" />
+<TGConnectingPoint num="0" id="6118" />
+<TGConnectingPoint num="1" id="6119" />
+<TGConnectingPoint num="2" id="6120" />
+<TGConnectingPoint num="3" id="6121" />
+<TGConnectingPoint num="4" id="6122" />
+<TGConnectingPoint num="5" id="6123" />
+<TGConnectingPoint num="6" id="6124" />
+<TGConnectingPoint num="7" id="6125" />
+<TGConnectingPoint num="8" id="6126" />
+<TGConnectingPoint num="9" id="6127" />
+<TGConnectingPoint num="10" id="6128" />
+<TGConnectingPoint num="11" id="6129" />
+<TGConnectingPoint num="12" id="6130" />
+<TGConnectingPoint num="13" id="6131" />
+<TGConnectingPoint num="14" id="6132" />
+<TGConnectingPoint num="15" id="6133" />
+<TGConnectingPoint num="16" id="6134" />
+<TGConnectingPoint num="17" id="6135" />
+<TGConnectingPoint num="18" id="6136" />
+<TGConnectingPoint num="19" id="6137" />
+<TGConnectingPoint num="20" id="6138" />
+<TGConnectingPoint num="21" id="6139" />
+<TGConnectingPoint num="22" id="6140" />
+<TGConnectingPoint num="23" id="6141" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in obs_open()" />
-<Signal value="in obs_closed()" />
-<Signal value="in obs_magnetronStart()" />
+<Signal value="in obs_open()" attached="false" />
+<Signal value="in obs_closed()" attached="false" />
+<Signal value="in obs_magnetronStart()" attached="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="6325" >
+<COMPONENT type="5003" id="6151" >
 <cdparam x="384" y="998" />
 <sizeparam width="203" height="93" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="6317" />
-<TGConnectingPoint num="1" id="6318" />
-<TGConnectingPoint num="2" id="6319" />
-<TGConnectingPoint num="3" id="6320" />
-<TGConnectingPoint num="4" id="6321" />
-<TGConnectingPoint num="5" id="6322" />
-<TGConnectingPoint num="6" id="6323" />
-<TGConnectingPoint num="7" id="6324" />
+<TGConnectingPoint num="0" id="6143" />
+<TGConnectingPoint num="1" id="6144" />
+<TGConnectingPoint num="2" id="6145" />
+<TGConnectingPoint num="3" id="6146" />
+<TGConnectingPoint num="4" id="6147" />
+<TGConnectingPoint num="5" id="6148" />
+<TGConnectingPoint num="6" id="6149" />
+<TGConnectingPoint num="7" id="6150" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="6334" >
+<COMPONENT type="5003" id="6160" >
 <cdparam x="150" y="996" />
 <sizeparam width="203" height="90" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="6326" />
-<TGConnectingPoint num="1" id="6327" />
-<TGConnectingPoint num="2" id="6328" />
-<TGConnectingPoint num="3" id="6329" />
-<TGConnectingPoint num="4" id="6330" />
-<TGConnectingPoint num="5" id="6331" />
-<TGConnectingPoint num="6" id="6332" />
-<TGConnectingPoint num="7" id="6333" />
+<TGConnectingPoint num="0" id="6152" />
+<TGConnectingPoint num="1" id="6153" />
+<TGConnectingPoint num="2" id="6154" />
+<TGConnectingPoint num="3" id="6155" />
+<TGConnectingPoint num="4" id="6156" />
+<TGConnectingPoint num="5" id="6157" />
+<TGConnectingPoint num="6" id="6158" />
+<TGConnectingPoint num="7" id="6159" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="6351" >
+<COMPONENT type="301" id="6177" >
 <cdparam x="130" y="222" />
 <sizeparam width="586" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -13788,22 +13537,22 @@ or by a maintenance station
 
 #InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK
 " />
-<TGConnectingPoint num="0" id="6335" />
-<TGConnectingPoint num="1" id="6336" />
-<TGConnectingPoint num="2" id="6337" />
-<TGConnectingPoint num="3" id="6338" />
-<TGConnectingPoint num="4" id="6339" />
-<TGConnectingPoint num="5" id="6340" />
-<TGConnectingPoint num="6" id="6341" />
-<TGConnectingPoint num="7" id="6342" />
-<TGConnectingPoint num="8" id="6343" />
-<TGConnectingPoint num="9" id="6344" />
-<TGConnectingPoint num="10" id="6345" />
-<TGConnectingPoint num="11" id="6346" />
-<TGConnectingPoint num="12" id="6347" />
-<TGConnectingPoint num="13" id="6348" />
-<TGConnectingPoint num="14" id="6349" />
-<TGConnectingPoint num="15" id="6350" />
+<TGConnectingPoint num="0" id="6161" />
+<TGConnectingPoint num="1" id="6162" />
+<TGConnectingPoint num="2" id="6163" />
+<TGConnectingPoint num="3" id="6164" />
+<TGConnectingPoint num="4" id="6165" />
+<TGConnectingPoint num="5" id="6166" />
+<TGConnectingPoint num="6" id="6167" />
+<TGConnectingPoint num="7" id="6168" />
+<TGConnectingPoint num="8" id="6169" />
+<TGConnectingPoint num="9" id="6170" />
+<TGConnectingPoint num="10" id="6171" />
+<TGConnectingPoint num="11" id="6172" />
+<TGConnectingPoint num="12" id="6173" />
+<TGConnectingPoint num="13" id="6174" />
+<TGConnectingPoint num="14" id="6175" />
+<TGConnectingPoint num="15" id="6176" />
 <extraparam>
 <Line value="#Confidentiality RemoteControl.duration" />
 <Line value="#Authenticity RemoteControl.SendingRemoteOrder.msg1 WirelessInterface.gotWirelessOrder.msg2" />
@@ -13812,111 +13561,111 @@ or by a maintenance station
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="6576" >
+<COMPONENT type="5000" id="6402" >
 <cdparam x="148" y="343" />
 <sizeparam width="967" height="631" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="RemotelyControlledMicrowave" />
-<TGConnectingPoint num="0" id="6552" />
-<TGConnectingPoint num="1" id="6553" />
-<TGConnectingPoint num="2" id="6554" />
-<TGConnectingPoint num="3" id="6555" />
-<TGConnectingPoint num="4" id="6556" />
-<TGConnectingPoint num="5" id="6557" />
-<TGConnectingPoint num="6" id="6558" />
-<TGConnectingPoint num="7" id="6559" />
-<TGConnectingPoint num="8" id="6560" />
-<TGConnectingPoint num="9" id="6561" />
-<TGConnectingPoint num="10" id="6562" />
-<TGConnectingPoint num="11" id="6563" />
-<TGConnectingPoint num="12" id="6564" />
-<TGConnectingPoint num="13" id="6565" />
-<TGConnectingPoint num="14" id="6566" />
-<TGConnectingPoint num="15" id="6567" />
-<TGConnectingPoint num="16" id="6568" />
-<TGConnectingPoint num="17" id="6569" />
-<TGConnectingPoint num="18" id="6570" />
-<TGConnectingPoint num="19" id="6571" />
-<TGConnectingPoint num="20" id="6572" />
-<TGConnectingPoint num="21" id="6573" />
-<TGConnectingPoint num="22" id="6574" />
-<TGConnectingPoint num="23" id="6575" />
+<TGConnectingPoint num="0" id="6378" />
+<TGConnectingPoint num="1" id="6379" />
+<TGConnectingPoint num="2" id="6380" />
+<TGConnectingPoint num="3" id="6381" />
+<TGConnectingPoint num="4" id="6382" />
+<TGConnectingPoint num="5" id="6383" />
+<TGConnectingPoint num="6" id="6384" />
+<TGConnectingPoint num="7" id="6385" />
+<TGConnectingPoint num="8" id="6386" />
+<TGConnectingPoint num="9" id="6387" />
+<TGConnectingPoint num="10" id="6388" />
+<TGConnectingPoint num="11" id="6389" />
+<TGConnectingPoint num="12" id="6390" />
+<TGConnectingPoint num="13" id="6391" />
+<TGConnectingPoint num="14" id="6392" />
+<TGConnectingPoint num="15" id="6393" />
+<TGConnectingPoint num="16" id="6394" />
+<TGConnectingPoint num="17" id="6395" />
+<TGConnectingPoint num="18" id="6396" />
+<TGConnectingPoint num="19" id="6397" />
+<TGConnectingPoint num="20" id="6398" />
+<TGConnectingPoint num="21" id="6399" />
+<TGConnectingPoint num="22" id="6400" />
+<TGConnectingPoint num="23" id="6401" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in wirelessChannelRead(Message msg)" />
-<Signal value="out wirelessChannelWrite(Message msg)" />
+<Signal value="in wirelessChannelRead(Message msg)" attached="false" />
+<Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="6526" >
-<father id="6576" num="0" />
+<SUBCOMPONENT type="5000" id="6352" >
+<father id="6402" num="0" />
 <cdparam x="173" y="554" />
 <sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
 <infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="6502" />
-<TGConnectingPoint num="1" id="6503" />
-<TGConnectingPoint num="2" id="6504" />
-<TGConnectingPoint num="3" id="6505" />
-<TGConnectingPoint num="4" id="6506" />
-<TGConnectingPoint num="5" id="6507" />
-<TGConnectingPoint num="6" id="6508" />
-<TGConnectingPoint num="7" id="6509" />
-<TGConnectingPoint num="8" id="6510" />
-<TGConnectingPoint num="9" id="6511" />
-<TGConnectingPoint num="10" id="6512" />
-<TGConnectingPoint num="11" id="6513" />
-<TGConnectingPoint num="12" id="6514" />
-<TGConnectingPoint num="13" id="6515" />
-<TGConnectingPoint num="14" id="6516" />
-<TGConnectingPoint num="15" id="6517" />
-<TGConnectingPoint num="16" id="6518" />
-<TGConnectingPoint num="17" id="6519" />
-<TGConnectingPoint num="18" id="6520" />
-<TGConnectingPoint num="19" id="6521" />
-<TGConnectingPoint num="20" id="6522" />
-<TGConnectingPoint num="21" id="6523" />
-<TGConnectingPoint num="22" id="6524" />
-<TGConnectingPoint num="23" id="6525" />
+<TGConnectingPoint num="0" id="6328" />
+<TGConnectingPoint num="1" id="6329" />
+<TGConnectingPoint num="2" id="6330" />
+<TGConnectingPoint num="3" id="6331" />
+<TGConnectingPoint num="4" id="6332" />
+<TGConnectingPoint num="5" id="6333" />
+<TGConnectingPoint num="6" id="6334" />
+<TGConnectingPoint num="7" id="6335" />
+<TGConnectingPoint num="8" id="6336" />
+<TGConnectingPoint num="9" id="6337" />
+<TGConnectingPoint num="10" id="6338" />
+<TGConnectingPoint num="11" id="6339" />
+<TGConnectingPoint num="12" id="6340" />
+<TGConnectingPoint num="13" id="6341" />
+<TGConnectingPoint num="14" id="6342" />
+<TGConnectingPoint num="15" id="6343" />
+<TGConnectingPoint num="16" id="6344" />
+<TGConnectingPoint num="17" id="6345" />
+<TGConnectingPoint num="18" id="6346" />
+<TGConnectingPoint num="19" id="6347" />
+<TGConnectingPoint num="20" id="6348" />
+<TGConnectingPoint num="21" id="6349" />
+<TGConnectingPoint num="22" id="6350" />
+<TGConnectingPoint num="23" id="6351" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" />
+<Signal value="in remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6376" >
-<father id="6526" num="0" />
+<SUBCOMPONENT type="5000" id="6202" >
+<father id="6352" num="0" />
 <cdparam x="468" y="620" />
 <sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
 <infoparam name="Block0" value="WirelessInterface" />
-<TGConnectingPoint num="0" id="6352" />
-<TGConnectingPoint num="1" id="6353" />
-<TGConnectingPoint num="2" id="6354" />
-<TGConnectingPoint num="3" id="6355" />
-<TGConnectingPoint num="4" id="6356" />
-<TGConnectingPoint num="5" id="6357" />
-<TGConnectingPoint num="6" id="6358" />
-<TGConnectingPoint num="7" id="6359" />
-<TGConnectingPoint num="8" id="6360" />
-<TGConnectingPoint num="9" id="6361" />
-<TGConnectingPoint num="10" id="6362" />
-<TGConnectingPoint num="11" id="6363" />
-<TGConnectingPoint num="12" id="6364" />
-<TGConnectingPoint num="13" id="6365" />
-<TGConnectingPoint num="14" id="6366" />
-<TGConnectingPoint num="15" id="6367" />
-<TGConnectingPoint num="16" id="6368" />
-<TGConnectingPoint num="17" id="6369" />
-<TGConnectingPoint num="18" id="6370" />
-<TGConnectingPoint num="19" id="6371" />
-<TGConnectingPoint num="20" id="6372" />
-<TGConnectingPoint num="21" id="6373" />
-<TGConnectingPoint num="22" id="6374" />
-<TGConnectingPoint num="23" id="6375" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="6178" />
+<TGConnectingPoint num="1" id="6179" />
+<TGConnectingPoint num="2" id="6180" />
+<TGConnectingPoint num="3" id="6181" />
+<TGConnectingPoint num="4" id="6182" />
+<TGConnectingPoint num="5" id="6183" />
+<TGConnectingPoint num="6" id="6184" />
+<TGConnectingPoint num="7" id="6185" />
+<TGConnectingPoint num="8" id="6186" />
+<TGConnectingPoint num="9" id="6187" />
+<TGConnectingPoint num="10" id="6188" />
+<TGConnectingPoint num="11" id="6189" />
+<TGConnectingPoint num="12" id="6190" />
+<TGConnectingPoint num="13" id="6191" />
+<TGConnectingPoint num="14" id="6192" />
+<TGConnectingPoint num="15" id="6193" />
+<TGConnectingPoint num="16" id="6194" />
+<TGConnectingPoint num="17" id="6195" />
+<TGConnectingPoint num="18" id="6196" />
+<TGConnectingPoint num="19" id="6197" />
+<TGConnectingPoint num="20" id="6198" />
+<TGConnectingPoint num="21" id="6199" />
+<TGConnectingPoint num="22" id="6200" />
+<TGConnectingPoint num="23" id="6201" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
@@ -13932,47 +13681,57 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Signal value="out remoteStart(int value)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6401" >
-<father id="6526" num="1" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+<Signal value="out remoteStart(int value)" attached="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="6227" >
+<father id="6352" num="1" />
 <cdparam x="850" y="832" />
 <sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
 <infoparam name="Block0" value="Door" />
-<TGConnectingPoint num="0" id="6377" />
-<TGConnectingPoint num="1" id="6378" />
-<TGConnectingPoint num="2" id="6379" />
-<TGConnectingPoint num="3" id="6380" />
-<TGConnectingPoint num="4" id="6381" />
-<TGConnectingPoint num="5" id="6382" />
-<TGConnectingPoint num="6" id="6383" />
-<TGConnectingPoint num="7" id="6384" />
-<TGConnectingPoint num="8" id="6385" />
-<TGConnectingPoint num="9" id="6386" />
-<TGConnectingPoint num="10" id="6387" />
-<TGConnectingPoint num="11" id="6388" />
-<TGConnectingPoint num="12" id="6389" />
-<TGConnectingPoint num="13" id="6390" />
-<TGConnectingPoint num="14" id="6391" />
-<TGConnectingPoint num="15" id="6392" />
-<TGConnectingPoint num="16" id="6393" />
-<TGConnectingPoint num="17" id="6394" />
-<TGConnectingPoint num="18" id="6395" />
-<TGConnectingPoint num="19" id="6396" />
-<TGConnectingPoint num="20" id="6397" />
-<TGConnectingPoint num="21" id="6398" />
-<TGConnectingPoint num="22" id="6399" />
-<TGConnectingPoint num="23" id="6400" />
+<TGConnectingPoint num="0" id="6203" />
+<TGConnectingPoint num="1" id="6204" />
+<TGConnectingPoint num="2" id="6205" />
+<TGConnectingPoint num="3" id="6206" />
+<TGConnectingPoint num="4" id="6207" />
+<TGConnectingPoint num="5" id="6208" />
+<TGConnectingPoint num="6" id="6209" />
+<TGConnectingPoint num="7" id="6210" />
+<TGConnectingPoint num="8" id="6211" />
+<TGConnectingPoint num="9" id="6212" />
+<TGConnectingPoint num="10" id="6213" />
+<TGConnectingPoint num="11" id="6214" />
+<TGConnectingPoint num="12" id="6215" />
+<TGConnectingPoint num="13" id="6216" />
+<TGConnectingPoint num="14" id="6217" />
+<TGConnectingPoint num="15" id="6218" />
+<TGConnectingPoint num="16" id="6219" />
+<TGConnectingPoint num="17" id="6220" />
+<TGConnectingPoint num="18" id="6221" />
+<TGConnectingPoint num="19" id="6222" />
+<TGConnectingPoint num="20" id="6223" />
+<TGConnectingPoint num="21" id="6224" />
+<TGConnectingPoint num="22" id="6225" />
+<TGConnectingPoint num="23" id="6226" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$openM()" />
 <Method value="$closeM()" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
-<Signal value="in unlockDoor()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
+<Signal value="in unlockDoor()" attached="false" />
 <globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
@@ -13988,44 +13747,44 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6426" >
-<father id="6526" num="2" />
+<SUBCOMPONENT type="5000" id="6252" >
+<father id="6352" num="2" />
 <cdparam x="835" y="618" />
 <sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
 <infoparam name="Block0" value="Magnetron" />
-<TGConnectingPoint num="0" id="6402" />
-<TGConnectingPoint num="1" id="6403" />
-<TGConnectingPoint num="2" id="6404" />
-<TGConnectingPoint num="3" id="6405" />
-<TGConnectingPoint num="4" id="6406" />
-<TGConnectingPoint num="5" id="6407" />
-<TGConnectingPoint num="6" id="6408" />
-<TGConnectingPoint num="7" id="6409" />
-<TGConnectingPoint num="8" id="6410" />
-<TGConnectingPoint num="9" id="6411" />
-<TGConnectingPoint num="10" id="6412" />
-<TGConnectingPoint num="11" id="6413" />
-<TGConnectingPoint num="12" id="6414" />
-<TGConnectingPoint num="13" id="6415" />
-<TGConnectingPoint num="14" id="6416" />
-<TGConnectingPoint num="15" id="6417" />
-<TGConnectingPoint num="16" id="6418" />
-<TGConnectingPoint num="17" id="6419" />
-<TGConnectingPoint num="18" id="6420" />
-<TGConnectingPoint num="19" id="6421" />
-<TGConnectingPoint num="20" id="6422" />
-<TGConnectingPoint num="21" id="6423" />
-<TGConnectingPoint num="22" id="6424" />
-<TGConnectingPoint num="23" id="6425" />
+<TGConnectingPoint num="0" id="6228" />
+<TGConnectingPoint num="1" id="6229" />
+<TGConnectingPoint num="2" id="6230" />
+<TGConnectingPoint num="3" id="6231" />
+<TGConnectingPoint num="4" id="6232" />
+<TGConnectingPoint num="5" id="6233" />
+<TGConnectingPoint num="6" id="6234" />
+<TGConnectingPoint num="7" id="6235" />
+<TGConnectingPoint num="8" id="6236" />
+<TGConnectingPoint num="9" id="6237" />
+<TGConnectingPoint num="10" id="6238" />
+<TGConnectingPoint num="11" id="6239" />
+<TGConnectingPoint num="12" id="6240" />
+<TGConnectingPoint num="13" id="6241" />
+<TGConnectingPoint num="14" id="6242" />
+<TGConnectingPoint num="15" id="6243" />
+<TGConnectingPoint num="16" id="6244" />
+<TGConnectingPoint num="17" id="6245" />
+<TGConnectingPoint num="18" id="6246" />
+<TGConnectingPoint num="19" id="6247" />
+<TGConnectingPoint num="20" id="6248" />
+<TGConnectingPoint num="21" id="6249" />
+<TGConnectingPoint num="22" id="6250" />
+<TGConnectingPoint num="23" id="6251" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="power" value="0" type="8" typeOther="" />
 <Method value="$ON()" />
 <Method value="$OFF()" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="" />
@@ -14038,55 +13797,55 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6451" >
-<father id="6526" num="3" />
+<SUBCOMPONENT type="5000" id="6277" >
+<father id="6352" num="3" />
 <cdparam x="476" y="787" />
 <sizeparam width="328" height="167" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="593" minY="0" maxY="245" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="6427" />
-<TGConnectingPoint num="1" id="6428" />
-<TGConnectingPoint num="2" id="6429" />
-<TGConnectingPoint num="3" id="6430" />
-<TGConnectingPoint num="4" id="6431" />
-<TGConnectingPoint num="5" id="6432" />
-<TGConnectingPoint num="6" id="6433" />
-<TGConnectingPoint num="7" id="6434" />
-<TGConnectingPoint num="8" id="6435" />
-<TGConnectingPoint num="9" id="6436" />
-<TGConnectingPoint num="10" id="6437" />
-<TGConnectingPoint num="11" id="6438" />
-<TGConnectingPoint num="12" id="6439" />
-<TGConnectingPoint num="13" id="6440" />
-<TGConnectingPoint num="14" id="6441" />
-<TGConnectingPoint num="15" id="6442" />
-<TGConnectingPoint num="16" id="6443" />
-<TGConnectingPoint num="17" id="6444" />
-<TGConnectingPoint num="18" id="6445" />
-<TGConnectingPoint num="19" id="6446" />
-<TGConnectingPoint num="20" id="6447" />
-<TGConnectingPoint num="21" id="6448" />
-<TGConnectingPoint num="22" id="6449" />
-<TGConnectingPoint num="23" id="6450" />
+<TGConnectingPoint num="0" id="6253" />
+<TGConnectingPoint num="1" id="6254" />
+<TGConnectingPoint num="2" id="6255" />
+<TGConnectingPoint num="3" id="6256" />
+<TGConnectingPoint num="4" id="6257" />
+<TGConnectingPoint num="5" id="6258" />
+<TGConnectingPoint num="6" id="6259" />
+<TGConnectingPoint num="7" id="6260" />
+<TGConnectingPoint num="8" id="6261" />
+<TGConnectingPoint num="9" id="6262" />
+<TGConnectingPoint num="10" id="6263" />
+<TGConnectingPoint num="11" id="6264" />
+<TGConnectingPoint num="12" id="6265" />
+<TGConnectingPoint num="13" id="6266" />
+<TGConnectingPoint num="14" id="6267" />
+<TGConnectingPoint num="15" id="6268" />
+<TGConnectingPoint num="16" id="6269" />
+<TGConnectingPoint num="17" id="6270" />
+<TGConnectingPoint num="18" id="6271" />
+<TGConnectingPoint num="19" id="6272" />
+<TGConnectingPoint num="20" id="6273" />
+<TGConnectingPoint num="21" id="6274" />
+<TGConnectingPoint num="22" id="6275" />
+<TGConnectingPoint num="23" id="6276" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
 <Method value="$startCooking(int duration)" />
 <Method value="$durationModified(int duration)" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out obs_open()" />
-<Signal value="out obs_closed()" />
-<Signal value="out obs_magnetronStart()" />
-<Signal value="out unlockDoor()" />
+<Signal value="in start(int duration)" attached="false" />
+<Signal value="in closed()" attached="false" />
+<Signal value="in open()" attached="false" />
+<Signal value="out ringBell()" attached="false" />
+<Signal value="out startMagnetron()" attached="false" />
+<Signal value="out stopMagnetron()" attached="false" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out obs_open()" attached="false" />
+<Signal value="out obs_closed()" attached="false" />
+<Signal value="out obs_magnetronStart()" attached="false" />
+<Signal value="out unlockDoor()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dur = &quot;Duration&quot;;" />
@@ -14117,80 +13876,80 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6476" >
-<father id="6526" num="4" />
+<SUBCOMPONENT type="5000" id="6302" >
+<father id="6352" num="4" />
 <cdparam x="187" y="676" />
 <sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
 <infoparam name="Block0" value="ControlPanel" />
-<TGConnectingPoint num="0" id="6452" />
-<TGConnectingPoint num="1" id="6453" />
-<TGConnectingPoint num="2" id="6454" />
-<TGConnectingPoint num="3" id="6455" />
-<TGConnectingPoint num="4" id="6456" />
-<TGConnectingPoint num="5" id="6457" />
-<TGConnectingPoint num="6" id="6458" />
-<TGConnectingPoint num="7" id="6459" />
-<TGConnectingPoint num="8" id="6460" />
-<TGConnectingPoint num="9" id="6461" />
-<TGConnectingPoint num="10" id="6462" />
-<TGConnectingPoint num="11" id="6463" />
-<TGConnectingPoint num="12" id="6464" />
-<TGConnectingPoint num="13" id="6465" />
-<TGConnectingPoint num="14" id="6466" />
-<TGConnectingPoint num="15" id="6467" />
-<TGConnectingPoint num="16" id="6468" />
-<TGConnectingPoint num="17" id="6469" />
-<TGConnectingPoint num="18" id="6470" />
-<TGConnectingPoint num="19" id="6471" />
-<TGConnectingPoint num="20" id="6472" />
-<TGConnectingPoint num="21" id="6473" />
-<TGConnectingPoint num="22" id="6474" />
-<TGConnectingPoint num="23" id="6475" />
+<TGConnectingPoint num="0" id="6278" />
+<TGConnectingPoint num="1" id="6279" />
+<TGConnectingPoint num="2" id="6280" />
+<TGConnectingPoint num="3" id="6281" />
+<TGConnectingPoint num="4" id="6282" />
+<TGConnectingPoint num="5" id="6283" />
+<TGConnectingPoint num="6" id="6284" />
+<TGConnectingPoint num="7" id="6285" />
+<TGConnectingPoint num="8" id="6286" />
+<TGConnectingPoint num="9" id="6287" />
+<TGConnectingPoint num="10" id="6288" />
+<TGConnectingPoint num="11" id="6289" />
+<TGConnectingPoint num="12" id="6290" />
+<TGConnectingPoint num="13" id="6291" />
+<TGConnectingPoint num="14" id="6292" />
+<TGConnectingPoint num="15" id="6293" />
+<TGConnectingPoint num="16" id="6294" />
+<TGConnectingPoint num="17" id="6295" />
+<TGConnectingPoint num="18" id="6296" />
+<TGConnectingPoint num="19" id="6297" />
+<TGConnectingPoint num="20" id="6298" />
+<TGConnectingPoint num="21" id="6299" />
+<TGConnectingPoint num="22" id="6300" />
+<TGConnectingPoint num="23" id="6301" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6501" >
-<father id="6526" num="5" />
+<SUBCOMPONENT type="5000" id="6327" >
+<father id="6352" num="5" />
 <cdparam x="196" y="864" />
 <sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
 <infoparam name="Block0" value="Bell" />
-<TGConnectingPoint num="0" id="6477" />
-<TGConnectingPoint num="1" id="6478" />
-<TGConnectingPoint num="2" id="6479" />
-<TGConnectingPoint num="3" id="6480" />
-<TGConnectingPoint num="4" id="6481" />
-<TGConnectingPoint num="5" id="6482" />
-<TGConnectingPoint num="6" id="6483" />
-<TGConnectingPoint num="7" id="6484" />
-<TGConnectingPoint num="8" id="6485" />
-<TGConnectingPoint num="9" id="6486" />
-<TGConnectingPoint num="10" id="6487" />
-<TGConnectingPoint num="11" id="6488" />
-<TGConnectingPoint num="12" id="6489" />
-<TGConnectingPoint num="13" id="6490" />
-<TGConnectingPoint num="14" id="6491" />
-<TGConnectingPoint num="15" id="6492" />
-<TGConnectingPoint num="16" id="6493" />
-<TGConnectingPoint num="17" id="6494" />
-<TGConnectingPoint num="18" id="6495" />
-<TGConnectingPoint num="19" id="6496" />
-<TGConnectingPoint num="20" id="6497" />
-<TGConnectingPoint num="21" id="6498" />
-<TGConnectingPoint num="22" id="6499" />
-<TGConnectingPoint num="23" id="6500" />
+<TGConnectingPoint num="0" id="6303" />
+<TGConnectingPoint num="1" id="6304" />
+<TGConnectingPoint num="2" id="6305" />
+<TGConnectingPoint num="3" id="6306" />
+<TGConnectingPoint num="4" id="6307" />
+<TGConnectingPoint num="5" id="6308" />
+<TGConnectingPoint num="6" id="6309" />
+<TGConnectingPoint num="7" id="6310" />
+<TGConnectingPoint num="8" id="6311" />
+<TGConnectingPoint num="9" id="6312" />
+<TGConnectingPoint num="10" id="6313" />
+<TGConnectingPoint num="11" id="6314" />
+<TGConnectingPoint num="12" id="6315" />
+<TGConnectingPoint num="13" id="6316" />
+<TGConnectingPoint num="14" id="6317" />
+<TGConnectingPoint num="15" id="6318" />
+<TGConnectingPoint num="16" id="6319" />
+<TGConnectingPoint num="17" id="6320" />
+<TGConnectingPoint num="18" id="6321" />
+<TGConnectingPoint num="19" id="6322" />
+<TGConnectingPoint num="20" id="6323" />
+<TGConnectingPoint num="21" id="6324" />
+<TGConnectingPoint num="22" id="6325" />
+<TGConnectingPoint num="23" id="6326" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$runBell()" />
-<Signal value="in ring()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
@@ -14200,39 +13959,39 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="6551" >
-<father id="6576" num="1" />
+<SUBCOMPONENT type="5000" id="6377" >
+<father id="6402" num="1" />
 <cdparam x="491" y="390" />
 <sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
 <infoparam name="Block0" value="RemoteControl" />
-<TGConnectingPoint num="0" id="6527" />
-<TGConnectingPoint num="1" id="6528" />
-<TGConnectingPoint num="2" id="6529" />
-<TGConnectingPoint num="3" id="6530" />
-<TGConnectingPoint num="4" id="6531" />
-<TGConnectingPoint num="5" id="6532" />
-<TGConnectingPoint num="6" id="6533" />
-<TGConnectingPoint num="7" id="6534" />
-<TGConnectingPoint num="8" id="6535" />
-<TGConnectingPoint num="9" id="6536" />
-<TGConnectingPoint num="10" id="6537" />
-<TGConnectingPoint num="11" id="6538" />
-<TGConnectingPoint num="12" id="6539" />
-<TGConnectingPoint num="13" id="6540" />
-<TGConnectingPoint num="14" id="6541" />
-<TGConnectingPoint num="15" id="6542" />
-<TGConnectingPoint num="16" id="6543" />
-<TGConnectingPoint num="17" id="6544" />
-<TGConnectingPoint num="18" id="6545" />
-<TGConnectingPoint num="19" id="6546" />
-<TGConnectingPoint num="20" id="6547" />
-<TGConnectingPoint num="21" id="6548" />
-<TGConnectingPoint num="22" id="6549" />
-<TGConnectingPoint num="23" id="6550" />
-<extraparam>
-<CryptoBlock value="false" />
+<TGConnectingPoint num="0" id="6353" />
+<TGConnectingPoint num="1" id="6354" />
+<TGConnectingPoint num="2" id="6355" />
+<TGConnectingPoint num="3" id="6356" />
+<TGConnectingPoint num="4" id="6357" />
+<TGConnectingPoint num="5" id="6358" />
+<TGConnectingPoint num="6" id="6359" />
+<TGConnectingPoint num="7" id="6360" />
+<TGConnectingPoint num="8" id="6361" />
+<TGConnectingPoint num="9" id="6362" />
+<TGConnectingPoint num="10" id="6363" />
+<TGConnectingPoint num="11" id="6364" />
+<TGConnectingPoint num="12" id="6365" />
+<TGConnectingPoint num="13" id="6366" />
+<TGConnectingPoint num="14" id="6367" />
+<TGConnectingPoint num="15" id="6368" />
+<TGConnectingPoint num="16" id="6369" />
+<TGConnectingPoint num="17" id="6370" />
+<TGConnectingPoint num="18" id="6371" />
+<TGConnectingPoint num="19" id="6372" />
+<TGConnectingPoint num="20" id="6373" />
+<TGConnectingPoint num="21" id="6374" />
+<TGConnectingPoint num="22" id="6375" />
+<TGConnectingPoint num="23" id="6376" />
+<extraparam>
+<CryptoBlock value="true" />
 <Attribute access="0" id="duration" value="12" type="8" typeOther="" />
 <Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
@@ -14248,6 +14007,16 @@ or by a maintenance station
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 <globalCode value="" />
 <globalCode value="/* This is my global code !!!! */" />
 </extraparam>
@@ -14257,25 +14026,25 @@ or by a maintenance station
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ObserverProp1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6583" >
+<CONNECTOR type="5102" id="6409" >
 <cdparam x="395" y="433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6582" />
-<P1  x="395" y="433" id="6696" />
-<P2  x="395" y="450" id="6655" />
+<TGConnectingPoint num="0" id="6408" />
+<P1  x="395" y="433" id="6522" />
+<P2  x="395" y="450" id="6481" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6581" >
-<father id="6583" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6407" >
+<father id="6409" num="0" />
 <cdparam x="395" y="473" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6577" />
-<TGConnectingPoint num="1" id="6578" />
-<TGConnectingPoint num="2" id="6579" />
-<TGConnectingPoint num="3" id="6580" />
+<TGConnectingPoint num="0" id="6403" />
+<TGConnectingPoint num="1" id="6404" />
+<TGConnectingPoint num="2" id="6405" />
+<TGConnectingPoint num="3" id="6406" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14285,25 +14054,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6590" >
+<CONNECTOR type="5102" id="6416" >
 <cdparam x="303" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6589" />
-<P1  x="303" y="356" id="6743" />
-<P2  x="395" y="403" id="6695" />
+<TGConnectingPoint num="0" id="6415" />
+<P1  x="303" y="356" id="6569" />
+<P2  x="395" y="403" id="6521" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6588" >
-<father id="6590" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6414" >
+<father id="6416" num="0" />
 <cdparam x="303" y="396" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6584" />
-<TGConnectingPoint num="1" id="6585" />
-<TGConnectingPoint num="2" id="6586" />
-<TGConnectingPoint num="3" id="6587" />
+<TGConnectingPoint num="0" id="6410" />
+<TGConnectingPoint num="1" id="6411" />
+<TGConnectingPoint num="2" id="6412" />
+<TGConnectingPoint num="3" id="6413" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14313,55 +14082,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6603" >
+<CONNECTOR type="5102" id="6429" >
 <cdparam x="436" y="285" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6599" />
-<TGConnectingPoint num="1" id="6600" />
-<TGConnectingPoint num="2" id="6601" />
-<TGConnectingPoint num="3" id="6602" />
-<P1  x="436" y="285" id="6707" />
-<P2  x="409" y="180" id="6791" />
+<TGConnectingPoint num="0" id="6425" />
+<TGConnectingPoint num="1" id="6426" />
+<TGConnectingPoint num="2" id="6427" />
+<TGConnectingPoint num="3" id="6428" />
+<P1  x="436" y="285" id="6533" />
+<P2  x="409" y="180" id="6617" />
 <Point x="436" y="302" />
 <Point x="554" y="302" />
 <Point x="554" y="180" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6591" >
-<father id="6603" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6417" >
+<father id="6429" num="0" />
 <cdparam x="436" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6592" >
-<father id="6603" num="1" />
+<SUBCOMPONENT type="-1" id="6418" >
+<father id="6429" num="1" />
 <cdparam x="554" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6593" >
-<father id="6603" num="2" />
+<SUBCOMPONENT type="-1" id="6419" >
+<father id="6429" num="2" />
 <cdparam x="554" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6598" >
-<father id="6603" num="3" />
+<SUBCOMPONENT type="-1" id="6424" >
+<father id="6429" num="3" />
 <cdparam x="436" y="325" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6594" />
-<TGConnectingPoint num="1" id="6595" />
-<TGConnectingPoint num="2" id="6596" />
-<TGConnectingPoint num="3" id="6597" />
+<TGConnectingPoint num="0" id="6420" />
+<TGConnectingPoint num="1" id="6421" />
+<TGConnectingPoint num="2" id="6422" />
+<TGConnectingPoint num="3" id="6423" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14371,25 +14140,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6610" >
+<CONNECTOR type="5102" id="6436" >
 <cdparam x="379" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6609" />
-<P1  x="379" y="218" id="6795" />
-<P2  x="436" y="255" id="6706" />
+<TGConnectingPoint num="0" id="6435" />
+<P1  x="379" y="218" id="6621" />
+<P2  x="436" y="255" id="6532" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6608" >
-<father id="6610" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6434" >
+<father id="6436" num="0" />
 <cdparam x="379" y="258" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6604" />
-<TGConnectingPoint num="1" id="6605" />
-<TGConnectingPoint num="2" id="6606" />
-<TGConnectingPoint num="3" id="6607" />
+<TGConnectingPoint num="0" id="6430" />
+<TGConnectingPoint num="1" id="6431" />
+<TGConnectingPoint num="2" id="6432" />
+<TGConnectingPoint num="3" id="6433" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14399,65 +14168,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6625" >
+<CONNECTOR type="5102" id="6451" >
 <cdparam x="228" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6620" />
-<TGConnectingPoint num="1" id="6621" />
-<TGConnectingPoint num="2" id="6622" />
-<TGConnectingPoint num="3" id="6623" />
-<TGConnectingPoint num="4" id="6624" />
-<P1  x="228" y="432" id="6718" />
-<P2  x="319" y="168" id="6788" />
+<TGConnectingPoint num="0" id="6446" />
+<TGConnectingPoint num="1" id="6447" />
+<TGConnectingPoint num="2" id="6448" />
+<TGConnectingPoint num="3" id="6449" />
+<TGConnectingPoint num="4" id="6450" />
+<P1  x="228" y="432" id="6544" />
+<P2  x="319" y="168" id="6614" />
 <Point x="228" y="452" />
 <Point x="165" y="452" />
 <Point x="165" y="136" />
 <Point x="320" y="136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6611" >
-<father id="6625" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6437" >
+<father id="6451" num="0" />
 <cdparam x="228" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6612" >
-<father id="6625" num="1" />
+<SUBCOMPONENT type="-1" id="6438" >
+<father id="6451" num="1" />
 <cdparam x="165" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6613" >
-<father id="6625" num="2" />
+<SUBCOMPONENT type="-1" id="6439" >
+<father id="6451" num="2" />
 <cdparam x="165" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6614" >
-<father id="6625" num="3" />
+<SUBCOMPONENT type="-1" id="6440" >
+<father id="6451" num="3" />
 <cdparam x="320" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6619" >
-<father id="6625" num="4" />
+<SUBCOMPONENT type="-1" id="6445" >
+<father id="6451" num="4" />
 <cdparam x="228" y="472" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6615" />
-<TGConnectingPoint num="1" id="6616" />
-<TGConnectingPoint num="2" id="6617" />
-<TGConnectingPoint num="3" id="6618" />
+<TGConnectingPoint num="0" id="6441" />
+<TGConnectingPoint num="1" id="6442" />
+<TGConnectingPoint num="2" id="6443" />
+<TGConnectingPoint num="3" id="6444" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14467,25 +14236,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6632" >
+<CONNECTOR type="5102" id="6458" >
 <cdparam x="252" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6631" />
-<P1  x="246" y="356" id="6742" />
-<P2  x="228" y="402" id="6717" />
+<TGConnectingPoint num="0" id="6457" />
+<P1  x="246" y="356" id="6568" />
+<P2  x="228" y="402" id="6543" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6630" >
-<father id="6632" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6456" >
+<father id="6458" num="0" />
 <cdparam x="252" y="408" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6626" />
-<TGConnectingPoint num="1" id="6627" />
-<TGConnectingPoint num="2" id="6628" />
-<TGConnectingPoint num="3" id="6629" />
+<TGConnectingPoint num="0" id="6452" />
+<TGConnectingPoint num="1" id="6453" />
+<TGConnectingPoint num="2" id="6454" />
+<TGConnectingPoint num="3" id="6455" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14495,25 +14264,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6639" >
+<CONNECTOR type="5102" id="6465" >
 <cdparam x="275" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6638" />
-<P1  x="275" y="286" id="6770" />
-<P2  x="275" y="306" id="6729" />
+<TGConnectingPoint num="0" id="6464" />
+<P1  x="275" y="286" id="6596" />
+<P2  x="275" y="306" id="6555" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6637" >
-<father id="6639" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6463" >
+<father id="6465" num="0" />
 <cdparam x="275" y="326" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6633" />
-<TGConnectingPoint num="1" id="6634" />
-<TGConnectingPoint num="2" id="6635" />
-<TGConnectingPoint num="3" id="6636" />
+<TGConnectingPoint num="0" id="6459" />
+<TGConnectingPoint num="1" id="6460" />
+<TGConnectingPoint num="2" id="6461" />
+<TGConnectingPoint num="3" id="6462" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14523,25 +14292,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6646" >
+<CONNECTOR type="5102" id="6472" >
 <cdparam x="319" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6645" />
-<P1  x="319" y="218" id="6794" />
-<P2  x="275" y="256" id="6769" />
+<TGConnectingPoint num="0" id="6471" />
+<P1  x="319" y="218" id="6620" />
+<P2  x="275" y="256" id="6595" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6644" >
-<father id="6646" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6470" >
+<father id="6472" num="0" />
 <cdparam x="319" y="245" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6640" />
-<TGConnectingPoint num="1" id="6641" />
-<TGConnectingPoint num="2" id="6642" />
-<TGConnectingPoint num="3" id="6643" />
+<TGConnectingPoint num="0" id="6466" />
+<TGConnectingPoint num="1" id="6467" />
+<TGConnectingPoint num="2" id="6468" />
+<TGConnectingPoint num="3" id="6469" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14551,25 +14320,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6653" >
+<CONNECTOR type="5102" id="6479" >
 <cdparam x="349" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="6652" />
-<P1  x="349" y="143" id="6821" />
-<P2  x="349" y="168" id="6781" />
+<TGConnectingPoint num="0" id="6478" />
+<P1  x="349" y="143" id="6647" />
+<P2  x="349" y="168" id="6607" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6651" >
-<father id="6653" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6477" >
+<father id="6479" num="0" />
 <cdparam x="349" y="183" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6647" />
-<TGConnectingPoint num="1" id="6648" />
-<TGConnectingPoint num="2" id="6649" />
-<TGConnectingPoint num="3" id="6650" />
+<TGConnectingPoint num="0" id="6473" />
+<TGConnectingPoint num="1" id="6474" />
+<TGConnectingPoint num="2" id="6475" />
+<TGConnectingPoint num="3" id="6476" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14579,261 +14348,261 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="6694" >
+<COMPONENT type="5106" id="6520" >
 <cdparam x="345" y="450" />
 <sizeparam width="100" height="54" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Error" />
-<TGConnectingPoint num="0" id="6654" />
-<TGConnectingPoint num="1" id="6655" />
-<TGConnectingPoint num="2" id="6656" />
-<TGConnectingPoint num="3" id="6657" />
-<TGConnectingPoint num="4" id="6658" />
-<TGConnectingPoint num="5" id="6659" />
-<TGConnectingPoint num="6" id="6660" />
-<TGConnectingPoint num="7" id="6661" />
-<TGConnectingPoint num="8" id="6662" />
-<TGConnectingPoint num="9" id="6663" />
-<TGConnectingPoint num="10" id="6664" />
-<TGConnectingPoint num="11" id="6665" />
-<TGConnectingPoint num="12" id="6666" />
-<TGConnectingPoint num="13" id="6667" />
-<TGConnectingPoint num="14" id="6668" />
-<TGConnectingPoint num="15" id="6669" />
-<TGConnectingPoint num="16" id="6670" />
-<TGConnectingPoint num="17" id="6671" />
-<TGConnectingPoint num="18" id="6672" />
-<TGConnectingPoint num="19" id="6673" />
-<TGConnectingPoint num="20" id="6674" />
-<TGConnectingPoint num="21" id="6675" />
-<TGConnectingPoint num="22" id="6676" />
-<TGConnectingPoint num="23" id="6677" />
-<TGConnectingPoint num="24" id="6678" />
-<TGConnectingPoint num="25" id="6679" />
-<TGConnectingPoint num="26" id="6680" />
-<TGConnectingPoint num="27" id="6681" />
-<TGConnectingPoint num="28" id="6682" />
-<TGConnectingPoint num="29" id="6683" />
-<TGConnectingPoint num="30" id="6684" />
-<TGConnectingPoint num="31" id="6685" />
-<TGConnectingPoint num="32" id="6686" />
-<TGConnectingPoint num="33" id="6687" />
-<TGConnectingPoint num="34" id="6688" />
-<TGConnectingPoint num="35" id="6689" />
-<TGConnectingPoint num="36" id="6690" />
-<TGConnectingPoint num="37" id="6691" />
-<TGConnectingPoint num="38" id="6692" />
-<TGConnectingPoint num="39" id="6693" />
+<TGConnectingPoint num="0" id="6480" />
+<TGConnectingPoint num="1" id="6481" />
+<TGConnectingPoint num="2" id="6482" />
+<TGConnectingPoint num="3" id="6483" />
+<TGConnectingPoint num="4" id="6484" />
+<TGConnectingPoint num="5" id="6485" />
+<TGConnectingPoint num="6" id="6486" />
+<TGConnectingPoint num="7" id="6487" />
+<TGConnectingPoint num="8" id="6488" />
+<TGConnectingPoint num="9" id="6489" />
+<TGConnectingPoint num="10" id="6490" />
+<TGConnectingPoint num="11" id="6491" />
+<TGConnectingPoint num="12" id="6492" />
+<TGConnectingPoint num="13" id="6493" />
+<TGConnectingPoint num="14" id="6494" />
+<TGConnectingPoint num="15" id="6495" />
+<TGConnectingPoint num="16" id="6496" />
+<TGConnectingPoint num="17" id="6497" />
+<TGConnectingPoint num="18" id="6498" />
+<TGConnectingPoint num="19" id="6499" />
+<TGConnectingPoint num="20" id="6500" />
+<TGConnectingPoint num="21" id="6501" />
+<TGConnectingPoint num="22" id="6502" />
+<TGConnectingPoint num="23" id="6503" />
+<TGConnectingPoint num="24" id="6504" />
+<TGConnectingPoint num="25" id="6505" />
+<TGConnectingPoint num="26" id="6506" />
+<TGConnectingPoint num="27" id="6507" />
+<TGConnectingPoint num="28" id="6508" />
+<TGConnectingPoint num="29" id="6509" />
+<TGConnectingPoint num="30" id="6510" />
+<TGConnectingPoint num="31" id="6511" />
+<TGConnectingPoint num="32" id="6512" />
+<TGConnectingPoint num="33" id="6513" />
+<TGConnectingPoint num="34" id="6514" />
+<TGConnectingPoint num="35" id="6515" />
+<TGConnectingPoint num="36" id="6516" />
+<TGConnectingPoint num="37" id="6517" />
+<TGConnectingPoint num="38" id="6518" />
+<TGConnectingPoint num="39" id="6519" />
 <accessibility />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="6705" >
+<COMPONENT type="5104" id="6531" >
 <cdparam x="325" y="408" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="6695" />
-<TGConnectingPoint num="1" id="6696" />
-<TGConnectingPoint num="2" id="6697" />
-<TGConnectingPoint num="3" id="6698" />
-<TGConnectingPoint num="4" id="6699" />
-<TGConnectingPoint num="5" id="6700" />
-<TGConnectingPoint num="6" id="6701" />
-<TGConnectingPoint num="7" id="6702" />
-<TGConnectingPoint num="8" id="6703" />
-<TGConnectingPoint num="9" id="6704" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="6716" >
+<TGConnectingPoint num="0" id="6521" />
+<TGConnectingPoint num="1" id="6522" />
+<TGConnectingPoint num="2" id="6523" />
+<TGConnectingPoint num="3" id="6524" />
+<TGConnectingPoint num="4" id="6525" />
+<TGConnectingPoint num="5" id="6526" />
+<TGConnectingPoint num="6" id="6527" />
+<TGConnectingPoint num="7" id="6528" />
+<TGConnectingPoint num="8" id="6529" />
+<TGConnectingPoint num="9" id="6530" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="6542" >
 <cdparam x="366" y="260" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="6706" />
-<TGConnectingPoint num="1" id="6707" />
-<TGConnectingPoint num="2" id="6708" />
-<TGConnectingPoint num="3" id="6709" />
-<TGConnectingPoint num="4" id="6710" />
-<TGConnectingPoint num="5" id="6711" />
-<TGConnectingPoint num="6" id="6712" />
-<TGConnectingPoint num="7" id="6713" />
-<TGConnectingPoint num="8" id="6714" />
-<TGConnectingPoint num="9" id="6715" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="6727" >
+<TGConnectingPoint num="0" id="6532" />
+<TGConnectingPoint num="1" id="6533" />
+<TGConnectingPoint num="2" id="6534" />
+<TGConnectingPoint num="3" id="6535" />
+<TGConnectingPoint num="4" id="6536" />
+<TGConnectingPoint num="5" id="6537" />
+<TGConnectingPoint num="6" id="6538" />
+<TGConnectingPoint num="7" id="6539" />
+<TGConnectingPoint num="8" id="6540" />
+<TGConnectingPoint num="9" id="6541" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="6553" >
 <cdparam x="183" y="407" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="6717" />
-<TGConnectingPoint num="1" id="6718" />
-<TGConnectingPoint num="2" id="6719" />
-<TGConnectingPoint num="3" id="6720" />
-<TGConnectingPoint num="4" id="6721" />
-<TGConnectingPoint num="5" id="6722" />
-<TGConnectingPoint num="6" id="6723" />
-<TGConnectingPoint num="7" id="6724" />
-<TGConnectingPoint num="8" id="6725" />
-<TGConnectingPoint num="9" id="6726" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="6768" >
+<TGConnectingPoint num="0" id="6543" />
+<TGConnectingPoint num="1" id="6544" />
+<TGConnectingPoint num="2" id="6545" />
+<TGConnectingPoint num="3" id="6546" />
+<TGConnectingPoint num="4" id="6547" />
+<TGConnectingPoint num="5" id="6548" />
+<TGConnectingPoint num="6" id="6549" />
+<TGConnectingPoint num="7" id="6550" />
+<TGConnectingPoint num="8" id="6551" />
+<TGConnectingPoint num="9" id="6552" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6594" >
 <cdparam x="218" y="306" />
 <sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForClosed" />
-<TGConnectingPoint num="0" id="6728" />
-<TGConnectingPoint num="1" id="6729" />
-<TGConnectingPoint num="2" id="6730" />
-<TGConnectingPoint num="3" id="6731" />
-<TGConnectingPoint num="4" id="6732" />
-<TGConnectingPoint num="5" id="6733" />
-<TGConnectingPoint num="6" id="6734" />
-<TGConnectingPoint num="7" id="6735" />
-<TGConnectingPoint num="8" id="6736" />
-<TGConnectingPoint num="9" id="6737" />
-<TGConnectingPoint num="10" id="6738" />
-<TGConnectingPoint num="11" id="6739" />
-<TGConnectingPoint num="12" id="6740" />
-<TGConnectingPoint num="13" id="6741" />
-<TGConnectingPoint num="14" id="6742" />
-<TGConnectingPoint num="15" id="6743" />
-<TGConnectingPoint num="16" id="6744" />
-<TGConnectingPoint num="17" id="6745" />
-<TGConnectingPoint num="18" id="6746" />
-<TGConnectingPoint num="19" id="6747" />
-<TGConnectingPoint num="20" id="6748" />
-<TGConnectingPoint num="21" id="6749" />
-<TGConnectingPoint num="22" id="6750" />
-<TGConnectingPoint num="23" id="6751" />
-<TGConnectingPoint num="24" id="6752" />
-<TGConnectingPoint num="25" id="6753" />
-<TGConnectingPoint num="26" id="6754" />
-<TGConnectingPoint num="27" id="6755" />
-<TGConnectingPoint num="28" id="6756" />
-<TGConnectingPoint num="29" id="6757" />
-<TGConnectingPoint num="30" id="6758" />
-<TGConnectingPoint num="31" id="6759" />
-<TGConnectingPoint num="32" id="6760" />
-<TGConnectingPoint num="33" id="6761" />
-<TGConnectingPoint num="34" id="6762" />
-<TGConnectingPoint num="35" id="6763" />
-<TGConnectingPoint num="36" id="6764" />
-<TGConnectingPoint num="37" id="6765" />
-<TGConnectingPoint num="38" id="6766" />
-<TGConnectingPoint num="39" id="6767" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="6779" >
+<TGConnectingPoint num="0" id="6554" />
+<TGConnectingPoint num="1" id="6555" />
+<TGConnectingPoint num="2" id="6556" />
+<TGConnectingPoint num="3" id="6557" />
+<TGConnectingPoint num="4" id="6558" />
+<TGConnectingPoint num="5" id="6559" />
+<TGConnectingPoint num="6" id="6560" />
+<TGConnectingPoint num="7" id="6561" />
+<TGConnectingPoint num="8" id="6562" />
+<TGConnectingPoint num="9" id="6563" />
+<TGConnectingPoint num="10" id="6564" />
+<TGConnectingPoint num="11" id="6565" />
+<TGConnectingPoint num="12" id="6566" />
+<TGConnectingPoint num="13" id="6567" />
+<TGConnectingPoint num="14" id="6568" />
+<TGConnectingPoint num="15" id="6569" />
+<TGConnectingPoint num="16" id="6570" />
+<TGConnectingPoint num="17" id="6571" />
+<TGConnectingPoint num="18" id="6572" />
+<TGConnectingPoint num="19" id="6573" />
+<TGConnectingPoint num="20" id="6574" />
+<TGConnectingPoint num="21" id="6575" />
+<TGConnectingPoint num="22" id="6576" />
+<TGConnectingPoint num="23" id="6577" />
+<TGConnectingPoint num="24" id="6578" />
+<TGConnectingPoint num="25" id="6579" />
+<TGConnectingPoint num="26" id="6580" />
+<TGConnectingPoint num="27" id="6581" />
+<TGConnectingPoint num="28" id="6582" />
+<TGConnectingPoint num="29" id="6583" />
+<TGConnectingPoint num="30" id="6584" />
+<TGConnectingPoint num="31" id="6585" />
+<TGConnectingPoint num="32" id="6586" />
+<TGConnectingPoint num="33" id="6587" />
+<TGConnectingPoint num="34" id="6588" />
+<TGConnectingPoint num="35" id="6589" />
+<TGConnectingPoint num="36" id="6590" />
+<TGConnectingPoint num="37" id="6591" />
+<TGConnectingPoint num="38" id="6592" />
+<TGConnectingPoint num="39" id="6593" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="6605" >
 <cdparam x="234" y="261" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="6769" />
-<TGConnectingPoint num="1" id="6770" />
-<TGConnectingPoint num="2" id="6771" />
-<TGConnectingPoint num="3" id="6772" />
-<TGConnectingPoint num="4" id="6773" />
-<TGConnectingPoint num="5" id="6774" />
-<TGConnectingPoint num="6" id="6775" />
-<TGConnectingPoint num="7" id="6776" />
-<TGConnectingPoint num="8" id="6777" />
-<TGConnectingPoint num="9" id="6778" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="6820" >
+<TGConnectingPoint num="0" id="6595" />
+<TGConnectingPoint num="1" id="6596" />
+<TGConnectingPoint num="2" id="6597" />
+<TGConnectingPoint num="3" id="6598" />
+<TGConnectingPoint num="4" id="6599" />
+<TGConnectingPoint num="5" id="6600" />
+<TGConnectingPoint num="6" id="6601" />
+<TGConnectingPoint num="7" id="6602" />
+<TGConnectingPoint num="8" id="6603" />
+<TGConnectingPoint num="9" id="6604" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6646" >
 <cdparam x="289" y="168" />
 <sizeparam width="120" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForOpen" />
-<TGConnectingPoint num="0" id="6780" />
-<TGConnectingPoint num="1" id="6781" />
-<TGConnectingPoint num="2" id="6782" />
-<TGConnectingPoint num="3" id="6783" />
-<TGConnectingPoint num="4" id="6784" />
-<TGConnectingPoint num="5" id="6785" />
-<TGConnectingPoint num="6" id="6786" />
-<TGConnectingPoint num="7" id="6787" />
-<TGConnectingPoint num="8" id="6788" />
-<TGConnectingPoint num="9" id="6789" />
-<TGConnectingPoint num="10" id="6790" />
-<TGConnectingPoint num="11" id="6791" />
-<TGConnectingPoint num="12" id="6792" />
-<TGConnectingPoint num="13" id="6793" />
-<TGConnectingPoint num="14" id="6794" />
-<TGConnectingPoint num="15" id="6795" />
-<TGConnectingPoint num="16" id="6796" />
-<TGConnectingPoint num="17" id="6797" />
-<TGConnectingPoint num="18" id="6798" />
-<TGConnectingPoint num="19" id="6799" />
-<TGConnectingPoint num="20" id="6800" />
-<TGConnectingPoint num="21" id="6801" />
-<TGConnectingPoint num="22" id="6802" />
-<TGConnectingPoint num="23" id="6803" />
-<TGConnectingPoint num="24" id="6804" />
-<TGConnectingPoint num="25" id="6805" />
-<TGConnectingPoint num="26" id="6806" />
-<TGConnectingPoint num="27" id="6807" />
-<TGConnectingPoint num="28" id="6808" />
-<TGConnectingPoint num="29" id="6809" />
-<TGConnectingPoint num="30" id="6810" />
-<TGConnectingPoint num="31" id="6811" />
-<TGConnectingPoint num="32" id="6812" />
-<TGConnectingPoint num="33" id="6813" />
-<TGConnectingPoint num="34" id="6814" />
-<TGConnectingPoint num="35" id="6815" />
-<TGConnectingPoint num="36" id="6816" />
-<TGConnectingPoint num="37" id="6817" />
-<TGConnectingPoint num="38" id="6818" />
-<TGConnectingPoint num="39" id="6819" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="6822" >
+<TGConnectingPoint num="0" id="6606" />
+<TGConnectingPoint num="1" id="6607" />
+<TGConnectingPoint num="2" id="6608" />
+<TGConnectingPoint num="3" id="6609" />
+<TGConnectingPoint num="4" id="6610" />
+<TGConnectingPoint num="5" id="6611" />
+<TGConnectingPoint num="6" id="6612" />
+<TGConnectingPoint num="7" id="6613" />
+<TGConnectingPoint num="8" id="6614" />
+<TGConnectingPoint num="9" id="6615" />
+<TGConnectingPoint num="10" id="6616" />
+<TGConnectingPoint num="11" id="6617" />
+<TGConnectingPoint num="12" id="6618" />
+<TGConnectingPoint num="13" id="6619" />
+<TGConnectingPoint num="14" id="6620" />
+<TGConnectingPoint num="15" id="6621" />
+<TGConnectingPoint num="16" id="6622" />
+<TGConnectingPoint num="17" id="6623" />
+<TGConnectingPoint num="18" id="6624" />
+<TGConnectingPoint num="19" id="6625" />
+<TGConnectingPoint num="20" id="6626" />
+<TGConnectingPoint num="21" id="6627" />
+<TGConnectingPoint num="22" id="6628" />
+<TGConnectingPoint num="23" id="6629" />
+<TGConnectingPoint num="24" id="6630" />
+<TGConnectingPoint num="25" id="6631" />
+<TGConnectingPoint num="26" id="6632" />
+<TGConnectingPoint num="27" id="6633" />
+<TGConnectingPoint num="28" id="6634" />
+<TGConnectingPoint num="29" id="6635" />
+<TGConnectingPoint num="30" id="6636" />
+<TGConnectingPoint num="31" id="6637" />
+<TGConnectingPoint num="32" id="6638" />
+<TGConnectingPoint num="33" id="6639" />
+<TGConnectingPoint num="34" id="6640" />
+<TGConnectingPoint num="35" id="6641" />
+<TGConnectingPoint num="36" id="6642" />
+<TGConnectingPoint num="37" id="6643" />
+<TGConnectingPoint num="38" id="6644" />
+<TGConnectingPoint num="39" id="6645" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="6648" >
 <cdparam x="342" y="123" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6821" />
+<TGConnectingPoint num="0" id="6647" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemotelyControlledMicrowave" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6829" >
+<CONNECTOR type="5102" id="6655" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<TGConnectingPoint num="0" id="6828" />
-<P1  x="407" y="70" id="6832" />
-<P2  x="408" y="85" id="6830" />
+<TGConnectingPoint num="0" id="6654" />
+<P1  x="407" y="70" id="6658" />
+<P2  x="408" y="85" id="6656" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6827" >
-<father id="6829" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6653" >
+<father id="6655" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6823" />
-<TGConnectingPoint num="1" id="6824" />
-<TGConnectingPoint num="2" id="6825" />
-<TGConnectingPoint num="3" id="6826" />
+<TGConnectingPoint num="0" id="6649" />
+<TGConnectingPoint num="1" id="6650" />
+<TGConnectingPoint num="2" id="6651" />
+<TGConnectingPoint num="3" id="6652" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14843,55 +14612,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="6831" >
+<COMPONENT type="5101" id="6657" >
 <cdparam x="398" y="90" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="6830" />
+<TGConnectingPoint num="0" id="6656" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="6833" >
+<COMPONENT type="5100" id="6659" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6832" />
+<TGConnectingPoint num="0" id="6658" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemoteControl" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="118" id="6834" >
+<CONNECTOR type="118" id="6660" >
 <cdparam x="516" y="268" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from List of all parameters of an Avatar SMD transition to UML Note" value="null" />
-<P1  x="531" y="264" id="6851" />
-<P2  x="607" y="233" id="6859" />
+<P1  x="531" y="264" id="6677" />
+<P2  x="607" y="233" id="6685" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="6841" >
+<CONNECTOR type="5102" id="6667" >
 <cdparam x="290" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="6840" />
-<P1  x="309" y="119" id="6927" />
-<P2  x="325" y="163" id="6874" />
+<TGConnectingPoint num="0" id="6666" />
+<P1  x="309" y="119" id="6753" />
+<P2  x="325" y="163" id="6700" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6839" >
-<father id="6841" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6665" >
+<father id="6667" num="0" />
 <cdparam x="290" y="180" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6835" />
-<TGConnectingPoint num="1" id="6836" />
-<TGConnectingPoint num="2" id="6837" />
-<TGConnectingPoint num="3" id="6838" />
+<TGConnectingPoint num="0" id="6661" />
+<TGConnectingPoint num="1" id="6662" />
+<TGConnectingPoint num="2" id="6663" />
+<TGConnectingPoint num="3" id="6664" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14901,25 +14670,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6848" >
+<CONNECTOR type="5102" id="6674" >
 <cdparam x="347" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="6847" />
-<P1  x="347" y="321" id="6917" />
-<P2  x="350" y="350" id="6914" />
+<TGConnectingPoint num="0" id="6673" />
+<P1  x="347" y="321" id="6743" />
+<P2  x="350" y="350" id="6740" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6846" >
-<father id="6848" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6672" >
+<father id="6674" num="0" />
 <cdparam x="347" y="361" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6842" />
-<TGConnectingPoint num="1" id="6843" />
-<TGConnectingPoint num="2" id="6844" />
-<TGConnectingPoint num="3" id="6845" />
+<TGConnectingPoint num="0" id="6668" />
+<TGConnectingPoint num="1" id="6669" />
+<TGConnectingPoint num="2" id="6670" />
+<TGConnectingPoint num="3" id="6671" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14929,25 +14698,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6855" >
+<CONNECTOR type="5102" id="6681" >
 <cdparam x="327" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="6854" />
-<P1  x="325" y="213" id="6879" />
-<P2  x="347" y="291" id="6916" />
+<TGConnectingPoint num="0" id="6680" />
+<P1  x="325" y="213" id="6705" />
+<P2  x="347" y="291" id="6742" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6853" >
-<father id="6855" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6679" >
+<father id="6681" num="0" />
 <cdparam x="363" y="249" />
 <sizeparam width="168" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6849" />
-<TGConnectingPoint num="1" id="6850" />
-<TGConnectingPoint num="2" id="6851" />
-<TGConnectingPoint num="3" id="6852" />
+<TGConnectingPoint num="0" id="6675" />
+<TGConnectingPoint num="1" id="6676" />
+<TGConnectingPoint num="2" id="6677" />
+<TGConnectingPoint num="3" id="6678" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -14959,143 +14728,143 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="6872" >
+<COMPONENT type="301" id="6698" >
 <cdparam x="607" y="216" />
 <sizeparam width="251" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Encrypting data with the pre shared key
 " />
-<TGConnectingPoint num="0" id="6856" />
-<TGConnectingPoint num="1" id="6857" />
-<TGConnectingPoint num="2" id="6858" />
-<TGConnectingPoint num="3" id="6859" />
-<TGConnectingPoint num="4" id="6860" />
-<TGConnectingPoint num="5" id="6861" />
-<TGConnectingPoint num="6" id="6862" />
-<TGConnectingPoint num="7" id="6863" />
-<TGConnectingPoint num="8" id="6864" />
-<TGConnectingPoint num="9" id="6865" />
-<TGConnectingPoint num="10" id="6866" />
-<TGConnectingPoint num="11" id="6867" />
-<TGConnectingPoint num="12" id="6868" />
-<TGConnectingPoint num="13" id="6869" />
-<TGConnectingPoint num="14" id="6870" />
-<TGConnectingPoint num="15" id="6871" />
+<TGConnectingPoint num="0" id="6682" />
+<TGConnectingPoint num="1" id="6683" />
+<TGConnectingPoint num="2" id="6684" />
+<TGConnectingPoint num="3" id="6685" />
+<TGConnectingPoint num="4" id="6686" />
+<TGConnectingPoint num="5" id="6687" />
+<TGConnectingPoint num="6" id="6688" />
+<TGConnectingPoint num="7" id="6689" />
+<TGConnectingPoint num="8" id="6690" />
+<TGConnectingPoint num="9" id="6691" />
+<TGConnectingPoint num="10" id="6692" />
+<TGConnectingPoint num="11" id="6693" />
+<TGConnectingPoint num="12" id="6694" />
+<TGConnectingPoint num="13" id="6695" />
+<TGConnectingPoint num="14" id="6696" />
+<TGConnectingPoint num="15" id="6697" />
 <extraparam>
 <Line value="Encrypting data with the pre shared key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6913" >
+<COMPONENT type="5106" id="6739" >
 <cdparam x="239" y="163" />
 <sizeparam width="172" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="SendingRemoteOrder" />
-<TGConnectingPoint num="0" id="6873" />
-<TGConnectingPoint num="1" id="6874" />
-<TGConnectingPoint num="2" id="6875" />
-<TGConnectingPoint num="3" id="6876" />
-<TGConnectingPoint num="4" id="6877" />
-<TGConnectingPoint num="5" id="6878" />
-<TGConnectingPoint num="6" id="6879" />
-<TGConnectingPoint num="7" id="6880" />
-<TGConnectingPoint num="8" id="6881" />
-<TGConnectingPoint num="9" id="6882" />
-<TGConnectingPoint num="10" id="6883" />
-<TGConnectingPoint num="11" id="6884" />
-<TGConnectingPoint num="12" id="6885" />
-<TGConnectingPoint num="13" id="6886" />
-<TGConnectingPoint num="14" id="6887" />
-<TGConnectingPoint num="15" id="6888" />
-<TGConnectingPoint num="16" id="6889" />
-<TGConnectingPoint num="17" id="6890" />
-<TGConnectingPoint num="18" id="6891" />
-<TGConnectingPoint num="19" id="6892" />
-<TGConnectingPoint num="20" id="6893" />
-<TGConnectingPoint num="21" id="6894" />
-<TGConnectingPoint num="22" id="6895" />
-<TGConnectingPoint num="23" id="6896" />
-<TGConnectingPoint num="24" id="6897" />
-<TGConnectingPoint num="25" id="6898" />
-<TGConnectingPoint num="26" id="6899" />
-<TGConnectingPoint num="27" id="6900" />
-<TGConnectingPoint num="28" id="6901" />
-<TGConnectingPoint num="29" id="6902" />
-<TGConnectingPoint num="30" id="6903" />
-<TGConnectingPoint num="31" id="6904" />
-<TGConnectingPoint num="32" id="6905" />
-<TGConnectingPoint num="33" id="6906" />
-<TGConnectingPoint num="34" id="6907" />
-<TGConnectingPoint num="35" id="6908" />
-<TGConnectingPoint num="36" id="6909" />
-<TGConnectingPoint num="37" id="6910" />
-<TGConnectingPoint num="38" id="6911" />
-<TGConnectingPoint num="39" id="6912" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="6915" >
+<TGConnectingPoint num="0" id="6699" />
+<TGConnectingPoint num="1" id="6700" />
+<TGConnectingPoint num="2" id="6701" />
+<TGConnectingPoint num="3" id="6702" />
+<TGConnectingPoint num="4" id="6703" />
+<TGConnectingPoint num="5" id="6704" />
+<TGConnectingPoint num="6" id="6705" />
+<TGConnectingPoint num="7" id="6706" />
+<TGConnectingPoint num="8" id="6707" />
+<TGConnectingPoint num="9" id="6708" />
+<TGConnectingPoint num="10" id="6709" />
+<TGConnectingPoint num="11" id="6710" />
+<TGConnectingPoint num="12" id="6711" />
+<TGConnectingPoint num="13" id="6712" />
+<TGConnectingPoint num="14" id="6713" />
+<TGConnectingPoint num="15" id="6714" />
+<TGConnectingPoint num="16" id="6715" />
+<TGConnectingPoint num="17" id="6716" />
+<TGConnectingPoint num="18" id="6717" />
+<TGConnectingPoint num="19" id="6718" />
+<TGConnectingPoint num="20" id="6719" />
+<TGConnectingPoint num="21" id="6720" />
+<TGConnectingPoint num="22" id="6721" />
+<TGConnectingPoint num="23" id="6722" />
+<TGConnectingPoint num="24" id="6723" />
+<TGConnectingPoint num="25" id="6724" />
+<TGConnectingPoint num="26" id="6725" />
+<TGConnectingPoint num="27" id="6726" />
+<TGConnectingPoint num="28" id="6727" />
+<TGConnectingPoint num="29" id="6728" />
+<TGConnectingPoint num="30" id="6729" />
+<TGConnectingPoint num="31" id="6730" />
+<TGConnectingPoint num="32" id="6731" />
+<TGConnectingPoint num="33" id="6732" />
+<TGConnectingPoint num="34" id="6733" />
+<TGConnectingPoint num="35" id="6734" />
+<TGConnectingPoint num="36" id="6735" />
+<TGConnectingPoint num="37" id="6736" />
+<TGConnectingPoint num="38" id="6737" />
+<TGConnectingPoint num="39" id="6738" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="6741" >
 <cdparam x="340" y="355" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="6914" />
+<TGConnectingPoint num="0" id="6740" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="6926" >
+<COMPONENT type="5103" id="6752" >
 <cdparam x="262" y="296" />
 <sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="wirelessChannelWrite(msg1)" />
-<TGConnectingPoint num="0" id="6916" />
-<TGConnectingPoint num="1" id="6917" />
-<TGConnectingPoint num="2" id="6918" />
-<TGConnectingPoint num="3" id="6919" />
-<TGConnectingPoint num="4" id="6920" />
-<TGConnectingPoint num="5" id="6921" />
-<TGConnectingPoint num="6" id="6922" />
-<TGConnectingPoint num="7" id="6923" />
-<TGConnectingPoint num="8" id="6924" />
-<TGConnectingPoint num="9" id="6925" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="6928" >
+<TGConnectingPoint num="0" id="6742" />
+<TGConnectingPoint num="1" id="6743" />
+<TGConnectingPoint num="2" id="6744" />
+<TGConnectingPoint num="3" id="6745" />
+<TGConnectingPoint num="4" id="6746" />
+<TGConnectingPoint num="5" id="6747" />
+<TGConnectingPoint num="6" id="6748" />
+<TGConnectingPoint num="7" id="6749" />
+<TGConnectingPoint num="8" id="6750" />
+<TGConnectingPoint num="9" id="6751" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="6754" >
 <cdparam x="302" y="99" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6927" />
+<TGConnectingPoint num="0" id="6753" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6935" >
+<CONNECTOR type="5102" id="6761" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="6934" />
-<P1  x="407" y="70" id="6977" />
-<P2  x="451" y="106" id="6937" />
+<TGConnectingPoint num="0" id="6760" />
+<P1  x="407" y="70" id="6803" />
+<P2  x="451" y="106" id="6763" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6933" >
-<father id="6935" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6759" >
+<father id="6761" num="0" />
 <cdparam x="444" y="75" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6929" />
-<TGConnectingPoint num="1" id="6930" />
-<TGConnectingPoint num="2" id="6931" />
-<TGConnectingPoint num="3" id="6932" />
+<TGConnectingPoint num="0" id="6755" />
+<TGConnectingPoint num="1" id="6756" />
+<TGConnectingPoint num="2" id="6757" />
+<TGConnectingPoint num="3" id="6758" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15105,88 +14874,88 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="6976" >
+<COMPONENT type="5106" id="6802" >
 <cdparam x="396" y="106" />
 <sizeparam width="111" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Running" />
-<TGConnectingPoint num="0" id="6936" />
-<TGConnectingPoint num="1" id="6937" />
-<TGConnectingPoint num="2" id="6938" />
-<TGConnectingPoint num="3" id="6939" />
-<TGConnectingPoint num="4" id="6940" />
-<TGConnectingPoint num="5" id="6941" />
-<TGConnectingPoint num="6" id="6942" />
-<TGConnectingPoint num="7" id="6943" />
-<TGConnectingPoint num="8" id="6944" />
-<TGConnectingPoint num="9" id="6945" />
-<TGConnectingPoint num="10" id="6946" />
-<TGConnectingPoint num="11" id="6947" />
-<TGConnectingPoint num="12" id="6948" />
-<TGConnectingPoint num="13" id="6949" />
-<TGConnectingPoint num="14" id="6950" />
-<TGConnectingPoint num="15" id="6951" />
-<TGConnectingPoint num="16" id="6952" />
-<TGConnectingPoint num="17" id="6953" />
-<TGConnectingPoint num="18" id="6954" />
-<TGConnectingPoint num="19" id="6955" />
-<TGConnectingPoint num="20" id="6956" />
-<TGConnectingPoint num="21" id="6957" />
-<TGConnectingPoint num="22" id="6958" />
-<TGConnectingPoint num="23" id="6959" />
-<TGConnectingPoint num="24" id="6960" />
-<TGConnectingPoint num="25" id="6961" />
-<TGConnectingPoint num="26" id="6962" />
-<TGConnectingPoint num="27" id="6963" />
-<TGConnectingPoint num="28" id="6964" />
-<TGConnectingPoint num="29" id="6965" />
-<TGConnectingPoint num="30" id="6966" />
-<TGConnectingPoint num="31" id="6967" />
-<TGConnectingPoint num="32" id="6968" />
-<TGConnectingPoint num="33" id="6969" />
-<TGConnectingPoint num="34" id="6970" />
-<TGConnectingPoint num="35" id="6971" />
-<TGConnectingPoint num="36" id="6972" />
-<TGConnectingPoint num="37" id="6973" />
-<TGConnectingPoint num="38" id="6974" />
-<TGConnectingPoint num="39" id="6975" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="6978" >
+<TGConnectingPoint num="0" id="6762" />
+<TGConnectingPoint num="1" id="6763" />
+<TGConnectingPoint num="2" id="6764" />
+<TGConnectingPoint num="3" id="6765" />
+<TGConnectingPoint num="4" id="6766" />
+<TGConnectingPoint num="5" id="6767" />
+<TGConnectingPoint num="6" id="6768" />
+<TGConnectingPoint num="7" id="6769" />
+<TGConnectingPoint num="8" id="6770" />
+<TGConnectingPoint num="9" id="6771" />
+<TGConnectingPoint num="10" id="6772" />
+<TGConnectingPoint num="11" id="6773" />
+<TGConnectingPoint num="12" id="6774" />
+<TGConnectingPoint num="13" id="6775" />
+<TGConnectingPoint num="14" id="6776" />
+<TGConnectingPoint num="15" id="6777" />
+<TGConnectingPoint num="16" id="6778" />
+<TGConnectingPoint num="17" id="6779" />
+<TGConnectingPoint num="18" id="6780" />
+<TGConnectingPoint num="19" id="6781" />
+<TGConnectingPoint num="20" id="6782" />
+<TGConnectingPoint num="21" id="6783" />
+<TGConnectingPoint num="22" id="6784" />
+<TGConnectingPoint num="23" id="6785" />
+<TGConnectingPoint num="24" id="6786" />
+<TGConnectingPoint num="25" id="6787" />
+<TGConnectingPoint num="26" id="6788" />
+<TGConnectingPoint num="27" id="6789" />
+<TGConnectingPoint num="28" id="6790" />
+<TGConnectingPoint num="29" id="6791" />
+<TGConnectingPoint num="30" id="6792" />
+<TGConnectingPoint num="31" id="6793" />
+<TGConnectingPoint num="32" id="6794" />
+<TGConnectingPoint num="33" id="6795" />
+<TGConnectingPoint num="34" id="6796" />
+<TGConnectingPoint num="35" id="6797" />
+<TGConnectingPoint num="36" id="6798" />
+<TGConnectingPoint num="37" id="6799" />
+<TGConnectingPoint num="38" id="6800" />
+<TGConnectingPoint num="39" id="6801" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="6804" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6977" />
+<TGConnectingPoint num="0" id="6803" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="6985" >
+<CONNECTOR type="5102" id="6811" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6984" />
-<P1  x="419" y="209" id="7055" />
-<P2  x="419" y="313" id="7014" />
+<TGConnectingPoint num="0" id="6810" />
+<P1  x="419" y="209" id="6881" />
+<P2  x="419" y="313" id="6840" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6983" >
-<father id="6985" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6809" >
+<father id="6811" num="0" />
 <cdparam x="429" y="249" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6979" />
-<TGConnectingPoint num="1" id="6980" />
-<TGConnectingPoint num="2" id="6981" />
-<TGConnectingPoint num="3" id="6982" />
+<TGConnectingPoint num="0" id="6805" />
+<TGConnectingPoint num="1" id="6806" />
+<TGConnectingPoint num="2" id="6807" />
+<TGConnectingPoint num="3" id="6808" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15197,55 +14966,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6998" >
+<CONNECTOR type="5102" id="6824" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6994" />
-<TGConnectingPoint num="1" id="6995" />
-<TGConnectingPoint num="2" id="6996" />
-<TGConnectingPoint num="3" id="6997" />
-<P1  x="419" y="363" id="7019" />
-<P2  x="369" y="123" id="7068" />
+<TGConnectingPoint num="0" id="6820" />
+<TGConnectingPoint num="1" id="6821" />
+<TGConnectingPoint num="2" id="6822" />
+<TGConnectingPoint num="3" id="6823" />
+<P1  x="419" y="363" id="6845" />
+<P2  x="369" y="123" id="6894" />
 <Point x="412" y="419" />
 <Point x="332" y="419" />
 <Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6986" >
-<father id="6998" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6812" >
+<father id="6824" num="0" />
 <cdparam x="412" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6987" >
-<father id="6998" num="1" />
+<SUBCOMPONENT type="-1" id="6813" >
+<father id="6824" num="1" />
 <cdparam x="332" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6988" >
-<father id="6998" num="2" />
+<SUBCOMPONENT type="-1" id="6814" >
+<father id="6824" num="2" />
 <cdparam x="332" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="6993" >
-<father id="6998" num="3" />
+<SUBCOMPONENT type="-1" id="6819" >
+<father id="6824" num="3" />
 <cdparam x="430" y="402" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6989" />
-<TGConnectingPoint num="1" id="6990" />
-<TGConnectingPoint num="2" id="6991" />
-<TGConnectingPoint num="3" id="6992" />
+<TGConnectingPoint num="0" id="6815" />
+<TGConnectingPoint num="1" id="6816" />
+<TGConnectingPoint num="2" id="6817" />
+<TGConnectingPoint num="3" id="6818" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15255,25 +15024,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7005" >
+<CONNECTOR type="5102" id="6831" >
 <cdparam x="420" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7004" />
-<P1  x="419" y="148" id="7071" />
-<P2  x="419" y="179" id="7054" />
+<TGConnectingPoint num="0" id="6830" />
+<P1  x="419" y="148" id="6897" />
+<P2  x="419" y="179" id="6880" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7003" >
-<father id="7005" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6829" >
+<father id="6831" num="0" />
 <cdparam x="420" y="191" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6999" />
-<TGConnectingPoint num="1" id="7000" />
-<TGConnectingPoint num="2" id="7001" />
-<TGConnectingPoint num="3" id="7002" />
+<TGConnectingPoint num="0" id="6825" />
+<TGConnectingPoint num="1" id="6826" />
+<TGConnectingPoint num="2" id="6827" />
+<TGConnectingPoint num="3" id="6828" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15283,25 +15052,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7012" >
+<CONNECTOR type="5102" id="6838" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="7011" />
-<P1  x="407" y="70" id="7106" />
-<P2  x="419" y="98" id="7066" />
+<TGConnectingPoint num="0" id="6837" />
+<P1  x="407" y="70" id="6932" />
+<P2  x="419" y="98" id="6892" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7010" >
-<father id="7012" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6836" >
+<father id="6838" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7006" />
-<TGConnectingPoint num="1" id="7007" />
-<TGConnectingPoint num="2" id="7008" />
-<TGConnectingPoint num="3" id="7009" />
+<TGConnectingPoint num="0" id="6832" />
+<TGConnectingPoint num="1" id="6833" />
+<TGConnectingPoint num="2" id="6834" />
+<TGConnectingPoint num="3" id="6835" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15311,188 +15080,188 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="7053" >
+<COMPONENT type="5106" id="6879" >
 <cdparam x="369" y="313" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Ringing" />
-<TGConnectingPoint num="0" id="7013" />
-<TGConnectingPoint num="1" id="7014" />
-<TGConnectingPoint num="2" id="7015" />
-<TGConnectingPoint num="3" id="7016" />
-<TGConnectingPoint num="4" id="7017" />
-<TGConnectingPoint num="5" id="7018" />
-<TGConnectingPoint num="6" id="7019" />
-<TGConnectingPoint num="7" id="7020" />
-<TGConnectingPoint num="8" id="7021" />
-<TGConnectingPoint num="9" id="7022" />
-<TGConnectingPoint num="10" id="7023" />
-<TGConnectingPoint num="11" id="7024" />
-<TGConnectingPoint num="12" id="7025" />
-<TGConnectingPoint num="13" id="7026" />
-<TGConnectingPoint num="14" id="7027" />
-<TGConnectingPoint num="15" id="7028" />
-<TGConnectingPoint num="16" id="7029" />
-<TGConnectingPoint num="17" id="7030" />
-<TGConnectingPoint num="18" id="7031" />
-<TGConnectingPoint num="19" id="7032" />
-<TGConnectingPoint num="20" id="7033" />
-<TGConnectingPoint num="21" id="7034" />
-<TGConnectingPoint num="22" id="7035" />
-<TGConnectingPoint num="23" id="7036" />
-<TGConnectingPoint num="24" id="7037" />
-<TGConnectingPoint num="25" id="7038" />
-<TGConnectingPoint num="26" id="7039" />
-<TGConnectingPoint num="27" id="7040" />
-<TGConnectingPoint num="28" id="7041" />
-<TGConnectingPoint num="29" id="7042" />
-<TGConnectingPoint num="30" id="7043" />
-<TGConnectingPoint num="31" id="7044" />
-<TGConnectingPoint num="32" id="7045" />
-<TGConnectingPoint num="33" id="7046" />
-<TGConnectingPoint num="34" id="7047" />
-<TGConnectingPoint num="35" id="7048" />
-<TGConnectingPoint num="36" id="7049" />
-<TGConnectingPoint num="37" id="7050" />
-<TGConnectingPoint num="38" id="7051" />
-<TGConnectingPoint num="39" id="7052" />
+<TGConnectingPoint num="0" id="6839" />
+<TGConnectingPoint num="1" id="6840" />
+<TGConnectingPoint num="2" id="6841" />
+<TGConnectingPoint num="3" id="6842" />
+<TGConnectingPoint num="4" id="6843" />
+<TGConnectingPoint num="5" id="6844" />
+<TGConnectingPoint num="6" id="6845" />
+<TGConnectingPoint num="7" id="6846" />
+<TGConnectingPoint num="8" id="6847" />
+<TGConnectingPoint num="9" id="6848" />
+<TGConnectingPoint num="10" id="6849" />
+<TGConnectingPoint num="11" id="6850" />
+<TGConnectingPoint num="12" id="6851" />
+<TGConnectingPoint num="13" id="6852" />
+<TGConnectingPoint num="14" id="6853" />
+<TGConnectingPoint num="15" id="6854" />
+<TGConnectingPoint num="16" id="6855" />
+<TGConnectingPoint num="17" id="6856" />
+<TGConnectingPoint num="18" id="6857" />
+<TGConnectingPoint num="19" id="6858" />
+<TGConnectingPoint num="20" id="6859" />
+<TGConnectingPoint num="21" id="6860" />
+<TGConnectingPoint num="22" id="6861" />
+<TGConnectingPoint num="23" id="6862" />
+<TGConnectingPoint num="24" id="6863" />
+<TGConnectingPoint num="25" id="6864" />
+<TGConnectingPoint num="26" id="6865" />
+<TGConnectingPoint num="27" id="6866" />
+<TGConnectingPoint num="28" id="6867" />
+<TGConnectingPoint num="29" id="6868" />
+<TGConnectingPoint num="30" id="6869" />
+<TGConnectingPoint num="31" id="6870" />
+<TGConnectingPoint num="32" id="6871" />
+<TGConnectingPoint num="33" id="6872" />
+<TGConnectingPoint num="34" id="6873" />
+<TGConnectingPoint num="35" id="6874" />
+<TGConnectingPoint num="36" id="6875" />
+<TGConnectingPoint num="37" id="6876" />
+<TGConnectingPoint num="38" id="6877" />
+<TGConnectingPoint num="39" id="6878" />
 <extraparam>
 <entryCode value="" />
 <entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="7064" >
+<COMPONENT type="5104" id="6890" >
 <cdparam x="395" y="184" />
 <sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ring()" />
-<TGConnectingPoint num="0" id="7054" />
-<TGConnectingPoint num="1" id="7055" />
-<TGConnectingPoint num="2" id="7056" />
-<TGConnectingPoint num="3" id="7057" />
-<TGConnectingPoint num="4" id="7058" />
-<TGConnectingPoint num="5" id="7059" />
-<TGConnectingPoint num="6" id="7060" />
-<TGConnectingPoint num="7" id="7061" />
-<TGConnectingPoint num="8" id="7062" />
-<TGConnectingPoint num="9" id="7063" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7105" >
+<TGConnectingPoint num="0" id="6880" />
+<TGConnectingPoint num="1" id="6881" />
+<TGConnectingPoint num="2" id="6882" />
+<TGConnectingPoint num="3" id="6883" />
+<TGConnectingPoint num="4" id="6884" />
+<TGConnectingPoint num="5" id="6885" />
+<TGConnectingPoint num="6" id="6886" />
+<TGConnectingPoint num="7" id="6887" />
+<TGConnectingPoint num="8" id="6888" />
+<TGConnectingPoint num="9" id="6889" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6931" >
 <cdparam x="369" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="7065" />
-<TGConnectingPoint num="1" id="7066" />
-<TGConnectingPoint num="2" id="7067" />
-<TGConnectingPoint num="3" id="7068" />
-<TGConnectingPoint num="4" id="7069" />
-<TGConnectingPoint num="5" id="7070" />
-<TGConnectingPoint num="6" id="7071" />
-<TGConnectingPoint num="7" id="7072" />
-<TGConnectingPoint num="8" id="7073" />
-<TGConnectingPoint num="9" id="7074" />
-<TGConnectingPoint num="10" id="7075" />
-<TGConnectingPoint num="11" id="7076" />
-<TGConnectingPoint num="12" id="7077" />
-<TGConnectingPoint num="13" id="7078" />
-<TGConnectingPoint num="14" id="7079" />
-<TGConnectingPoint num="15" id="7080" />
-<TGConnectingPoint num="16" id="7081" />
-<TGConnectingPoint num="17" id="7082" />
-<TGConnectingPoint num="18" id="7083" />
-<TGConnectingPoint num="19" id="7084" />
-<TGConnectingPoint num="20" id="7085" />
-<TGConnectingPoint num="21" id="7086" />
-<TGConnectingPoint num="22" id="7087" />
-<TGConnectingPoint num="23" id="7088" />
-<TGConnectingPoint num="24" id="7089" />
-<TGConnectingPoint num="25" id="7090" />
-<TGConnectingPoint num="26" id="7091" />
-<TGConnectingPoint num="27" id="7092" />
-<TGConnectingPoint num="28" id="7093" />
-<TGConnectingPoint num="29" id="7094" />
-<TGConnectingPoint num="30" id="7095" />
-<TGConnectingPoint num="31" id="7096" />
-<TGConnectingPoint num="32" id="7097" />
-<TGConnectingPoint num="33" id="7098" />
-<TGConnectingPoint num="34" id="7099" />
-<TGConnectingPoint num="35" id="7100" />
-<TGConnectingPoint num="36" id="7101" />
-<TGConnectingPoint num="37" id="7102" />
-<TGConnectingPoint num="38" id="7103" />
-<TGConnectingPoint num="39" id="7104" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="7107" >
+<TGConnectingPoint num="0" id="6891" />
+<TGConnectingPoint num="1" id="6892" />
+<TGConnectingPoint num="2" id="6893" />
+<TGConnectingPoint num="3" id="6894" />
+<TGConnectingPoint num="4" id="6895" />
+<TGConnectingPoint num="5" id="6896" />
+<TGConnectingPoint num="6" id="6897" />
+<TGConnectingPoint num="7" id="6898" />
+<TGConnectingPoint num="8" id="6899" />
+<TGConnectingPoint num="9" id="6900" />
+<TGConnectingPoint num="10" id="6901" />
+<TGConnectingPoint num="11" id="6902" />
+<TGConnectingPoint num="12" id="6903" />
+<TGConnectingPoint num="13" id="6904" />
+<TGConnectingPoint num="14" id="6905" />
+<TGConnectingPoint num="15" id="6906" />
+<TGConnectingPoint num="16" id="6907" />
+<TGConnectingPoint num="17" id="6908" />
+<TGConnectingPoint num="18" id="6909" />
+<TGConnectingPoint num="19" id="6910" />
+<TGConnectingPoint num="20" id="6911" />
+<TGConnectingPoint num="21" id="6912" />
+<TGConnectingPoint num="22" id="6913" />
+<TGConnectingPoint num="23" id="6914" />
+<TGConnectingPoint num="24" id="6915" />
+<TGConnectingPoint num="25" id="6916" />
+<TGConnectingPoint num="26" id="6917" />
+<TGConnectingPoint num="27" id="6918" />
+<TGConnectingPoint num="28" id="6919" />
+<TGConnectingPoint num="29" id="6920" />
+<TGConnectingPoint num="30" id="6921" />
+<TGConnectingPoint num="31" id="6922" />
+<TGConnectingPoint num="32" id="6923" />
+<TGConnectingPoint num="33" id="6924" />
+<TGConnectingPoint num="34" id="6925" />
+<TGConnectingPoint num="35" id="6926" />
+<TGConnectingPoint num="36" id="6927" />
+<TGConnectingPoint num="37" id="6928" />
+<TGConnectingPoint num="38" id="6929" />
+<TGConnectingPoint num="39" id="6930" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="6933" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7106" />
+<TGConnectingPoint num="0" id="6932" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="7120" >
+<CONNECTOR type="5102" id="6946" >
 <cdparam x="504" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7116" />
-<TGConnectingPoint num="1" id="7117" />
-<TGConnectingPoint num="2" id="7118" />
-<TGConnectingPoint num="3" id="7119" />
-<P1  x="504" y="232" id="7179" />
-<P2  x="454" y="123" id="7140" />
+<TGConnectingPoint num="0" id="6942" />
+<TGConnectingPoint num="1" id="6943" />
+<TGConnectingPoint num="2" id="6944" />
+<TGConnectingPoint num="3" id="6945" />
+<P1  x="504" y="232" id="7005" />
+<P2  x="454" y="123" id="6966" />
 <Point x="503" y="254" />
 <Point x="425" y="254" />
 <Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7108" >
-<father id="7120" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6934" >
+<father id="6946" num="0" />
 <cdparam x="503" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7109" >
-<father id="7120" num="1" />
+<SUBCOMPONENT type="-1" id="6935" >
+<father id="6946" num="1" />
 <cdparam x="425" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7110" >
-<father id="7120" num="2" />
+<SUBCOMPONENT type="-1" id="6936" >
+<father id="6946" num="2" />
 <cdparam x="426" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7115" >
-<father id="7120" num="3" />
+<SUBCOMPONENT type="-1" id="6941" >
+<father id="6946" num="3" />
 <cdparam x="465" y="275" />
 <sizeparam width="100" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7111" />
-<TGConnectingPoint num="1" id="7112" />
-<TGConnectingPoint num="2" id="7113" />
-<TGConnectingPoint num="3" id="7114" />
+<TGConnectingPoint num="0" id="6937" />
+<TGConnectingPoint num="1" id="6938" />
+<TGConnectingPoint num="2" id="6939" />
+<TGConnectingPoint num="3" id="6940" />
 <extraparam>
 <guard value="[  ]" />
 <afterMin value="" />
@@ -15502,35 +15271,35 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7129" >
+<CONNECTOR type="5102" id="6955" >
 <cdparam x="504" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7127" />
-<TGConnectingPoint num="1" id="7128" />
-<P1  x="504" y="148" id="7143" />
-<P2  x="504" y="202" id="7178" />
+<TGConnectingPoint num="0" id="6953" />
+<TGConnectingPoint num="1" id="6954" />
+<P1  x="504" y="148" id="6969" />
+<P2  x="504" y="202" id="7004" />
 <Point x="504" y="175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7121" >
-<father id="7129" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6947" >
+<father id="6955" num="0" />
 <cdparam x="504" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7126" >
-<father id="7129" num="1" />
+<SUBCOMPONENT type="-1" id="6952" >
+<father id="6955" num="1" />
 <cdparam x="504" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7122" />
-<TGConnectingPoint num="1" id="7123" />
-<TGConnectingPoint num="2" id="7124" />
-<TGConnectingPoint num="3" id="7125" />
+<TGConnectingPoint num="0" id="6948" />
+<TGConnectingPoint num="1" id="6949" />
+<TGConnectingPoint num="2" id="6950" />
+<TGConnectingPoint num="3" id="6951" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15540,25 +15309,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7136" >
+<CONNECTOR type="5102" id="6962" >
 <cdparam x="385" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="7135" />
-<P1  x="481" y="74" id="7189" />
-<P2  x="504" y="98" id="7138" />
+<TGConnectingPoint num="0" id="6961" />
+<P1  x="481" y="74" id="7015" />
+<P2  x="504" y="98" id="6964" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7134" >
-<father id="7136" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6960" >
+<father id="6962" num="0" />
 <cdparam x="385" y="115" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7130" />
-<TGConnectingPoint num="1" id="7131" />
-<TGConnectingPoint num="2" id="7132" />
-<TGConnectingPoint num="3" id="7133" />
+<TGConnectingPoint num="0" id="6956" />
+<TGConnectingPoint num="1" id="6957" />
+<TGConnectingPoint num="2" id="6958" />
+<TGConnectingPoint num="3" id="6959" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15568,106 +15337,106 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="7177" >
+<COMPONENT type="5106" id="7003" >
 <cdparam x="454" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="7137" />
-<TGConnectingPoint num="1" id="7138" />
-<TGConnectingPoint num="2" id="7139" />
-<TGConnectingPoint num="3" id="7140" />
-<TGConnectingPoint num="4" id="7141" />
-<TGConnectingPoint num="5" id="7142" />
-<TGConnectingPoint num="6" id="7143" />
-<TGConnectingPoint num="7" id="7144" />
-<TGConnectingPoint num="8" id="7145" />
-<TGConnectingPoint num="9" id="7146" />
-<TGConnectingPoint num="10" id="7147" />
-<TGConnectingPoint num="11" id="7148" />
-<TGConnectingPoint num="12" id="7149" />
-<TGConnectingPoint num="13" id="7150" />
-<TGConnectingPoint num="14" id="7151" />
-<TGConnectingPoint num="15" id="7152" />
-<TGConnectingPoint num="16" id="7153" />
-<TGConnectingPoint num="17" id="7154" />
-<TGConnectingPoint num="18" id="7155" />
-<TGConnectingPoint num="19" id="7156" />
-<TGConnectingPoint num="20" id="7157" />
-<TGConnectingPoint num="21" id="7158" />
-<TGConnectingPoint num="22" id="7159" />
-<TGConnectingPoint num="23" id="7160" />
-<TGConnectingPoint num="24" id="7161" />
-<TGConnectingPoint num="25" id="7162" />
-<TGConnectingPoint num="26" id="7163" />
-<TGConnectingPoint num="27" id="7164" />
-<TGConnectingPoint num="28" id="7165" />
-<TGConnectingPoint num="29" id="7166" />
-<TGConnectingPoint num="30" id="7167" />
-<TGConnectingPoint num="31" id="7168" />
-<TGConnectingPoint num="32" id="7169" />
-<TGConnectingPoint num="33" id="7170" />
-<TGConnectingPoint num="34" id="7171" />
-<TGConnectingPoint num="35" id="7172" />
-<TGConnectingPoint num="36" id="7173" />
-<TGConnectingPoint num="37" id="7174" />
-<TGConnectingPoint num="38" id="7175" />
-<TGConnectingPoint num="39" id="7176" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="7188" >
+<TGConnectingPoint num="0" id="6963" />
+<TGConnectingPoint num="1" id="6964" />
+<TGConnectingPoint num="2" id="6965" />
+<TGConnectingPoint num="3" id="6966" />
+<TGConnectingPoint num="4" id="6967" />
+<TGConnectingPoint num="5" id="6968" />
+<TGConnectingPoint num="6" id="6969" />
+<TGConnectingPoint num="7" id="6970" />
+<TGConnectingPoint num="8" id="6971" />
+<TGConnectingPoint num="9" id="6972" />
+<TGConnectingPoint num="10" id="6973" />
+<TGConnectingPoint num="11" id="6974" />
+<TGConnectingPoint num="12" id="6975" />
+<TGConnectingPoint num="13" id="6976" />
+<TGConnectingPoint num="14" id="6977" />
+<TGConnectingPoint num="15" id="6978" />
+<TGConnectingPoint num="16" id="6979" />
+<TGConnectingPoint num="17" id="6980" />
+<TGConnectingPoint num="18" id="6981" />
+<TGConnectingPoint num="19" id="6982" />
+<TGConnectingPoint num="20" id="6983" />
+<TGConnectingPoint num="21" id="6984" />
+<TGConnectingPoint num="22" id="6985" />
+<TGConnectingPoint num="23" id="6986" />
+<TGConnectingPoint num="24" id="6987" />
+<TGConnectingPoint num="25" id="6988" />
+<TGConnectingPoint num="26" id="6989" />
+<TGConnectingPoint num="27" id="6990" />
+<TGConnectingPoint num="28" id="6991" />
+<TGConnectingPoint num="29" id="6992" />
+<TGConnectingPoint num="30" id="6993" />
+<TGConnectingPoint num="31" id="6994" />
+<TGConnectingPoint num="32" id="6995" />
+<TGConnectingPoint num="33" id="6996" />
+<TGConnectingPoint num="34" id="6997" />
+<TGConnectingPoint num="35" id="6998" />
+<TGConnectingPoint num="36" id="6999" />
+<TGConnectingPoint num="37" id="7000" />
+<TGConnectingPoint num="38" id="7001" />
+<TGConnectingPoint num="39" id="7002" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="7014" >
 <cdparam x="440" y="207" />
 <sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="7178" />
-<TGConnectingPoint num="1" id="7179" />
-<TGConnectingPoint num="2" id="7180" />
-<TGConnectingPoint num="3" id="7181" />
-<TGConnectingPoint num="4" id="7182" />
-<TGConnectingPoint num="5" id="7183" />
-<TGConnectingPoint num="6" id="7184" />
-<TGConnectingPoint num="7" id="7185" />
-<TGConnectingPoint num="8" id="7186" />
-<TGConnectingPoint num="9" id="7187" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="7190" >
+<TGConnectingPoint num="0" id="7004" />
+<TGConnectingPoint num="1" id="7005" />
+<TGConnectingPoint num="2" id="7006" />
+<TGConnectingPoint num="3" id="7007" />
+<TGConnectingPoint num="4" id="7008" />
+<TGConnectingPoint num="5" id="7009" />
+<TGConnectingPoint num="6" id="7010" />
+<TGConnectingPoint num="7" id="7011" />
+<TGConnectingPoint num="8" id="7012" />
+<TGConnectingPoint num="9" id="7013" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="7016" >
 <cdparam x="474" y="54" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7189" />
+<TGConnectingPoint num="0" id="7015" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="7197" >
+<CONNECTOR type="5102" id="7023" >
 <cdparam x="671" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7196" />
-<P1  x="671" y="347" id="7647" />
-<P2  x="672" y="349" id="7400" />
+<TGConnectingPoint num="0" id="7022" />
+<P1  x="671" y="347" id="7473" />
+<P2  x="672" y="349" id="7226" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7195" >
-<father id="7197" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7021" >
+<father id="7023" num="0" />
 <cdparam x="671" y="387" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7191" />
-<TGConnectingPoint num="1" id="7192" />
-<TGConnectingPoint num="2" id="7193" />
-<TGConnectingPoint num="3" id="7194" />
+<TGConnectingPoint num="0" id="7017" />
+<TGConnectingPoint num="1" id="7018" />
+<TGConnectingPoint num="2" id="7019" />
+<TGConnectingPoint num="3" id="7020" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15677,25 +15446,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7204" >
+<CONNECTOR type="5102" id="7030" >
 <cdparam x="671" y="540" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7203" />
-<P1  x="671" y="540" id="7412" />
-<P2  x="671" y="551" id="7668" />
+<TGConnectingPoint num="0" id="7029" />
+<P1  x="671" y="540" id="7238" />
+<P2  x="671" y="551" id="7494" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7202" >
-<father id="7204" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7028" >
+<father id="7030" num="0" />
 <cdparam x="671" y="580" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7198" />
-<TGConnectingPoint num="1" id="7199" />
-<TGConnectingPoint num="2" id="7200" />
-<TGConnectingPoint num="3" id="7201" />
+<TGConnectingPoint num="0" id="7024" />
+<TGConnectingPoint num="1" id="7025" />
+<TGConnectingPoint num="2" id="7026" />
+<TGConnectingPoint num="3" id="7027" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15705,25 +15474,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7211" >
+<CONNECTOR type="5102" id="7037" >
 <cdparam x="671" y="332" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7210" />
-<P1  x="669" y="317" id="7423" />
-<P2  x="671" y="317" id="7646" />
+<TGConnectingPoint num="0" id="7036" />
+<P1  x="669" y="317" id="7249" />
+<P2  x="671" y="317" id="7472" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7209" >
-<father id="7211" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7035" >
+<father id="7037" num="0" />
 <cdparam x="671" y="385" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7205" />
-<TGConnectingPoint num="1" id="7206" />
-<TGConnectingPoint num="2" id="7207" />
-<TGConnectingPoint num="3" id="7208" />
+<TGConnectingPoint num="0" id="7031" />
+<TGConnectingPoint num="1" id="7032" />
+<TGConnectingPoint num="2" id="7033" />
+<TGConnectingPoint num="3" id="7034" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15733,25 +15502,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7218" >
+<CONNECTOR type="5102" id="7044" >
 <cdparam x="428" y="373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7217" />
-<P1  x="428" y="380" id="7434" />
-<P2  x="428" y="395" id="7530" />
+<TGConnectingPoint num="0" id="7043" />
+<P1  x="428" y="380" id="7260" />
+<P2  x="428" y="395" id="7356" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7216" >
-<father id="7218" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7042" >
+<father id="7044" num="0" />
 <cdparam x="428" y="413" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7212" />
-<TGConnectingPoint num="1" id="7213" />
-<TGConnectingPoint num="2" id="7214" />
-<TGConnectingPoint num="3" id="7215" />
+<TGConnectingPoint num="0" id="7038" />
+<TGConnectingPoint num="1" id="7039" />
+<TGConnectingPoint num="2" id="7040" />
+<TGConnectingPoint num="3" id="7041" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15761,25 +15530,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7225" >
+<CONNECTOR type="5102" id="7051" >
 <cdparam x="661" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7224" />
-<P1  x="661" y="175" id="7702" />
-<P2  x="661" y="180" id="7444" />
+<TGConnectingPoint num="0" id="7050" />
+<P1  x="661" y="175" id="7528" />
+<P2  x="661" y="180" id="7270" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7223" >
-<father id="7225" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7049" >
+<father id="7051" num="0" />
 <cdparam x="661" y="215" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7219" />
-<TGConnectingPoint num="1" id="7220" />
-<TGConnectingPoint num="2" id="7221" />
-<TGConnectingPoint num="3" id="7222" />
+<TGConnectingPoint num="0" id="7045" />
+<TGConnectingPoint num="1" id="7046" />
+<TGConnectingPoint num="2" id="7047" />
+<TGConnectingPoint num="3" id="7048" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15789,25 +15558,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7232" >
+<CONNECTOR type="5102" id="7058" >
 <cdparam x="661" y="95" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7231" />
-<P1  x="661" y="95" id="7456" />
-<P2  x="661" y="106" id="7713" />
+<TGConnectingPoint num="0" id="7057" />
+<P1  x="661" y="95" id="7282" />
+<P2  x="661" y="106" id="7539" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7230" >
-<father id="7232" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7056" >
+<father id="7058" num="0" />
 <cdparam x="661" y="135" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7226" />
-<TGConnectingPoint num="1" id="7227" />
-<TGConnectingPoint num="2" id="7228" />
-<TGConnectingPoint num="3" id="7229" />
+<TGConnectingPoint num="0" id="7052" />
+<TGConnectingPoint num="1" id="7053" />
+<TGConnectingPoint num="2" id="7054" />
+<TGConnectingPoint num="3" id="7055" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15817,25 +15586,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7239" >
+<CONNECTOR type="5102" id="7065" >
 <cdparam x="450" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7238" />
-<P1  x="492" y="208" id="7634" />
-<P2  x="453" y="262" id="7475" />
+<TGConnectingPoint num="0" id="7064" />
+<P1  x="492" y="208" id="7460" />
+<P2  x="453" y="262" id="7301" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7237" >
-<father id="7239" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7063" >
+<father id="7065" num="0" />
 <cdparam x="450" y="295" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7233" />
-<TGConnectingPoint num="1" id="7234" />
-<TGConnectingPoint num="2" id="7235" />
-<TGConnectingPoint num="3" id="7236" />
+<TGConnectingPoint num="0" id="7059" />
+<TGConnectingPoint num="1" id="7060" />
+<TGConnectingPoint num="2" id="7061" />
+<TGConnectingPoint num="3" id="7062" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15845,25 +15614,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7246" >
+<CONNECTOR type="5102" id="7072" >
 <cdparam x="304" y="257" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7245" />
-<P1  x="357" y="209" id="7508" />
-<P2  x="403" y="262" id="7474" />
+<TGConnectingPoint num="0" id="7071" />
+<P1  x="357" y="209" id="7334" />
+<P2  x="403" y="262" id="7300" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7244" >
-<father id="7246" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7070" >
+<father id="7072" num="0" />
 <cdparam x="304" y="297" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7240" />
-<TGConnectingPoint num="1" id="7241" />
-<TGConnectingPoint num="2" id="7242" />
-<TGConnectingPoint num="3" id="7243" />
+<TGConnectingPoint num="0" id="7066" />
+<TGConnectingPoint num="1" id="7067" />
+<TGConnectingPoint num="2" id="7068" />
+<TGConnectingPoint num="3" id="7069" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15873,25 +15642,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7253" >
+<CONNECTOR type="5102" id="7079" >
 <cdparam x="409" y="164" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="7252" />
-<P1  x="409" y="164" id="7606" />
-<P2  x="357" y="179" id="7507" />
+<TGConnectingPoint num="0" id="7078" />
+<P1  x="409" y="164" id="7432" />
+<P2  x="357" y="179" id="7333" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7251" >
-<father id="7253" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7077" >
+<father id="7079" num="0" />
 <cdparam x="409" y="204" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7247" />
-<TGConnectingPoint num="1" id="7248" />
-<TGConnectingPoint num="2" id="7249" />
-<TGConnectingPoint num="3" id="7250" />
+<TGConnectingPoint num="0" id="7073" />
+<TGConnectingPoint num="1" id="7074" />
+<TGConnectingPoint num="2" id="7075" />
+<TGConnectingPoint num="3" id="7076" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15901,25 +15670,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7260" >
+<CONNECTOR type="5102" id="7086" >
 <cdparam x="646" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="7259" />
-<P1  x="661" y="210" id="7445" />
-<P2  x="471" y="152" id="7605" />
+<TGConnectingPoint num="0" id="7085" />
+<P1  x="661" y="210" id="7271" />
+<P2  x="471" y="152" id="7431" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7258" >
-<father id="7260" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7084" >
+<father id="7086" num="0" />
 <cdparam x="646" y="310" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7254" />
-<TGConnectingPoint num="1" id="7255" />
-<TGConnectingPoint num="2" id="7256" />
-<TGConnectingPoint num="3" id="7257" />
+<TGConnectingPoint num="0" id="7080" />
+<TGConnectingPoint num="1" id="7081" />
+<TGConnectingPoint num="2" id="7082" />
+<TGConnectingPoint num="3" id="7083" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15929,25 +15698,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7267" >
+<CONNECTOR type="5102" id="7093" >
 <cdparam x="660" y="178" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7266" />
-<P1  x="661" y="141" id="7718" />
-<P2  x="661" y="145" id="7701" />
+<TGConnectingPoint num="0" id="7092" />
+<P1  x="661" y="141" id="7544" />
+<P2  x="661" y="145" id="7527" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7265" >
-<father id="7267" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7091" >
+<father id="7093" num="0" />
 <cdparam x="660" y="218" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7261" />
-<TGConnectingPoint num="1" id="7262" />
-<TGConnectingPoint num="2" id="7263" />
-<TGConnectingPoint num="3" id="7264" />
+<TGConnectingPoint num="0" id="7087" />
+<TGConnectingPoint num="1" id="7088" />
+<TGConnectingPoint num="2" id="7089" />
+<TGConnectingPoint num="3" id="7090" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15957,25 +15726,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7274" >
+<CONNECTOR type="5102" id="7100" >
 <cdparam x="659" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7273" />
-<P1  x="661" y="61" id="7582" />
-<P2  x="661" y="65" id="7455" />
+<TGConnectingPoint num="0" id="7099" />
+<P1  x="661" y="61" id="7408" />
+<P2  x="661" y="65" id="7281" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7272" >
-<father id="7274" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7098" >
+<father id="7100" num="0" />
 <cdparam x="659" y="150" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7268" />
-<TGConnectingPoint num="1" id="7269" />
-<TGConnectingPoint num="2" id="7270" />
-<TGConnectingPoint num="3" id="7271" />
+<TGConnectingPoint num="0" id="7094" />
+<TGConnectingPoint num="1" id="7095" />
+<TGConnectingPoint num="2" id="7096" />
+<TGConnectingPoint num="3" id="7097" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -15985,25 +15754,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7281" >
+<CONNECTOR type="5102" id="7107" >
 <cdparam x="739" y="573" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7280" />
-<P1  x="671" y="503" id="7691" />
-<P2  x="671" y="510" id="7411" />
+<TGConnectingPoint num="0" id="7106" />
+<P1  x="671" y="503" id="7517" />
+<P2  x="671" y="510" id="7237" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7279" >
-<father id="7281" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7105" >
+<father id="7107" num="0" />
 <cdparam x="739" y="613" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7275" />
-<TGConnectingPoint num="1" id="7276" />
-<TGConnectingPoint num="2" id="7277" />
-<TGConnectingPoint num="3" id="7278" />
+<TGConnectingPoint num="0" id="7101" />
+<TGConnectingPoint num="1" id="7102" />
+<TGConnectingPoint num="2" id="7103" />
+<TGConnectingPoint num="3" id="7104" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16013,25 +15782,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7288" >
+<CONNECTOR type="5102" id="7114" >
 <cdparam x="769" y="593" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7287" />
-<P1  x="671" y="443" id="7759" />
-<P2  x="671" y="473" id="7690" />
+<TGConnectingPoint num="0" id="7113" />
+<P1  x="671" y="443" id="7585" />
+<P2  x="671" y="473" id="7516" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7286" >
-<father id="7288" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7112" >
+<father id="7114" num="0" />
 <cdparam x="769" y="633" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7282" />
-<TGConnectingPoint num="1" id="7283" />
-<TGConnectingPoint num="2" id="7284" />
-<TGConnectingPoint num="3" id="7285" />
+<TGConnectingPoint num="0" id="7108" />
+<TGConnectingPoint num="1" id="7109" />
+<TGConnectingPoint num="2" id="7110" />
+<TGConnectingPoint num="3" id="7111" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16041,55 +15810,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7301" >
+<CONNECTOR type="5102" id="7127" >
 <cdparam x="656" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7297" />
-<TGConnectingPoint num="1" id="7298" />
-<TGConnectingPoint num="2" id="7299" />
-<TGConnectingPoint num="3" id="7300" />
-<P1  x="671" y="581" id="7669" />
-<P2  x="478" y="432" id="7542" />
+<TGConnectingPoint num="0" id="7123" />
+<TGConnectingPoint num="1" id="7124" />
+<TGConnectingPoint num="2" id="7125" />
+<TGConnectingPoint num="3" id="7126" />
+<P1  x="671" y="581" id="7495" />
+<P2  x="478" y="432" id="7368" />
 <Point x="671" y="595" />
 <Point x="548" y="595" />
 <Point x="548" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7289" >
-<father id="7301" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7115" >
+<father id="7127" num="0" />
 <cdparam x="671" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7290" >
-<father id="7301" num="1" />
+<SUBCOMPONENT type="-1" id="7116" >
+<father id="7127" num="1" />
 <cdparam x="548" y="595" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7291" >
-<father id="7301" num="2" />
+<SUBCOMPONENT type="-1" id="7117" >
+<father id="7127" num="2" />
 <cdparam x="548" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7296" >
-<father id="7301" num="3" />
+<SUBCOMPONENT type="-1" id="7122" >
+<father id="7127" num="3" />
 <cdparam x="656" y="648" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7292" />
-<TGConnectingPoint num="1" id="7293" />
-<TGConnectingPoint num="2" id="7294" />
-<TGConnectingPoint num="3" id="7295" />
+<TGConnectingPoint num="0" id="7118" />
+<TGConnectingPoint num="1" id="7119" />
+<TGConnectingPoint num="2" id="7120" />
+<TGConnectingPoint num="3" id="7121" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16099,25 +15868,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7308" >
+<CONNECTOR type="5102" id="7134" >
 <cdparam x="770" y="523" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7307" />
-<P1  x="672" y="379" id="7401" />
-<P2  x="671" y="393" id="7754" />
+<TGConnectingPoint num="0" id="7133" />
+<P1  x="672" y="379" id="7227" />
+<P2  x="671" y="393" id="7580" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7306" >
-<father id="7308" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7132" >
+<father id="7134" num="0" />
 <cdparam x="770" y="563" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7302" />
-<TGConnectingPoint num="1" id="7303" />
-<TGConnectingPoint num="2" id="7304" />
-<TGConnectingPoint num="3" id="7305" />
+<TGConnectingPoint num="0" id="7128" />
+<TGConnectingPoint num="1" id="7129" />
+<TGConnectingPoint num="2" id="7130" />
+<TGConnectingPoint num="3" id="7131" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16127,25 +15896,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7315" >
+<CONNECTOR type="5102" id="7141" >
 <cdparam x="642" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7314" />
-<P1  x="670" y="287" id="7519" />
-<P2  x="669" y="287" id="7422" />
+<TGConnectingPoint num="0" id="7140" />
+<P1  x="670" y="287" id="7345" />
+<P2  x="669" y="287" id="7248" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7313" >
-<father id="7315" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7139" >
+<father id="7141" num="0" />
 <cdparam x="654" y="379" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7309" />
-<TGConnectingPoint num="1" id="7310" />
-<TGConnectingPoint num="2" id="7311" />
-<TGConnectingPoint num="3" id="7312" />
+<TGConnectingPoint num="0" id="7135" />
+<TGConnectingPoint num="1" id="7136" />
+<TGConnectingPoint num="2" id="7137" />
+<TGConnectingPoint num="3" id="7138" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16155,55 +15924,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7328" >
+<CONNECTOR type="5102" id="7154" >
 <cdparam x="425" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="7324" />
-<TGConnectingPoint num="1" id="7325" />
-<TGConnectingPoint num="2" id="7326" />
-<TGConnectingPoint num="3" id="7327" />
-<P1  x="403" y="445" id="7543" />
-<P2  x="378" y="432" id="7541" />
+<TGConnectingPoint num="0" id="7150" />
+<TGConnectingPoint num="1" id="7151" />
+<TGConnectingPoint num="2" id="7152" />
+<TGConnectingPoint num="3" id="7153" />
+<P1  x="403" y="445" id="7369" />
+<P2  x="378" y="432" id="7367" />
 <Point x="403" y="480" />
 <Point x="319" y="480" />
 <Point x="319" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7316" >
-<father id="7328" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7142" >
+<father id="7154" num="0" />
 <cdparam x="403" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7317" >
-<father id="7328" num="1" />
+<SUBCOMPONENT type="-1" id="7143" >
+<father id="7154" num="1" />
 <cdparam x="319" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7318" >
-<father id="7328" num="2" />
+<SUBCOMPONENT type="-1" id="7144" >
+<father id="7154" num="2" />
 <cdparam x="319" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7323" >
-<father id="7328" num="3" />
+<SUBCOMPONENT type="-1" id="7149" >
+<father id="7154" num="3" />
 <cdparam x="158" y="477" />
 <sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7319" />
-<TGConnectingPoint num="1" id="7320" />
-<TGConnectingPoint num="2" id="7321" />
-<TGConnectingPoint num="3" id="7322" />
+<TGConnectingPoint num="0" id="7145" />
+<TGConnectingPoint num="1" id="7146" />
+<TGConnectingPoint num="2" id="7147" />
+<TGConnectingPoint num="3" id="7148" />
 <extraparam>
 <guard value="[ remainingTime&gt;0 ]" />
 <afterMin value="1" />
@@ -16215,25 +15984,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7335" >
+<CONNECTOR type="5102" id="7161" >
 <cdparam x="499" y="496" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="7334" />
-<P1  x="478" y="420" id="7533" />
-<P2  x="670" y="257" id="7518" />
+<TGConnectingPoint num="0" id="7160" />
+<P1  x="478" y="420" id="7359" />
+<P2  x="670" y="257" id="7344" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7333" >
-<father id="7335" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7159" >
+<father id="7161" num="0" />
 <cdparam x="457" y="282" />
 <sizeparam width="201" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7329" />
-<TGConnectingPoint num="1" id="7330" />
-<TGConnectingPoint num="2" id="7331" />
-<TGConnectingPoint num="3" id="7332" />
+<TGConnectingPoint num="0" id="7155" />
+<TGConnectingPoint num="1" id="7156" />
+<TGConnectingPoint num="2" id="7157" />
+<TGConnectingPoint num="3" id="7158" />
 <extraparam>
 <guard value="[remainingTime &gt; 0 ]" />
 <afterMin value="1" />
@@ -16245,25 +16014,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7342" >
+<CONNECTOR type="5102" id="7168" >
 <cdparam x="450" y="562" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7341" />
-<P1  x="428" y="445" id="7535" />
-<P2  x="428" y="507" id="7657" />
+<TGConnectingPoint num="0" id="7167" />
+<P1  x="428" y="445" id="7361" />
+<P2  x="428" y="507" id="7483" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7340" >
-<father id="7342" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7166" >
+<father id="7168" num="0" />
 <cdparam x="397" y="475" />
 <sizeparam width="139" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7336" />
-<TGConnectingPoint num="1" id="7337" />
-<TGConnectingPoint num="2" id="7338" />
-<TGConnectingPoint num="3" id="7339" />
+<TGConnectingPoint num="0" id="7162" />
+<TGConnectingPoint num="1" id="7163" />
+<TGConnectingPoint num="2" id="7164" />
+<TGConnectingPoint num="3" id="7165" />
 <extraparam>
 <guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
@@ -16273,25 +16042,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7349" >
+<CONNECTOR type="5102" id="7175" >
 <cdparam x="450" y="487" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7348" />
-<P1  x="428" y="334" id="7680" />
-<P2  x="428" y="350" id="7433" />
+<TGConnectingPoint num="0" id="7174" />
+<P1  x="428" y="334" id="7506" />
+<P2  x="428" y="350" id="7259" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7347" >
-<father id="7349" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7173" >
+<father id="7175" num="0" />
 <cdparam x="252" y="341" />
 <sizeparam width="166" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7343" />
-<TGConnectingPoint num="1" id="7344" />
-<TGConnectingPoint num="2" id="7345" />
-<TGConnectingPoint num="3" id="7346" />
+<TGConnectingPoint num="0" id="7169" />
+<TGConnectingPoint num="1" id="7170" />
+<TGConnectingPoint num="2" id="7171" />
+<TGConnectingPoint num="3" id="7172" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16303,65 +16072,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7364" >
+<CONNECTOR type="5102" id="7190" >
 <cdparam x="419" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="7359" />
-<TGConnectingPoint num="1" id="7360" />
-<TGConnectingPoint num="2" id="7361" />
-<TGConnectingPoint num="3" id="7362" />
-<TGConnectingPoint num="4" id="7363" />
-<P1  x="428" y="579" id="7571" />
-<P2  x="389" y="119" id="7592" />
+<TGConnectingPoint num="0" id="7185" />
+<TGConnectingPoint num="1" id="7186" />
+<TGConnectingPoint num="2" id="7187" />
+<TGConnectingPoint num="3" id="7188" />
+<TGConnectingPoint num="4" id="7189" />
+<P1  x="428" y="579" id="7397" />
+<P2  x="389" y="119" id="7418" />
 <Point x="428" y="603" />
 <Point x="220" y="603" />
 <Point x="220" y="83" />
 <Point x="389" y="83" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7350" >
-<father id="7364" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7176" >
+<father id="7190" num="0" />
 <cdparam x="428" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7351" >
-<father id="7364" num="1" />
+<SUBCOMPONENT type="-1" id="7177" >
+<father id="7190" num="1" />
 <cdparam x="220" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7352" >
-<father id="7364" num="2" />
+<SUBCOMPONENT type="-1" id="7178" >
+<father id="7190" num="2" />
 <cdparam x="220" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7353" >
-<father id="7364" num="3" />
+<SUBCOMPONENT type="-1" id="7179" >
+<father id="7190" num="3" />
 <cdparam x="389" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7358" >
-<father id="7364" num="4" />
+<SUBCOMPONENT type="-1" id="7184" >
+<father id="7190" num="4" />
 <cdparam x="419" y="587" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7354" />
-<TGConnectingPoint num="1" id="7355" />
-<TGConnectingPoint num="2" id="7356" />
-<TGConnectingPoint num="3" id="7357" />
+<TGConnectingPoint num="0" id="7180" />
+<TGConnectingPoint num="1" id="7181" />
+<TGConnectingPoint num="2" id="7182" />
+<TGConnectingPoint num="3" id="7183" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -16371,25 +16140,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7371" >
+<CONNECTOR type="5102" id="7197" >
 <cdparam x="419" y="633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7370" />
-<P1  x="428" y="537" id="7658" />
-<P2  x="428" y="549" id="7570" />
+<TGConnectingPoint num="0" id="7196" />
+<P1  x="428" y="537" id="7484" />
+<P2  x="428" y="549" id="7396" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7369" >
-<father id="7371" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7195" >
+<father id="7197" num="0" />
 <cdparam x="419" y="673" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7365" />
-<TGConnectingPoint num="1" id="7366" />
-<TGConnectingPoint num="2" id="7367" />
-<TGConnectingPoint num="3" id="7368" />
+<TGConnectingPoint num="0" id="7191" />
+<TGConnectingPoint num="1" id="7192" />
+<TGConnectingPoint num="2" id="7193" />
+<TGConnectingPoint num="3" id="7194" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16399,25 +16168,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7378" >
+<CONNECTOR type="5102" id="7204" >
 <cdparam x="471" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7377" />
-<P1  x="471" y="141" id="7596" />
-<P2  x="661" y="31" id="7581" />
+<TGConnectingPoint num="0" id="7203" />
+<P1  x="471" y="141" id="7422" />
+<P2  x="661" y="31" id="7407" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7376" >
-<father id="7378" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7202" >
+<father id="7204" num="0" />
 <cdparam x="471" y="223" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7372" />
-<TGConnectingPoint num="1" id="7373" />
-<TGConnectingPoint num="2" id="7374" />
-<TGConnectingPoint num="3" id="7375" />
+<TGConnectingPoint num="0" id="7198" />
+<TGConnectingPoint num="1" id="7199" />
+<TGConnectingPoint num="2" id="7200" />
+<TGConnectingPoint num="3" id="7201" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16427,25 +16196,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7385" >
+<CONNECTOR type="5102" id="7211" >
 <cdparam x="463" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7384" />
-<P1  x="450" y="164" id="7607" />
-<P2  x="492" y="178" id="7633" />
+<TGConnectingPoint num="0" id="7210" />
+<P1  x="450" y="164" id="7433" />
+<P2  x="492" y="178" id="7459" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7383" >
-<father id="7385" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7209" >
+<father id="7211" num="0" />
 <cdparam x="400" y="221" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7379" />
-<TGConnectingPoint num="1" id="7380" />
-<TGConnectingPoint num="2" id="7381" />
-<TGConnectingPoint num="3" id="7382" />
+<TGConnectingPoint num="0" id="7205" />
+<TGConnectingPoint num="1" id="7206" />
+<TGConnectingPoint num="2" id="7207" />
+<TGConnectingPoint num="3" id="7208" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16455,25 +16224,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7392" >
+<CONNECTOR type="5102" id="7218" >
 <cdparam x="438" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state1" value="null" />
-<TGConnectingPoint num="0" id="7391" />
-<P1  x="430" y="100" id="7644" />
-<P2  x="430" y="119" id="7593" />
+<TGConnectingPoint num="0" id="7217" />
+<P1  x="430" y="100" id="7470" />
+<P2  x="430" y="119" id="7419" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7390" >
-<father id="7392" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7216" >
+<father id="7218" num="0" />
 <cdparam x="442" y="129" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7386" />
-<TGConnectingPoint num="1" id="7387" />
-<TGConnectingPoint num="2" id="7388" />
-<TGConnectingPoint num="3" id="7389" />
+<TGConnectingPoint num="0" id="7212" />
+<TGConnectingPoint num="1" id="7213" />
+<TGConnectingPoint num="2" id="7214" />
+<TGConnectingPoint num="3" id="7215" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16483,25 +16252,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7399" >
+<CONNECTOR type="5102" id="7225" >
 <cdparam x="449" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7398" />
-<P1  x="428" y="298" id="7472" />
-<P2  x="428" y="304" id="7679" />
+<TGConnectingPoint num="0" id="7224" />
+<P1  x="428" y="298" id="7298" />
+<P2  x="428" y="304" id="7505" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7397" >
-<father id="7399" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7223" >
+<father id="7225" num="0" />
 <cdparam x="449" y="428" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7393" />
-<TGConnectingPoint num="1" id="7394" />
-<TGConnectingPoint num="2" id="7395" />
-<TGConnectingPoint num="3" id="7396" />
+<TGConnectingPoint num="0" id="7219" />
+<TGConnectingPoint num="1" id="7220" />
+<TGConnectingPoint num="2" id="7221" />
+<TGConnectingPoint num="3" id="7222" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -16511,620 +16280,620 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="7410" >
+<COMPONENT type="5103" id="7236" >
 <cdparam x="631" y="354" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="7400" />
-<TGConnectingPoint num="1" id="7401" />
-<TGConnectingPoint num="2" id="7402" />
-<TGConnectingPoint num="3" id="7403" />
-<TGConnectingPoint num="4" id="7404" />
-<TGConnectingPoint num="5" id="7405" />
-<TGConnectingPoint num="6" id="7406" />
-<TGConnectingPoint num="7" id="7407" />
-<TGConnectingPoint num="8" id="7408" />
-<TGConnectingPoint num="9" id="7409" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7421" >
+<TGConnectingPoint num="0" id="7226" />
+<TGConnectingPoint num="1" id="7227" />
+<TGConnectingPoint num="2" id="7228" />
+<TGConnectingPoint num="3" id="7229" />
+<TGConnectingPoint num="4" id="7230" />
+<TGConnectingPoint num="5" id="7231" />
+<TGConnectingPoint num="6" id="7232" />
+<TGConnectingPoint num="7" id="7233" />
+<TGConnectingPoint num="8" id="7234" />
+<TGConnectingPoint num="9" id="7235" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7247" >
 <cdparam x="630" y="515" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="7411" />
-<TGConnectingPoint num="1" id="7412" />
-<TGConnectingPoint num="2" id="7413" />
-<TGConnectingPoint num="3" id="7414" />
-<TGConnectingPoint num="4" id="7415" />
-<TGConnectingPoint num="5" id="7416" />
-<TGConnectingPoint num="6" id="7417" />
-<TGConnectingPoint num="7" id="7418" />
-<TGConnectingPoint num="8" id="7419" />
-<TGConnectingPoint num="9" id="7420" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7432" >
+<TGConnectingPoint num="0" id="7237" />
+<TGConnectingPoint num="1" id="7238" />
+<TGConnectingPoint num="2" id="7239" />
+<TGConnectingPoint num="3" id="7240" />
+<TGConnectingPoint num="4" id="7241" />
+<TGConnectingPoint num="5" id="7242" />
+<TGConnectingPoint num="6" id="7243" />
+<TGConnectingPoint num="7" id="7244" />
+<TGConnectingPoint num="8" id="7245" />
+<TGConnectingPoint num="9" id="7246" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7258" >
 <cdparam x="632" y="292" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="7422" />
-<TGConnectingPoint num="1" id="7423" />
-<TGConnectingPoint num="2" id="7424" />
-<TGConnectingPoint num="3" id="7425" />
-<TGConnectingPoint num="4" id="7426" />
-<TGConnectingPoint num="5" id="7427" />
-<TGConnectingPoint num="6" id="7428" />
-<TGConnectingPoint num="7" id="7429" />
-<TGConnectingPoint num="8" id="7430" />
-<TGConnectingPoint num="9" id="7431" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7443" >
+<TGConnectingPoint num="0" id="7248" />
+<TGConnectingPoint num="1" id="7249" />
+<TGConnectingPoint num="2" id="7250" />
+<TGConnectingPoint num="3" id="7251" />
+<TGConnectingPoint num="4" id="7252" />
+<TGConnectingPoint num="5" id="7253" />
+<TGConnectingPoint num="6" id="7254" />
+<TGConnectingPoint num="7" id="7255" />
+<TGConnectingPoint num="8" id="7256" />
+<TGConnectingPoint num="9" id="7257" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7269" >
 <cdparam x="362" y="355" />
 <sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="7433" />
-<TGConnectingPoint num="1" id="7434" />
-<TGConnectingPoint num="2" id="7435" />
-<TGConnectingPoint num="3" id="7436" />
-<TGConnectingPoint num="4" id="7437" />
-<TGConnectingPoint num="5" id="7438" />
-<TGConnectingPoint num="6" id="7439" />
-<TGConnectingPoint num="7" id="7440" />
-<TGConnectingPoint num="8" id="7441" />
-<TGConnectingPoint num="9" id="7442" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7454" >
+<TGConnectingPoint num="0" id="7259" />
+<TGConnectingPoint num="1" id="7260" />
+<TGConnectingPoint num="2" id="7261" />
+<TGConnectingPoint num="3" id="7262" />
+<TGConnectingPoint num="4" id="7263" />
+<TGConnectingPoint num="5" id="7264" />
+<TGConnectingPoint num="6" id="7265" />
+<TGConnectingPoint num="7" id="7266" />
+<TGConnectingPoint num="8" id="7267" />
+<TGConnectingPoint num="9" id="7268" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7280" >
 <cdparam x="620" y="185" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="7444" />
-<TGConnectingPoint num="1" id="7445" />
-<TGConnectingPoint num="2" id="7446" />
-<TGConnectingPoint num="3" id="7447" />
-<TGConnectingPoint num="4" id="7448" />
-<TGConnectingPoint num="5" id="7449" />
-<TGConnectingPoint num="6" id="7450" />
-<TGConnectingPoint num="7" id="7451" />
-<TGConnectingPoint num="8" id="7452" />
-<TGConnectingPoint num="9" id="7453" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7465" >
+<TGConnectingPoint num="0" id="7270" />
+<TGConnectingPoint num="1" id="7271" />
+<TGConnectingPoint num="2" id="7272" />
+<TGConnectingPoint num="3" id="7273" />
+<TGConnectingPoint num="4" id="7274" />
+<TGConnectingPoint num="5" id="7275" />
+<TGConnectingPoint num="6" id="7276" />
+<TGConnectingPoint num="7" id="7277" />
+<TGConnectingPoint num="8" id="7278" />
+<TGConnectingPoint num="9" id="7279" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7291" >
 <cdparam x="624" y="70" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="7455" />
-<TGConnectingPoint num="1" id="7456" />
-<TGConnectingPoint num="2" id="7457" />
-<TGConnectingPoint num="3" id="7458" />
-<TGConnectingPoint num="4" id="7459" />
-<TGConnectingPoint num="5" id="7460" />
-<TGConnectingPoint num="6" id="7461" />
-<TGConnectingPoint num="7" id="7462" />
-<TGConnectingPoint num="8" id="7463" />
-<TGConnectingPoint num="9" id="7464" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7506" >
+<TGConnectingPoint num="0" id="7281" />
+<TGConnectingPoint num="1" id="7282" />
+<TGConnectingPoint num="2" id="7283" />
+<TGConnectingPoint num="3" id="7284" />
+<TGConnectingPoint num="4" id="7285" />
+<TGConnectingPoint num="5" id="7286" />
+<TGConnectingPoint num="6" id="7287" />
+<TGConnectingPoint num="7" id="7288" />
+<TGConnectingPoint num="8" id="7289" />
+<TGConnectingPoint num="9" id="7290" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7332" >
 <cdparam x="378" y="262" />
 <sizeparam width="100" height="36" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Starting" />
-<TGConnectingPoint num="0" id="7466" />
-<TGConnectingPoint num="1" id="7467" />
-<TGConnectingPoint num="2" id="7468" />
-<TGConnectingPoint num="3" id="7469" />
-<TGConnectingPoint num="4" id="7470" />
-<TGConnectingPoint num="5" id="7471" />
-<TGConnectingPoint num="6" id="7472" />
-<TGConnectingPoint num="7" id="7473" />
-<TGConnectingPoint num="8" id="7474" />
-<TGConnectingPoint num="9" id="7475" />
-<TGConnectingPoint num="10" id="7476" />
-<TGConnectingPoint num="11" id="7477" />
-<TGConnectingPoint num="12" id="7478" />
-<TGConnectingPoint num="13" id="7479" />
-<TGConnectingPoint num="14" id="7480" />
-<TGConnectingPoint num="15" id="7481" />
-<TGConnectingPoint num="16" id="7482" />
-<TGConnectingPoint num="17" id="7483" />
-<TGConnectingPoint num="18" id="7484" />
-<TGConnectingPoint num="19" id="7485" />
-<TGConnectingPoint num="20" id="7486" />
-<TGConnectingPoint num="21" id="7487" />
-<TGConnectingPoint num="22" id="7488" />
-<TGConnectingPoint num="23" id="7489" />
-<TGConnectingPoint num="24" id="7490" />
-<TGConnectingPoint num="25" id="7491" />
-<TGConnectingPoint num="26" id="7492" />
-<TGConnectingPoint num="27" id="7493" />
-<TGConnectingPoint num="28" id="7494" />
-<TGConnectingPoint num="29" id="7495" />
-<TGConnectingPoint num="30" id="7496" />
-<TGConnectingPoint num="31" id="7497" />
-<TGConnectingPoint num="32" id="7498" />
-<TGConnectingPoint num="33" id="7499" />
-<TGConnectingPoint num="34" id="7500" />
-<TGConnectingPoint num="35" id="7501" />
-<TGConnectingPoint num="36" id="7502" />
-<TGConnectingPoint num="37" id="7503" />
-<TGConnectingPoint num="38" id="7504" />
-<TGConnectingPoint num="39" id="7505" />
+<TGConnectingPoint num="0" id="7292" />
+<TGConnectingPoint num="1" id="7293" />
+<TGConnectingPoint num="2" id="7294" />
+<TGConnectingPoint num="3" id="7295" />
+<TGConnectingPoint num="4" id="7296" />
+<TGConnectingPoint num="5" id="7297" />
+<TGConnectingPoint num="6" id="7298" />
+<TGConnectingPoint num="7" id="7299" />
+<TGConnectingPoint num="8" id="7300" />
+<TGConnectingPoint num="9" id="7301" />
+<TGConnectingPoint num="10" id="7302" />
+<TGConnectingPoint num="11" id="7303" />
+<TGConnectingPoint num="12" id="7304" />
+<TGConnectingPoint num="13" id="7305" />
+<TGConnectingPoint num="14" id="7306" />
+<TGConnectingPoint num="15" id="7307" />
+<TGConnectingPoint num="16" id="7308" />
+<TGConnectingPoint num="17" id="7309" />
+<TGConnectingPoint num="18" id="7310" />
+<TGConnectingPoint num="19" id="7311" />
+<TGConnectingPoint num="20" id="7312" />
+<TGConnectingPoint num="21" id="7313" />
+<TGConnectingPoint num="22" id="7314" />
+<TGConnectingPoint num="23" id="7315" />
+<TGConnectingPoint num="24" id="7316" />
+<TGConnectingPoint num="25" id="7317" />
+<TGConnectingPoint num="26" id="7318" />
+<TGConnectingPoint num="27" id="7319" />
+<TGConnectingPoint num="28" id="7320" />
+<TGConnectingPoint num="29" id="7321" />
+<TGConnectingPoint num="30" id="7322" />
+<TGConnectingPoint num="31" id="7323" />
+<TGConnectingPoint num="32" id="7324" />
+<TGConnectingPoint num="33" id="7325" />
+<TGConnectingPoint num="34" id="7326" />
+<TGConnectingPoint num="35" id="7327" />
+<TGConnectingPoint num="36" id="7328" />
+<TGConnectingPoint num="37" id="7329" />
+<TGConnectingPoint num="38" id="7330" />
+<TGConnectingPoint num="39" id="7331" />
 <extraparam>
 <entryCode value="printf(&quot;Starting microwave, lets go!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="7517" >
+<COMPONENT type="5104" id="7343" >
 <cdparam x="287" y="184" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="remoteStart(duration)" />
-<TGConnectingPoint num="0" id="7507" />
-<TGConnectingPoint num="1" id="7508" />
-<TGConnectingPoint num="2" id="7509" />
-<TGConnectingPoint num="3" id="7510" />
-<TGConnectingPoint num="4" id="7511" />
-<TGConnectingPoint num="5" id="7512" />
-<TGConnectingPoint num="6" id="7513" />
-<TGConnectingPoint num="7" id="7514" />
-<TGConnectingPoint num="8" id="7515" />
-<TGConnectingPoint num="9" id="7516" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="7528" >
+<TGConnectingPoint num="0" id="7333" />
+<TGConnectingPoint num="1" id="7334" />
+<TGConnectingPoint num="2" id="7335" />
+<TGConnectingPoint num="3" id="7336" />
+<TGConnectingPoint num="4" id="7337" />
+<TGConnectingPoint num="5" id="7338" />
+<TGConnectingPoint num="6" id="7339" />
+<TGConnectingPoint num="7" id="7340" />
+<TGConnectingPoint num="8" id="7341" />
+<TGConnectingPoint num="9" id="7342" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="7354" >
 <cdparam x="643" y="262" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="open()" />
-<TGConnectingPoint num="0" id="7518" />
-<TGConnectingPoint num="1" id="7519" />
-<TGConnectingPoint num="2" id="7520" />
-<TGConnectingPoint num="3" id="7521" />
-<TGConnectingPoint num="4" id="7522" />
-<TGConnectingPoint num="5" id="7523" />
-<TGConnectingPoint num="6" id="7524" />
-<TGConnectingPoint num="7" id="7525" />
-<TGConnectingPoint num="8" id="7526" />
-<TGConnectingPoint num="9" id="7527" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7569" >
+<TGConnectingPoint num="0" id="7344" />
+<TGConnectingPoint num="1" id="7345" />
+<TGConnectingPoint num="2" id="7346" />
+<TGConnectingPoint num="3" id="7347" />
+<TGConnectingPoint num="4" id="7348" />
+<TGConnectingPoint num="5" id="7349" />
+<TGConnectingPoint num="6" id="7350" />
+<TGConnectingPoint num="7" id="7351" />
+<TGConnectingPoint num="8" id="7352" />
+<TGConnectingPoint num="9" id="7353" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7395" >
 <cdparam x="378" y="395" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="7529" />
-<TGConnectingPoint num="1" id="7530" />
-<TGConnectingPoint num="2" id="7531" />
-<TGConnectingPoint num="3" id="7532" />
-<TGConnectingPoint num="4" id="7533" />
-<TGConnectingPoint num="5" id="7534" />
-<TGConnectingPoint num="6" id="7535" />
-<TGConnectingPoint num="7" id="7536" />
-<TGConnectingPoint num="8" id="7537" />
-<TGConnectingPoint num="9" id="7538" />
-<TGConnectingPoint num="10" id="7539" />
-<TGConnectingPoint num="11" id="7540" />
-<TGConnectingPoint num="12" id="7541" />
-<TGConnectingPoint num="13" id="7542" />
-<TGConnectingPoint num="14" id="7543" />
-<TGConnectingPoint num="15" id="7544" />
-<TGConnectingPoint num="16" id="7545" />
-<TGConnectingPoint num="17" id="7546" />
-<TGConnectingPoint num="18" id="7547" />
-<TGConnectingPoint num="19" id="7548" />
-<TGConnectingPoint num="20" id="7549" />
-<TGConnectingPoint num="21" id="7550" />
-<TGConnectingPoint num="22" id="7551" />
-<TGConnectingPoint num="23" id="7552" />
-<TGConnectingPoint num="24" id="7553" />
-<TGConnectingPoint num="25" id="7554" />
-<TGConnectingPoint num="26" id="7555" />
-<TGConnectingPoint num="27" id="7556" />
-<TGConnectingPoint num="28" id="7557" />
-<TGConnectingPoint num="29" id="7558" />
-<TGConnectingPoint num="30" id="7559" />
-<TGConnectingPoint num="31" id="7560" />
-<TGConnectingPoint num="32" id="7561" />
-<TGConnectingPoint num="33" id="7562" />
-<TGConnectingPoint num="34" id="7563" />
-<TGConnectingPoint num="35" id="7564" />
-<TGConnectingPoint num="36" id="7565" />
-<TGConnectingPoint num="37" id="7566" />
-<TGConnectingPoint num="38" id="7567" />
-<TGConnectingPoint num="39" id="7568" />
+<TGConnectingPoint num="0" id="7355" />
+<TGConnectingPoint num="1" id="7356" />
+<TGConnectingPoint num="2" id="7357" />
+<TGConnectingPoint num="3" id="7358" />
+<TGConnectingPoint num="4" id="7359" />
+<TGConnectingPoint num="5" id="7360" />
+<TGConnectingPoint num="6" id="7361" />
+<TGConnectingPoint num="7" id="7362" />
+<TGConnectingPoint num="8" id="7363" />
+<TGConnectingPoint num="9" id="7364" />
+<TGConnectingPoint num="10" id="7365" />
+<TGConnectingPoint num="11" id="7366" />
+<TGConnectingPoint num="12" id="7367" />
+<TGConnectingPoint num="13" id="7368" />
+<TGConnectingPoint num="14" id="7369" />
+<TGConnectingPoint num="15" id="7370" />
+<TGConnectingPoint num="16" id="7371" />
+<TGConnectingPoint num="17" id="7372" />
+<TGConnectingPoint num="18" id="7373" />
+<TGConnectingPoint num="19" id="7374" />
+<TGConnectingPoint num="20" id="7375" />
+<TGConnectingPoint num="21" id="7376" />
+<TGConnectingPoint num="22" id="7377" />
+<TGConnectingPoint num="23" id="7378" />
+<TGConnectingPoint num="24" id="7379" />
+<TGConnectingPoint num="25" id="7380" />
+<TGConnectingPoint num="26" id="7381" />
+<TGConnectingPoint num="27" id="7382" />
+<TGConnectingPoint num="28" id="7383" />
+<TGConnectingPoint num="29" id="7384" />
+<TGConnectingPoint num="30" id="7385" />
+<TGConnectingPoint num="31" id="7386" />
+<TGConnectingPoint num="32" id="7387" />
+<TGConnectingPoint num="33" id="7388" />
+<TGConnectingPoint num="34" id="7389" />
+<TGConnectingPoint num="35" id="7390" />
+<TGConnectingPoint num="36" id="7391" />
+<TGConnectingPoint num="37" id="7392" />
+<TGConnectingPoint num="38" id="7393" />
+<TGConnectingPoint num="39" id="7394" />
 <extraparam>
 <entryCode value="printf(&quot;Heating ; remaining time :%d\n&quot;, remainingTime);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="7580" >
+<COMPONENT type="5103" id="7406" >
 <cdparam x="398" y="554" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ringBell()" />
-<TGConnectingPoint num="0" id="7570" />
-<TGConnectingPoint num="1" id="7571" />
-<TGConnectingPoint num="2" id="7572" />
-<TGConnectingPoint num="3" id="7573" />
-<TGConnectingPoint num="4" id="7574" />
-<TGConnectingPoint num="5" id="7575" />
-<TGConnectingPoint num="6" id="7576" />
-<TGConnectingPoint num="7" id="7577" />
-<TGConnectingPoint num="8" id="7578" />
-<TGConnectingPoint num="9" id="7579" />
+<TGConnectingPoint num="0" id="7396" />
+<TGConnectingPoint num="1" id="7397" />
+<TGConnectingPoint num="2" id="7398" />
+<TGConnectingPoint num="3" id="7399" />
+<TGConnectingPoint num="4" id="7400" />
+<TGConnectingPoint num="5" id="7401" />
+<TGConnectingPoint num="6" id="7402" />
+<TGConnectingPoint num="7" id="7403" />
+<TGConnectingPoint num="8" id="7404" />
+<TGConnectingPoint num="9" id="7405" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5104" id="7591" >
+<COMPONENT type="5104" id="7417" >
 <cdparam x="634" y="36" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="7581" />
-<TGConnectingPoint num="1" id="7582" />
-<TGConnectingPoint num="2" id="7583" />
-<TGConnectingPoint num="3" id="7584" />
-<TGConnectingPoint num="4" id="7585" />
-<TGConnectingPoint num="5" id="7586" />
-<TGConnectingPoint num="6" id="7587" />
-<TGConnectingPoint num="7" id="7588" />
-<TGConnectingPoint num="8" id="7589" />
-<TGConnectingPoint num="9" id="7590" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7632" >
+<TGConnectingPoint num="0" id="7407" />
+<TGConnectingPoint num="1" id="7408" />
+<TGConnectingPoint num="2" id="7409" />
+<TGConnectingPoint num="3" id="7410" />
+<TGConnectingPoint num="4" id="7411" />
+<TGConnectingPoint num="5" id="7412" />
+<TGConnectingPoint num="6" id="7413" />
+<TGConnectingPoint num="7" id="7414" />
+<TGConnectingPoint num="8" id="7415" />
+<TGConnectingPoint num="9" id="7416" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7458" >
 <cdparam x="389" y="119" />
 <sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Idle" />
-<TGConnectingPoint num="0" id="7592" />
-<TGConnectingPoint num="1" id="7593" />
-<TGConnectingPoint num="2" id="7594" />
-<TGConnectingPoint num="3" id="7595" />
-<TGConnectingPoint num="4" id="7596" />
-<TGConnectingPoint num="5" id="7597" />
-<TGConnectingPoint num="6" id="7598" />
-<TGConnectingPoint num="7" id="7599" />
-<TGConnectingPoint num="8" id="7600" />
-<TGConnectingPoint num="9" id="7601" />
-<TGConnectingPoint num="10" id="7602" />
-<TGConnectingPoint num="11" id="7603" />
-<TGConnectingPoint num="12" id="7604" />
-<TGConnectingPoint num="13" id="7605" />
-<TGConnectingPoint num="14" id="7606" />
-<TGConnectingPoint num="15" id="7607" />
-<TGConnectingPoint num="16" id="7608" />
-<TGConnectingPoint num="17" id="7609" />
-<TGConnectingPoint num="18" id="7610" />
-<TGConnectingPoint num="19" id="7611" />
-<TGConnectingPoint num="20" id="7612" />
-<TGConnectingPoint num="21" id="7613" />
-<TGConnectingPoint num="22" id="7614" />
-<TGConnectingPoint num="23" id="7615" />
-<TGConnectingPoint num="24" id="7616" />
-<TGConnectingPoint num="25" id="7617" />
-<TGConnectingPoint num="26" id="7618" />
-<TGConnectingPoint num="27" id="7619" />
-<TGConnectingPoint num="28" id="7620" />
-<TGConnectingPoint num="29" id="7621" />
-<TGConnectingPoint num="30" id="7622" />
-<TGConnectingPoint num="31" id="7623" />
-<TGConnectingPoint num="32" id="7624" />
-<TGConnectingPoint num="33" id="7625" />
-<TGConnectingPoint num="34" id="7626" />
-<TGConnectingPoint num="35" id="7627" />
-<TGConnectingPoint num="36" id="7628" />
-<TGConnectingPoint num="37" id="7629" />
-<TGConnectingPoint num="38" id="7630" />
-<TGConnectingPoint num="39" id="7631" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="7643" >
+<TGConnectingPoint num="0" id="7418" />
+<TGConnectingPoint num="1" id="7419" />
+<TGConnectingPoint num="2" id="7420" />
+<TGConnectingPoint num="3" id="7421" />
+<TGConnectingPoint num="4" id="7422" />
+<TGConnectingPoint num="5" id="7423" />
+<TGConnectingPoint num="6" id="7424" />
+<TGConnectingPoint num="7" id="7425" />
+<TGConnectingPoint num="8" id="7426" />
+<TGConnectingPoint num="9" id="7427" />
+<TGConnectingPoint num="10" id="7428" />
+<TGConnectingPoint num="11" id="7429" />
+<TGConnectingPoint num="12" id="7430" />
+<TGConnectingPoint num="13" id="7431" />
+<TGConnectingPoint num="14" id="7432" />
+<TGConnectingPoint num="15" id="7433" />
+<TGConnectingPoint num="16" id="7434" />
+<TGConnectingPoint num="17" id="7435" />
+<TGConnectingPoint num="18" id="7436" />
+<TGConnectingPoint num="19" id="7437" />
+<TGConnectingPoint num="20" id="7438" />
+<TGConnectingPoint num="21" id="7439" />
+<TGConnectingPoint num="22" id="7440" />
+<TGConnectingPoint num="23" id="7441" />
+<TGConnectingPoint num="24" id="7442" />
+<TGConnectingPoint num="25" id="7443" />
+<TGConnectingPoint num="26" id="7444" />
+<TGConnectingPoint num="27" id="7445" />
+<TGConnectingPoint num="28" id="7446" />
+<TGConnectingPoint num="29" id="7447" />
+<TGConnectingPoint num="30" id="7448" />
+<TGConnectingPoint num="31" id="7449" />
+<TGConnectingPoint num="32" id="7450" />
+<TGConnectingPoint num="33" id="7451" />
+<TGConnectingPoint num="34" id="7452" />
+<TGConnectingPoint num="35" id="7453" />
+<TGConnectingPoint num="36" id="7454" />
+<TGConnectingPoint num="37" id="7455" />
+<TGConnectingPoint num="38" id="7456" />
+<TGConnectingPoint num="39" id="7457" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="7469" >
 <cdparam x="442" y="183" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="start(duration)" />
-<TGConnectingPoint num="0" id="7633" />
-<TGConnectingPoint num="1" id="7634" />
-<TGConnectingPoint num="2" id="7635" />
-<TGConnectingPoint num="3" id="7636" />
-<TGConnectingPoint num="4" id="7637" />
-<TGConnectingPoint num="5" id="7638" />
-<TGConnectingPoint num="6" id="7639" />
-<TGConnectingPoint num="7" id="7640" />
-<TGConnectingPoint num="8" id="7641" />
-<TGConnectingPoint num="9" id="7642" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="7645" >
+<TGConnectingPoint num="0" id="7459" />
+<TGConnectingPoint num="1" id="7460" />
+<TGConnectingPoint num="2" id="7461" />
+<TGConnectingPoint num="3" id="7462" />
+<TGConnectingPoint num="4" id="7463" />
+<TGConnectingPoint num="5" id="7464" />
+<TGConnectingPoint num="6" id="7465" />
+<TGConnectingPoint num="7" id="7466" />
+<TGConnectingPoint num="8" id="7467" />
+<TGConnectingPoint num="9" id="7468" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="7471" >
 <cdparam x="423" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7644" />
+<TGConnectingPoint num="0" id="7470" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="7656" >
+<COMPONENT type="5103" id="7482" >
 <cdparam x="619" y="322" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="7646" />
-<TGConnectingPoint num="1" id="7647" />
-<TGConnectingPoint num="2" id="7648" />
-<TGConnectingPoint num="3" id="7649" />
-<TGConnectingPoint num="4" id="7650" />
-<TGConnectingPoint num="5" id="7651" />
-<TGConnectingPoint num="6" id="7652" />
-<TGConnectingPoint num="7" id="7653" />
-<TGConnectingPoint num="8" id="7654" />
-<TGConnectingPoint num="9" id="7655" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7667" >
+<TGConnectingPoint num="0" id="7472" />
+<TGConnectingPoint num="1" id="7473" />
+<TGConnectingPoint num="2" id="7474" />
+<TGConnectingPoint num="3" id="7475" />
+<TGConnectingPoint num="4" id="7476" />
+<TGConnectingPoint num="5" id="7477" />
+<TGConnectingPoint num="6" id="7478" />
+<TGConnectingPoint num="7" id="7479" />
+<TGConnectingPoint num="8" id="7480" />
+<TGConnectingPoint num="9" id="7481" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7493" >
 <cdparam x="376" y="512" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="7657" />
-<TGConnectingPoint num="1" id="7658" />
-<TGConnectingPoint num="2" id="7659" />
-<TGConnectingPoint num="3" id="7660" />
-<TGConnectingPoint num="4" id="7661" />
-<TGConnectingPoint num="5" id="7662" />
-<TGConnectingPoint num="6" id="7663" />
-<TGConnectingPoint num="7" id="7664" />
-<TGConnectingPoint num="8" id="7665" />
-<TGConnectingPoint num="9" id="7666" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7678" >
+<TGConnectingPoint num="0" id="7483" />
+<TGConnectingPoint num="1" id="7484" />
+<TGConnectingPoint num="2" id="7485" />
+<TGConnectingPoint num="3" id="7486" />
+<TGConnectingPoint num="4" id="7487" />
+<TGConnectingPoint num="5" id="7488" />
+<TGConnectingPoint num="6" id="7489" />
+<TGConnectingPoint num="7" id="7490" />
+<TGConnectingPoint num="8" id="7491" />
+<TGConnectingPoint num="9" id="7492" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7504" >
 <cdparam x="619" y="556" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="7668" />
-<TGConnectingPoint num="1" id="7669" />
-<TGConnectingPoint num="2" id="7670" />
-<TGConnectingPoint num="3" id="7671" />
-<TGConnectingPoint num="4" id="7672" />
-<TGConnectingPoint num="5" id="7673" />
-<TGConnectingPoint num="6" id="7674" />
-<TGConnectingPoint num="7" id="7675" />
-<TGConnectingPoint num="8" id="7676" />
-<TGConnectingPoint num="9" id="7677" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="7689" >
+<TGConnectingPoint num="0" id="7494" />
+<TGConnectingPoint num="1" id="7495" />
+<TGConnectingPoint num="2" id="7496" />
+<TGConnectingPoint num="3" id="7497" />
+<TGConnectingPoint num="4" id="7498" />
+<TGConnectingPoint num="5" id="7499" />
+<TGConnectingPoint num="6" id="7500" />
+<TGConnectingPoint num="7" id="7501" />
+<TGConnectingPoint num="8" id="7502" />
+<TGConnectingPoint num="9" id="7503" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7515" >
 <cdparam x="376" y="309" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="7679" />
-<TGConnectingPoint num="1" id="7680" />
-<TGConnectingPoint num="2" id="7681" />
-<TGConnectingPoint num="3" id="7682" />
-<TGConnectingPoint num="4" id="7683" />
-<TGConnectingPoint num="5" id="7684" />
-<TGConnectingPoint num="6" id="7685" />
-<TGConnectingPoint num="7" id="7686" />
-<TGConnectingPoint num="8" id="7687" />
-<TGConnectingPoint num="9" id="7688" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="7700" >
+<TGConnectingPoint num="0" id="7505" />
+<TGConnectingPoint num="1" id="7506" />
+<TGConnectingPoint num="2" id="7507" />
+<TGConnectingPoint num="3" id="7508" />
+<TGConnectingPoint num="4" id="7509" />
+<TGConnectingPoint num="5" id="7510" />
+<TGConnectingPoint num="6" id="7511" />
+<TGConnectingPoint num="7" id="7512" />
+<TGConnectingPoint num="8" id="7513" />
+<TGConnectingPoint num="9" id="7514" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="7526" >
 <cdparam x="640" y="478" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="7690" />
-<TGConnectingPoint num="1" id="7691" />
-<TGConnectingPoint num="2" id="7692" />
-<TGConnectingPoint num="3" id="7693" />
-<TGConnectingPoint num="4" id="7694" />
-<TGConnectingPoint num="5" id="7695" />
-<TGConnectingPoint num="6" id="7696" />
-<TGConnectingPoint num="7" id="7697" />
-<TGConnectingPoint num="8" id="7698" />
-<TGConnectingPoint num="9" id="7699" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="7711" >
+<TGConnectingPoint num="0" id="7516" />
+<TGConnectingPoint num="1" id="7517" />
+<TGConnectingPoint num="2" id="7518" />
+<TGConnectingPoint num="3" id="7519" />
+<TGConnectingPoint num="4" id="7520" />
+<TGConnectingPoint num="5" id="7521" />
+<TGConnectingPoint num="6" id="7522" />
+<TGConnectingPoint num="7" id="7523" />
+<TGConnectingPoint num="8" id="7524" />
+<TGConnectingPoint num="9" id="7525" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="7537" >
 <cdparam x="630" y="150" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="7701" />
-<TGConnectingPoint num="1" id="7702" />
-<TGConnectingPoint num="2" id="7703" />
-<TGConnectingPoint num="3" id="7704" />
-<TGConnectingPoint num="4" id="7705" />
-<TGConnectingPoint num="5" id="7706" />
-<TGConnectingPoint num="6" id="7707" />
-<TGConnectingPoint num="7" id="7708" />
-<TGConnectingPoint num="8" id="7709" />
-<TGConnectingPoint num="9" id="7710" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7752" >
+<TGConnectingPoint num="0" id="7527" />
+<TGConnectingPoint num="1" id="7528" />
+<TGConnectingPoint num="2" id="7529" />
+<TGConnectingPoint num="3" id="7530" />
+<TGConnectingPoint num="4" id="7531" />
+<TGConnectingPoint num="5" id="7532" />
+<TGConnectingPoint num="6" id="7533" />
+<TGConnectingPoint num="7" id="7534" />
+<TGConnectingPoint num="8" id="7535" />
+<TGConnectingPoint num="9" id="7536" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7578" >
 <cdparam x="603" y="106" />
 <sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpened" />
-<TGConnectingPoint num="0" id="7712" />
-<TGConnectingPoint num="1" id="7713" />
-<TGConnectingPoint num="2" id="7714" />
-<TGConnectingPoint num="3" id="7715" />
-<TGConnectingPoint num="4" id="7716" />
-<TGConnectingPoint num="5" id="7717" />
-<TGConnectingPoint num="6" id="7718" />
-<TGConnectingPoint num="7" id="7719" />
-<TGConnectingPoint num="8" id="7720" />
-<TGConnectingPoint num="9" id="7721" />
-<TGConnectingPoint num="10" id="7722" />
-<TGConnectingPoint num="11" id="7723" />
-<TGConnectingPoint num="12" id="7724" />
-<TGConnectingPoint num="13" id="7725" />
-<TGConnectingPoint num="14" id="7726" />
-<TGConnectingPoint num="15" id="7727" />
-<TGConnectingPoint num="16" id="7728" />
-<TGConnectingPoint num="17" id="7729" />
-<TGConnectingPoint num="18" id="7730" />
-<TGConnectingPoint num="19" id="7731" />
-<TGConnectingPoint num="20" id="7732" />
-<TGConnectingPoint num="21" id="7733" />
-<TGConnectingPoint num="22" id="7734" />
-<TGConnectingPoint num="23" id="7735" />
-<TGConnectingPoint num="24" id="7736" />
-<TGConnectingPoint num="25" id="7737" />
-<TGConnectingPoint num="26" id="7738" />
-<TGConnectingPoint num="27" id="7739" />
-<TGConnectingPoint num="28" id="7740" />
-<TGConnectingPoint num="29" id="7741" />
-<TGConnectingPoint num="30" id="7742" />
-<TGConnectingPoint num="31" id="7743" />
-<TGConnectingPoint num="32" id="7744" />
-<TGConnectingPoint num="33" id="7745" />
-<TGConnectingPoint num="34" id="7746" />
-<TGConnectingPoint num="35" id="7747" />
-<TGConnectingPoint num="36" id="7748" />
-<TGConnectingPoint num="37" id="7749" />
-<TGConnectingPoint num="38" id="7750" />
-<TGConnectingPoint num="39" id="7751" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="7793" >
+<TGConnectingPoint num="0" id="7538" />
+<TGConnectingPoint num="1" id="7539" />
+<TGConnectingPoint num="2" id="7540" />
+<TGConnectingPoint num="3" id="7541" />
+<TGConnectingPoint num="4" id="7542" />
+<TGConnectingPoint num="5" id="7543" />
+<TGConnectingPoint num="6" id="7544" />
+<TGConnectingPoint num="7" id="7545" />
+<TGConnectingPoint num="8" id="7546" />
+<TGConnectingPoint num="9" id="7547" />
+<TGConnectingPoint num="10" id="7548" />
+<TGConnectingPoint num="11" id="7549" />
+<TGConnectingPoint num="12" id="7550" />
+<TGConnectingPoint num="13" id="7551" />
+<TGConnectingPoint num="14" id="7552" />
+<TGConnectingPoint num="15" id="7553" />
+<TGConnectingPoint num="16" id="7554" />
+<TGConnectingPoint num="17" id="7555" />
+<TGConnectingPoint num="18" id="7556" />
+<TGConnectingPoint num="19" id="7557" />
+<TGConnectingPoint num="20" id="7558" />
+<TGConnectingPoint num="21" id="7559" />
+<TGConnectingPoint num="22" id="7560" />
+<TGConnectingPoint num="23" id="7561" />
+<TGConnectingPoint num="24" id="7562" />
+<TGConnectingPoint num="25" id="7563" />
+<TGConnectingPoint num="26" id="7564" />
+<TGConnectingPoint num="27" id="7565" />
+<TGConnectingPoint num="28" id="7566" />
+<TGConnectingPoint num="29" id="7567" />
+<TGConnectingPoint num="30" id="7568" />
+<TGConnectingPoint num="31" id="7569" />
+<TGConnectingPoint num="32" id="7570" />
+<TGConnectingPoint num="33" id="7571" />
+<TGConnectingPoint num="34" id="7572" />
+<TGConnectingPoint num="35" id="7573" />
+<TGConnectingPoint num="36" id="7574" />
+<TGConnectingPoint num="37" id="7575" />
+<TGConnectingPoint num="38" id="7576" />
+<TGConnectingPoint num="39" id="7577" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="7619" >
 <cdparam x="571" y="393" />
 <sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpenedWhileHeating" />
-<TGConnectingPoint num="0" id="7753" />
-<TGConnectingPoint num="1" id="7754" />
-<TGConnectingPoint num="2" id="7755" />
-<TGConnectingPoint num="3" id="7756" />
-<TGConnectingPoint num="4" id="7757" />
-<TGConnectingPoint num="5" id="7758" />
-<TGConnectingPoint num="6" id="7759" />
-<TGConnectingPoint num="7" id="7760" />
-<TGConnectingPoint num="8" id="7761" />
-<TGConnectingPoint num="9" id="7762" />
-<TGConnectingPoint num="10" id="7763" />
-<TGConnectingPoint num="11" id="7764" />
-<TGConnectingPoint num="12" id="7765" />
-<TGConnectingPoint num="13" id="7766" />
-<TGConnectingPoint num="14" id="7767" />
-<TGConnectingPoint num="15" id="7768" />
-<TGConnectingPoint num="16" id="7769" />
-<TGConnectingPoint num="17" id="7770" />
-<TGConnectingPoint num="18" id="7771" />
-<TGConnectingPoint num="19" id="7772" />
-<TGConnectingPoint num="20" id="7773" />
-<TGConnectingPoint num="21" id="7774" />
-<TGConnectingPoint num="22" id="7775" />
-<TGConnectingPoint num="23" id="7776" />
-<TGConnectingPoint num="24" id="7777" />
-<TGConnectingPoint num="25" id="7778" />
-<TGConnectingPoint num="26" id="7779" />
-<TGConnectingPoint num="27" id="7780" />
-<TGConnectingPoint num="28" id="7781" />
-<TGConnectingPoint num="29" id="7782" />
-<TGConnectingPoint num="30" id="7783" />
-<TGConnectingPoint num="31" id="7784" />
-<TGConnectingPoint num="32" id="7785" />
-<TGConnectingPoint num="33" id="7786" />
-<TGConnectingPoint num="34" id="7787" />
-<TGConnectingPoint num="35" id="7788" />
-<TGConnectingPoint num="36" id="7789" />
-<TGConnectingPoint num="37" id="7790" />
-<TGConnectingPoint num="38" id="7791" />
-<TGConnectingPoint num="39" id="7792" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="7834" >
+<TGConnectingPoint num="0" id="7579" />
+<TGConnectingPoint num="1" id="7580" />
+<TGConnectingPoint num="2" id="7581" />
+<TGConnectingPoint num="3" id="7582" />
+<TGConnectingPoint num="4" id="7583" />
+<TGConnectingPoint num="5" id="7584" />
+<TGConnectingPoint num="6" id="7585" />
+<TGConnectingPoint num="7" id="7586" />
+<TGConnectingPoint num="8" id="7587" />
+<TGConnectingPoint num="9" id="7588" />
+<TGConnectingPoint num="10" id="7589" />
+<TGConnectingPoint num="11" id="7590" />
+<TGConnectingPoint num="12" id="7591" />
+<TGConnectingPoint num="13" id="7592" />
+<TGConnectingPoint num="14" id="7593" />
+<TGConnectingPoint num="15" id="7594" />
+<TGConnectingPoint num="16" id="7595" />
+<TGConnectingPoint num="17" id="7596" />
+<TGConnectingPoint num="18" id="7597" />
+<TGConnectingPoint num="19" id="7598" />
+<TGConnectingPoint num="20" id="7599" />
+<TGConnectingPoint num="21" id="7600" />
+<TGConnectingPoint num="22" id="7601" />
+<TGConnectingPoint num="23" id="7602" />
+<TGConnectingPoint num="24" id="7603" />
+<TGConnectingPoint num="25" id="7604" />
+<TGConnectingPoint num="26" id="7605" />
+<TGConnectingPoint num="27" id="7606" />
+<TGConnectingPoint num="28" id="7607" />
+<TGConnectingPoint num="29" id="7608" />
+<TGConnectingPoint num="30" id="7609" />
+<TGConnectingPoint num="31" id="7610" />
+<TGConnectingPoint num="32" id="7611" />
+<TGConnectingPoint num="33" id="7612" />
+<TGConnectingPoint num="34" id="7613" />
+<TGConnectingPoint num="35" id="7614" />
+<TGConnectingPoint num="36" id="7615" />
+<TGConnectingPoint num="37" id="7616" />
+<TGConnectingPoint num="38" id="7617" />
+<TGConnectingPoint num="39" id="7618" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="7660" >
 <cdparam x="251" y="240" />
 <sizeparam width="614" height="519" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="7794" />
-<TGConnectingPoint num="1" id="7795" />
-<TGConnectingPoint num="2" id="7796" />
-<TGConnectingPoint num="3" id="7797" />
-<TGConnectingPoint num="4" id="7798" />
-<TGConnectingPoint num="5" id="7799" />
-<TGConnectingPoint num="6" id="7800" />
-<TGConnectingPoint num="7" id="7801" />
-<TGConnectingPoint num="8" id="7802" />
-<TGConnectingPoint num="9" id="7803" />
-<TGConnectingPoint num="10" id="7804" />
-<TGConnectingPoint num="11" id="7805" />
-<TGConnectingPoint num="12" id="7806" />
-<TGConnectingPoint num="13" id="7807" />
-<TGConnectingPoint num="14" id="7808" />
-<TGConnectingPoint num="15" id="7809" />
-<TGConnectingPoint num="16" id="7810" />
-<TGConnectingPoint num="17" id="7811" />
-<TGConnectingPoint num="18" id="7812" />
-<TGConnectingPoint num="19" id="7813" />
-<TGConnectingPoint num="20" id="7814" />
-<TGConnectingPoint num="21" id="7815" />
-<TGConnectingPoint num="22" id="7816" />
-<TGConnectingPoint num="23" id="7817" />
-<TGConnectingPoint num="24" id="7818" />
-<TGConnectingPoint num="25" id="7819" />
-<TGConnectingPoint num="26" id="7820" />
-<TGConnectingPoint num="27" id="7821" />
-<TGConnectingPoint num="28" id="7822" />
-<TGConnectingPoint num="29" id="7823" />
-<TGConnectingPoint num="30" id="7824" />
-<TGConnectingPoint num="31" id="7825" />
-<TGConnectingPoint num="32" id="7826" />
-<TGConnectingPoint num="33" id="7827" />
-<TGConnectingPoint num="34" id="7828" />
-<TGConnectingPoint num="35" id="7829" />
-<TGConnectingPoint num="36" id="7830" />
-<TGConnectingPoint num="37" id="7831" />
-<TGConnectingPoint num="38" id="7832" />
-<TGConnectingPoint num="39" id="7833" />
+<TGConnectingPoint num="0" id="7620" />
+<TGConnectingPoint num="1" id="7621" />
+<TGConnectingPoint num="2" id="7622" />
+<TGConnectingPoint num="3" id="7623" />
+<TGConnectingPoint num="4" id="7624" />
+<TGConnectingPoint num="5" id="7625" />
+<TGConnectingPoint num="6" id="7626" />
+<TGConnectingPoint num="7" id="7627" />
+<TGConnectingPoint num="8" id="7628" />
+<TGConnectingPoint num="9" id="7629" />
+<TGConnectingPoint num="10" id="7630" />
+<TGConnectingPoint num="11" id="7631" />
+<TGConnectingPoint num="12" id="7632" />
+<TGConnectingPoint num="13" id="7633" />
+<TGConnectingPoint num="14" id="7634" />
+<TGConnectingPoint num="15" id="7635" />
+<TGConnectingPoint num="16" id="7636" />
+<TGConnectingPoint num="17" id="7637" />
+<TGConnectingPoint num="18" id="7638" />
+<TGConnectingPoint num="19" id="7639" />
+<TGConnectingPoint num="20" id="7640" />
+<TGConnectingPoint num="21" id="7641" />
+<TGConnectingPoint num="22" id="7642" />
+<TGConnectingPoint num="23" id="7643" />
+<TGConnectingPoint num="24" id="7644" />
+<TGConnectingPoint num="25" id="7645" />
+<TGConnectingPoint num="26" id="7646" />
+<TGConnectingPoint num="27" id="7647" />
+<TGConnectingPoint num="28" id="7648" />
+<TGConnectingPoint num="29" id="7649" />
+<TGConnectingPoint num="30" id="7650" />
+<TGConnectingPoint num="31" id="7651" />
+<TGConnectingPoint num="32" id="7652" />
+<TGConnectingPoint num="33" id="7653" />
+<TGConnectingPoint num="34" id="7654" />
+<TGConnectingPoint num="35" id="7655" />
+<TGConnectingPoint num="36" id="7656" />
+<TGConnectingPoint num="37" id="7657" />
+<TGConnectingPoint num="38" id="7658" />
+<TGConnectingPoint num="39" id="7659" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -17133,55 +16902,55 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="7847" >
+<CONNECTOR type="5102" id="7673" >
 <cdparam x="407" y="380" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7843" />
-<TGConnectingPoint num="1" id="7844" />
-<TGConnectingPoint num="2" id="7845" />
-<TGConnectingPoint num="3" id="7846" />
-<P1  x="407" y="310" id="7877" />
-<P2  x="365" y="113" id="7944" />
+<TGConnectingPoint num="0" id="7669" />
+<TGConnectingPoint num="1" id="7670" />
+<TGConnectingPoint num="2" id="7671" />
+<TGConnectingPoint num="3" id="7672" />
+<P1  x="407" y="310" id="7703" />
+<P2  x="365" y="113" id="7770" />
 <Point x="407" y="327" />
 <Point x="323" y="327" />
 <Point x="323" y="113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7835" >
-<father id="7847" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7661" >
+<father id="7673" num="0" />
 <cdparam x="407" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7836" >
-<father id="7847" num="1" />
+<SUBCOMPONENT type="-1" id="7662" >
+<father id="7673" num="1" />
 <cdparam x="323" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7837" >
-<father id="7847" num="2" />
+<SUBCOMPONENT type="-1" id="7663" >
+<father id="7673" num="2" />
 <cdparam x="323" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7842" >
-<father id="7847" num="3" />
+<SUBCOMPONENT type="-1" id="7668" >
+<father id="7673" num="3" />
 <cdparam x="418" y="339" />
 <sizeparam width="29" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7838" />
-<TGConnectingPoint num="1" id="7839" />
-<TGConnectingPoint num="2" id="7840" />
-<TGConnectingPoint num="3" id="7841" />
+<TGConnectingPoint num="0" id="7664" />
+<TGConnectingPoint num="1" id="7665" />
+<TGConnectingPoint num="2" id="7666" />
+<TGConnectingPoint num="3" id="7667" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17192,25 +16961,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7854" >
+<CONNECTOR type="5102" id="7680" >
 <cdparam x="411" y="243" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7853" />
-<P1  x="408" y="242" id="7893" />
-<P2  x="407" y="280" id="7876" />
+<TGConnectingPoint num="0" id="7679" />
+<P1  x="408" y="242" id="7719" />
+<P2  x="407" y="280" id="7702" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7852" >
-<father id="7854" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7678" >
+<father id="7680" num="0" />
 <cdparam x="411" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7848" />
-<TGConnectingPoint num="1" id="7849" />
-<TGConnectingPoint num="2" id="7850" />
-<TGConnectingPoint num="3" id="7851" />
+<TGConnectingPoint num="0" id="7674" />
+<TGConnectingPoint num="1" id="7675" />
+<TGConnectingPoint num="2" id="7676" />
+<TGConnectingPoint num="3" id="7677" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17220,25 +16989,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7861" >
+<CONNECTOR type="5102" id="7687" >
 <cdparam x="398" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="7860" />
-<P1  x="407" y="183" id="7929" />
-<P2  x="408" y="202" id="7888" />
+<TGConnectingPoint num="0" id="7686" />
+<P1  x="407" y="183" id="7755" />
+<P2  x="408" y="202" id="7714" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7859" >
-<father id="7861" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7685" >
+<father id="7687" num="0" />
 <cdparam x="421" y="197" />
 <sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7855" />
-<TGConnectingPoint num="1" id="7856" />
-<TGConnectingPoint num="2" id="7857" />
-<TGConnectingPoint num="3" id="7858" />
+<TGConnectingPoint num="0" id="7681" />
+<TGConnectingPoint num="1" id="7682" />
+<TGConnectingPoint num="2" id="7683" />
+<TGConnectingPoint num="3" id="7684" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17249,25 +17018,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7868" >
+<CONNECTOR type="5102" id="7694" >
 <cdparam x="393" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7867" />
-<P1  x="407" y="131" id="7947" />
-<P2  x="407" y="153" id="7928" />
+<TGConnectingPoint num="0" id="7693" />
+<P1  x="407" y="131" id="7773" />
+<P2  x="407" y="153" id="7754" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7866" >
-<father id="7868" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7692" >
+<father id="7694" num="0" />
 <cdparam x="393" y="171" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7862" />
-<TGConnectingPoint num="1" id="7863" />
-<TGConnectingPoint num="2" id="7864" />
-<TGConnectingPoint num="3" id="7865" />
+<TGConnectingPoint num="0" id="7688" />
+<TGConnectingPoint num="1" id="7689" />
+<TGConnectingPoint num="2" id="7690" />
+<TGConnectingPoint num="3" id="7691" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17277,25 +17046,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="7875" >
+<CONNECTOR type="5102" id="7701" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="7874" />
-<P1  x="407" y="70" id="7939" />
-<P2  x="407" y="96" id="7942" />
+<TGConnectingPoint num="0" id="7700" />
+<P1  x="407" y="70" id="7765" />
+<P2  x="407" y="96" id="7768" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7873" >
-<father id="7875" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7699" >
+<father id="7701" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7869" />
-<TGConnectingPoint num="1" id="7870" />
-<TGConnectingPoint num="2" id="7871" />
-<TGConnectingPoint num="3" id="7872" />
+<TGConnectingPoint num="0" id="7695" />
+<TGConnectingPoint num="1" id="7696" />
+<TGConnectingPoint num="2" id="7697" />
+<TGConnectingPoint num="3" id="7698" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17305,148 +17074,148 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="7886" >
+<COMPONENT type="5104" id="7712" >
 <cdparam x="377" y="285" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopM()" />
-<TGConnectingPoint num="0" id="7876" />
-<TGConnectingPoint num="1" id="7877" />
-<TGConnectingPoint num="2" id="7878" />
-<TGConnectingPoint num="3" id="7879" />
-<TGConnectingPoint num="4" id="7880" />
-<TGConnectingPoint num="5" id="7881" />
-<TGConnectingPoint num="6" id="7882" />
-<TGConnectingPoint num="7" id="7883" />
-<TGConnectingPoint num="8" id="7884" />
-<TGConnectingPoint num="9" id="7885" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="7927" >
+<TGConnectingPoint num="0" id="7702" />
+<TGConnectingPoint num="1" id="7703" />
+<TGConnectingPoint num="2" id="7704" />
+<TGConnectingPoint num="3" id="7705" />
+<TGConnectingPoint num="4" id="7706" />
+<TGConnectingPoint num="5" id="7707" />
+<TGConnectingPoint num="6" id="7708" />
+<TGConnectingPoint num="7" id="7709" />
+<TGConnectingPoint num="8" id="7710" />
+<TGConnectingPoint num="9" id="7711" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7753" >
 <cdparam x="373" y="202" />
 <sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Running" />
-<TGConnectingPoint num="0" id="7887" />
-<TGConnectingPoint num="1" id="7888" />
-<TGConnectingPoint num="2" id="7889" />
-<TGConnectingPoint num="3" id="7890" />
-<TGConnectingPoint num="4" id="7891" />
-<TGConnectingPoint num="5" id="7892" />
-<TGConnectingPoint num="6" id="7893" />
-<TGConnectingPoint num="7" id="7894" />
-<TGConnectingPoint num="8" id="7895" />
-<TGConnectingPoint num="9" id="7896" />
-<TGConnectingPoint num="10" id="7897" />
-<TGConnectingPoint num="11" id="7898" />
-<TGConnectingPoint num="12" id="7899" />
-<TGConnectingPoint num="13" id="7900" />
-<TGConnectingPoint num="14" id="7901" />
-<TGConnectingPoint num="15" id="7902" />
-<TGConnectingPoint num="16" id="7903" />
-<TGConnectingPoint num="17" id="7904" />
-<TGConnectingPoint num="18" id="7905" />
-<TGConnectingPoint num="19" id="7906" />
-<TGConnectingPoint num="20" id="7907" />
-<TGConnectingPoint num="21" id="7908" />
-<TGConnectingPoint num="22" id="7909" />
-<TGConnectingPoint num="23" id="7910" />
-<TGConnectingPoint num="24" id="7911" />
-<TGConnectingPoint num="25" id="7912" />
-<TGConnectingPoint num="26" id="7913" />
-<TGConnectingPoint num="27" id="7914" />
-<TGConnectingPoint num="28" id="7915" />
-<TGConnectingPoint num="29" id="7916" />
-<TGConnectingPoint num="30" id="7917" />
-<TGConnectingPoint num="31" id="7918" />
-<TGConnectingPoint num="32" id="7919" />
-<TGConnectingPoint num="33" id="7920" />
-<TGConnectingPoint num="34" id="7921" />
-<TGConnectingPoint num="35" id="7922" />
-<TGConnectingPoint num="36" id="7923" />
-<TGConnectingPoint num="37" id="7924" />
-<TGConnectingPoint num="38" id="7925" />
-<TGConnectingPoint num="39" id="7926" />
+<TGConnectingPoint num="0" id="7713" />
+<TGConnectingPoint num="1" id="7714" />
+<TGConnectingPoint num="2" id="7715" />
+<TGConnectingPoint num="3" id="7716" />
+<TGConnectingPoint num="4" id="7717" />
+<TGConnectingPoint num="5" id="7718" />
+<TGConnectingPoint num="6" id="7719" />
+<TGConnectingPoint num="7" id="7720" />
+<TGConnectingPoint num="8" id="7721" />
+<TGConnectingPoint num="9" id="7722" />
+<TGConnectingPoint num="10" id="7723" />
+<TGConnectingPoint num="11" id="7724" />
+<TGConnectingPoint num="12" id="7725" />
+<TGConnectingPoint num="13" id="7726" />
+<TGConnectingPoint num="14" id="7727" />
+<TGConnectingPoint num="15" id="7728" />
+<TGConnectingPoint num="16" id="7729" />
+<TGConnectingPoint num="17" id="7730" />
+<TGConnectingPoint num="18" id="7731" />
+<TGConnectingPoint num="19" id="7732" />
+<TGConnectingPoint num="20" id="7733" />
+<TGConnectingPoint num="21" id="7734" />
+<TGConnectingPoint num="22" id="7735" />
+<TGConnectingPoint num="23" id="7736" />
+<TGConnectingPoint num="24" id="7737" />
+<TGConnectingPoint num="25" id="7738" />
+<TGConnectingPoint num="26" id="7739" />
+<TGConnectingPoint num="27" id="7740" />
+<TGConnectingPoint num="28" id="7741" />
+<TGConnectingPoint num="29" id="7742" />
+<TGConnectingPoint num="30" id="7743" />
+<TGConnectingPoint num="31" id="7744" />
+<TGConnectingPoint num="32" id="7745" />
+<TGConnectingPoint num="33" id="7746" />
+<TGConnectingPoint num="34" id="7747" />
+<TGConnectingPoint num="35" id="7748" />
+<TGConnectingPoint num="36" id="7749" />
+<TGConnectingPoint num="37" id="7750" />
+<TGConnectingPoint num="38" id="7751" />
+<TGConnectingPoint num="39" id="7752" />
 <extraparam>
 <entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="7938" >
+<COMPONENT type="5104" id="7764" >
 <cdparam x="376" y="158" />
 <sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startM()" />
-<TGConnectingPoint num="0" id="7928" />
-<TGConnectingPoint num="1" id="7929" />
-<TGConnectingPoint num="2" id="7930" />
-<TGConnectingPoint num="3" id="7931" />
-<TGConnectingPoint num="4" id="7932" />
-<TGConnectingPoint num="5" id="7933" />
-<TGConnectingPoint num="6" id="7934" />
-<TGConnectingPoint num="7" id="7935" />
-<TGConnectingPoint num="8" id="7936" />
-<TGConnectingPoint num="9" id="7937" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="7940" >
+<TGConnectingPoint num="0" id="7754" />
+<TGConnectingPoint num="1" id="7755" />
+<TGConnectingPoint num="2" id="7756" />
+<TGConnectingPoint num="3" id="7757" />
+<TGConnectingPoint num="4" id="7758" />
+<TGConnectingPoint num="5" id="7759" />
+<TGConnectingPoint num="6" id="7760" />
+<TGConnectingPoint num="7" id="7761" />
+<TGConnectingPoint num="8" id="7762" />
+<TGConnectingPoint num="9" id="7763" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="7766" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7939" />
+<TGConnectingPoint num="0" id="7765" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="7981" >
+<COMPONENT type="5106" id="7807" >
 <cdparam x="365" y="96" />
 <sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitForStart" />
-<TGConnectingPoint num="0" id="7941" />
-<TGConnectingPoint num="1" id="7942" />
-<TGConnectingPoint num="2" id="7943" />
-<TGConnectingPoint num="3" id="7944" />
-<TGConnectingPoint num="4" id="7945" />
-<TGConnectingPoint num="5" id="7946" />
-<TGConnectingPoint num="6" id="7947" />
-<TGConnectingPoint num="7" id="7948" />
-<TGConnectingPoint num="8" id="7949" />
-<TGConnectingPoint num="9" id="7950" />
-<TGConnectingPoint num="10" id="7951" />
-<TGConnectingPoint num="11" id="7952" />
-<TGConnectingPoint num="12" id="7953" />
-<TGConnectingPoint num="13" id="7954" />
-<TGConnectingPoint num="14" id="7955" />
-<TGConnectingPoint num="15" id="7956" />
-<TGConnectingPoint num="16" id="7957" />
-<TGConnectingPoint num="17" id="7958" />
-<TGConnectingPoint num="18" id="7959" />
-<TGConnectingPoint num="19" id="7960" />
-<TGConnectingPoint num="20" id="7961" />
-<TGConnectingPoint num="21" id="7962" />
-<TGConnectingPoint num="22" id="7963" />
-<TGConnectingPoint num="23" id="7964" />
-<TGConnectingPoint num="24" id="7965" />
-<TGConnectingPoint num="25" id="7966" />
-<TGConnectingPoint num="26" id="7967" />
-<TGConnectingPoint num="27" id="7968" />
-<TGConnectingPoint num="28" id="7969" />
-<TGConnectingPoint num="29" id="7970" />
-<TGConnectingPoint num="30" id="7971" />
-<TGConnectingPoint num="31" id="7972" />
-<TGConnectingPoint num="32" id="7973" />
-<TGConnectingPoint num="33" id="7974" />
-<TGConnectingPoint num="34" id="7975" />
-<TGConnectingPoint num="35" id="7976" />
-<TGConnectingPoint num="36" id="7977" />
-<TGConnectingPoint num="37" id="7978" />
-<TGConnectingPoint num="38" id="7979" />
-<TGConnectingPoint num="39" id="7980" />
+<TGConnectingPoint num="0" id="7767" />
+<TGConnectingPoint num="1" id="7768" />
+<TGConnectingPoint num="2" id="7769" />
+<TGConnectingPoint num="3" id="7770" />
+<TGConnectingPoint num="4" id="7771" />
+<TGConnectingPoint num="5" id="7772" />
+<TGConnectingPoint num="6" id="7773" />
+<TGConnectingPoint num="7" id="7774" />
+<TGConnectingPoint num="8" id="7775" />
+<TGConnectingPoint num="9" id="7776" />
+<TGConnectingPoint num="10" id="7777" />
+<TGConnectingPoint num="11" id="7778" />
+<TGConnectingPoint num="12" id="7779" />
+<TGConnectingPoint num="13" id="7780" />
+<TGConnectingPoint num="14" id="7781" />
+<TGConnectingPoint num="15" id="7782" />
+<TGConnectingPoint num="16" id="7783" />
+<TGConnectingPoint num="17" id="7784" />
+<TGConnectingPoint num="18" id="7785" />
+<TGConnectingPoint num="19" id="7786" />
+<TGConnectingPoint num="20" id="7787" />
+<TGConnectingPoint num="21" id="7788" />
+<TGConnectingPoint num="22" id="7789" />
+<TGConnectingPoint num="23" id="7790" />
+<TGConnectingPoint num="24" id="7791" />
+<TGConnectingPoint num="25" id="7792" />
+<TGConnectingPoint num="26" id="7793" />
+<TGConnectingPoint num="27" id="7794" />
+<TGConnectingPoint num="28" id="7795" />
+<TGConnectingPoint num="29" id="7796" />
+<TGConnectingPoint num="30" id="7797" />
+<TGConnectingPoint num="31" id="7798" />
+<TGConnectingPoint num="32" id="7799" />
+<TGConnectingPoint num="33" id="7800" />
+<TGConnectingPoint num="34" id="7801" />
+<TGConnectingPoint num="35" id="7802" />
+<TGConnectingPoint num="36" id="7803" />
+<TGConnectingPoint num="37" id="7804" />
+<TGConnectingPoint num="38" id="7805" />
+<TGConnectingPoint num="39" id="7806" />
 <extraparam>
 <entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
 </extraparam>
@@ -17456,25 +17225,25 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="7988" >
+<CONNECTOR type="5102" id="7814" >
 <cdparam x="407" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="7987" />
-<P1  x="407" y="340" id="8047" />
-<P2  x="407" y="374" id="8082" />
+<TGConnectingPoint num="0" id="7813" />
+<P1  x="407" y="340" id="7873" />
+<P2  x="407" y="374" id="7908" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7986" >
-<father id="7988" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7812" >
+<father id="7814" num="0" />
 <cdparam x="414" y="365" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7982" />
-<TGConnectingPoint num="1" id="7983" />
-<TGConnectingPoint num="2" id="7984" />
-<TGConnectingPoint num="3" id="7985" />
+<TGConnectingPoint num="0" id="7808" />
+<TGConnectingPoint num="1" id="7809" />
+<TGConnectingPoint num="2" id="7810" />
+<TGConnectingPoint num="3" id="7811" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -17484,55 +17253,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8001" >
+<CONNECTOR type="5102" id="7827" >
 <cdparam x="407" y="277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="7997" />
-<TGConnectingPoint num="1" id="7998" />
-<TGConnectingPoint num="2" id="7999" />
-<TGConnectingPoint num="3" id="8000" />
-<P1  x="407" y="404" id="8083" />
-<P2  x="357" y="125" id="8107" />
+<TGConnectingPoint num="0" id="7823" />
+<TGConnectingPoint num="1" id="7824" />
+<TGConnectingPoint num="2" id="7825" />
+<TGConnectingPoint num="3" id="7826" />
+<P1  x="407" y="404" id="7909" />
+<P2  x="357" y="125" id="7933" />
 <Point x="300" y="404" />
 <Point x="300" y="278" />
 <Point x="300" y="125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="7989" >
-<father id="8001" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7815" >
+<father id="7827" num="0" />
 <cdparam x="300" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7990" >
-<father id="8001" num="1" />
+<SUBCOMPONENT type="-1" id="7816" >
+<father id="7827" num="1" />
 <cdparam x="300" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7991" >
-<father id="8001" num="2" />
+<SUBCOMPONENT type="-1" id="7817" >
+<father id="7827" num="2" />
 <cdparam x="300" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="7996" >
-<father id="8001" num="3" />
+<SUBCOMPONENT type="-1" id="7822" >
+<father id="7827" num="3" />
 <cdparam x="246" y="301" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="7992" />
-<TGConnectingPoint num="1" id="7993" />
-<TGConnectingPoint num="2" id="7994" />
-<TGConnectingPoint num="3" id="7995" />
+<TGConnectingPoint num="0" id="7818" />
+<TGConnectingPoint num="1" id="7819" />
+<TGConnectingPoint num="2" id="7820" />
+<TGConnectingPoint num="3" id="7821" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17543,25 +17312,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8008" >
+<CONNECTOR type="5102" id="7834" >
 <cdparam x="407" y="214" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8007" />
-<P1  x="407" y="209" id="8094" />
-<P2  x="406" y="240" id="8030" />
+<TGConnectingPoint num="0" id="7833" />
+<P1  x="407" y="209" id="7920" />
+<P2  x="406" y="240" id="7856" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8006" >
-<father id="8008" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7832" >
+<father id="7834" num="0" />
 <cdparam x="440" y="220" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8002" />
-<TGConnectingPoint num="1" id="8003" />
-<TGConnectingPoint num="2" id="8004" />
-<TGConnectingPoint num="3" id="8005" />
+<TGConnectingPoint num="0" id="7828" />
+<TGConnectingPoint num="1" id="7829" />
+<TGConnectingPoint num="2" id="7830" />
+<TGConnectingPoint num="3" id="7831" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17572,25 +17341,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8015" >
+<CONNECTOR type="5102" id="7841" >
 <cdparam x="407" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8014" />
-<P1  x="407" y="150" id="8110" />
-<P2  x="407" y="179" id="8093" />
+<TGConnectingPoint num="0" id="7840" />
+<P1  x="407" y="150" id="7936" />
+<P2  x="407" y="179" id="7919" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8013" >
-<father id="8015" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7839" >
+<father id="7841" num="0" />
 <cdparam x="412" y="172" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8009" />
-<TGConnectingPoint num="1" id="8010" />
-<TGConnectingPoint num="2" id="8011" />
-<TGConnectingPoint num="3" id="8012" />
+<TGConnectingPoint num="0" id="7835" />
+<TGConnectingPoint num="1" id="7836" />
+<TGConnectingPoint num="2" id="7837" />
+<TGConnectingPoint num="3" id="7838" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -17600,25 +17369,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8022" >
+<CONNECTOR type="5102" id="7848" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="8021" />
-<P1  x="407" y="70" id="8145" />
-<P2  x="407" y="100" id="8105" />
+<TGConnectingPoint num="0" id="7847" />
+<P1  x="407" y="70" id="7971" />
+<P2  x="407" y="100" id="7931" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8020" >
-<father id="8022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7846" >
+<father id="7848" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8016" />
-<TGConnectingPoint num="1" id="8017" />
-<TGConnectingPoint num="2" id="8018" />
-<TGConnectingPoint num="3" id="8019" />
+<TGConnectingPoint num="0" id="7842" />
+<TGConnectingPoint num="1" id="7843" />
+<TGConnectingPoint num="2" id="7844" />
+<TGConnectingPoint num="3" id="7845" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17628,25 +17397,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8029" >
+<CONNECTOR type="5102" id="7855" >
 <cdparam x="512" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8028" />
-<P1  x="406" y="270" id="8031" />
-<P2  x="407" y="290" id="8042" />
+<TGConnectingPoint num="0" id="7854" />
+<P1  x="406" y="270" id="7857" />
+<P2  x="407" y="290" id="7868" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8027" >
-<father id="8029" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7853" >
+<father id="7855" num="0" />
 <cdparam x="512" y="311" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8023" />
-<TGConnectingPoint num="1" id="8024" />
-<TGConnectingPoint num="2" id="8025" />
-<TGConnectingPoint num="3" id="8026" />
+<TGConnectingPoint num="0" id="7849" />
+<TGConnectingPoint num="1" id="7850" />
+<TGConnectingPoint num="2" id="7851" />
+<TGConnectingPoint num="3" id="7852" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17656,195 +17425,195 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="8040" >
+<COMPONENT type="5104" id="7866" >
 <cdparam x="361" y="245" />
 <sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="8030" />
-<TGConnectingPoint num="1" id="8031" />
-<TGConnectingPoint num="2" id="8032" />
-<TGConnectingPoint num="3" id="8033" />
-<TGConnectingPoint num="4" id="8034" />
-<TGConnectingPoint num="5" id="8035" />
-<TGConnectingPoint num="6" id="8036" />
-<TGConnectingPoint num="7" id="8037" />
-<TGConnectingPoint num="8" id="8038" />
-<TGConnectingPoint num="9" id="8039" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8081" >
+<TGConnectingPoint num="0" id="7856" />
+<TGConnectingPoint num="1" id="7857" />
+<TGConnectingPoint num="2" id="7858" />
+<TGConnectingPoint num="3" id="7859" />
+<TGConnectingPoint num="4" id="7860" />
+<TGConnectingPoint num="5" id="7861" />
+<TGConnectingPoint num="6" id="7862" />
+<TGConnectingPoint num="7" id="7863" />
+<TGConnectingPoint num="8" id="7864" />
+<TGConnectingPoint num="9" id="7865" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7907" >
 <cdparam x="357" y="290" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Opened" />
-<TGConnectingPoint num="0" id="8041" />
-<TGConnectingPoint num="1" id="8042" />
-<TGConnectingPoint num="2" id="8043" />
-<TGConnectingPoint num="3" id="8044" />
-<TGConnectingPoint num="4" id="8045" />
-<TGConnectingPoint num="5" id="8046" />
-<TGConnectingPoint num="6" id="8047" />
-<TGConnectingPoint num="7" id="8048" />
-<TGConnectingPoint num="8" id="8049" />
-<TGConnectingPoint num="9" id="8050" />
-<TGConnectingPoint num="10" id="8051" />
-<TGConnectingPoint num="11" id="8052" />
-<TGConnectingPoint num="12" id="8053" />
-<TGConnectingPoint num="13" id="8054" />
-<TGConnectingPoint num="14" id="8055" />
-<TGConnectingPoint num="15" id="8056" />
-<TGConnectingPoint num="16" id="8057" />
-<TGConnectingPoint num="17" id="8058" />
-<TGConnectingPoint num="18" id="8059" />
-<TGConnectingPoint num="19" id="8060" />
-<TGConnectingPoint num="20" id="8061" />
-<TGConnectingPoint num="21" id="8062" />
-<TGConnectingPoint num="22" id="8063" />
-<TGConnectingPoint num="23" id="8064" />
-<TGConnectingPoint num="24" id="8065" />
-<TGConnectingPoint num="25" id="8066" />
-<TGConnectingPoint num="26" id="8067" />
-<TGConnectingPoint num="27" id="8068" />
-<TGConnectingPoint num="28" id="8069" />
-<TGConnectingPoint num="29" id="8070" />
-<TGConnectingPoint num="30" id="8071" />
-<TGConnectingPoint num="31" id="8072" />
-<TGConnectingPoint num="32" id="8073" />
-<TGConnectingPoint num="33" id="8074" />
-<TGConnectingPoint num="34" id="8075" />
-<TGConnectingPoint num="35" id="8076" />
-<TGConnectingPoint num="36" id="8077" />
-<TGConnectingPoint num="37" id="8078" />
-<TGConnectingPoint num="38" id="8079" />
-<TGConnectingPoint num="39" id="8080" />
+<TGConnectingPoint num="0" id="7867" />
+<TGConnectingPoint num="1" id="7868" />
+<TGConnectingPoint num="2" id="7869" />
+<TGConnectingPoint num="3" id="7870" />
+<TGConnectingPoint num="4" id="7871" />
+<TGConnectingPoint num="5" id="7872" />
+<TGConnectingPoint num="6" id="7873" />
+<TGConnectingPoint num="7" id="7874" />
+<TGConnectingPoint num="8" id="7875" />
+<TGConnectingPoint num="9" id="7876" />
+<TGConnectingPoint num="10" id="7877" />
+<TGConnectingPoint num="11" id="7878" />
+<TGConnectingPoint num="12" id="7879" />
+<TGConnectingPoint num="13" id="7880" />
+<TGConnectingPoint num="14" id="7881" />
+<TGConnectingPoint num="15" id="7882" />
+<TGConnectingPoint num="16" id="7883" />
+<TGConnectingPoint num="17" id="7884" />
+<TGConnectingPoint num="18" id="7885" />
+<TGConnectingPoint num="19" id="7886" />
+<TGConnectingPoint num="20" id="7887" />
+<TGConnectingPoint num="21" id="7888" />
+<TGConnectingPoint num="22" id="7889" />
+<TGConnectingPoint num="23" id="7890" />
+<TGConnectingPoint num="24" id="7891" />
+<TGConnectingPoint num="25" id="7892" />
+<TGConnectingPoint num="26" id="7893" />
+<TGConnectingPoint num="27" id="7894" />
+<TGConnectingPoint num="28" id="7895" />
+<TGConnectingPoint num="29" id="7896" />
+<TGConnectingPoint num="30" id="7897" />
+<TGConnectingPoint num="31" id="7898" />
+<TGConnectingPoint num="32" id="7899" />
+<TGConnectingPoint num="33" id="7900" />
+<TGConnectingPoint num="34" id="7901" />
+<TGConnectingPoint num="35" id="7902" />
+<TGConnectingPoint num="36" id="7903" />
+<TGConnectingPoint num="37" id="7904" />
+<TGConnectingPoint num="38" id="7905" />
+<TGConnectingPoint num="39" id="7906" />
 <mastermutex />
 <extraparam>
 <entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="8092" >
+<COMPONENT type="5103" id="7918" >
 <cdparam x="380" y="379" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="8082" />
-<TGConnectingPoint num="1" id="8083" />
-<TGConnectingPoint num="2" id="8084" />
-<TGConnectingPoint num="3" id="8085" />
-<TGConnectingPoint num="4" id="8086" />
-<TGConnectingPoint num="5" id="8087" />
-<TGConnectingPoint num="6" id="8088" />
-<TGConnectingPoint num="7" id="8089" />
-<TGConnectingPoint num="8" id="8090" />
-<TGConnectingPoint num="9" id="8091" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="8103" >
+<TGConnectingPoint num="0" id="7908" />
+<TGConnectingPoint num="1" id="7909" />
+<TGConnectingPoint num="2" id="7910" />
+<TGConnectingPoint num="3" id="7911" />
+<TGConnectingPoint num="4" id="7912" />
+<TGConnectingPoint num="5" id="7913" />
+<TGConnectingPoint num="6" id="7914" />
+<TGConnectingPoint num="7" id="7915" />
+<TGConnectingPoint num="8" id="7916" />
+<TGConnectingPoint num="9" id="7917" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="7929" >
 <cdparam x="384" y="184" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="8093" />
-<TGConnectingPoint num="1" id="8094" />
-<TGConnectingPoint num="2" id="8095" />
-<TGConnectingPoint num="3" id="8096" />
-<TGConnectingPoint num="4" id="8097" />
-<TGConnectingPoint num="5" id="8098" />
-<TGConnectingPoint num="6" id="8099" />
-<TGConnectingPoint num="7" id="8100" />
-<TGConnectingPoint num="8" id="8101" />
-<TGConnectingPoint num="9" id="8102" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8144" >
+<TGConnectingPoint num="0" id="7919" />
+<TGConnectingPoint num="1" id="7920" />
+<TGConnectingPoint num="2" id="7921" />
+<TGConnectingPoint num="3" id="7922" />
+<TGConnectingPoint num="4" id="7923" />
+<TGConnectingPoint num="5" id="7924" />
+<TGConnectingPoint num="6" id="7925" />
+<TGConnectingPoint num="7" id="7926" />
+<TGConnectingPoint num="8" id="7927" />
+<TGConnectingPoint num="9" id="7928" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7970" >
 <cdparam x="357" y="100" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="8104" />
-<TGConnectingPoint num="1" id="8105" />
-<TGConnectingPoint num="2" id="8106" />
-<TGConnectingPoint num="3" id="8107" />
-<TGConnectingPoint num="4" id="8108" />
-<TGConnectingPoint num="5" id="8109" />
-<TGConnectingPoint num="6" id="8110" />
-<TGConnectingPoint num="7" id="8111" />
-<TGConnectingPoint num="8" id="8112" />
-<TGConnectingPoint num="9" id="8113" />
-<TGConnectingPoint num="10" id="8114" />
-<TGConnectingPoint num="11" id="8115" />
-<TGConnectingPoint num="12" id="8116" />
-<TGConnectingPoint num="13" id="8117" />
-<TGConnectingPoint num="14" id="8118" />
-<TGConnectingPoint num="15" id="8119" />
-<TGConnectingPoint num="16" id="8120" />
-<TGConnectingPoint num="17" id="8121" />
-<TGConnectingPoint num="18" id="8122" />
-<TGConnectingPoint num="19" id="8123" />
-<TGConnectingPoint num="20" id="8124" />
-<TGConnectingPoint num="21" id="8125" />
-<TGConnectingPoint num="22" id="8126" />
-<TGConnectingPoint num="23" id="8127" />
-<TGConnectingPoint num="24" id="8128" />
-<TGConnectingPoint num="25" id="8129" />
-<TGConnectingPoint num="26" id="8130" />
-<TGConnectingPoint num="27" id="8131" />
-<TGConnectingPoint num="28" id="8132" />
-<TGConnectingPoint num="29" id="8133" />
-<TGConnectingPoint num="30" id="8134" />
-<TGConnectingPoint num="31" id="8135" />
-<TGConnectingPoint num="32" id="8136" />
-<TGConnectingPoint num="33" id="8137" />
-<TGConnectingPoint num="34" id="8138" />
-<TGConnectingPoint num="35" id="8139" />
-<TGConnectingPoint num="36" id="8140" />
-<TGConnectingPoint num="37" id="8141" />
-<TGConnectingPoint num="38" id="8142" />
-<TGConnectingPoint num="39" id="8143" />
+<TGConnectingPoint num="0" id="7930" />
+<TGConnectingPoint num="1" id="7931" />
+<TGConnectingPoint num="2" id="7932" />
+<TGConnectingPoint num="3" id="7933" />
+<TGConnectingPoint num="4" id="7934" />
+<TGConnectingPoint num="5" id="7935" />
+<TGConnectingPoint num="6" id="7936" />
+<TGConnectingPoint num="7" id="7937" />
+<TGConnectingPoint num="8" id="7938" />
+<TGConnectingPoint num="9" id="7939" />
+<TGConnectingPoint num="10" id="7940" />
+<TGConnectingPoint num="11" id="7941" />
+<TGConnectingPoint num="12" id="7942" />
+<TGConnectingPoint num="13" id="7943" />
+<TGConnectingPoint num="14" id="7944" />
+<TGConnectingPoint num="15" id="7945" />
+<TGConnectingPoint num="16" id="7946" />
+<TGConnectingPoint num="17" id="7947" />
+<TGConnectingPoint num="18" id="7948" />
+<TGConnectingPoint num="19" id="7949" />
+<TGConnectingPoint num="20" id="7950" />
+<TGConnectingPoint num="21" id="7951" />
+<TGConnectingPoint num="22" id="7952" />
+<TGConnectingPoint num="23" id="7953" />
+<TGConnectingPoint num="24" id="7954" />
+<TGConnectingPoint num="25" id="7955" />
+<TGConnectingPoint num="26" id="7956" />
+<TGConnectingPoint num="27" id="7957" />
+<TGConnectingPoint num="28" id="7958" />
+<TGConnectingPoint num="29" id="7959" />
+<TGConnectingPoint num="30" id="7960" />
+<TGConnectingPoint num="31" id="7961" />
+<TGConnectingPoint num="32" id="7962" />
+<TGConnectingPoint num="33" id="7963" />
+<TGConnectingPoint num="34" id="7964" />
+<TGConnectingPoint num="35" id="7965" />
+<TGConnectingPoint num="36" id="7966" />
+<TGConnectingPoint num="37" id="7967" />
+<TGConnectingPoint num="38" id="7968" />
+<TGConnectingPoint num="39" id="7969" />
 <extraparam>
 <entryCode value="printf(&quot;Door is closed\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="8146" >
+<COMPONENT type="5100" id="7972" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8145" />
+<TGConnectingPoint num="0" id="7971" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="WirelessInterface" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8153" >
+<CONNECTOR type="5102" id="7979" >
 <cdparam x="466" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="8152" />
-<P1  x="449" y="422" id="8176" />
-<P2  x="460" y="455" id="8227" />
+<TGConnectingPoint num="0" id="7978" />
+<P1  x="449" y="422" id="8002" />
+<P2  x="460" y="455" id="8053" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8151" >
-<father id="8153" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7977" >
+<father id="7979" num="0" />
 <cdparam x="466" y="459" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8147" />
-<TGConnectingPoint num="1" id="8148" />
-<TGConnectingPoint num="2" id="8149" />
-<TGConnectingPoint num="3" id="8150" />
+<TGConnectingPoint num="0" id="7973" />
+<TGConnectingPoint num="1" id="7974" />
+<TGConnectingPoint num="2" id="7975" />
+<TGConnectingPoint num="3" id="7976" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17854,25 +17623,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8160" >
+<CONNECTOR type="5102" id="7986" >
 <cdparam x="455" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="8159" />
-<P1  x="414" y="275" id="8192" />
-<P2  x="449" y="392" id="8175" />
+<TGConnectingPoint num="0" id="7985" />
+<P1  x="414" y="275" id="8018" />
+<P2  x="449" y="392" id="8001" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8158" >
-<father id="8160" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7984" >
+<father id="7986" num="0" />
 <cdparam x="441" y="319" />
 <sizeparam width="177" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8154" />
-<TGConnectingPoint num="1" id="8155" />
-<TGConnectingPoint num="2" id="8156" />
-<TGConnectingPoint num="3" id="8157" />
+<TGConnectingPoint num="0" id="7980" />
+<TGConnectingPoint num="1" id="7981" />
+<TGConnectingPoint num="2" id="7982" />
+<TGConnectingPoint num="3" id="7983" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17884,25 +17653,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8167" >
+<CONNECTOR type="5102" id="7993" >
 <cdparam x="386" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="8166" />
-<P1  x="386" y="101" id="8240" />
-<P2  x="401" y="161" id="8229" />
+<TGConnectingPoint num="0" id="7992" />
+<P1  x="386" y="101" id="8066" />
+<P2  x="401" y="161" id="8055" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8165" >
-<father id="8167" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7991" >
+<father id="7993" num="0" />
 <cdparam x="386" y="141" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8161" />
-<TGConnectingPoint num="1" id="8162" />
-<TGConnectingPoint num="2" id="8163" />
-<TGConnectingPoint num="3" id="8164" />
+<TGConnectingPoint num="0" id="7987" />
+<TGConnectingPoint num="1" id="7988" />
+<TGConnectingPoint num="2" id="7989" />
+<TGConnectingPoint num="3" id="7990" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17912,25 +17681,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8174" >
+<CONNECTOR type="5102" id="8000" >
 <cdparam x="401" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="8173" />
-<P1  x="401" y="191" id="8230" />
-<P2  x="414" y="225" id="8187" />
+<TGConnectingPoint num="0" id="7999" />
+<P1  x="401" y="191" id="8056" />
+<P2  x="414" y="225" id="8013" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8172" >
-<father id="8174" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="7998" >
+<father id="8000" num="0" />
 <cdparam x="453" y="214" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8168" />
-<TGConnectingPoint num="1" id="8169" />
-<TGConnectingPoint num="2" id="8170" />
-<TGConnectingPoint num="3" id="8171" />
+<TGConnectingPoint num="0" id="7994" />
+<TGConnectingPoint num="1" id="7995" />
+<TGConnectingPoint num="2" id="7996" />
+<TGConnectingPoint num="3" id="7997" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -17940,109 +17709,109 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="8185" >
+<COMPONENT type="5103" id="8011" >
 <cdparam x="358" y="397" />
 <sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="remoteStart(selectedDuration)" />
-<TGConnectingPoint num="0" id="8175" />
-<TGConnectingPoint num="1" id="8176" />
-<TGConnectingPoint num="2" id="8177" />
-<TGConnectingPoint num="3" id="8178" />
-<TGConnectingPoint num="4" id="8179" />
-<TGConnectingPoint num="5" id="8180" />
-<TGConnectingPoint num="6" id="8181" />
-<TGConnectingPoint num="7" id="8182" />
-<TGConnectingPoint num="8" id="8183" />
-<TGConnectingPoint num="9" id="8184" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8226" >
+<TGConnectingPoint num="0" id="8001" />
+<TGConnectingPoint num="1" id="8002" />
+<TGConnectingPoint num="2" id="8003" />
+<TGConnectingPoint num="3" id="8004" />
+<TGConnectingPoint num="4" id="8005" />
+<TGConnectingPoint num="5" id="8006" />
+<TGConnectingPoint num="6" id="8007" />
+<TGConnectingPoint num="7" id="8008" />
+<TGConnectingPoint num="8" id="8009" />
+<TGConnectingPoint num="9" id="8010" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8052" >
 <cdparam x="348" y="225" />
 <sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="gotWirelessOrder" />
-<TGConnectingPoint num="0" id="8186" />
-<TGConnectingPoint num="1" id="8187" />
-<TGConnectingPoint num="2" id="8188" />
-<TGConnectingPoint num="3" id="8189" />
-<TGConnectingPoint num="4" id="8190" />
-<TGConnectingPoint num="5" id="8191" />
-<TGConnectingPoint num="6" id="8192" />
-<TGConnectingPoint num="7" id="8193" />
-<TGConnectingPoint num="8" id="8194" />
-<TGConnectingPoint num="9" id="8195" />
-<TGConnectingPoint num="10" id="8196" />
-<TGConnectingPoint num="11" id="8197" />
-<TGConnectingPoint num="12" id="8198" />
-<TGConnectingPoint num="13" id="8199" />
-<TGConnectingPoint num="14" id="8200" />
-<TGConnectingPoint num="15" id="8201" />
-<TGConnectingPoint num="16" id="8202" />
-<TGConnectingPoint num="17" id="8203" />
-<TGConnectingPoint num="18" id="8204" />
-<TGConnectingPoint num="19" id="8205" />
-<TGConnectingPoint num="20" id="8206" />
-<TGConnectingPoint num="21" id="8207" />
-<TGConnectingPoint num="22" id="8208" />
-<TGConnectingPoint num="23" id="8209" />
-<TGConnectingPoint num="24" id="8210" />
-<TGConnectingPoint num="25" id="8211" />
-<TGConnectingPoint num="26" id="8212" />
-<TGConnectingPoint num="27" id="8213" />
-<TGConnectingPoint num="28" id="8214" />
-<TGConnectingPoint num="29" id="8215" />
-<TGConnectingPoint num="30" id="8216" />
-<TGConnectingPoint num="31" id="8217" />
-<TGConnectingPoint num="32" id="8218" />
-<TGConnectingPoint num="33" id="8219" />
-<TGConnectingPoint num="34" id="8220" />
-<TGConnectingPoint num="35" id="8221" />
-<TGConnectingPoint num="36" id="8222" />
-<TGConnectingPoint num="37" id="8223" />
-<TGConnectingPoint num="38" id="8224" />
-<TGConnectingPoint num="39" id="8225" />
+<TGConnectingPoint num="0" id="8012" />
+<TGConnectingPoint num="1" id="8013" />
+<TGConnectingPoint num="2" id="8014" />
+<TGConnectingPoint num="3" id="8015" />
+<TGConnectingPoint num="4" id="8016" />
+<TGConnectingPoint num="5" id="8017" />
+<TGConnectingPoint num="6" id="8018" />
+<TGConnectingPoint num="7" id="8019" />
+<TGConnectingPoint num="8" id="8020" />
+<TGConnectingPoint num="9" id="8021" />
+<TGConnectingPoint num="10" id="8022" />
+<TGConnectingPoint num="11" id="8023" />
+<TGConnectingPoint num="12" id="8024" />
+<TGConnectingPoint num="13" id="8025" />
+<TGConnectingPoint num="14" id="8026" />
+<TGConnectingPoint num="15" id="8027" />
+<TGConnectingPoint num="16" id="8028" />
+<TGConnectingPoint num="17" id="8029" />
+<TGConnectingPoint num="18" id="8030" />
+<TGConnectingPoint num="19" id="8031" />
+<TGConnectingPoint num="20" id="8032" />
+<TGConnectingPoint num="21" id="8033" />
+<TGConnectingPoint num="22" id="8034" />
+<TGConnectingPoint num="23" id="8035" />
+<TGConnectingPoint num="24" id="8036" />
+<TGConnectingPoint num="25" id="8037" />
+<TGConnectingPoint num="26" id="8038" />
+<TGConnectingPoint num="27" id="8039" />
+<TGConnectingPoint num="28" id="8040" />
+<TGConnectingPoint num="29" id="8041" />
+<TGConnectingPoint num="30" id="8042" />
+<TGConnectingPoint num="31" id="8043" />
+<TGConnectingPoint num="32" id="8044" />
+<TGConnectingPoint num="33" id="8045" />
+<TGConnectingPoint num="34" id="8046" />
+<TGConnectingPoint num="35" id="8047" />
+<TGConnectingPoint num="36" id="8048" />
+<TGConnectingPoint num="37" id="8049" />
+<TGConnectingPoint num="38" id="8050" />
+<TGConnectingPoint num="39" id="8051" />
 <extraparam>
 <entryCode value="printf(&quot;Got duration from remote control :%d\n&quot;, msg2__data);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="8228" >
+<COMPONENT type="5101" id="8054" >
 <cdparam x="450" y="460" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="8227" />
+<TGConnectingPoint num="0" id="8053" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="8239" >
+<COMPONENT type="5104" id="8065" >
 <cdparam x="311" y="166" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="wirelessChannelRead(msg2)" />
-<TGConnectingPoint num="0" id="8229" />
-<TGConnectingPoint num="1" id="8230" />
-<TGConnectingPoint num="2" id="8231" />
-<TGConnectingPoint num="3" id="8232" />
-<TGConnectingPoint num="4" id="8233" />
-<TGConnectingPoint num="5" id="8234" />
-<TGConnectingPoint num="6" id="8235" />
-<TGConnectingPoint num="7" id="8236" />
-<TGConnectingPoint num="8" id="8237" />
-<TGConnectingPoint num="9" id="8238" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="8241" >
+<TGConnectingPoint num="0" id="8055" />
+<TGConnectingPoint num="1" id="8056" />
+<TGConnectingPoint num="2" id="8057" />
+<TGConnectingPoint num="3" id="8058" />
+<TGConnectingPoint num="4" id="8059" />
+<TGConnectingPoint num="5" id="8060" />
+<TGConnectingPoint num="6" id="8061" />
+<TGConnectingPoint num="7" id="8062" />
+<TGConnectingPoint num="8" id="8063" />
+<TGConnectingPoint num="9" id="8064" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="8067" >
 <cdparam x="379" y="81" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8240" />
+<TGConnectingPoint num="0" id="8066" />
 </COMPONENT>
 
 
@@ -18106,13 +17875,13 @@ or by a maintenance station
 <Validated value="ObserverProp1;RemotelyControlledMicrowave;MicroWaveOven;Bell;ControlPanel;Controller;Magnetron;Door;" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="8243" >
+<CONNECTOR type="5002" id="8069" >
 <cdparam x="770" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="8242" />
-<P1  x="722" y="954" id="8342" />
-<P2  x="727" y="996" id="8253" />
+<TGConnectingPoint num="0" id="8068" />
+<P1  x="722" y="954" id="8168" />
+<P2  x="727" y="996" id="8079" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obs_open()" />
@@ -18124,13 +17893,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="8245" >
+<CONNECTOR type="5002" id="8071" >
 <cdparam x="719" y="481" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="8244" />
-<P1  x="476" y="912" id="8339" />
-<P2  x="377" y="911" id="8281" />
+<TGConnectingPoint num="0" id="8070" />
+<P1  x="476" y="912" id="8165" />
+<P2  x="377" y="911" id="8107" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -18138,13 +17907,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="8247" >
+<CONNECTOR type="5002" id="8073" >
 <cdparam x="422" y="503" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="8246" />
-<P1  x="850" y="927" id="8389" />
-<P2  x="804" y="912" id="8340" />
+<TGConnectingPoint num="0" id="8072" />
+<P1  x="850" y="927" id="8215" />
+<P2  x="804" y="912" id="8166" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in unlockDoor()" />
@@ -18156,13 +17925,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="8249" >
+<CONNECTOR type="5002" id="8075" >
 <cdparam x="714" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="8248" />
-<P1  x="804" y="787" id="8329" />
-<P2  x="835" y="698" id="8355" />
+<TGConnectingPoint num="0" id="8074" />
+<P1  x="804" y="787" id="8155" />
+<P2  x="835" y="698" id="8181" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -18172,13 +17941,13 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="8251" >
+<CONNECTOR type="5002" id="8077" >
 <cdparam x="394" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="8250" />
-<P1  x="443" y="757" id="8306" />
-<P2  x="476" y="870" id="8330" />
+<TGConnectingPoint num="0" id="8076" />
+<P1  x="443" y="757" id="8132" />
+<P2  x="476" y="870" id="8156" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in LEDOn()" />
@@ -18190,149 +17959,149 @@ or by a maintenance station
 <FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="8276" >
+<COMPONENT type="5000" id="8102" >
 <cdparam x="615" y="996" />
 <sizeparam width="225" height="131" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="ObserverProp1" />
-<TGConnectingPoint num="0" id="8252" />
-<TGConnectingPoint num="1" id="8253" />
-<TGConnectingPoint num="2" id="8254" />
-<TGConnectingPoint num="3" id="8255" />
-<TGConnectingPoint num="4" id="8256" />
-<TGConnectingPoint num="5" id="8257" />
-<TGConnectingPoint num="6" id="8258" />
-<TGConnectingPoint num="7" id="8259" />
-<TGConnectingPoint num="8" id="8260" />
-<TGConnectingPoint num="9" id="8261" />
-<TGConnectingPoint num="10" id="8262" />
-<TGConnectingPoint num="11" id="8263" />
-<TGConnectingPoint num="12" id="8264" />
-<TGConnectingPoint num="13" id="8265" />
-<TGConnectingPoint num="14" id="8266" />
-<TGConnectingPoint num="15" id="8267" />
-<TGConnectingPoint num="16" id="8268" />
-<TGConnectingPoint num="17" id="8269" />
-<TGConnectingPoint num="18" id="8270" />
-<TGConnectingPoint num="19" id="8271" />
-<TGConnectingPoint num="20" id="8272" />
-<TGConnectingPoint num="21" id="8273" />
-<TGConnectingPoint num="22" id="8274" />
-<TGConnectingPoint num="23" id="8275" />
+<TGConnectingPoint num="0" id="8078" />
+<TGConnectingPoint num="1" id="8079" />
+<TGConnectingPoint num="2" id="8080" />
+<TGConnectingPoint num="3" id="8081" />
+<TGConnectingPoint num="4" id="8082" />
+<TGConnectingPoint num="5" id="8083" />
+<TGConnectingPoint num="6" id="8084" />
+<TGConnectingPoint num="7" id="8085" />
+<TGConnectingPoint num="8" id="8086" />
+<TGConnectingPoint num="9" id="8087" />
+<TGConnectingPoint num="10" id="8088" />
+<TGConnectingPoint num="11" id="8089" />
+<TGConnectingPoint num="12" id="8090" />
+<TGConnectingPoint num="13" id="8091" />
+<TGConnectingPoint num="14" id="8092" />
+<TGConnectingPoint num="15" id="8093" />
+<TGConnectingPoint num="16" id="8094" />
+<TGConnectingPoint num="17" id="8095" />
+<TGConnectingPoint num="18" id="8096" />
+<TGConnectingPoint num="19" id="8097" />
+<TGConnectingPoint num="20" id="8098" />
+<TGConnectingPoint num="21" id="8099" />
+<TGConnectingPoint num="22" id="8100" />
+<TGConnectingPoint num="23" id="8101" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in obs_open()" />
-<Signal value="in obs_closed()" />
-<Signal value="in obs_magnetronStart()" />
+<Signal value="in obs_open()" attached="true" />
+<Signal value="in obs_closed()" attached="true" />
+<Signal value="in obs_magnetronStart()" attached="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="8451" >
+<COMPONENT type="5000" id="8277" >
 <cdparam x="148" y="343" />
 <sizeparam width="967" height="631" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="RemotelyControlledMicrowave" />
-<TGConnectingPoint num="0" id="8427" />
-<TGConnectingPoint num="1" id="8428" />
-<TGConnectingPoint num="2" id="8429" />
-<TGConnectingPoint num="3" id="8430" />
-<TGConnectingPoint num="4" id="8431" />
-<TGConnectingPoint num="5" id="8432" />
-<TGConnectingPoint num="6" id="8433" />
-<TGConnectingPoint num="7" id="8434" />
-<TGConnectingPoint num="8" id="8435" />
-<TGConnectingPoint num="9" id="8436" />
-<TGConnectingPoint num="10" id="8437" />
-<TGConnectingPoint num="11" id="8438" />
-<TGConnectingPoint num="12" id="8439" />
-<TGConnectingPoint num="13" id="8440" />
-<TGConnectingPoint num="14" id="8441" />
-<TGConnectingPoint num="15" id="8442" />
-<TGConnectingPoint num="16" id="8443" />
-<TGConnectingPoint num="17" id="8444" />
-<TGConnectingPoint num="18" id="8445" />
-<TGConnectingPoint num="19" id="8446" />
-<TGConnectingPoint num="20" id="8447" />
-<TGConnectingPoint num="21" id="8448" />
-<TGConnectingPoint num="22" id="8449" />
-<TGConnectingPoint num="23" id="8450" />
+<TGConnectingPoint num="0" id="8253" />
+<TGConnectingPoint num="1" id="8254" />
+<TGConnectingPoint num="2" id="8255" />
+<TGConnectingPoint num="3" id="8256" />
+<TGConnectingPoint num="4" id="8257" />
+<TGConnectingPoint num="5" id="8258" />
+<TGConnectingPoint num="6" id="8259" />
+<TGConnectingPoint num="7" id="8260" />
+<TGConnectingPoint num="8" id="8261" />
+<TGConnectingPoint num="9" id="8262" />
+<TGConnectingPoint num="10" id="8263" />
+<TGConnectingPoint num="11" id="8264" />
+<TGConnectingPoint num="12" id="8265" />
+<TGConnectingPoint num="13" id="8266" />
+<TGConnectingPoint num="14" id="8267" />
+<TGConnectingPoint num="15" id="8268" />
+<TGConnectingPoint num="16" id="8269" />
+<TGConnectingPoint num="17" id="8270" />
+<TGConnectingPoint num="18" id="8271" />
+<TGConnectingPoint num="19" id="8272" />
+<TGConnectingPoint num="20" id="8273" />
+<TGConnectingPoint num="21" id="8274" />
+<TGConnectingPoint num="22" id="8275" />
+<TGConnectingPoint num="23" id="8276" />
 <extraparam>
 <CryptoBlock value="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="8426" >
-<father id="8451" num="0" />
+<SUBCOMPONENT type="5000" id="8252" >
+<father id="8277" num="0" />
 <cdparam x="173" y="554" />
 <sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
 <infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="8402" />
-<TGConnectingPoint num="1" id="8403" />
-<TGConnectingPoint num="2" id="8404" />
-<TGConnectingPoint num="3" id="8405" />
-<TGConnectingPoint num="4" id="8406" />
-<TGConnectingPoint num="5" id="8407" />
-<TGConnectingPoint num="6" id="8408" />
-<TGConnectingPoint num="7" id="8409" />
-<TGConnectingPoint num="8" id="8410" />
-<TGConnectingPoint num="9" id="8411" />
-<TGConnectingPoint num="10" id="8412" />
-<TGConnectingPoint num="11" id="8413" />
-<TGConnectingPoint num="12" id="8414" />
-<TGConnectingPoint num="13" id="8415" />
-<TGConnectingPoint num="14" id="8416" />
-<TGConnectingPoint num="15" id="8417" />
-<TGConnectingPoint num="16" id="8418" />
-<TGConnectingPoint num="17" id="8419" />
-<TGConnectingPoint num="18" id="8420" />
-<TGConnectingPoint num="19" id="8421" />
-<TGConnectingPoint num="20" id="8422" />
-<TGConnectingPoint num="21" id="8423" />
-<TGConnectingPoint num="22" id="8424" />
-<TGConnectingPoint num="23" id="8425" />
+<TGConnectingPoint num="0" id="8228" />
+<TGConnectingPoint num="1" id="8229" />
+<TGConnectingPoint num="2" id="8230" />
+<TGConnectingPoint num="3" id="8231" />
+<TGConnectingPoint num="4" id="8232" />
+<TGConnectingPoint num="5" id="8233" />
+<TGConnectingPoint num="6" id="8234" />
+<TGConnectingPoint num="7" id="8235" />
+<TGConnectingPoint num="8" id="8236" />
+<TGConnectingPoint num="9" id="8237" />
+<TGConnectingPoint num="10" id="8238" />
+<TGConnectingPoint num="11" id="8239" />
+<TGConnectingPoint num="12" id="8240" />
+<TGConnectingPoint num="13" id="8241" />
+<TGConnectingPoint num="14" id="8242" />
+<TGConnectingPoint num="15" id="8243" />
+<TGConnectingPoint num="16" id="8244" />
+<TGConnectingPoint num="17" id="8245" />
+<TGConnectingPoint num="18" id="8246" />
+<TGConnectingPoint num="19" id="8247" />
+<TGConnectingPoint num="20" id="8248" />
+<TGConnectingPoint num="21" id="8249" />
+<TGConnectingPoint num="22" id="8250" />
+<TGConnectingPoint num="23" id="8251" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" />
+<Signal value="in remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="8301" >
-<father id="8426" num="0" />
+<SUBCOMPONENT type="5000" id="8127" >
+<father id="8252" num="0" />
 <cdparam x="196" y="864" />
 <sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
 <infoparam name="Block0" value="Bell" />
-<TGConnectingPoint num="0" id="8277" />
-<TGConnectingPoint num="1" id="8278" />
-<TGConnectingPoint num="2" id="8279" />
-<TGConnectingPoint num="3" id="8280" />
-<TGConnectingPoint num="4" id="8281" />
-<TGConnectingPoint num="5" id="8282" />
-<TGConnectingPoint num="6" id="8283" />
-<TGConnectingPoint num="7" id="8284" />
-<TGConnectingPoint num="8" id="8285" />
-<TGConnectingPoint num="9" id="8286" />
-<TGConnectingPoint num="10" id="8287" />
-<TGConnectingPoint num="11" id="8288" />
-<TGConnectingPoint num="12" id="8289" />
-<TGConnectingPoint num="13" id="8290" />
-<TGConnectingPoint num="14" id="8291" />
-<TGConnectingPoint num="15" id="8292" />
-<TGConnectingPoint num="16" id="8293" />
-<TGConnectingPoint num="17" id="8294" />
-<TGConnectingPoint num="18" id="8295" />
-<TGConnectingPoint num="19" id="8296" />
-<TGConnectingPoint num="20" id="8297" />
-<TGConnectingPoint num="21" id="8298" />
-<TGConnectingPoint num="22" id="8299" />
-<TGConnectingPoint num="23" id="8300" />
+<TGConnectingPoint num="0" id="8103" />
+<TGConnectingPoint num="1" id="8104" />
+<TGConnectingPoint num="2" id="8105" />
+<TGConnectingPoint num="3" id="8106" />
+<TGConnectingPoint num="4" id="8107" />
+<TGConnectingPoint num="5" id="8108" />
+<TGConnectingPoint num="6" id="8109" />
+<TGConnectingPoint num="7" id="8110" />
+<TGConnectingPoint num="8" id="8111" />
+<TGConnectingPoint num="9" id="8112" />
+<TGConnectingPoint num="10" id="8113" />
+<TGConnectingPoint num="11" id="8114" />
+<TGConnectingPoint num="12" id="8115" />
+<TGConnectingPoint num="13" id="8116" />
+<TGConnectingPoint num="14" id="8117" />
+<TGConnectingPoint num="15" id="8118" />
+<TGConnectingPoint num="16" id="8119" />
+<TGConnectingPoint num="17" id="8120" />
+<TGConnectingPoint num="18" id="8121" />
+<TGConnectingPoint num="19" id="8122" />
+<TGConnectingPoint num="20" id="8123" />
+<TGConnectingPoint num="21" id="8124" />
+<TGConnectingPoint num="22" id="8125" />
+<TGConnectingPoint num="23" id="8126" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$runBell()" />
-<Signal value="in ring()" />
+<Signal value="in ring()" attached="true" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
@@ -18342,94 +18111,94 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="8326" >
-<father id="8426" num="1" />
+<SUBCOMPONENT type="5000" id="8152" >
+<father id="8252" num="1" />
 <cdparam x="187" y="676" />
 <sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
 <infoparam name="Block0" value="ControlPanel" />
-<TGConnectingPoint num="0" id="8302" />
-<TGConnectingPoint num="1" id="8303" />
-<TGConnectingPoint num="2" id="8304" />
-<TGConnectingPoint num="3" id="8305" />
-<TGConnectingPoint num="4" id="8306" />
-<TGConnectingPoint num="5" id="8307" />
-<TGConnectingPoint num="6" id="8308" />
-<TGConnectingPoint num="7" id="8309" />
-<TGConnectingPoint num="8" id="8310" />
-<TGConnectingPoint num="9" id="8311" />
-<TGConnectingPoint num="10" id="8312" />
-<TGConnectingPoint num="11" id="8313" />
-<TGConnectingPoint num="12" id="8314" />
-<TGConnectingPoint num="13" id="8315" />
-<TGConnectingPoint num="14" id="8316" />
-<TGConnectingPoint num="15" id="8317" />
-<TGConnectingPoint num="16" id="8318" />
-<TGConnectingPoint num="17" id="8319" />
-<TGConnectingPoint num="18" id="8320" />
-<TGConnectingPoint num="19" id="8321" />
-<TGConnectingPoint num="20" id="8322" />
-<TGConnectingPoint num="21" id="8323" />
-<TGConnectingPoint num="22" id="8324" />
-<TGConnectingPoint num="23" id="8325" />
+<TGConnectingPoint num="0" id="8128" />
+<TGConnectingPoint num="1" id="8129" />
+<TGConnectingPoint num="2" id="8130" />
+<TGConnectingPoint num="3" id="8131" />
+<TGConnectingPoint num="4" id="8132" />
+<TGConnectingPoint num="5" id="8133" />
+<TGConnectingPoint num="6" id="8134" />
+<TGConnectingPoint num="7" id="8135" />
+<TGConnectingPoint num="8" id="8136" />
+<TGConnectingPoint num="9" id="8137" />
+<TGConnectingPoint num="10" id="8138" />
+<TGConnectingPoint num="11" id="8139" />
+<TGConnectingPoint num="12" id="8140" />
+<TGConnectingPoint num="13" id="8141" />
+<TGConnectingPoint num="14" id="8142" />
+<TGConnectingPoint num="15" id="8143" />
+<TGConnectingPoint num="16" id="8144" />
+<TGConnectingPoint num="17" id="8145" />
+<TGConnectingPoint num="18" id="8146" />
+<TGConnectingPoint num="19" id="8147" />
+<TGConnectingPoint num="20" id="8148" />
+<TGConnectingPoint num="21" id="8149" />
+<TGConnectingPoint num="22" id="8150" />
+<TGConnectingPoint num="23" id="8151" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="8351" >
-<father id="8426" num="2" />
+<SUBCOMPONENT type="5000" id="8177" >
+<father id="8252" num="2" />
 <cdparam x="476" y="787" />
 <sizeparam width="328" height="167" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="593" minY="0" maxY="245" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="8327" />
-<TGConnectingPoint num="1" id="8328" />
-<TGConnectingPoint num="2" id="8329" />
-<TGConnectingPoint num="3" id="8330" />
-<TGConnectingPoint num="4" id="8331" />
-<TGConnectingPoint num="5" id="8332" />
-<TGConnectingPoint num="6" id="8333" />
-<TGConnectingPoint num="7" id="8334" />
-<TGConnectingPoint num="8" id="8335" />
-<TGConnectingPoint num="9" id="8336" />
-<TGConnectingPoint num="10" id="8337" />
-<TGConnectingPoint num="11" id="8338" />
-<TGConnectingPoint num="12" id="8339" />
-<TGConnectingPoint num="13" id="8340" />
-<TGConnectingPoint num="14" id="8341" />
-<TGConnectingPoint num="15" id="8342" />
-<TGConnectingPoint num="16" id="8343" />
-<TGConnectingPoint num="17" id="8344" />
-<TGConnectingPoint num="18" id="8345" />
-<TGConnectingPoint num="19" id="8346" />
-<TGConnectingPoint num="20" id="8347" />
-<TGConnectingPoint num="21" id="8348" />
-<TGConnectingPoint num="22" id="8349" />
-<TGConnectingPoint num="23" id="8350" />
+<TGConnectingPoint num="0" id="8153" />
+<TGConnectingPoint num="1" id="8154" />
+<TGConnectingPoint num="2" id="8155" />
+<TGConnectingPoint num="3" id="8156" />
+<TGConnectingPoint num="4" id="8157" />
+<TGConnectingPoint num="5" id="8158" />
+<TGConnectingPoint num="6" id="8159" />
+<TGConnectingPoint num="7" id="8160" />
+<TGConnectingPoint num="8" id="8161" />
+<TGConnectingPoint num="9" id="8162" />
+<TGConnectingPoint num="10" id="8163" />
+<TGConnectingPoint num="11" id="8164" />
+<TGConnectingPoint num="12" id="8165" />
+<TGConnectingPoint num="13" id="8166" />
+<TGConnectingPoint num="14" id="8167" />
+<TGConnectingPoint num="15" id="8168" />
+<TGConnectingPoint num="16" id="8169" />
+<TGConnectingPoint num="17" id="8170" />
+<TGConnectingPoint num="18" id="8171" />
+<TGConnectingPoint num="19" id="8172" />
+<TGConnectingPoint num="20" id="8173" />
+<TGConnectingPoint num="21" id="8174" />
+<TGConnectingPoint num="22" id="8175" />
+<TGConnectingPoint num="23" id="8176" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
 <Method value="$startCooking(int duration)" />
 <Method value="$durationModified(int duration)" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out obs_open()" />
-<Signal value="out obs_closed()" />
-<Signal value="out obs_magnetronStart()" />
-<Signal value="out unlockDoor()" />
+<Signal value="in start(int duration)" attached="true" />
+<Signal value="in closed()" attached="true" />
+<Signal value="in open()" attached="true" />
+<Signal value="out ringBell()" attached="true" />
+<Signal value="out startMagnetron()" attached="true" />
+<Signal value="out stopMagnetron()" attached="true" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out obs_open()" attached="true" />
+<Signal value="out obs_closed()" attached="true" />
+<Signal value="out obs_magnetronStart()" attached="true" />
+<Signal value="out unlockDoor()" attached="true" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="const char* dur = &quot;Duration&quot;;" />
@@ -18460,44 +18229,44 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="8376" >
-<father id="8426" num="3" />
+<SUBCOMPONENT type="5000" id="8202" >
+<father id="8252" num="3" />
 <cdparam x="835" y="618" />
 <sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
 <infoparam name="Block0" value="Magnetron" />
-<TGConnectingPoint num="0" id="8352" />
-<TGConnectingPoint num="1" id="8353" />
-<TGConnectingPoint num="2" id="8354" />
-<TGConnectingPoint num="3" id="8355" />
-<TGConnectingPoint num="4" id="8356" />
-<TGConnectingPoint num="5" id="8357" />
-<TGConnectingPoint num="6" id="8358" />
-<TGConnectingPoint num="7" id="8359" />
-<TGConnectingPoint num="8" id="8360" />
-<TGConnectingPoint num="9" id="8361" />
-<TGConnectingPoint num="10" id="8362" />
-<TGConnectingPoint num="11" id="8363" />
-<TGConnectingPoint num="12" id="8364" />
-<TGConnectingPoint num="13" id="8365" />
-<TGConnectingPoint num="14" id="8366" />
-<TGConnectingPoint num="15" id="8367" />
-<TGConnectingPoint num="16" id="8368" />
-<TGConnectingPoint num="17" id="8369" />
-<TGConnectingPoint num="18" id="8370" />
-<TGConnectingPoint num="19" id="8371" />
-<TGConnectingPoint num="20" id="8372" />
-<TGConnectingPoint num="21" id="8373" />
-<TGConnectingPoint num="22" id="8374" />
-<TGConnectingPoint num="23" id="8375" />
+<TGConnectingPoint num="0" id="8178" />
+<TGConnectingPoint num="1" id="8179" />
+<TGConnectingPoint num="2" id="8180" />
+<TGConnectingPoint num="3" id="8181" />
+<TGConnectingPoint num="4" id="8182" />
+<TGConnectingPoint num="5" id="8183" />
+<TGConnectingPoint num="6" id="8184" />
+<TGConnectingPoint num="7" id="8185" />
+<TGConnectingPoint num="8" id="8186" />
+<TGConnectingPoint num="9" id="8187" />
+<TGConnectingPoint num="10" id="8188" />
+<TGConnectingPoint num="11" id="8189" />
+<TGConnectingPoint num="12" id="8190" />
+<TGConnectingPoint num="13" id="8191" />
+<TGConnectingPoint num="14" id="8192" />
+<TGConnectingPoint num="15" id="8193" />
+<TGConnectingPoint num="16" id="8194" />
+<TGConnectingPoint num="17" id="8195" />
+<TGConnectingPoint num="18" id="8196" />
+<TGConnectingPoint num="19" id="8197" />
+<TGConnectingPoint num="20" id="8198" />
+<TGConnectingPoint num="21" id="8199" />
+<TGConnectingPoint num="22" id="8200" />
+<TGConnectingPoint num="23" id="8201" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="power" value="0" type="8" typeOther="" />
 <Method value="$ON()" />
 <Method value="$OFF()" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Signal value="in startM()" attached="true" />
+<Signal value="in stopM()" attached="true" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
 <globalCode value="" />
@@ -18510,44 +18279,44 @@ or by a maintenance station
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="8401" >
-<father id="8426" num="4" />
+<SUBCOMPONENT type="5000" id="8227" >
+<father id="8252" num="4" />
 <cdparam x="850" y="833" />
 <sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
 <infoparam name="Block0" value="Door" />
-<TGConnectingPoint num="0" id="8377" />
-<TGConnectingPoint num="1" id="8378" />
-<TGConnectingPoint num="2" id="8379" />
-<TGConnectingPoint num="3" id="8380" />
-<TGConnectingPoint num="4" id="8381" />
-<TGConnectingPoint num="5" id="8382" />
-<TGConnectingPoint num="6" id="8383" />
-<TGConnectingPoint num="7" id="8384" />
-<TGConnectingPoint num="8" id="8385" />
-<TGConnectingPoint num="9" id="8386" />
-<TGConnectingPoint num="10" id="8387" />
-<TGConnectingPoint num="11" id="8388" />
-<TGConnectingPoint num="12" id="8389" />
-<TGConnectingPoint num="13" id="8390" />
-<TGConnectingPoint num="14" id="8391" />
-<TGConnectingPoint num="15" id="8392" />
-<TGConnectingPoint num="16" id="8393" />
-<TGConnectingPoint num="17" id="8394" />
-<TGConnectingPoint num="18" id="8395" />
-<TGConnectingPoint num="19" id="8396" />
-<TGConnectingPoint num="20" id="8397" />
-<TGConnectingPoint num="21" id="8398" />
-<TGConnectingPoint num="22" id="8399" />
-<TGConnectingPoint num="23" id="8400" />
+<TGConnectingPoint num="0" id="8203" />
+<TGConnectingPoint num="1" id="8204" />
+<TGConnectingPoint num="2" id="8205" />
+<TGConnectingPoint num="3" id="8206" />
+<TGConnectingPoint num="4" id="8207" />
+<TGConnectingPoint num="5" id="8208" />
+<TGConnectingPoint num="6" id="8209" />
+<TGConnectingPoint num="7" id="8210" />
+<TGConnectingPoint num="8" id="8211" />
+<TGConnectingPoint num="9" id="8212" />
+<TGConnectingPoint num="10" id="8213" />
+<TGConnectingPoint num="11" id="8214" />
+<TGConnectingPoint num="12" id="8215" />
+<TGConnectingPoint num="13" id="8216" />
+<TGConnectingPoint num="14" id="8217" />
+<TGConnectingPoint num="15" id="8218" />
+<TGConnectingPoint num="16" id="8219" />
+<TGConnectingPoint num="17" id="8220" />
+<TGConnectingPoint num="18" id="8221" />
+<TGConnectingPoint num="19" id="8222" />
+<TGConnectingPoint num="20" id="8223" />
+<TGConnectingPoint num="21" id="8224" />
+<TGConnectingPoint num="22" id="8225" />
+<TGConnectingPoint num="23" id="8226" />
 <extraparam>
 <CryptoBlock value="false" />
 <Method value="$openM()" />
 <Method value="$closeM()" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
-<Signal value="in unlockDoor()" />
+<Signal value="out closed()" attached="true" />
+<Signal value="out open()" attached="true" />
+<Signal value="in unlockDoor()" attached="true" />
 <globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
@@ -18568,25 +18337,25 @@ or by a maintenance station
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ObserverProp1" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8458" >
+<CONNECTOR type="5102" id="8284" >
 <cdparam x="395" y="433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8457" />
-<P1  x="395" y="433" id="8571" />
-<P2  x="395" y="450" id="8530" />
+<TGConnectingPoint num="0" id="8283" />
+<P1  x="395" y="433" id="8397" />
+<P2  x="395" y="450" id="8356" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8456" >
-<father id="8458" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8282" >
+<father id="8284" num="0" />
 <cdparam x="395" y="473" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8452" />
-<TGConnectingPoint num="1" id="8453" />
-<TGConnectingPoint num="2" id="8454" />
-<TGConnectingPoint num="3" id="8455" />
+<TGConnectingPoint num="0" id="8278" />
+<TGConnectingPoint num="1" id="8279" />
+<TGConnectingPoint num="2" id="8280" />
+<TGConnectingPoint num="3" id="8281" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18596,25 +18365,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8465" >
+<CONNECTOR type="5102" id="8291" >
 <cdparam x="303" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="8464" />
-<P1  x="303" y="356" id="8618" />
-<P2  x="395" y="403" id="8570" />
+<TGConnectingPoint num="0" id="8290" />
+<P1  x="303" y="356" id="8444" />
+<P2  x="395" y="403" id="8396" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8463" >
-<father id="8465" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8289" >
+<father id="8291" num="0" />
 <cdparam x="303" y="396" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8459" />
-<TGConnectingPoint num="1" id="8460" />
-<TGConnectingPoint num="2" id="8461" />
-<TGConnectingPoint num="3" id="8462" />
+<TGConnectingPoint num="0" id="8285" />
+<TGConnectingPoint num="1" id="8286" />
+<TGConnectingPoint num="2" id="8287" />
+<TGConnectingPoint num="3" id="8288" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18624,55 +18393,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8478" >
+<CONNECTOR type="5102" id="8304" >
 <cdparam x="436" y="285" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8474" />
-<TGConnectingPoint num="1" id="8475" />
-<TGConnectingPoint num="2" id="8476" />
-<TGConnectingPoint num="3" id="8477" />
-<P1  x="436" y="285" id="8582" />
-<P2  x="409" y="180" id="8666" />
+<TGConnectingPoint num="0" id="8300" />
+<TGConnectingPoint num="1" id="8301" />
+<TGConnectingPoint num="2" id="8302" />
+<TGConnectingPoint num="3" id="8303" />
+<P1  x="436" y="285" id="8408" />
+<P2  x="409" y="180" id="8492" />
 <Point x="436" y="302" />
 <Point x="554" y="302" />
 <Point x="554" y="180" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8466" >
-<father id="8478" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8292" >
+<father id="8304" num="0" />
 <cdparam x="436" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8467" >
-<father id="8478" num="1" />
+<SUBCOMPONENT type="-1" id="8293" >
+<father id="8304" num="1" />
 <cdparam x="554" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8468" >
-<father id="8478" num="2" />
+<SUBCOMPONENT type="-1" id="8294" >
+<father id="8304" num="2" />
 <cdparam x="554" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8473" >
-<father id="8478" num="3" />
+<SUBCOMPONENT type="-1" id="8299" >
+<father id="8304" num="3" />
 <cdparam x="436" y="325" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8469" />
-<TGConnectingPoint num="1" id="8470" />
-<TGConnectingPoint num="2" id="8471" />
-<TGConnectingPoint num="3" id="8472" />
+<TGConnectingPoint num="0" id="8295" />
+<TGConnectingPoint num="1" id="8296" />
+<TGConnectingPoint num="2" id="8297" />
+<TGConnectingPoint num="3" id="8298" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18682,25 +18451,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8485" >
+<CONNECTOR type="5102" id="8311" >
 <cdparam x="379" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="8484" />
-<P1  x="379" y="218" id="8670" />
-<P2  x="436" y="255" id="8581" />
+<TGConnectingPoint num="0" id="8310" />
+<P1  x="379" y="218" id="8496" />
+<P2  x="436" y="255" id="8407" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8483" >
-<father id="8485" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8309" >
+<father id="8311" num="0" />
 <cdparam x="379" y="258" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8479" />
-<TGConnectingPoint num="1" id="8480" />
-<TGConnectingPoint num="2" id="8481" />
-<TGConnectingPoint num="3" id="8482" />
+<TGConnectingPoint num="0" id="8305" />
+<TGConnectingPoint num="1" id="8306" />
+<TGConnectingPoint num="2" id="8307" />
+<TGConnectingPoint num="3" id="8308" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18710,65 +18479,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8500" >
+<CONNECTOR type="5102" id="8326" >
 <cdparam x="228" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8495" />
-<TGConnectingPoint num="1" id="8496" />
-<TGConnectingPoint num="2" id="8497" />
-<TGConnectingPoint num="3" id="8498" />
-<TGConnectingPoint num="4" id="8499" />
-<P1  x="228" y="432" id="8593" />
-<P2  x="319" y="168" id="8663" />
+<TGConnectingPoint num="0" id="8321" />
+<TGConnectingPoint num="1" id="8322" />
+<TGConnectingPoint num="2" id="8323" />
+<TGConnectingPoint num="3" id="8324" />
+<TGConnectingPoint num="4" id="8325" />
+<P1  x="228" y="432" id="8419" />
+<P2  x="319" y="168" id="8489" />
 <Point x="228" y="452" />
 <Point x="165" y="452" />
 <Point x="165" y="136" />
 <Point x="320" y="136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8486" >
-<father id="8500" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8312" >
+<father id="8326" num="0" />
 <cdparam x="228" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8487" >
-<father id="8500" num="1" />
+<SUBCOMPONENT type="-1" id="8313" >
+<father id="8326" num="1" />
 <cdparam x="165" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8488" >
-<father id="8500" num="2" />
+<SUBCOMPONENT type="-1" id="8314" >
+<father id="8326" num="2" />
 <cdparam x="165" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8489" >
-<father id="8500" num="3" />
+<SUBCOMPONENT type="-1" id="8315" >
+<father id="8326" num="3" />
 <cdparam x="320" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8494" >
-<father id="8500" num="4" />
+<SUBCOMPONENT type="-1" id="8320" >
+<father id="8326" num="4" />
 <cdparam x="228" y="472" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8490" />
-<TGConnectingPoint num="1" id="8491" />
-<TGConnectingPoint num="2" id="8492" />
-<TGConnectingPoint num="3" id="8493" />
+<TGConnectingPoint num="0" id="8316" />
+<TGConnectingPoint num="1" id="8317" />
+<TGConnectingPoint num="2" id="8318" />
+<TGConnectingPoint num="3" id="8319" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18778,25 +18547,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8507" >
+<CONNECTOR type="5102" id="8333" >
 <cdparam x="252" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="8506" />
-<P1  x="246" y="356" id="8617" />
-<P2  x="228" y="402" id="8592" />
+<TGConnectingPoint num="0" id="8332" />
+<P1  x="246" y="356" id="8443" />
+<P2  x="228" y="402" id="8418" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8505" >
-<father id="8507" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8331" >
+<father id="8333" num="0" />
 <cdparam x="252" y="408" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8501" />
-<TGConnectingPoint num="1" id="8502" />
-<TGConnectingPoint num="2" id="8503" />
-<TGConnectingPoint num="3" id="8504" />
+<TGConnectingPoint num="0" id="8327" />
+<TGConnectingPoint num="1" id="8328" />
+<TGConnectingPoint num="2" id="8329" />
+<TGConnectingPoint num="3" id="8330" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18806,25 +18575,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8514" >
+<CONNECTOR type="5102" id="8340" >
 <cdparam x="275" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8513" />
-<P1  x="275" y="286" id="8645" />
-<P2  x="275" y="306" id="8604" />
+<TGConnectingPoint num="0" id="8339" />
+<P1  x="275" y="286" id="8471" />
+<P2  x="275" y="306" id="8430" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8512" >
-<father id="8514" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8338" >
+<father id="8340" num="0" />
 <cdparam x="275" y="326" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8508" />
-<TGConnectingPoint num="1" id="8509" />
-<TGConnectingPoint num="2" id="8510" />
-<TGConnectingPoint num="3" id="8511" />
+<TGConnectingPoint num="0" id="8334" />
+<TGConnectingPoint num="1" id="8335" />
+<TGConnectingPoint num="2" id="8336" />
+<TGConnectingPoint num="3" id="8337" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18834,25 +18603,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8521" >
+<CONNECTOR type="5102" id="8347" >
 <cdparam x="319" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="8520" />
-<P1  x="319" y="218" id="8669" />
-<P2  x="275" y="256" id="8644" />
+<TGConnectingPoint num="0" id="8346" />
+<P1  x="319" y="218" id="8495" />
+<P2  x="275" y="256" id="8470" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8519" >
-<father id="8521" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8345" >
+<father id="8347" num="0" />
 <cdparam x="319" y="245" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8515" />
-<TGConnectingPoint num="1" id="8516" />
-<TGConnectingPoint num="2" id="8517" />
-<TGConnectingPoint num="3" id="8518" />
+<TGConnectingPoint num="0" id="8341" />
+<TGConnectingPoint num="1" id="8342" />
+<TGConnectingPoint num="2" id="8343" />
+<TGConnectingPoint num="3" id="8344" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18862,25 +18631,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8528" >
+<CONNECTOR type="5102" id="8354" >
 <cdparam x="349" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="8527" />
-<P1  x="349" y="143" id="8696" />
-<P2  x="349" y="168" id="8656" />
+<TGConnectingPoint num="0" id="8353" />
+<P1  x="349" y="143" id="8522" />
+<P2  x="349" y="168" id="8482" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8526" >
-<father id="8528" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8352" >
+<father id="8354" num="0" />
 <cdparam x="349" y="183" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8522" />
-<TGConnectingPoint num="1" id="8523" />
-<TGConnectingPoint num="2" id="8524" />
-<TGConnectingPoint num="3" id="8525" />
+<TGConnectingPoint num="0" id="8348" />
+<TGConnectingPoint num="1" id="8349" />
+<TGConnectingPoint num="2" id="8350" />
+<TGConnectingPoint num="3" id="8351" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -18890,261 +18659,261 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="8569" >
+<COMPONENT type="5106" id="8395" >
 <cdparam x="345" y="450" />
 <sizeparam width="100" height="54" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Error" />
-<TGConnectingPoint num="0" id="8529" />
-<TGConnectingPoint num="1" id="8530" />
-<TGConnectingPoint num="2" id="8531" />
-<TGConnectingPoint num="3" id="8532" />
-<TGConnectingPoint num="4" id="8533" />
-<TGConnectingPoint num="5" id="8534" />
-<TGConnectingPoint num="6" id="8535" />
-<TGConnectingPoint num="7" id="8536" />
-<TGConnectingPoint num="8" id="8537" />
-<TGConnectingPoint num="9" id="8538" />
-<TGConnectingPoint num="10" id="8539" />
-<TGConnectingPoint num="11" id="8540" />
-<TGConnectingPoint num="12" id="8541" />
-<TGConnectingPoint num="13" id="8542" />
-<TGConnectingPoint num="14" id="8543" />
-<TGConnectingPoint num="15" id="8544" />
-<TGConnectingPoint num="16" id="8545" />
-<TGConnectingPoint num="17" id="8546" />
-<TGConnectingPoint num="18" id="8547" />
-<TGConnectingPoint num="19" id="8548" />
-<TGConnectingPoint num="20" id="8549" />
-<TGConnectingPoint num="21" id="8550" />
-<TGConnectingPoint num="22" id="8551" />
-<TGConnectingPoint num="23" id="8552" />
-<TGConnectingPoint num="24" id="8553" />
-<TGConnectingPoint num="25" id="8554" />
-<TGConnectingPoint num="26" id="8555" />
-<TGConnectingPoint num="27" id="8556" />
-<TGConnectingPoint num="28" id="8557" />
-<TGConnectingPoint num="29" id="8558" />
-<TGConnectingPoint num="30" id="8559" />
-<TGConnectingPoint num="31" id="8560" />
-<TGConnectingPoint num="32" id="8561" />
-<TGConnectingPoint num="33" id="8562" />
-<TGConnectingPoint num="34" id="8563" />
-<TGConnectingPoint num="35" id="8564" />
-<TGConnectingPoint num="36" id="8565" />
-<TGConnectingPoint num="37" id="8566" />
-<TGConnectingPoint num="38" id="8567" />
-<TGConnectingPoint num="39" id="8568" />
+<TGConnectingPoint num="0" id="8355" />
+<TGConnectingPoint num="1" id="8356" />
+<TGConnectingPoint num="2" id="8357" />
+<TGConnectingPoint num="3" id="8358" />
+<TGConnectingPoint num="4" id="8359" />
+<TGConnectingPoint num="5" id="8360" />
+<TGConnectingPoint num="6" id="8361" />
+<TGConnectingPoint num="7" id="8362" />
+<TGConnectingPoint num="8" id="8363" />
+<TGConnectingPoint num="9" id="8364" />
+<TGConnectingPoint num="10" id="8365" />
+<TGConnectingPoint num="11" id="8366" />
+<TGConnectingPoint num="12" id="8367" />
+<TGConnectingPoint num="13" id="8368" />
+<TGConnectingPoint num="14" id="8369" />
+<TGConnectingPoint num="15" id="8370" />
+<TGConnectingPoint num="16" id="8371" />
+<TGConnectingPoint num="17" id="8372" />
+<TGConnectingPoint num="18" id="8373" />
+<TGConnectingPoint num="19" id="8374" />
+<TGConnectingPoint num="20" id="8375" />
+<TGConnectingPoint num="21" id="8376" />
+<TGConnectingPoint num="22" id="8377" />
+<TGConnectingPoint num="23" id="8378" />
+<TGConnectingPoint num="24" id="8379" />
+<TGConnectingPoint num="25" id="8380" />
+<TGConnectingPoint num="26" id="8381" />
+<TGConnectingPoint num="27" id="8382" />
+<TGConnectingPoint num="28" id="8383" />
+<TGConnectingPoint num="29" id="8384" />
+<TGConnectingPoint num="30" id="8385" />
+<TGConnectingPoint num="31" id="8386" />
+<TGConnectingPoint num="32" id="8387" />
+<TGConnectingPoint num="33" id="8388" />
+<TGConnectingPoint num="34" id="8389" />
+<TGConnectingPoint num="35" id="8390" />
+<TGConnectingPoint num="36" id="8391" />
+<TGConnectingPoint num="37" id="8392" />
+<TGConnectingPoint num="38" id="8393" />
+<TGConnectingPoint num="39" id="8394" />
 <accessibility />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="8580" >
+<COMPONENT type="5104" id="8406" >
 <cdparam x="325" y="408" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="8570" />
-<TGConnectingPoint num="1" id="8571" />
-<TGConnectingPoint num="2" id="8572" />
-<TGConnectingPoint num="3" id="8573" />
-<TGConnectingPoint num="4" id="8574" />
-<TGConnectingPoint num="5" id="8575" />
-<TGConnectingPoint num="6" id="8576" />
-<TGConnectingPoint num="7" id="8577" />
-<TGConnectingPoint num="8" id="8578" />
-<TGConnectingPoint num="9" id="8579" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="8591" >
+<TGConnectingPoint num="0" id="8396" />
+<TGConnectingPoint num="1" id="8397" />
+<TGConnectingPoint num="2" id="8398" />
+<TGConnectingPoint num="3" id="8399" />
+<TGConnectingPoint num="4" id="8400" />
+<TGConnectingPoint num="5" id="8401" />
+<TGConnectingPoint num="6" id="8402" />
+<TGConnectingPoint num="7" id="8403" />
+<TGConnectingPoint num="8" id="8404" />
+<TGConnectingPoint num="9" id="8405" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="8417" >
 <cdparam x="366" y="260" />
 <sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="8581" />
-<TGConnectingPoint num="1" id="8582" />
-<TGConnectingPoint num="2" id="8583" />
-<TGConnectingPoint num="3" id="8584" />
-<TGConnectingPoint num="4" id="8585" />
-<TGConnectingPoint num="5" id="8586" />
-<TGConnectingPoint num="6" id="8587" />
-<TGConnectingPoint num="7" id="8588" />
-<TGConnectingPoint num="8" id="8589" />
-<TGConnectingPoint num="9" id="8590" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="8602" >
+<TGConnectingPoint num="0" id="8407" />
+<TGConnectingPoint num="1" id="8408" />
+<TGConnectingPoint num="2" id="8409" />
+<TGConnectingPoint num="3" id="8410" />
+<TGConnectingPoint num="4" id="8411" />
+<TGConnectingPoint num="5" id="8412" />
+<TGConnectingPoint num="6" id="8413" />
+<TGConnectingPoint num="7" id="8414" />
+<TGConnectingPoint num="8" id="8415" />
+<TGConnectingPoint num="9" id="8416" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="8428" >
 <cdparam x="183" y="407" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="8592" />
-<TGConnectingPoint num="1" id="8593" />
-<TGConnectingPoint num="2" id="8594" />
-<TGConnectingPoint num="3" id="8595" />
-<TGConnectingPoint num="4" id="8596" />
-<TGConnectingPoint num="5" id="8597" />
-<TGConnectingPoint num="6" id="8598" />
-<TGConnectingPoint num="7" id="8599" />
-<TGConnectingPoint num="8" id="8600" />
-<TGConnectingPoint num="9" id="8601" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8643" >
+<TGConnectingPoint num="0" id="8418" />
+<TGConnectingPoint num="1" id="8419" />
+<TGConnectingPoint num="2" id="8420" />
+<TGConnectingPoint num="3" id="8421" />
+<TGConnectingPoint num="4" id="8422" />
+<TGConnectingPoint num="5" id="8423" />
+<TGConnectingPoint num="6" id="8424" />
+<TGConnectingPoint num="7" id="8425" />
+<TGConnectingPoint num="8" id="8426" />
+<TGConnectingPoint num="9" id="8427" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8469" >
 <cdparam x="218" y="306" />
 <sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForClosed" />
-<TGConnectingPoint num="0" id="8603" />
-<TGConnectingPoint num="1" id="8604" />
-<TGConnectingPoint num="2" id="8605" />
-<TGConnectingPoint num="3" id="8606" />
-<TGConnectingPoint num="4" id="8607" />
-<TGConnectingPoint num="5" id="8608" />
-<TGConnectingPoint num="6" id="8609" />
-<TGConnectingPoint num="7" id="8610" />
-<TGConnectingPoint num="8" id="8611" />
-<TGConnectingPoint num="9" id="8612" />
-<TGConnectingPoint num="10" id="8613" />
-<TGConnectingPoint num="11" id="8614" />
-<TGConnectingPoint num="12" id="8615" />
-<TGConnectingPoint num="13" id="8616" />
-<TGConnectingPoint num="14" id="8617" />
-<TGConnectingPoint num="15" id="8618" />
-<TGConnectingPoint num="16" id="8619" />
-<TGConnectingPoint num="17" id="8620" />
-<TGConnectingPoint num="18" id="8621" />
-<TGConnectingPoint num="19" id="8622" />
-<TGConnectingPoint num="20" id="8623" />
-<TGConnectingPoint num="21" id="8624" />
-<TGConnectingPoint num="22" id="8625" />
-<TGConnectingPoint num="23" id="8626" />
-<TGConnectingPoint num="24" id="8627" />
-<TGConnectingPoint num="25" id="8628" />
-<TGConnectingPoint num="26" id="8629" />
-<TGConnectingPoint num="27" id="8630" />
-<TGConnectingPoint num="28" id="8631" />
-<TGConnectingPoint num="29" id="8632" />
-<TGConnectingPoint num="30" id="8633" />
-<TGConnectingPoint num="31" id="8634" />
-<TGConnectingPoint num="32" id="8635" />
-<TGConnectingPoint num="33" id="8636" />
-<TGConnectingPoint num="34" id="8637" />
-<TGConnectingPoint num="35" id="8638" />
-<TGConnectingPoint num="36" id="8639" />
-<TGConnectingPoint num="37" id="8640" />
-<TGConnectingPoint num="38" id="8641" />
-<TGConnectingPoint num="39" id="8642" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="8654" >
+<TGConnectingPoint num="0" id="8429" />
+<TGConnectingPoint num="1" id="8430" />
+<TGConnectingPoint num="2" id="8431" />
+<TGConnectingPoint num="3" id="8432" />
+<TGConnectingPoint num="4" id="8433" />
+<TGConnectingPoint num="5" id="8434" />
+<TGConnectingPoint num="6" id="8435" />
+<TGConnectingPoint num="7" id="8436" />
+<TGConnectingPoint num="8" id="8437" />
+<TGConnectingPoint num="9" id="8438" />
+<TGConnectingPoint num="10" id="8439" />
+<TGConnectingPoint num="11" id="8440" />
+<TGConnectingPoint num="12" id="8441" />
+<TGConnectingPoint num="13" id="8442" />
+<TGConnectingPoint num="14" id="8443" />
+<TGConnectingPoint num="15" id="8444" />
+<TGConnectingPoint num="16" id="8445" />
+<TGConnectingPoint num="17" id="8446" />
+<TGConnectingPoint num="18" id="8447" />
+<TGConnectingPoint num="19" id="8448" />
+<TGConnectingPoint num="20" id="8449" />
+<TGConnectingPoint num="21" id="8450" />
+<TGConnectingPoint num="22" id="8451" />
+<TGConnectingPoint num="23" id="8452" />
+<TGConnectingPoint num="24" id="8453" />
+<TGConnectingPoint num="25" id="8454" />
+<TGConnectingPoint num="26" id="8455" />
+<TGConnectingPoint num="27" id="8456" />
+<TGConnectingPoint num="28" id="8457" />
+<TGConnectingPoint num="29" id="8458" />
+<TGConnectingPoint num="30" id="8459" />
+<TGConnectingPoint num="31" id="8460" />
+<TGConnectingPoint num="32" id="8461" />
+<TGConnectingPoint num="33" id="8462" />
+<TGConnectingPoint num="34" id="8463" />
+<TGConnectingPoint num="35" id="8464" />
+<TGConnectingPoint num="36" id="8465" />
+<TGConnectingPoint num="37" id="8466" />
+<TGConnectingPoint num="38" id="8467" />
+<TGConnectingPoint num="39" id="8468" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="8480" >
 <cdparam x="234" y="261" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="8644" />
-<TGConnectingPoint num="1" id="8645" />
-<TGConnectingPoint num="2" id="8646" />
-<TGConnectingPoint num="3" id="8647" />
-<TGConnectingPoint num="4" id="8648" />
-<TGConnectingPoint num="5" id="8649" />
-<TGConnectingPoint num="6" id="8650" />
-<TGConnectingPoint num="7" id="8651" />
-<TGConnectingPoint num="8" id="8652" />
-<TGConnectingPoint num="9" id="8653" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8695" >
+<TGConnectingPoint num="0" id="8470" />
+<TGConnectingPoint num="1" id="8471" />
+<TGConnectingPoint num="2" id="8472" />
+<TGConnectingPoint num="3" id="8473" />
+<TGConnectingPoint num="4" id="8474" />
+<TGConnectingPoint num="5" id="8475" />
+<TGConnectingPoint num="6" id="8476" />
+<TGConnectingPoint num="7" id="8477" />
+<TGConnectingPoint num="8" id="8478" />
+<TGConnectingPoint num="9" id="8479" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8521" >
 <cdparam x="289" y="168" />
 <sizeparam width="120" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForOpen" />
-<TGConnectingPoint num="0" id="8655" />
-<TGConnectingPoint num="1" id="8656" />
-<TGConnectingPoint num="2" id="8657" />
-<TGConnectingPoint num="3" id="8658" />
-<TGConnectingPoint num="4" id="8659" />
-<TGConnectingPoint num="5" id="8660" />
-<TGConnectingPoint num="6" id="8661" />
-<TGConnectingPoint num="7" id="8662" />
-<TGConnectingPoint num="8" id="8663" />
-<TGConnectingPoint num="9" id="8664" />
-<TGConnectingPoint num="10" id="8665" />
-<TGConnectingPoint num="11" id="8666" />
-<TGConnectingPoint num="12" id="8667" />
-<TGConnectingPoint num="13" id="8668" />
-<TGConnectingPoint num="14" id="8669" />
-<TGConnectingPoint num="15" id="8670" />
-<TGConnectingPoint num="16" id="8671" />
-<TGConnectingPoint num="17" id="8672" />
-<TGConnectingPoint num="18" id="8673" />
-<TGConnectingPoint num="19" id="8674" />
-<TGConnectingPoint num="20" id="8675" />
-<TGConnectingPoint num="21" id="8676" />
-<TGConnectingPoint num="22" id="8677" />
-<TGConnectingPoint num="23" id="8678" />
-<TGConnectingPoint num="24" id="8679" />
-<TGConnectingPoint num="25" id="8680" />
-<TGConnectingPoint num="26" id="8681" />
-<TGConnectingPoint num="27" id="8682" />
-<TGConnectingPoint num="28" id="8683" />
-<TGConnectingPoint num="29" id="8684" />
-<TGConnectingPoint num="30" id="8685" />
-<TGConnectingPoint num="31" id="8686" />
-<TGConnectingPoint num="32" id="8687" />
-<TGConnectingPoint num="33" id="8688" />
-<TGConnectingPoint num="34" id="8689" />
-<TGConnectingPoint num="35" id="8690" />
-<TGConnectingPoint num="36" id="8691" />
-<TGConnectingPoint num="37" id="8692" />
-<TGConnectingPoint num="38" id="8693" />
-<TGConnectingPoint num="39" id="8694" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="8697" >
+<TGConnectingPoint num="0" id="8481" />
+<TGConnectingPoint num="1" id="8482" />
+<TGConnectingPoint num="2" id="8483" />
+<TGConnectingPoint num="3" id="8484" />
+<TGConnectingPoint num="4" id="8485" />
+<TGConnectingPoint num="5" id="8486" />
+<TGConnectingPoint num="6" id="8487" />
+<TGConnectingPoint num="7" id="8488" />
+<TGConnectingPoint num="8" id="8489" />
+<TGConnectingPoint num="9" id="8490" />
+<TGConnectingPoint num="10" id="8491" />
+<TGConnectingPoint num="11" id="8492" />
+<TGConnectingPoint num="12" id="8493" />
+<TGConnectingPoint num="13" id="8494" />
+<TGConnectingPoint num="14" id="8495" />
+<TGConnectingPoint num="15" id="8496" />
+<TGConnectingPoint num="16" id="8497" />
+<TGConnectingPoint num="17" id="8498" />
+<TGConnectingPoint num="18" id="8499" />
+<TGConnectingPoint num="19" id="8500" />
+<TGConnectingPoint num="20" id="8501" />
+<TGConnectingPoint num="21" id="8502" />
+<TGConnectingPoint num="22" id="8503" />
+<TGConnectingPoint num="23" id="8504" />
+<TGConnectingPoint num="24" id="8505" />
+<TGConnectingPoint num="25" id="8506" />
+<TGConnectingPoint num="26" id="8507" />
+<TGConnectingPoint num="27" id="8508" />
+<TGConnectingPoint num="28" id="8509" />
+<TGConnectingPoint num="29" id="8510" />
+<TGConnectingPoint num="30" id="8511" />
+<TGConnectingPoint num="31" id="8512" />
+<TGConnectingPoint num="32" id="8513" />
+<TGConnectingPoint num="33" id="8514" />
+<TGConnectingPoint num="34" id="8515" />
+<TGConnectingPoint num="35" id="8516" />
+<TGConnectingPoint num="36" id="8517" />
+<TGConnectingPoint num="37" id="8518" />
+<TGConnectingPoint num="38" id="8519" />
+<TGConnectingPoint num="39" id="8520" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="8523" >
 <cdparam x="342" y="123" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8696" />
+<TGConnectingPoint num="0" id="8522" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="RemotelyControlledMicrowave" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8704" >
+<CONNECTOR type="5102" id="8530" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<TGConnectingPoint num="0" id="8703" />
-<P1  x="407" y="70" id="8707" />
-<P2  x="408" y="85" id="8705" />
+<TGConnectingPoint num="0" id="8529" />
+<P1  x="407" y="70" id="8533" />
+<P2  x="408" y="85" id="8531" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8702" >
-<father id="8704" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8528" >
+<father id="8530" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8698" />
-<TGConnectingPoint num="1" id="8699" />
-<TGConnectingPoint num="2" id="8700" />
-<TGConnectingPoint num="3" id="8701" />
+<TGConnectingPoint num="0" id="8524" />
+<TGConnectingPoint num="1" id="8525" />
+<TGConnectingPoint num="2" id="8526" />
+<TGConnectingPoint num="3" id="8527" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19154,47 +18923,47 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="8706" >
+<COMPONENT type="5101" id="8532" >
 <cdparam x="398" y="90" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="8705" />
+<TGConnectingPoint num="0" id="8531" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="8708" >
+<COMPONENT type="5100" id="8534" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8707" />
+<TGConnectingPoint num="0" id="8533" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8715" >
+<CONNECTOR type="5102" id="8541" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="8714" />
-<P1  x="407" y="70" id="8757" />
-<P2  x="451" y="106" id="8717" />
+<TGConnectingPoint num="0" id="8540" />
+<P1  x="407" y="70" id="8583" />
+<P2  x="451" y="106" id="8543" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8713" >
-<father id="8715" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8539" >
+<father id="8541" num="0" />
 <cdparam x="444" y="75" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8709" />
-<TGConnectingPoint num="1" id="8710" />
-<TGConnectingPoint num="2" id="8711" />
-<TGConnectingPoint num="3" id="8712" />
+<TGConnectingPoint num="0" id="8535" />
+<TGConnectingPoint num="1" id="8536" />
+<TGConnectingPoint num="2" id="8537" />
+<TGConnectingPoint num="3" id="8538" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19204,88 +18973,88 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="8756" >
+<COMPONENT type="5106" id="8582" >
 <cdparam x="396" y="106" />
 <sizeparam width="111" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Running" />
-<TGConnectingPoint num="0" id="8716" />
-<TGConnectingPoint num="1" id="8717" />
-<TGConnectingPoint num="2" id="8718" />
-<TGConnectingPoint num="3" id="8719" />
-<TGConnectingPoint num="4" id="8720" />
-<TGConnectingPoint num="5" id="8721" />
-<TGConnectingPoint num="6" id="8722" />
-<TGConnectingPoint num="7" id="8723" />
-<TGConnectingPoint num="8" id="8724" />
-<TGConnectingPoint num="9" id="8725" />
-<TGConnectingPoint num="10" id="8726" />
-<TGConnectingPoint num="11" id="8727" />
-<TGConnectingPoint num="12" id="8728" />
-<TGConnectingPoint num="13" id="8729" />
-<TGConnectingPoint num="14" id="8730" />
-<TGConnectingPoint num="15" id="8731" />
-<TGConnectingPoint num="16" id="8732" />
-<TGConnectingPoint num="17" id="8733" />
-<TGConnectingPoint num="18" id="8734" />
-<TGConnectingPoint num="19" id="8735" />
-<TGConnectingPoint num="20" id="8736" />
-<TGConnectingPoint num="21" id="8737" />
-<TGConnectingPoint num="22" id="8738" />
-<TGConnectingPoint num="23" id="8739" />
-<TGConnectingPoint num="24" id="8740" />
-<TGConnectingPoint num="25" id="8741" />
-<TGConnectingPoint num="26" id="8742" />
-<TGConnectingPoint num="27" id="8743" />
-<TGConnectingPoint num="28" id="8744" />
-<TGConnectingPoint num="29" id="8745" />
-<TGConnectingPoint num="30" id="8746" />
-<TGConnectingPoint num="31" id="8747" />
-<TGConnectingPoint num="32" id="8748" />
-<TGConnectingPoint num="33" id="8749" />
-<TGConnectingPoint num="34" id="8750" />
-<TGConnectingPoint num="35" id="8751" />
-<TGConnectingPoint num="36" id="8752" />
-<TGConnectingPoint num="37" id="8753" />
-<TGConnectingPoint num="38" id="8754" />
-<TGConnectingPoint num="39" id="8755" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="8758" >
+<TGConnectingPoint num="0" id="8542" />
+<TGConnectingPoint num="1" id="8543" />
+<TGConnectingPoint num="2" id="8544" />
+<TGConnectingPoint num="3" id="8545" />
+<TGConnectingPoint num="4" id="8546" />
+<TGConnectingPoint num="5" id="8547" />
+<TGConnectingPoint num="6" id="8548" />
+<TGConnectingPoint num="7" id="8549" />
+<TGConnectingPoint num="8" id="8550" />
+<TGConnectingPoint num="9" id="8551" />
+<TGConnectingPoint num="10" id="8552" />
+<TGConnectingPoint num="11" id="8553" />
+<TGConnectingPoint num="12" id="8554" />
+<TGConnectingPoint num="13" id="8555" />
+<TGConnectingPoint num="14" id="8556" />
+<TGConnectingPoint num="15" id="8557" />
+<TGConnectingPoint num="16" id="8558" />
+<TGConnectingPoint num="17" id="8559" />
+<TGConnectingPoint num="18" id="8560" />
+<TGConnectingPoint num="19" id="8561" />
+<TGConnectingPoint num="20" id="8562" />
+<TGConnectingPoint num="21" id="8563" />
+<TGConnectingPoint num="22" id="8564" />
+<TGConnectingPoint num="23" id="8565" />
+<TGConnectingPoint num="24" id="8566" />
+<TGConnectingPoint num="25" id="8567" />
+<TGConnectingPoint num="26" id="8568" />
+<TGConnectingPoint num="27" id="8569" />
+<TGConnectingPoint num="28" id="8570" />
+<TGConnectingPoint num="29" id="8571" />
+<TGConnectingPoint num="30" id="8572" />
+<TGConnectingPoint num="31" id="8573" />
+<TGConnectingPoint num="32" id="8574" />
+<TGConnectingPoint num="33" id="8575" />
+<TGConnectingPoint num="34" id="8576" />
+<TGConnectingPoint num="35" id="8577" />
+<TGConnectingPoint num="36" id="8578" />
+<TGConnectingPoint num="37" id="8579" />
+<TGConnectingPoint num="38" id="8580" />
+<TGConnectingPoint num="39" id="8581" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="8584" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8757" />
+<TGConnectingPoint num="0" id="8583" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8772" >
+<CONNECTOR type="5102" id="8591" >
 <cdparam x="407" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8771" />
-<P1  x="407" y="340" id="8833" />
-<P2  x="407" y="374" id="8868" />
+<TGConnectingPoint num="0" id="8590" />
+<P1  x="407" y="340" id="8650" />
+<P2  x="407" y="374" id="8685" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8770" >
-<father id="8772" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8589" >
+<father id="8591" num="0" />
 <cdparam x="414" y="365" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8766" />
-<TGConnectingPoint num="1" id="8767" />
-<TGConnectingPoint num="2" id="8768" />
-<TGConnectingPoint num="3" id="8769" />
+<TGConnectingPoint num="0" id="8585" />
+<TGConnectingPoint num="1" id="8586" />
+<TGConnectingPoint num="2" id="8587" />
+<TGConnectingPoint num="3" id="8588" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -19295,55 +19064,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8785" >
+<CONNECTOR type="5102" id="8604" >
 <cdparam x="407" y="277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8781" />
-<TGConnectingPoint num="1" id="8782" />
-<TGConnectingPoint num="2" id="8783" />
-<TGConnectingPoint num="3" id="8784" />
-<P1  x="407" y="404" id="8869" />
-<P2  x="357" y="125" id="8893" />
+<TGConnectingPoint num="0" id="8600" />
+<TGConnectingPoint num="1" id="8601" />
+<TGConnectingPoint num="2" id="8602" />
+<TGConnectingPoint num="3" id="8603" />
+<P1  x="407" y="404" id="8686" />
+<P2  x="357" y="125" id="8710" />
 <Point x="300" y="404" />
 <Point x="300" y="278" />
 <Point x="300" y="125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8773" >
-<father id="8785" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8592" >
+<father id="8604" num="0" />
 <cdparam x="300" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8774" >
-<father id="8785" num="1" />
+<SUBCOMPONENT type="-1" id="8593" >
+<father id="8604" num="1" />
 <cdparam x="300" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8775" >
-<father id="8785" num="2" />
+<SUBCOMPONENT type="-1" id="8594" >
+<father id="8604" num="2" />
 <cdparam x="300" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8780" >
-<father id="8785" num="3" />
+<SUBCOMPONENT type="-1" id="8599" >
+<father id="8604" num="3" />
 <cdparam x="245" y="301" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8776" />
-<TGConnectingPoint num="1" id="8777" />
-<TGConnectingPoint num="2" id="8778" />
-<TGConnectingPoint num="3" id="8779" />
+<TGConnectingPoint num="0" id="8595" />
+<TGConnectingPoint num="1" id="8596" />
+<TGConnectingPoint num="2" id="8597" />
+<TGConnectingPoint num="3" id="8598" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19354,25 +19123,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8792" >
+<CONNECTOR type="5102" id="8611" >
 <cdparam x="407" y="214" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8791" />
-<P1  x="407" y="209" id="8880" />
-<P2  x="406" y="240" id="8816" />
+<TGConnectingPoint num="0" id="8610" />
+<P1  x="407" y="209" id="8697" />
+<P2  x="406" y="240" id="8633" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8790" >
-<father id="8792" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8609" >
+<father id="8611" num="0" />
 <cdparam x="414" y="225" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8786" />
-<TGConnectingPoint num="1" id="8787" />
-<TGConnectingPoint num="2" id="8788" />
-<TGConnectingPoint num="3" id="8789" />
+<TGConnectingPoint num="0" id="8605" />
+<TGConnectingPoint num="1" id="8606" />
+<TGConnectingPoint num="2" id="8607" />
+<TGConnectingPoint num="3" id="8608" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19383,25 +19152,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8799" >
+<CONNECTOR type="5102" id="8618" >
 <cdparam x="407" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8798" />
-<P1  x="407" y="150" id="8896" />
-<P2  x="407" y="179" id="8879" />
+<TGConnectingPoint num="0" id="8617" />
+<P1  x="407" y="150" id="8713" />
+<P2  x="407" y="179" id="8696" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8797" >
-<father id="8799" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8616" >
+<father id="8618" num="0" />
 <cdparam x="412" y="172" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8793" />
-<TGConnectingPoint num="1" id="8794" />
-<TGConnectingPoint num="2" id="8795" />
-<TGConnectingPoint num="3" id="8796" />
+<TGConnectingPoint num="0" id="8612" />
+<TGConnectingPoint num="1" id="8613" />
+<TGConnectingPoint num="2" id="8614" />
+<TGConnectingPoint num="3" id="8615" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="2" />
@@ -19411,25 +19180,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8806" >
+<CONNECTOR type="5102" id="8625" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="8805" />
-<P1  x="407" y="70" id="8931" />
-<P2  x="407" y="100" id="8891" />
+<TGConnectingPoint num="0" id="8624" />
+<P1  x="407" y="70" id="8748" />
+<P2  x="407" y="100" id="8708" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8804" >
-<father id="8806" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8623" >
+<father id="8625" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8800" />
-<TGConnectingPoint num="1" id="8801" />
-<TGConnectingPoint num="2" id="8802" />
-<TGConnectingPoint num="3" id="8803" />
+<TGConnectingPoint num="0" id="8619" />
+<TGConnectingPoint num="1" id="8620" />
+<TGConnectingPoint num="2" id="8621" />
+<TGConnectingPoint num="3" id="8622" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19439,25 +19208,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8813" >
+<CONNECTOR type="5102" id="8632" >
 <cdparam x="512" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8812" />
-<P1  x="406" y="270" id="8817" />
-<P2  x="407" y="290" id="8828" />
+<TGConnectingPoint num="0" id="8631" />
+<P1  x="406" y="270" id="8634" />
+<P2  x="407" y="290" id="8645" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8811" >
-<father id="8813" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8630" >
+<father id="8632" num="0" />
 <cdparam x="512" y="311" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8807" />
-<TGConnectingPoint num="1" id="8808" />
-<TGConnectingPoint num="2" id="8809" />
-<TGConnectingPoint num="3" id="8810" />
+<TGConnectingPoint num="0" id="8626" />
+<TGConnectingPoint num="1" id="8627" />
+<TGConnectingPoint num="2" id="8628" />
+<TGConnectingPoint num="3" id="8629" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19467,225 +19236,225 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="8826" >
+<COMPONENT type="5104" id="8643" >
 <cdparam x="361" y="245" />
 <sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="8816" />
-<TGConnectingPoint num="1" id="8817" />
-<TGConnectingPoint num="2" id="8818" />
-<TGConnectingPoint num="3" id="8819" />
-<TGConnectingPoint num="4" id="8820" />
-<TGConnectingPoint num="5" id="8821" />
-<TGConnectingPoint num="6" id="8822" />
-<TGConnectingPoint num="7" id="8823" />
-<TGConnectingPoint num="8" id="8824" />
-<TGConnectingPoint num="9" id="8825" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8867" >
+<TGConnectingPoint num="0" id="8633" />
+<TGConnectingPoint num="1" id="8634" />
+<TGConnectingPoint num="2" id="8635" />
+<TGConnectingPoint num="3" id="8636" />
+<TGConnectingPoint num="4" id="8637" />
+<TGConnectingPoint num="5" id="8638" />
+<TGConnectingPoint num="6" id="8639" />
+<TGConnectingPoint num="7" id="8640" />
+<TGConnectingPoint num="8" id="8641" />
+<TGConnectingPoint num="9" id="8642" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8684" >
 <cdparam x="357" y="290" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Opened" />
-<TGConnectingPoint num="0" id="8827" />
-<TGConnectingPoint num="1" id="8828" />
-<TGConnectingPoint num="2" id="8829" />
-<TGConnectingPoint num="3" id="8830" />
-<TGConnectingPoint num="4" id="8831" />
-<TGConnectingPoint num="5" id="8832" />
-<TGConnectingPoint num="6" id="8833" />
-<TGConnectingPoint num="7" id="8834" />
-<TGConnectingPoint num="8" id="8835" />
-<TGConnectingPoint num="9" id="8836" />
-<TGConnectingPoint num="10" id="8837" />
-<TGConnectingPoint num="11" id="8838" />
-<TGConnectingPoint num="12" id="8839" />
-<TGConnectingPoint num="13" id="8840" />
-<TGConnectingPoint num="14" id="8841" />
-<TGConnectingPoint num="15" id="8842" />
-<TGConnectingPoint num="16" id="8843" />
-<TGConnectingPoint num="17" id="8844" />
-<TGConnectingPoint num="18" id="8845" />
-<TGConnectingPoint num="19" id="8846" />
-<TGConnectingPoint num="20" id="8847" />
-<TGConnectingPoint num="21" id="8848" />
-<TGConnectingPoint num="22" id="8849" />
-<TGConnectingPoint num="23" id="8850" />
-<TGConnectingPoint num="24" id="8851" />
-<TGConnectingPoint num="25" id="8852" />
-<TGConnectingPoint num="26" id="8853" />
-<TGConnectingPoint num="27" id="8854" />
-<TGConnectingPoint num="28" id="8855" />
-<TGConnectingPoint num="29" id="8856" />
-<TGConnectingPoint num="30" id="8857" />
-<TGConnectingPoint num="31" id="8858" />
-<TGConnectingPoint num="32" id="8859" />
-<TGConnectingPoint num="33" id="8860" />
-<TGConnectingPoint num="34" id="8861" />
-<TGConnectingPoint num="35" id="8862" />
-<TGConnectingPoint num="36" id="8863" />
-<TGConnectingPoint num="37" id="8864" />
-<TGConnectingPoint num="38" id="8865" />
-<TGConnectingPoint num="39" id="8866" />
+<TGConnectingPoint num="0" id="8644" />
+<TGConnectingPoint num="1" id="8645" />
+<TGConnectingPoint num="2" id="8646" />
+<TGConnectingPoint num="3" id="8647" />
+<TGConnectingPoint num="4" id="8648" />
+<TGConnectingPoint num="5" id="8649" />
+<TGConnectingPoint num="6" id="8650" />
+<TGConnectingPoint num="7" id="8651" />
+<TGConnectingPoint num="8" id="8652" />
+<TGConnectingPoint num="9" id="8653" />
+<TGConnectingPoint num="10" id="8654" />
+<TGConnectingPoint num="11" id="8655" />
+<TGConnectingPoint num="12" id="8656" />
+<TGConnectingPoint num="13" id="8657" />
+<TGConnectingPoint num="14" id="8658" />
+<TGConnectingPoint num="15" id="8659" />
+<TGConnectingPoint num="16" id="8660" />
+<TGConnectingPoint num="17" id="8661" />
+<TGConnectingPoint num="18" id="8662" />
+<TGConnectingPoint num="19" id="8663" />
+<TGConnectingPoint num="20" id="8664" />
+<TGConnectingPoint num="21" id="8665" />
+<TGConnectingPoint num="22" id="8666" />
+<TGConnectingPoint num="23" id="8667" />
+<TGConnectingPoint num="24" id="8668" />
+<TGConnectingPoint num="25" id="8669" />
+<TGConnectingPoint num="26" id="8670" />
+<TGConnectingPoint num="27" id="8671" />
+<TGConnectingPoint num="28" id="8672" />
+<TGConnectingPoint num="29" id="8673" />
+<TGConnectingPoint num="30" id="8674" />
+<TGConnectingPoint num="31" id="8675" />
+<TGConnectingPoint num="32" id="8676" />
+<TGConnectingPoint num="33" id="8677" />
+<TGConnectingPoint num="34" id="8678" />
+<TGConnectingPoint num="35" id="8679" />
+<TGConnectingPoint num="36" id="8680" />
+<TGConnectingPoint num="37" id="8681" />
+<TGConnectingPoint num="38" id="8682" />
+<TGConnectingPoint num="39" id="8683" />
 <mastermutex />
 <extraparam>
 <entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="8878" >
+<COMPONENT type="5103" id="8695" >
 <cdparam x="380" y="379" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="8868" />
-<TGConnectingPoint num="1" id="8869" />
-<TGConnectingPoint num="2" id="8870" />
-<TGConnectingPoint num="3" id="8871" />
-<TGConnectingPoint num="4" id="8872" />
-<TGConnectingPoint num="5" id="8873" />
-<TGConnectingPoint num="6" id="8874" />
-<TGConnectingPoint num="7" id="8875" />
-<TGConnectingPoint num="8" id="8876" />
-<TGConnectingPoint num="9" id="8877" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="8889" >
+<TGConnectingPoint num="0" id="8685" />
+<TGConnectingPoint num="1" id="8686" />
+<TGConnectingPoint num="2" id="8687" />
+<TGConnectingPoint num="3" id="8688" />
+<TGConnectingPoint num="4" id="8689" />
+<TGConnectingPoint num="5" id="8690" />
+<TGConnectingPoint num="6" id="8691" />
+<TGConnectingPoint num="7" id="8692" />
+<TGConnectingPoint num="8" id="8693" />
+<TGConnectingPoint num="9" id="8694" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="8706" >
 <cdparam x="384" y="184" />
 <sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="8879" />
-<TGConnectingPoint num="1" id="8880" />
-<TGConnectingPoint num="2" id="8881" />
-<TGConnectingPoint num="3" id="8882" />
-<TGConnectingPoint num="4" id="8883" />
-<TGConnectingPoint num="5" id="8884" />
-<TGConnectingPoint num="6" id="8885" />
-<TGConnectingPoint num="7" id="8886" />
-<TGConnectingPoint num="8" id="8887" />
-<TGConnectingPoint num="9" id="8888" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="8930" >
+<TGConnectingPoint num="0" id="8696" />
+<TGConnectingPoint num="1" id="8697" />
+<TGConnectingPoint num="2" id="8698" />
+<TGConnectingPoint num="3" id="8699" />
+<TGConnectingPoint num="4" id="8700" />
+<TGConnectingPoint num="5" id="8701" />
+<TGConnectingPoint num="6" id="8702" />
+<TGConnectingPoint num="7" id="8703" />
+<TGConnectingPoint num="8" id="8704" />
+<TGConnectingPoint num="9" id="8705" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8747" >
 <cdparam x="357" y="100" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="8890" />
-<TGConnectingPoint num="1" id="8891" />
-<TGConnectingPoint num="2" id="8892" />
-<TGConnectingPoint num="3" id="8893" />
-<TGConnectingPoint num="4" id="8894" />
-<TGConnectingPoint num="5" id="8895" />
-<TGConnectingPoint num="6" id="8896" />
-<TGConnectingPoint num="7" id="8897" />
-<TGConnectingPoint num="8" id="8898" />
-<TGConnectingPoint num="9" id="8899" />
-<TGConnectingPoint num="10" id="8900" />
-<TGConnectingPoint num="11" id="8901" />
-<TGConnectingPoint num="12" id="8902" />
-<TGConnectingPoint num="13" id="8903" />
-<TGConnectingPoint num="14" id="8904" />
-<TGConnectingPoint num="15" id="8905" />
-<TGConnectingPoint num="16" id="8906" />
-<TGConnectingPoint num="17" id="8907" />
-<TGConnectingPoint num="18" id="8908" />
-<TGConnectingPoint num="19" id="8909" />
-<TGConnectingPoint num="20" id="8910" />
-<TGConnectingPoint num="21" id="8911" />
-<TGConnectingPoint num="22" id="8912" />
-<TGConnectingPoint num="23" id="8913" />
-<TGConnectingPoint num="24" id="8914" />
-<TGConnectingPoint num="25" id="8915" />
-<TGConnectingPoint num="26" id="8916" />
-<TGConnectingPoint num="27" id="8917" />
-<TGConnectingPoint num="28" id="8918" />
-<TGConnectingPoint num="29" id="8919" />
-<TGConnectingPoint num="30" id="8920" />
-<TGConnectingPoint num="31" id="8921" />
-<TGConnectingPoint num="32" id="8922" />
-<TGConnectingPoint num="33" id="8923" />
-<TGConnectingPoint num="34" id="8924" />
-<TGConnectingPoint num="35" id="8925" />
-<TGConnectingPoint num="36" id="8926" />
-<TGConnectingPoint num="37" id="8927" />
-<TGConnectingPoint num="38" id="8928" />
-<TGConnectingPoint num="39" id="8929" />
+<TGConnectingPoint num="0" id="8707" />
+<TGConnectingPoint num="1" id="8708" />
+<TGConnectingPoint num="2" id="8709" />
+<TGConnectingPoint num="3" id="8710" />
+<TGConnectingPoint num="4" id="8711" />
+<TGConnectingPoint num="5" id="8712" />
+<TGConnectingPoint num="6" id="8713" />
+<TGConnectingPoint num="7" id="8714" />
+<TGConnectingPoint num="8" id="8715" />
+<TGConnectingPoint num="9" id="8716" />
+<TGConnectingPoint num="10" id="8717" />
+<TGConnectingPoint num="11" id="8718" />
+<TGConnectingPoint num="12" id="8719" />
+<TGConnectingPoint num="13" id="8720" />
+<TGConnectingPoint num="14" id="8721" />
+<TGConnectingPoint num="15" id="8722" />
+<TGConnectingPoint num="16" id="8723" />
+<TGConnectingPoint num="17" id="8724" />
+<TGConnectingPoint num="18" id="8725" />
+<TGConnectingPoint num="19" id="8726" />
+<TGConnectingPoint num="20" id="8727" />
+<TGConnectingPoint num="21" id="8728" />
+<TGConnectingPoint num="22" id="8729" />
+<TGConnectingPoint num="23" id="8730" />
+<TGConnectingPoint num="24" id="8731" />
+<TGConnectingPoint num="25" id="8732" />
+<TGConnectingPoint num="26" id="8733" />
+<TGConnectingPoint num="27" id="8734" />
+<TGConnectingPoint num="28" id="8735" />
+<TGConnectingPoint num="29" id="8736" />
+<TGConnectingPoint num="30" id="8737" />
+<TGConnectingPoint num="31" id="8738" />
+<TGConnectingPoint num="32" id="8739" />
+<TGConnectingPoint num="33" id="8740" />
+<TGConnectingPoint num="34" id="8741" />
+<TGConnectingPoint num="35" id="8742" />
+<TGConnectingPoint num="36" id="8743" />
+<TGConnectingPoint num="37" id="8744" />
+<TGConnectingPoint num="38" id="8745" />
+<TGConnectingPoint num="39" id="8746" />
 <extraparam>
 <entryCode value="printf(&quot;Door is closed\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="8932" >
+<COMPONENT type="5100" id="8749" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="8931" />
+<TGConnectingPoint num="0" id="8748" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="8945" >
+<CONNECTOR type="5102" id="8762" >
 <cdparam x="407" y="380" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="8941" />
-<TGConnectingPoint num="1" id="8942" />
-<TGConnectingPoint num="2" id="8943" />
-<TGConnectingPoint num="3" id="8944" />
-<P1  x="407" y="310" id="8975" />
-<P2  x="365" y="113" id="9042" />
+<TGConnectingPoint num="0" id="8758" />
+<TGConnectingPoint num="1" id="8759" />
+<TGConnectingPoint num="2" id="8760" />
+<TGConnectingPoint num="3" id="8761" />
+<P1  x="407" y="310" id="8792" />
+<P2  x="365" y="113" id="8859" />
 <Point x="407" y="327" />
 <Point x="323" y="327" />
 <Point x="323" y="113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8933" >
-<father id="8945" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8750" >
+<father id="8762" num="0" />
 <cdparam x="407" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8934" >
-<father id="8945" num="1" />
+<SUBCOMPONENT type="-1" id="8751" >
+<father id="8762" num="1" />
 <cdparam x="323" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8935" >
-<father id="8945" num="2" />
+<SUBCOMPONENT type="-1" id="8752" >
+<father id="8762" num="2" />
 <cdparam x="323" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="8940" >
-<father id="8945" num="3" />
+<SUBCOMPONENT type="-1" id="8757" >
+<father id="8762" num="3" />
 <cdparam x="418" y="339" />
 <sizeparam width="29" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8936" />
-<TGConnectingPoint num="1" id="8937" />
-<TGConnectingPoint num="2" id="8938" />
-<TGConnectingPoint num="3" id="8939" />
+<TGConnectingPoint num="0" id="8753" />
+<TGConnectingPoint num="1" id="8754" />
+<TGConnectingPoint num="2" id="8755" />
+<TGConnectingPoint num="3" id="8756" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19696,25 +19465,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8952" >
+<CONNECTOR type="5102" id="8769" >
 <cdparam x="411" y="243" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8951" />
-<P1  x="408" y="242" id="8991" />
-<P2  x="407" y="280" id="8974" />
+<TGConnectingPoint num="0" id="8768" />
+<P1  x="408" y="242" id="8808" />
+<P2  x="407" y="280" id="8791" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8950" >
-<father id="8952" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8767" >
+<father id="8769" num="0" />
 <cdparam x="411" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8946" />
-<TGConnectingPoint num="1" id="8947" />
-<TGConnectingPoint num="2" id="8948" />
-<TGConnectingPoint num="3" id="8949" />
+<TGConnectingPoint num="0" id="8763" />
+<TGConnectingPoint num="1" id="8764" />
+<TGConnectingPoint num="2" id="8765" />
+<TGConnectingPoint num="3" id="8766" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19724,25 +19493,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8959" >
+<CONNECTOR type="5102" id="8776" >
 <cdparam x="398" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="8958" />
-<P1  x="407" y="183" id="9027" />
-<P2  x="408" y="202" id="8986" />
+<TGConnectingPoint num="0" id="8775" />
+<P1  x="407" y="183" id="8844" />
+<P2  x="408" y="202" id="8803" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8957" >
-<father id="8959" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8774" >
+<father id="8776" num="0" />
 <cdparam x="421" y="197" />
 <sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8953" />
-<TGConnectingPoint num="1" id="8954" />
-<TGConnectingPoint num="2" id="8955" />
-<TGConnectingPoint num="3" id="8956" />
+<TGConnectingPoint num="0" id="8770" />
+<TGConnectingPoint num="1" id="8771" />
+<TGConnectingPoint num="2" id="8772" />
+<TGConnectingPoint num="3" id="8773" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19753,25 +19522,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8966" >
+<CONNECTOR type="5102" id="8783" >
 <cdparam x="393" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="8965" />
-<P1  x="407" y="131" id="9045" />
-<P2  x="407" y="153" id="9026" />
+<TGConnectingPoint num="0" id="8782" />
+<P1  x="407" y="131" id="8862" />
+<P2  x="407" y="153" id="8843" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8964" >
-<father id="8966" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8781" >
+<father id="8783" num="0" />
 <cdparam x="393" y="171" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8960" />
-<TGConnectingPoint num="1" id="8961" />
-<TGConnectingPoint num="2" id="8962" />
-<TGConnectingPoint num="3" id="8963" />
+<TGConnectingPoint num="0" id="8777" />
+<TGConnectingPoint num="1" id="8778" />
+<TGConnectingPoint num="2" id="8779" />
+<TGConnectingPoint num="3" id="8780" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19781,25 +19550,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="8973" >
+<CONNECTOR type="5102" id="8790" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="8972" />
-<P1  x="407" y="70" id="9037" />
-<P2  x="407" y="96" id="9040" />
+<TGConnectingPoint num="0" id="8789" />
+<P1  x="407" y="70" id="8854" />
+<P2  x="407" y="96" id="8857" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="8971" >
-<father id="8973" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8788" >
+<father id="8790" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="8967" />
-<TGConnectingPoint num="1" id="8968" />
-<TGConnectingPoint num="2" id="8969" />
-<TGConnectingPoint num="3" id="8970" />
+<TGConnectingPoint num="0" id="8784" />
+<TGConnectingPoint num="1" id="8785" />
+<TGConnectingPoint num="2" id="8786" />
+<TGConnectingPoint num="3" id="8787" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19809,148 +19578,148 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="8984" >
+<COMPONENT type="5104" id="8801" >
 <cdparam x="377" y="285" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopM()" />
-<TGConnectingPoint num="0" id="8974" />
-<TGConnectingPoint num="1" id="8975" />
-<TGConnectingPoint num="2" id="8976" />
-<TGConnectingPoint num="3" id="8977" />
-<TGConnectingPoint num="4" id="8978" />
-<TGConnectingPoint num="5" id="8979" />
-<TGConnectingPoint num="6" id="8980" />
-<TGConnectingPoint num="7" id="8981" />
-<TGConnectingPoint num="8" id="8982" />
-<TGConnectingPoint num="9" id="8983" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9025" >
+<TGConnectingPoint num="0" id="8791" />
+<TGConnectingPoint num="1" id="8792" />
+<TGConnectingPoint num="2" id="8793" />
+<TGConnectingPoint num="3" id="8794" />
+<TGConnectingPoint num="4" id="8795" />
+<TGConnectingPoint num="5" id="8796" />
+<TGConnectingPoint num="6" id="8797" />
+<TGConnectingPoint num="7" id="8798" />
+<TGConnectingPoint num="8" id="8799" />
+<TGConnectingPoint num="9" id="8800" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="8842" >
 <cdparam x="373" y="202" />
 <sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Running" />
-<TGConnectingPoint num="0" id="8985" />
-<TGConnectingPoint num="1" id="8986" />
-<TGConnectingPoint num="2" id="8987" />
-<TGConnectingPoint num="3" id="8988" />
-<TGConnectingPoint num="4" id="8989" />
-<TGConnectingPoint num="5" id="8990" />
-<TGConnectingPoint num="6" id="8991" />
-<TGConnectingPoint num="7" id="8992" />
-<TGConnectingPoint num="8" id="8993" />
-<TGConnectingPoint num="9" id="8994" />
-<TGConnectingPoint num="10" id="8995" />
-<TGConnectingPoint num="11" id="8996" />
-<TGConnectingPoint num="12" id="8997" />
-<TGConnectingPoint num="13" id="8998" />
-<TGConnectingPoint num="14" id="8999" />
-<TGConnectingPoint num="15" id="9000" />
-<TGConnectingPoint num="16" id="9001" />
-<TGConnectingPoint num="17" id="9002" />
-<TGConnectingPoint num="18" id="9003" />
-<TGConnectingPoint num="19" id="9004" />
-<TGConnectingPoint num="20" id="9005" />
-<TGConnectingPoint num="21" id="9006" />
-<TGConnectingPoint num="22" id="9007" />
-<TGConnectingPoint num="23" id="9008" />
-<TGConnectingPoint num="24" id="9009" />
-<TGConnectingPoint num="25" id="9010" />
-<TGConnectingPoint num="26" id="9011" />
-<TGConnectingPoint num="27" id="9012" />
-<TGConnectingPoint num="28" id="9013" />
-<TGConnectingPoint num="29" id="9014" />
-<TGConnectingPoint num="30" id="9015" />
-<TGConnectingPoint num="31" id="9016" />
-<TGConnectingPoint num="32" id="9017" />
-<TGConnectingPoint num="33" id="9018" />
-<TGConnectingPoint num="34" id="9019" />
-<TGConnectingPoint num="35" id="9020" />
-<TGConnectingPoint num="36" id="9021" />
-<TGConnectingPoint num="37" id="9022" />
-<TGConnectingPoint num="38" id="9023" />
-<TGConnectingPoint num="39" id="9024" />
+<TGConnectingPoint num="0" id="8802" />
+<TGConnectingPoint num="1" id="8803" />
+<TGConnectingPoint num="2" id="8804" />
+<TGConnectingPoint num="3" id="8805" />
+<TGConnectingPoint num="4" id="8806" />
+<TGConnectingPoint num="5" id="8807" />
+<TGConnectingPoint num="6" id="8808" />
+<TGConnectingPoint num="7" id="8809" />
+<TGConnectingPoint num="8" id="8810" />
+<TGConnectingPoint num="9" id="8811" />
+<TGConnectingPoint num="10" id="8812" />
+<TGConnectingPoint num="11" id="8813" />
+<TGConnectingPoint num="12" id="8814" />
+<TGConnectingPoint num="13" id="8815" />
+<TGConnectingPoint num="14" id="8816" />
+<TGConnectingPoint num="15" id="8817" />
+<TGConnectingPoint num="16" id="8818" />
+<TGConnectingPoint num="17" id="8819" />
+<TGConnectingPoint num="18" id="8820" />
+<TGConnectingPoint num="19" id="8821" />
+<TGConnectingPoint num="20" id="8822" />
+<TGConnectingPoint num="21" id="8823" />
+<TGConnectingPoint num="22" id="8824" />
+<TGConnectingPoint num="23" id="8825" />
+<TGConnectingPoint num="24" id="8826" />
+<TGConnectingPoint num="25" id="8827" />
+<TGConnectingPoint num="26" id="8828" />
+<TGConnectingPoint num="27" id="8829" />
+<TGConnectingPoint num="28" id="8830" />
+<TGConnectingPoint num="29" id="8831" />
+<TGConnectingPoint num="30" id="8832" />
+<TGConnectingPoint num="31" id="8833" />
+<TGConnectingPoint num="32" id="8834" />
+<TGConnectingPoint num="33" id="8835" />
+<TGConnectingPoint num="34" id="8836" />
+<TGConnectingPoint num="35" id="8837" />
+<TGConnectingPoint num="36" id="8838" />
+<TGConnectingPoint num="37" id="8839" />
+<TGConnectingPoint num="38" id="8840" />
+<TGConnectingPoint num="39" id="8841" />
 <extraparam>
 <entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="9036" >
+<COMPONENT type="5104" id="8853" >
 <cdparam x="376" y="158" />
 <sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startM()" />
-<TGConnectingPoint num="0" id="9026" />
-<TGConnectingPoint num="1" id="9027" />
-<TGConnectingPoint num="2" id="9028" />
-<TGConnectingPoint num="3" id="9029" />
-<TGConnectingPoint num="4" id="9030" />
-<TGConnectingPoint num="5" id="9031" />
-<TGConnectingPoint num="6" id="9032" />
-<TGConnectingPoint num="7" id="9033" />
-<TGConnectingPoint num="8" id="9034" />
-<TGConnectingPoint num="9" id="9035" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="9038" >
+<TGConnectingPoint num="0" id="8843" />
+<TGConnectingPoint num="1" id="8844" />
+<TGConnectingPoint num="2" id="8845" />
+<TGConnectingPoint num="3" id="8846" />
+<TGConnectingPoint num="4" id="8847" />
+<TGConnectingPoint num="5" id="8848" />
+<TGConnectingPoint num="6" id="8849" />
+<TGConnectingPoint num="7" id="8850" />
+<TGConnectingPoint num="8" id="8851" />
+<TGConnectingPoint num="9" id="8852" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="8855" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="9037" />
+<TGConnectingPoint num="0" id="8854" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="9079" >
+<COMPONENT type="5106" id="8896" >
 <cdparam x="365" y="96" />
 <sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitForStart" />
-<TGConnectingPoint num="0" id="9039" />
-<TGConnectingPoint num="1" id="9040" />
-<TGConnectingPoint num="2" id="9041" />
-<TGConnectingPoint num="3" id="9042" />
-<TGConnectingPoint num="4" id="9043" />
-<TGConnectingPoint num="5" id="9044" />
-<TGConnectingPoint num="6" id="9045" />
-<TGConnectingPoint num="7" id="9046" />
-<TGConnectingPoint num="8" id="9047" />
-<TGConnectingPoint num="9" id="9048" />
-<TGConnectingPoint num="10" id="9049" />
-<TGConnectingPoint num="11" id="9050" />
-<TGConnectingPoint num="12" id="9051" />
-<TGConnectingPoint num="13" id="9052" />
-<TGConnectingPoint num="14" id="9053" />
-<TGConnectingPoint num="15" id="9054" />
-<TGConnectingPoint num="16" id="9055" />
-<TGConnectingPoint num="17" id="9056" />
-<TGConnectingPoint num="18" id="9057" />
-<TGConnectingPoint num="19" id="9058" />
-<TGConnectingPoint num="20" id="9059" />
-<TGConnectingPoint num="21" id="9060" />
-<TGConnectingPoint num="22" id="9061" />
-<TGConnectingPoint num="23" id="9062" />
-<TGConnectingPoint num="24" id="9063" />
-<TGConnectingPoint num="25" id="9064" />
-<TGConnectingPoint num="26" id="9065" />
-<TGConnectingPoint num="27" id="9066" />
-<TGConnectingPoint num="28" id="9067" />
-<TGConnectingPoint num="29" id="9068" />
-<TGConnectingPoint num="30" id="9069" />
-<TGConnectingPoint num="31" id="9070" />
-<TGConnectingPoint num="32" id="9071" />
-<TGConnectingPoint num="33" id="9072" />
-<TGConnectingPoint num="34" id="9073" />
-<TGConnectingPoint num="35" id="9074" />
-<TGConnectingPoint num="36" id="9075" />
-<TGConnectingPoint num="37" id="9076" />
-<TGConnectingPoint num="38" id="9077" />
-<TGConnectingPoint num="39" id="9078" />
+<TGConnectingPoint num="0" id="8856" />
+<TGConnectingPoint num="1" id="8857" />
+<TGConnectingPoint num="2" id="8858" />
+<TGConnectingPoint num="3" id="8859" />
+<TGConnectingPoint num="4" id="8860" />
+<TGConnectingPoint num="5" id="8861" />
+<TGConnectingPoint num="6" id="8862" />
+<TGConnectingPoint num="7" id="8863" />
+<TGConnectingPoint num="8" id="8864" />
+<TGConnectingPoint num="9" id="8865" />
+<TGConnectingPoint num="10" id="8866" />
+<TGConnectingPoint num="11" id="8867" />
+<TGConnectingPoint num="12" id="8868" />
+<TGConnectingPoint num="13" id="8869" />
+<TGConnectingPoint num="14" id="8870" />
+<TGConnectingPoint num="15" id="8871" />
+<TGConnectingPoint num="16" id="8872" />
+<TGConnectingPoint num="17" id="8873" />
+<TGConnectingPoint num="18" id="8874" />
+<TGConnectingPoint num="19" id="8875" />
+<TGConnectingPoint num="20" id="8876" />
+<TGConnectingPoint num="21" id="8877" />
+<TGConnectingPoint num="22" id="8878" />
+<TGConnectingPoint num="23" id="8879" />
+<TGConnectingPoint num="24" id="8880" />
+<TGConnectingPoint num="25" id="8881" />
+<TGConnectingPoint num="26" id="8882" />
+<TGConnectingPoint num="27" id="8883" />
+<TGConnectingPoint num="28" id="8884" />
+<TGConnectingPoint num="29" id="8885" />
+<TGConnectingPoint num="30" id="8886" />
+<TGConnectingPoint num="31" id="8887" />
+<TGConnectingPoint num="32" id="8888" />
+<TGConnectingPoint num="33" id="8889" />
+<TGConnectingPoint num="34" id="8890" />
+<TGConnectingPoint num="35" id="8891" />
+<TGConnectingPoint num="36" id="8892" />
+<TGConnectingPoint num="37" id="8893" />
+<TGConnectingPoint num="38" id="8894" />
+<TGConnectingPoint num="39" id="8895" />
 <extraparam>
 <entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
 </extraparam>
@@ -19960,25 +19729,25 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="19624" >
+<CONNECTOR type="5102" id="8903" >
 <cdparam x="663" y="125" />
 <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="19625" />
-<P1  x="663" y="125" id="18975" />
-<P2  x="663" y="147" id="9577" />
+<TGConnectingPoint num="0" id="8902" />
+<P1  x="663" y="125" id="9472" />
+<P2  x="663" y="147" id="9390" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="19626" >
-<father id="19624" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8901" >
+<father id="8903" num="0" />
 <cdparam x="663" y="165" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="19627" />
-<TGConnectingPoint num="1" id="19628" />
-<TGConnectingPoint num="2" id="19629" />
-<TGConnectingPoint num="3" id="19630" />
+<TGConnectingPoint num="0" id="8897" />
+<TGConnectingPoint num="1" id="8898" />
+<TGConnectingPoint num="2" id="8899" />
+<TGConnectingPoint num="3" id="8900" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -19988,25 +19757,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9086" >
+<CONNECTOR type="5102" id="8910" >
 <cdparam x="671" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9085" />
-<P1  x="671" y="378" id="9511" />
-<P2  x="672" y="380" id="9275" />
+<TGConnectingPoint num="0" id="8909" />
+<P1  x="671" y="378" id="9324" />
+<P2  x="672" y="380" id="9482" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9084" >
-<father id="9086" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8908" >
+<father id="8910" num="0" />
 <cdparam x="671" y="418" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9080" />
-<TGConnectingPoint num="1" id="9081" />
-<TGConnectingPoint num="2" id="9082" />
-<TGConnectingPoint num="3" id="9083" />
+<TGConnectingPoint num="0" id="8904" />
+<TGConnectingPoint num="1" id="8905" />
+<TGConnectingPoint num="2" id="8906" />
+<TGConnectingPoint num="3" id="8907" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20016,25 +19785,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9093" >
+<CONNECTOR type="5102" id="8917" >
 <cdparam x="671" y="571" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9092" />
-<P1  x="671" y="571" id="9287" />
-<P2  x="671" y="582" id="9532" />
+<TGConnectingPoint num="0" id="8916" />
+<P1  x="671" y="571" id="9100" />
+<P2  x="671" y="582" id="9345" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9091" >
-<father id="9093" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8915" >
+<father id="8917" num="0" />
 <cdparam x="671" y="611" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9087" />
-<TGConnectingPoint num="1" id="9088" />
-<TGConnectingPoint num="2" id="9089" />
-<TGConnectingPoint num="3" id="9090" />
+<TGConnectingPoint num="0" id="8911" />
+<TGConnectingPoint num="1" id="8912" />
+<TGConnectingPoint num="2" id="8913" />
+<TGConnectingPoint num="3" id="8914" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20044,25 +19813,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9100" >
+<CONNECTOR type="5102" id="8924" >
 <cdparam x="671" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9099" />
-<P1  x="669" y="348" id="9298" />
-<P2  x="671" y="348" id="9510" />
+<TGConnectingPoint num="0" id="8923" />
+<P1  x="669" y="348" id="9111" />
+<P2  x="671" y="348" id="9323" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9098" >
-<father id="9100" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8922" >
+<father id="8924" num="0" />
 <cdparam x="671" y="416" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9094" />
-<TGConnectingPoint num="1" id="9095" />
-<TGConnectingPoint num="2" id="9096" />
-<TGConnectingPoint num="3" id="9097" />
+<TGConnectingPoint num="0" id="8918" />
+<TGConnectingPoint num="1" id="8919" />
+<TGConnectingPoint num="2" id="8920" />
+<TGConnectingPoint num="3" id="8921" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20072,25 +19841,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9107" >
+<CONNECTOR type="5102" id="8931" >
 <cdparam x="428" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9106" />
-<P1  x="428" y="411" id="9309" />
-<P2  x="428" y="426" id="9394" />
+<TGConnectingPoint num="0" id="8930" />
+<P1  x="428" y="411" id="9122" />
+<P2  x="428" y="426" id="9207" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9105" >
-<father id="9107" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8929" >
+<father id="8931" num="0" />
 <cdparam x="428" y="444" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9101" />
-<TGConnectingPoint num="1" id="9102" />
-<TGConnectingPoint num="2" id="9103" />
-<TGConnectingPoint num="3" id="9104" />
+<TGConnectingPoint num="0" id="8925" />
+<TGConnectingPoint num="1" id="8926" />
+<TGConnectingPoint num="2" id="8927" />
+<TGConnectingPoint num="3" id="8928" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20100,25 +19869,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9114" >
+<CONNECTOR type="5102" id="8938" >
 <cdparam x="661" y="206" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9113" />
-<P1  x="663" y="216" id="9566" />
-<P2  x="663" y="221" id="9319" />
+<TGConnectingPoint num="0" id="8937" />
+<P1  x="663" y="216" id="9379" />
+<P2  x="663" y="221" id="9132" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9112" >
-<father id="9114" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8936" >
+<father id="8938" num="0" />
 <cdparam x="661" y="246" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9108" />
-<TGConnectingPoint num="1" id="9109" />
-<TGConnectingPoint num="2" id="9110" />
-<TGConnectingPoint num="3" id="9111" />
+<TGConnectingPoint num="0" id="8932" />
+<TGConnectingPoint num="1" id="8933" />
+<TGConnectingPoint num="2" id="8934" />
+<TGConnectingPoint num="3" id="8935" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20128,25 +19897,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9121" >
+<CONNECTOR type="5102" id="8945" >
 <cdparam x="660" y="81" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9120" />
-<P1  x="660" y="79" id="9331" />
-<P2  x="663" y="95" id="18974" />
+<TGConnectingPoint num="0" id="8944" />
+<P1  x="660" y="79" id="9144" />
+<P2  x="663" y="95" id="9471" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9119" >
-<father id="9121" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8943" >
+<father id="8945" num="0" />
 <cdparam x="660" y="121" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9115" />
-<TGConnectingPoint num="1" id="9116" />
-<TGConnectingPoint num="2" id="9117" />
-<TGConnectingPoint num="3" id="9118" />
+<TGConnectingPoint num="0" id="8939" />
+<TGConnectingPoint num="1" id="8940" />
+<TGConnectingPoint num="2" id="8941" />
+<TGConnectingPoint num="3" id="8942" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20156,25 +19925,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9128" >
+<CONNECTOR type="5102" id="8952" >
 <cdparam x="450" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9127" />
-<P1  x="492" y="239" id="9498" />
-<P2  x="453" y="293" id="9350" />
+<TGConnectingPoint num="0" id="8951" />
+<P1  x="492" y="239" id="9311" />
+<P2  x="453" y="293" id="9163" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9126" >
-<father id="9128" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8950" >
+<father id="8952" num="0" />
 <cdparam x="450" y="326" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9122" />
-<TGConnectingPoint num="1" id="9123" />
-<TGConnectingPoint num="2" id="9124" />
-<TGConnectingPoint num="3" id="9125" />
+<TGConnectingPoint num="0" id="8946" />
+<TGConnectingPoint num="1" id="8947" />
+<TGConnectingPoint num="2" id="8948" />
+<TGConnectingPoint num="3" id="8949" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20184,25 +19953,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9135" >
+<CONNECTOR type="5102" id="8959" >
 <cdparam x="646" y="301" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="9134" />
-<P1  x="663" y="251" id="9320" />
-<P2  x="471" y="183" id="9469" />
+<TGConnectingPoint num="0" id="8958" />
+<P1  x="663" y="251" id="9133" />
+<P2  x="471" y="183" id="9282" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9133" >
-<father id="9135" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8957" >
+<father id="8959" num="0" />
 <cdparam x="646" y="341" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9129" />
-<TGConnectingPoint num="1" id="9130" />
-<TGConnectingPoint num="2" id="9131" />
-<TGConnectingPoint num="3" id="9132" />
+<TGConnectingPoint num="0" id="8953" />
+<TGConnectingPoint num="1" id="8954" />
+<TGConnectingPoint num="2" id="8955" />
+<TGConnectingPoint num="3" id="8956" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20212,25 +19981,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9142" >
+<CONNECTOR type="5102" id="8966" >
 <cdparam x="660" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9141" />
-<P1  x="663" y="182" id="9582" />
-<P2  x="663" y="186" id="9565" />
+<TGConnectingPoint num="0" id="8965" />
+<P1  x="663" y="182" id="9395" />
+<P2  x="663" y="186" id="9378" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9140" >
-<father id="9142" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8964" >
+<father id="8966" num="0" />
 <cdparam x="660" y="249" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9136" />
-<TGConnectingPoint num="1" id="9137" />
-<TGConnectingPoint num="2" id="9138" />
-<TGConnectingPoint num="3" id="9139" />
+<TGConnectingPoint num="0" id="8960" />
+<TGConnectingPoint num="1" id="8961" />
+<TGConnectingPoint num="2" id="8962" />
+<TGConnectingPoint num="3" id="8963" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20240,25 +20009,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9149" >
+<CONNECTOR type="5102" id="8973" >
 <cdparam x="658" y="96" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9148" />
-<P1  x="660" y="45" id="9446" />
-<P2  x="660" y="49" id="9330" />
+<TGConnectingPoint num="0" id="8972" />
+<P1  x="660" y="45" id="9259" />
+<P2  x="660" y="49" id="9143" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9147" >
-<father id="9149" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8971" >
+<father id="8973" num="0" />
 <cdparam x="658" y="136" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9143" />
-<TGConnectingPoint num="1" id="9144" />
-<TGConnectingPoint num="2" id="9145" />
-<TGConnectingPoint num="3" id="9146" />
+<TGConnectingPoint num="0" id="8967" />
+<TGConnectingPoint num="1" id="8968" />
+<TGConnectingPoint num="2" id="8969" />
+<TGConnectingPoint num="3" id="8970" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20268,25 +20037,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9156" >
+<CONNECTOR type="5102" id="8980" >
 <cdparam x="739" y="604" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9155" />
-<P1  x="671" y="534" id="9555" />
-<P2  x="671" y="541" id="9286" />
+<TGConnectingPoint num="0" id="8979" />
+<P1  x="671" y="534" id="9368" />
+<P2  x="671" y="541" id="9099" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9154" >
-<father id="9156" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8978" >
+<father id="8980" num="0" />
 <cdparam x="739" y="644" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9150" />
-<TGConnectingPoint num="1" id="9151" />
-<TGConnectingPoint num="2" id="9152" />
-<TGConnectingPoint num="3" id="9153" />
+<TGConnectingPoint num="0" id="8974" />
+<TGConnectingPoint num="1" id="8975" />
+<TGConnectingPoint num="2" id="8976" />
+<TGConnectingPoint num="3" id="8977" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20296,25 +20065,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9163" >
+<CONNECTOR type="5102" id="8987" >
 <cdparam x="769" y="624" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9162" />
-<P1  x="671" y="474" id="9623" />
-<P2  x="671" y="504" id="9554" />
+<TGConnectingPoint num="0" id="8986" />
+<P1  x="671" y="474" id="9436" />
+<P2  x="671" y="504" id="9367" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9161" >
-<father id="9163" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8985" >
+<father id="8987" num="0" />
 <cdparam x="769" y="664" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9157" />
-<TGConnectingPoint num="1" id="9158" />
-<TGConnectingPoint num="2" id="9159" />
-<TGConnectingPoint num="3" id="9160" />
+<TGConnectingPoint num="0" id="8981" />
+<TGConnectingPoint num="1" id="8982" />
+<TGConnectingPoint num="2" id="8983" />
+<TGConnectingPoint num="3" id="8984" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20324,55 +20093,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9176" >
+<CONNECTOR type="5102" id="9000" >
 <cdparam x="656" y="639" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9172" />
-<TGConnectingPoint num="1" id="9173" />
-<TGConnectingPoint num="2" id="9174" />
-<TGConnectingPoint num="3" id="9175" />
-<P1  x="671" y="612" id="9533" />
-<P2  x="478" y="463" id="9406" />
+<TGConnectingPoint num="0" id="8996" />
+<TGConnectingPoint num="1" id="8997" />
+<TGConnectingPoint num="2" id="8998" />
+<TGConnectingPoint num="3" id="8999" />
+<P1  x="671" y="612" id="9346" />
+<P2  x="478" y="463" id="9219" />
 <Point x="671" y="626" />
 <Point x="548" y="626" />
 <Point x="548" y="463" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9164" >
-<father id="9176" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="8988" >
+<father id="9000" num="0" />
 <cdparam x="671" y="626" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9165" >
-<father id="9176" num="1" />
+<SUBCOMPONENT type="-1" id="8989" >
+<father id="9000" num="1" />
 <cdparam x="548" y="626" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9166" >
-<father id="9176" num="2" />
+<SUBCOMPONENT type="-1" id="8990" >
+<father id="9000" num="2" />
 <cdparam x="548" y="463" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9171" >
-<father id="9176" num="3" />
+<SUBCOMPONENT type="-1" id="8995" >
+<father id="9000" num="3" />
 <cdparam x="656" y="679" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9167" />
-<TGConnectingPoint num="1" id="9168" />
-<TGConnectingPoint num="2" id="9169" />
-<TGConnectingPoint num="3" id="9170" />
+<TGConnectingPoint num="0" id="8991" />
+<TGConnectingPoint num="1" id="8992" />
+<TGConnectingPoint num="2" id="8993" />
+<TGConnectingPoint num="3" id="8994" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20382,25 +20151,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9183" >
+<CONNECTOR type="5102" id="9007" >
 <cdparam x="770" y="554" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9182" />
-<P1  x="672" y="410" id="9276" />
-<P2  x="671" y="424" id="9618" />
+<TGConnectingPoint num="0" id="9006" />
+<P1  x="672" y="410" id="9483" />
+<P2  x="671" y="424" id="9431" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9181" >
-<father id="9183" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9005" >
+<father id="9007" num="0" />
 <cdparam x="770" y="594" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9177" />
-<TGConnectingPoint num="1" id="9178" />
-<TGConnectingPoint num="2" id="9179" />
-<TGConnectingPoint num="3" id="9180" />
+<TGConnectingPoint num="0" id="9001" />
+<TGConnectingPoint num="1" id="9002" />
+<TGConnectingPoint num="2" id="9003" />
+<TGConnectingPoint num="3" id="9004" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20410,25 +20179,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9190" >
+<CONNECTOR type="5102" id="9014" >
 <cdparam x="642" y="394" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9189" />
-<P1  x="670" y="318" id="9383" />
-<P2  x="669" y="318" id="9297" />
+<TGConnectingPoint num="0" id="9013" />
+<P1  x="670" y="318" id="9196" />
+<P2  x="669" y="318" id="9110" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9188" >
-<father id="9190" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9012" >
+<father id="9014" num="0" />
 <cdparam x="654" y="410" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9184" />
-<TGConnectingPoint num="1" id="9185" />
-<TGConnectingPoint num="2" id="9186" />
-<TGConnectingPoint num="3" id="9187" />
+<TGConnectingPoint num="0" id="9008" />
+<TGConnectingPoint num="1" id="9009" />
+<TGConnectingPoint num="2" id="9010" />
+<TGConnectingPoint num="3" id="9011" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20438,55 +20207,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9203" >
+<CONNECTOR type="5102" id="9027" >
 <cdparam x="425" y="593" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="9199" />
-<TGConnectingPoint num="1" id="9200" />
-<TGConnectingPoint num="2" id="9201" />
-<TGConnectingPoint num="3" id="9202" />
-<P1  x="403" y="476" id="9407" />
-<P2  x="378" y="463" id="9405" />
+<TGConnectingPoint num="0" id="9023" />
+<TGConnectingPoint num="1" id="9024" />
+<TGConnectingPoint num="2" id="9025" />
+<TGConnectingPoint num="3" id="9026" />
+<P1  x="403" y="476" id="9220" />
+<P2  x="378" y="463" id="9218" />
 <Point x="403" y="511" />
 <Point x="319" y="511" />
 <Point x="319" y="463" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9191" >
-<father id="9203" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9015" >
+<father id="9027" num="0" />
 <cdparam x="403" y="511" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9192" >
-<father id="9203" num="1" />
+<SUBCOMPONENT type="-1" id="9016" >
+<father id="9027" num="1" />
 <cdparam x="319" y="511" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9193" >
-<father id="9203" num="2" />
+<SUBCOMPONENT type="-1" id="9017" >
+<father id="9027" num="2" />
 <cdparam x="319" y="463" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9198" >
-<father id="9203" num="3" />
+<SUBCOMPONENT type="-1" id="9022" >
+<father id="9027" num="3" />
 <cdparam x="158" y="508" />
 <sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9194" />
-<TGConnectingPoint num="1" id="9195" />
-<TGConnectingPoint num="2" id="9196" />
-<TGConnectingPoint num="3" id="9197" />
+<TGConnectingPoint num="0" id="9018" />
+<TGConnectingPoint num="1" id="9019" />
+<TGConnectingPoint num="2" id="9020" />
+<TGConnectingPoint num="3" id="9021" />
 <extraparam>
 <guard value="[ remainingTime&gt;0 ]" />
 <afterMin value="1" />
@@ -20498,25 +20267,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9210" >
+<CONNECTOR type="5102" id="9034" >
 <cdparam x="499" y="527" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="9209" />
-<P1  x="478" y="451" id="9397" />
-<P2  x="670" y="288" id="9382" />
+<TGConnectingPoint num="0" id="9033" />
+<P1  x="478" y="451" id="9210" />
+<P2  x="670" y="288" id="9195" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9208" >
-<father id="9210" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9032" >
+<father id="9034" num="0" />
 <cdparam x="729" y="316" />
 <sizeparam width="201" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9204" />
-<TGConnectingPoint num="1" id="9205" />
-<TGConnectingPoint num="2" id="9206" />
-<TGConnectingPoint num="3" id="9207" />
+<TGConnectingPoint num="0" id="9028" />
+<TGConnectingPoint num="1" id="9029" />
+<TGConnectingPoint num="2" id="9030" />
+<TGConnectingPoint num="3" id="9031" />
 <extraparam>
 <guard value="[remainingTime &gt; 0 ]" />
 <afterMin value="1" />
@@ -20528,25 +20297,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9217" >
+<CONNECTOR type="5102" id="9041" >
 <cdparam x="450" y="593" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9216" />
-<P1  x="428" y="476" id="9399" />
-<P2  x="428" y="538" id="9521" />
+<TGConnectingPoint num="0" id="9040" />
+<P1  x="428" y="476" id="9212" />
+<P2  x="428" y="538" id="9334" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9215" >
-<father id="9217" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9039" >
+<father id="9041" num="0" />
 <cdparam x="397" y="506" />
 <sizeparam width="130" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9211" />
-<TGConnectingPoint num="1" id="9212" />
-<TGConnectingPoint num="2" id="9213" />
-<TGConnectingPoint num="3" id="9214" />
+<TGConnectingPoint num="0" id="9035" />
+<TGConnectingPoint num="1" id="9036" />
+<TGConnectingPoint num="2" id="9037" />
+<TGConnectingPoint num="3" id="9038" />
 <extraparam>
 <guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
@@ -20556,25 +20325,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9224" >
+<CONNECTOR type="5102" id="9048" >
 <cdparam x="450" y="518" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9223" />
-<P1  x="428" y="365" id="9544" />
-<P2  x="428" y="381" id="9308" />
+<TGConnectingPoint num="0" id="9047" />
+<P1  x="428" y="365" id="9357" />
+<P2  x="428" y="381" id="9121" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9222" >
-<father id="9224" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9046" >
+<father id="9048" num="0" />
 <cdparam x="252" y="372" />
 <sizeparam width="166" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9218" />
-<TGConnectingPoint num="1" id="9219" />
-<TGConnectingPoint num="2" id="9220" />
-<TGConnectingPoint num="3" id="9221" />
+<TGConnectingPoint num="0" id="9042" />
+<TGConnectingPoint num="1" id="9043" />
+<TGConnectingPoint num="2" id="9044" />
+<TGConnectingPoint num="3" id="9045" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20586,65 +20355,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9239" >
+<CONNECTOR type="5102" id="9063" >
 <cdparam x="419" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state1" value="null" />
-<TGConnectingPoint num="0" id="9234" />
-<TGConnectingPoint num="1" id="9235" />
-<TGConnectingPoint num="2" id="9236" />
-<TGConnectingPoint num="3" id="9237" />
-<TGConnectingPoint num="4" id="9238" />
-<P1  x="428" y="610" id="9435" />
-<P2  x="389" y="150" id="9456" />
+<TGConnectingPoint num="0" id="9058" />
+<TGConnectingPoint num="1" id="9059" />
+<TGConnectingPoint num="2" id="9060" />
+<TGConnectingPoint num="3" id="9061" />
+<TGConnectingPoint num="4" id="9062" />
+<P1  x="428" y="610" id="9248" />
+<P2  x="389" y="150" id="9269" />
 <Point x="428" y="603" />
 <Point x="220" y="603" />
 <Point x="220" y="83" />
 <Point x="389" y="83" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9225" >
-<father id="9239" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9049" >
+<father id="9063" num="0" />
 <cdparam x="428" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9226" >
-<father id="9239" num="1" />
+<SUBCOMPONENT type="-1" id="9050" >
+<father id="9063" num="1" />
 <cdparam x="220" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9227" >
-<father id="9239" num="2" />
+<SUBCOMPONENT type="-1" id="9051" >
+<father id="9063" num="2" />
 <cdparam x="220" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9228" >
-<father id="9239" num="3" />
+<SUBCOMPONENT type="-1" id="9052" >
+<father id="9063" num="3" />
 <cdparam x="389" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9233" >
-<father id="9239" num="4" />
+<SUBCOMPONENT type="-1" id="9057" >
+<father id="9063" num="4" />
 <cdparam x="419" y="587" />
 <sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9229" />
-<TGConnectingPoint num="1" id="9230" />
-<TGConnectingPoint num="2" id="9231" />
-<TGConnectingPoint num="3" id="9232" />
+<TGConnectingPoint num="0" id="9053" />
+<TGConnectingPoint num="1" id="9054" />
+<TGConnectingPoint num="2" id="9055" />
+<TGConnectingPoint num="3" id="9056" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -20654,25 +20423,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9246" >
+<CONNECTOR type="5102" id="9070" >
 <cdparam x="419" y="664" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9245" />
-<P1  x="428" y="568" id="9522" />
-<P2  x="428" y="580" id="9434" />
+<TGConnectingPoint num="0" id="9069" />
+<P1  x="428" y="568" id="9335" />
+<P2  x="428" y="580" id="9247" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9244" >
-<father id="9246" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9068" >
+<father id="9070" num="0" />
 <cdparam x="419" y="704" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9240" />
-<TGConnectingPoint num="1" id="9241" />
-<TGConnectingPoint num="2" id="9242" />
-<TGConnectingPoint num="3" id="9243" />
+<TGConnectingPoint num="0" id="9064" />
+<TGConnectingPoint num="1" id="9065" />
+<TGConnectingPoint num="2" id="9066" />
+<TGConnectingPoint num="3" id="9067" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20682,25 +20451,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9253" >
+<CONNECTOR type="5102" id="9077" >
 <cdparam x="471" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9252" />
-<P1  x="471" y="172" id="9460" />
-<P2  x="660" y="15" id="9445" />
+<TGConnectingPoint num="0" id="9076" />
+<P1  x="471" y="172" id="9273" />
+<P2  x="660" y="15" id="9258" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9251" >
-<father id="9253" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9075" >
+<father id="9077" num="0" />
 <cdparam x="471" y="223" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9247" />
-<TGConnectingPoint num="1" id="9248" />
-<TGConnectingPoint num="2" id="9249" />
-<TGConnectingPoint num="3" id="9250" />
+<TGConnectingPoint num="0" id="9071" />
+<TGConnectingPoint num="1" id="9072" />
+<TGConnectingPoint num="2" id="9073" />
+<TGConnectingPoint num="3" id="9074" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20710,25 +20479,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9260" >
+<CONNECTOR type="5102" id="9084" >
 <cdparam x="463" y="217" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9259" />
-<P1  x="450" y="195" id="9471" />
-<P2  x="492" y="209" id="9497" />
+<TGConnectingPoint num="0" id="9083" />
+<P1  x="450" y="195" id="9284" />
+<P2  x="492" y="209" id="9310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9258" >
-<father id="9260" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9082" >
+<father id="9084" num="0" />
 <cdparam x="400" y="252" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9254" />
-<TGConnectingPoint num="1" id="9255" />
-<TGConnectingPoint num="2" id="9256" />
-<TGConnectingPoint num="3" id="9257" />
+<TGConnectingPoint num="0" id="9078" />
+<TGConnectingPoint num="1" id="9079" />
+<TGConnectingPoint num="2" id="9080" />
+<TGConnectingPoint num="3" id="9081" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20738,25 +20507,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9267" >
+<CONNECTOR type="5102" id="9091" >
 <cdparam x="438" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state1" value="null" />
-<TGConnectingPoint num="0" id="9266" />
-<P1  x="430" y="100" id="9508" />
-<P2  x="430" y="150" id="9457" />
+<TGConnectingPoint num="0" id="9090" />
+<P1  x="430" y="100" id="9321" />
+<P2  x="430" y="150" id="9270" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9265" >
-<father id="9267" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9089" >
+<father id="9091" num="0" />
 <cdparam x="442" y="160" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9261" />
-<TGConnectingPoint num="1" id="9262" />
-<TGConnectingPoint num="2" id="9263" />
-<TGConnectingPoint num="3" id="9264" />
+<TGConnectingPoint num="0" id="9085" />
+<TGConnectingPoint num="1" id="9086" />
+<TGConnectingPoint num="2" id="9087" />
+<TGConnectingPoint num="3" id="9088" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20766,25 +20535,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9274" >
+<CONNECTOR type="5102" id="9098" >
 <cdparam x="449" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9273" />
-<P1  x="428" y="329" id="9347" />
-<P2  x="428" y="335" id="9543" />
+<TGConnectingPoint num="0" id="9097" />
+<P1  x="428" y="329" id="9160" />
+<P2  x="428" y="335" id="9356" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9272" >
-<father id="9274" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9096" >
+<father id="9098" num="0" />
 <cdparam x="449" y="459" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9268" />
-<TGConnectingPoint num="1" id="9269" />
-<TGConnectingPoint num="2" id="9270" />
-<TGConnectingPoint num="3" id="9271" />
+<TGConnectingPoint num="0" id="9092" />
+<TGConnectingPoint num="1" id="9093" />
+<TGConnectingPoint num="2" id="9094" />
+<TGConnectingPoint num="3" id="9095" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -20794,621 +20563,621 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="9296" >
+<COMPONENT type="5103" id="9109" >
 <cdparam x="630" y="546" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="9286" />
-<TGConnectingPoint num="1" id="9287" />
-<TGConnectingPoint num="2" id="9288" />
-<TGConnectingPoint num="3" id="9289" />
-<TGConnectingPoint num="4" id="9290" />
-<TGConnectingPoint num="5" id="9291" />
-<TGConnectingPoint num="6" id="9292" />
-<TGConnectingPoint num="7" id="9293" />
-<TGConnectingPoint num="8" id="9294" />
-<TGConnectingPoint num="9" id="9295" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9307" >
+<TGConnectingPoint num="0" id="9099" />
+<TGConnectingPoint num="1" id="9100" />
+<TGConnectingPoint num="2" id="9101" />
+<TGConnectingPoint num="3" id="9102" />
+<TGConnectingPoint num="4" id="9103" />
+<TGConnectingPoint num="5" id="9104" />
+<TGConnectingPoint num="6" id="9105" />
+<TGConnectingPoint num="7" id="9106" />
+<TGConnectingPoint num="8" id="9107" />
+<TGConnectingPoint num="9" id="9108" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9120" >
 <cdparam x="632" y="323" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="9297" />
-<TGConnectingPoint num="1" id="9298" />
-<TGConnectingPoint num="2" id="9299" />
-<TGConnectingPoint num="3" id="9300" />
-<TGConnectingPoint num="4" id="9301" />
-<TGConnectingPoint num="5" id="9302" />
-<TGConnectingPoint num="6" id="9303" />
-<TGConnectingPoint num="7" id="9304" />
-<TGConnectingPoint num="8" id="9305" />
-<TGConnectingPoint num="9" id="9306" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9318" >
+<TGConnectingPoint num="0" id="9110" />
+<TGConnectingPoint num="1" id="9111" />
+<TGConnectingPoint num="2" id="9112" />
+<TGConnectingPoint num="3" id="9113" />
+<TGConnectingPoint num="4" id="9114" />
+<TGConnectingPoint num="5" id="9115" />
+<TGConnectingPoint num="6" id="9116" />
+<TGConnectingPoint num="7" id="9117" />
+<TGConnectingPoint num="8" id="9118" />
+<TGConnectingPoint num="9" id="9119" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9131" >
 <cdparam x="362" y="386" />
 <sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_magnetronStart()" />
-<TGConnectingPoint num="0" id="9308" />
-<TGConnectingPoint num="1" id="9309" />
-<TGConnectingPoint num="2" id="9310" />
-<TGConnectingPoint num="3" id="9311" />
-<TGConnectingPoint num="4" id="9312" />
-<TGConnectingPoint num="5" id="9313" />
-<TGConnectingPoint num="6" id="9314" />
-<TGConnectingPoint num="7" id="9315" />
-<TGConnectingPoint num="8" id="9316" />
-<TGConnectingPoint num="9" id="9317" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9329" >
+<TGConnectingPoint num="0" id="9121" />
+<TGConnectingPoint num="1" id="9122" />
+<TGConnectingPoint num="2" id="9123" />
+<TGConnectingPoint num="3" id="9124" />
+<TGConnectingPoint num="4" id="9125" />
+<TGConnectingPoint num="5" id="9126" />
+<TGConnectingPoint num="6" id="9127" />
+<TGConnectingPoint num="7" id="9128" />
+<TGConnectingPoint num="8" id="9129" />
+<TGConnectingPoint num="9" id="9130" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9142" >
 <cdparam x="622" y="226" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_closed()" />
-<TGConnectingPoint num="0" id="9319" />
-<TGConnectingPoint num="1" id="9320" />
-<TGConnectingPoint num="2" id="9321" />
-<TGConnectingPoint num="3" id="9322" />
-<TGConnectingPoint num="4" id="9323" />
-<TGConnectingPoint num="5" id="9324" />
-<TGConnectingPoint num="6" id="9325" />
-<TGConnectingPoint num="7" id="9326" />
-<TGConnectingPoint num="8" id="9327" />
-<TGConnectingPoint num="9" id="9328" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9340" >
+<TGConnectingPoint num="0" id="9132" />
+<TGConnectingPoint num="1" id="9133" />
+<TGConnectingPoint num="2" id="9134" />
+<TGConnectingPoint num="3" id="9135" />
+<TGConnectingPoint num="4" id="9136" />
+<TGConnectingPoint num="5" id="9137" />
+<TGConnectingPoint num="6" id="9138" />
+<TGConnectingPoint num="7" id="9139" />
+<TGConnectingPoint num="8" id="9140" />
+<TGConnectingPoint num="9" id="9141" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9153" >
 <cdparam x="623" y="54" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="obs_open()" />
-<TGConnectingPoint num="0" id="9330" />
-<TGConnectingPoint num="1" id="9331" />
-<TGConnectingPoint num="2" id="9332" />
-<TGConnectingPoint num="3" id="9333" />
-<TGConnectingPoint num="4" id="9334" />
-<TGConnectingPoint num="5" id="9335" />
-<TGConnectingPoint num="6" id="9336" />
-<TGConnectingPoint num="7" id="9337" />
-<TGConnectingPoint num="8" id="9338" />
-<TGConnectingPoint num="9" id="9339" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9381" >
+<TGConnectingPoint num="0" id="9143" />
+<TGConnectingPoint num="1" id="9144" />
+<TGConnectingPoint num="2" id="9145" />
+<TGConnectingPoint num="3" id="9146" />
+<TGConnectingPoint num="4" id="9147" />
+<TGConnectingPoint num="5" id="9148" />
+<TGConnectingPoint num="6" id="9149" />
+<TGConnectingPoint num="7" id="9150" />
+<TGConnectingPoint num="8" id="9151" />
+<TGConnectingPoint num="9" id="9152" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9194" >
 <cdparam x="378" y="293" />
 <sizeparam width="100" height="36" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Starting" />
-<TGConnectingPoint num="0" id="9341" />
-<TGConnectingPoint num="1" id="9342" />
-<TGConnectingPoint num="2" id="9343" />
-<TGConnectingPoint num="3" id="9344" />
-<TGConnectingPoint num="4" id="9345" />
-<TGConnectingPoint num="5" id="9346" />
-<TGConnectingPoint num="6" id="9347" />
-<TGConnectingPoint num="7" id="9348" />
-<TGConnectingPoint num="8" id="9349" />
-<TGConnectingPoint num="9" id="9350" />
-<TGConnectingPoint num="10" id="9351" />
-<TGConnectingPoint num="11" id="9352" />
-<TGConnectingPoint num="12" id="9353" />
-<TGConnectingPoint num="13" id="9354" />
-<TGConnectingPoint num="14" id="9355" />
-<TGConnectingPoint num="15" id="9356" />
-<TGConnectingPoint num="16" id="9357" />
-<TGConnectingPoint num="17" id="9358" />
-<TGConnectingPoint num="18" id="9359" />
-<TGConnectingPoint num="19" id="9360" />
-<TGConnectingPoint num="20" id="9361" />
-<TGConnectingPoint num="21" id="9362" />
-<TGConnectingPoint num="22" id="9363" />
-<TGConnectingPoint num="23" id="9364" />
-<TGConnectingPoint num="24" id="9365" />
-<TGConnectingPoint num="25" id="9366" />
-<TGConnectingPoint num="26" id="9367" />
-<TGConnectingPoint num="27" id="9368" />
-<TGConnectingPoint num="28" id="9369" />
-<TGConnectingPoint num="29" id="9370" />
-<TGConnectingPoint num="30" id="9371" />
-<TGConnectingPoint num="31" id="9372" />
-<TGConnectingPoint num="32" id="9373" />
-<TGConnectingPoint num="33" id="9374" />
-<TGConnectingPoint num="34" id="9375" />
-<TGConnectingPoint num="35" id="9376" />
-<TGConnectingPoint num="36" id="9377" />
-<TGConnectingPoint num="37" id="9378" />
-<TGConnectingPoint num="38" id="9379" />
-<TGConnectingPoint num="39" id="9380" />
+<TGConnectingPoint num="0" id="9154" />
+<TGConnectingPoint num="1" id="9155" />
+<TGConnectingPoint num="2" id="9156" />
+<TGConnectingPoint num="3" id="9157" />
+<TGConnectingPoint num="4" id="9158" />
+<TGConnectingPoint num="5" id="9159" />
+<TGConnectingPoint num="6" id="9160" />
+<TGConnectingPoint num="7" id="9161" />
+<TGConnectingPoint num="8" id="9162" />
+<TGConnectingPoint num="9" id="9163" />
+<TGConnectingPoint num="10" id="9164" />
+<TGConnectingPoint num="11" id="9165" />
+<TGConnectingPoint num="12" id="9166" />
+<TGConnectingPoint num="13" id="9167" />
+<TGConnectingPoint num="14" id="9168" />
+<TGConnectingPoint num="15" id="9169" />
+<TGConnectingPoint num="16" id="9170" />
+<TGConnectingPoint num="17" id="9171" />
+<TGConnectingPoint num="18" id="9172" />
+<TGConnectingPoint num="19" id="9173" />
+<TGConnectingPoint num="20" id="9174" />
+<TGConnectingPoint num="21" id="9175" />
+<TGConnectingPoint num="22" id="9176" />
+<TGConnectingPoint num="23" id="9177" />
+<TGConnectingPoint num="24" id="9178" />
+<TGConnectingPoint num="25" id="9179" />
+<TGConnectingPoint num="26" id="9180" />
+<TGConnectingPoint num="27" id="9181" />
+<TGConnectingPoint num="28" id="9182" />
+<TGConnectingPoint num="29" id="9183" />
+<TGConnectingPoint num="30" id="9184" />
+<TGConnectingPoint num="31" id="9185" />
+<TGConnectingPoint num="32" id="9186" />
+<TGConnectingPoint num="33" id="9187" />
+<TGConnectingPoint num="34" id="9188" />
+<TGConnectingPoint num="35" id="9189" />
+<TGConnectingPoint num="36" id="9190" />
+<TGConnectingPoint num="37" id="9191" />
+<TGConnectingPoint num="38" id="9192" />
+<TGConnectingPoint num="39" id="9193" />
 <extraparam>
 <entryCode value="printf(&quot;Starting microwave, lets go!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="9392" >
+<COMPONENT type="5104" id="9205" >
 <cdparam x="643" y="293" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="open()" />
-<TGConnectingPoint num="0" id="9382" />
-<TGConnectingPoint num="1" id="9383" />
-<TGConnectingPoint num="2" id="9384" />
-<TGConnectingPoint num="3" id="9385" />
-<TGConnectingPoint num="4" id="9386" />
-<TGConnectingPoint num="5" id="9387" />
-<TGConnectingPoint num="6" id="9388" />
-<TGConnectingPoint num="7" id="9389" />
-<TGConnectingPoint num="8" id="9390" />
-<TGConnectingPoint num="9" id="9391" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9433" >
+<TGConnectingPoint num="0" id="9195" />
+<TGConnectingPoint num="1" id="9196" />
+<TGConnectingPoint num="2" id="9197" />
+<TGConnectingPoint num="3" id="9198" />
+<TGConnectingPoint num="4" id="9199" />
+<TGConnectingPoint num="5" id="9200" />
+<TGConnectingPoint num="6" id="9201" />
+<TGConnectingPoint num="7" id="9202" />
+<TGConnectingPoint num="8" id="9203" />
+<TGConnectingPoint num="9" id="9204" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9246" >
 <cdparam x="378" y="426" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="9393" />
-<TGConnectingPoint num="1" id="9394" />
-<TGConnectingPoint num="2" id="9395" />
-<TGConnectingPoint num="3" id="9396" />
-<TGConnectingPoint num="4" id="9397" />
-<TGConnectingPoint num="5" id="9398" />
-<TGConnectingPoint num="6" id="9399" />
-<TGConnectingPoint num="7" id="9400" />
-<TGConnectingPoint num="8" id="9401" />
-<TGConnectingPoint num="9" id="9402" />
-<TGConnectingPoint num="10" id="9403" />
-<TGConnectingPoint num="11" id="9404" />
-<TGConnectingPoint num="12" id="9405" />
-<TGConnectingPoint num="13" id="9406" />
-<TGConnectingPoint num="14" id="9407" />
-<TGConnectingPoint num="15" id="9408" />
-<TGConnectingPoint num="16" id="9409" />
-<TGConnectingPoint num="17" id="9410" />
-<TGConnectingPoint num="18" id="9411" />
-<TGConnectingPoint num="19" id="9412" />
-<TGConnectingPoint num="20" id="9413" />
-<TGConnectingPoint num="21" id="9414" />
-<TGConnectingPoint num="22" id="9415" />
-<TGConnectingPoint num="23" id="9416" />
-<TGConnectingPoint num="24" id="9417" />
-<TGConnectingPoint num="25" id="9418" />
-<TGConnectingPoint num="26" id="9419" />
-<TGConnectingPoint num="27" id="9420" />
-<TGConnectingPoint num="28" id="9421" />
-<TGConnectingPoint num="29" id="9422" />
-<TGConnectingPoint num="30" id="9423" />
-<TGConnectingPoint num="31" id="9424" />
-<TGConnectingPoint num="32" id="9425" />
-<TGConnectingPoint num="33" id="9426" />
-<TGConnectingPoint num="34" id="9427" />
-<TGConnectingPoint num="35" id="9428" />
-<TGConnectingPoint num="36" id="9429" />
-<TGConnectingPoint num="37" id="9430" />
-<TGConnectingPoint num="38" id="9431" />
-<TGConnectingPoint num="39" id="9432" />
+<TGConnectingPoint num="0" id="9206" />
+<TGConnectingPoint num="1" id="9207" />
+<TGConnectingPoint num="2" id="9208" />
+<TGConnectingPoint num="3" id="9209" />
+<TGConnectingPoint num="4" id="9210" />
+<TGConnectingPoint num="5" id="9211" />
+<TGConnectingPoint num="6" id="9212" />
+<TGConnectingPoint num="7" id="9213" />
+<TGConnectingPoint num="8" id="9214" />
+<TGConnectingPoint num="9" id="9215" />
+<TGConnectingPoint num="10" id="9216" />
+<TGConnectingPoint num="11" id="9217" />
+<TGConnectingPoint num="12" id="9218" />
+<TGConnectingPoint num="13" id="9219" />
+<TGConnectingPoint num="14" id="9220" />
+<TGConnectingPoint num="15" id="9221" />
+<TGConnectingPoint num="16" id="9222" />
+<TGConnectingPoint num="17" id="9223" />
+<TGConnectingPoint num="18" id="9224" />
+<TGConnectingPoint num="19" id="9225" />
+<TGConnectingPoint num="20" id="9226" />
+<TGConnectingPoint num="21" id="9227" />
+<TGConnectingPoint num="22" id="9228" />
+<TGConnectingPoint num="23" id="9229" />
+<TGConnectingPoint num="24" id="9230" />
+<TGConnectingPoint num="25" id="9231" />
+<TGConnectingPoint num="26" id="9232" />
+<TGConnectingPoint num="27" id="9233" />
+<TGConnectingPoint num="28" id="9234" />
+<TGConnectingPoint num="29" id="9235" />
+<TGConnectingPoint num="30" id="9236" />
+<TGConnectingPoint num="31" id="9237" />
+<TGConnectingPoint num="32" id="9238" />
+<TGConnectingPoint num="33" id="9239" />
+<TGConnectingPoint num="34" id="9240" />
+<TGConnectingPoint num="35" id="9241" />
+<TGConnectingPoint num="36" id="9242" />
+<TGConnectingPoint num="37" id="9243" />
+<TGConnectingPoint num="38" id="9244" />
+<TGConnectingPoint num="39" id="9245" />
 <extraparam>
 <entryCode value="printf(&quot;Heating ; remaining time :%d\n&quot;, remainingTime);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="9444" >
+<COMPONENT type="5103" id="9257" >
 <cdparam x="398" y="585" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ringBell()" />
-<TGConnectingPoint num="0" id="9434" />
-<TGConnectingPoint num="1" id="9435" />
-<TGConnectingPoint num="2" id="9436" />
-<TGConnectingPoint num="3" id="9437" />
-<TGConnectingPoint num="4" id="9438" />
-<TGConnectingPoint num="5" id="9439" />
-<TGConnectingPoint num="6" id="9440" />
-<TGConnectingPoint num="7" id="9441" />
-<TGConnectingPoint num="8" id="9442" />
-<TGConnectingPoint num="9" id="9443" />
+<TGConnectingPoint num="0" id="9247" />
+<TGConnectingPoint num="1" id="9248" />
+<TGConnectingPoint num="2" id="9249" />
+<TGConnectingPoint num="3" id="9250" />
+<TGConnectingPoint num="4" id="9251" />
+<TGConnectingPoint num="5" id="9252" />
+<TGConnectingPoint num="6" id="9253" />
+<TGConnectingPoint num="7" id="9254" />
+<TGConnectingPoint num="8" id="9255" />
+<TGConnectingPoint num="9" id="9256" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5104" id="9455" >
+<COMPONENT type="5104" id="9268" >
 <cdparam x="633" y="20" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="9445" />
-<TGConnectingPoint num="1" id="9446" />
-<TGConnectingPoint num="2" id="9447" />
-<TGConnectingPoint num="3" id="9448" />
-<TGConnectingPoint num="4" id="9449" />
-<TGConnectingPoint num="5" id="9450" />
-<TGConnectingPoint num="6" id="9451" />
-<TGConnectingPoint num="7" id="9452" />
-<TGConnectingPoint num="8" id="9453" />
-<TGConnectingPoint num="9" id="9454" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9496" >
+<TGConnectingPoint num="0" id="9258" />
+<TGConnectingPoint num="1" id="9259" />
+<TGConnectingPoint num="2" id="9260" />
+<TGConnectingPoint num="3" id="9261" />
+<TGConnectingPoint num="4" id="9262" />
+<TGConnectingPoint num="5" id="9263" />
+<TGConnectingPoint num="6" id="9264" />
+<TGConnectingPoint num="7" id="9265" />
+<TGConnectingPoint num="8" id="9266" />
+<TGConnectingPoint num="9" id="9267" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9309" >
 <cdparam x="389" y="150" />
 <sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state1" value="Idle" />
-<TGConnectingPoint num="0" id="9456" />
-<TGConnectingPoint num="1" id="9457" />
-<TGConnectingPoint num="2" id="9458" />
-<TGConnectingPoint num="3" id="9459" />
-<TGConnectingPoint num="4" id="9460" />
-<TGConnectingPoint num="5" id="9461" />
-<TGConnectingPoint num="6" id="9462" />
-<TGConnectingPoint num="7" id="9463" />
-<TGConnectingPoint num="8" id="9464" />
-<TGConnectingPoint num="9" id="9465" />
-<TGConnectingPoint num="10" id="9466" />
-<TGConnectingPoint num="11" id="9467" />
-<TGConnectingPoint num="12" id="9468" />
-<TGConnectingPoint num="13" id="9469" />
-<TGConnectingPoint num="14" id="9470" />
-<TGConnectingPoint num="15" id="9471" />
-<TGConnectingPoint num="16" id="9472" />
-<TGConnectingPoint num="17" id="9473" />
-<TGConnectingPoint num="18" id="9474" />
-<TGConnectingPoint num="19" id="9475" />
-<TGConnectingPoint num="20" id="9476" />
-<TGConnectingPoint num="21" id="9477" />
-<TGConnectingPoint num="22" id="9478" />
-<TGConnectingPoint num="23" id="9479" />
-<TGConnectingPoint num="24" id="9480" />
-<TGConnectingPoint num="25" id="9481" />
-<TGConnectingPoint num="26" id="9482" />
-<TGConnectingPoint num="27" id="9483" />
-<TGConnectingPoint num="28" id="9484" />
-<TGConnectingPoint num="29" id="9485" />
-<TGConnectingPoint num="30" id="9486" />
-<TGConnectingPoint num="31" id="9487" />
-<TGConnectingPoint num="32" id="9488" />
-<TGConnectingPoint num="33" id="9489" />
-<TGConnectingPoint num="34" id="9490" />
-<TGConnectingPoint num="35" id="9491" />
-<TGConnectingPoint num="36" id="9492" />
-<TGConnectingPoint num="37" id="9493" />
-<TGConnectingPoint num="38" id="9494" />
-<TGConnectingPoint num="39" id="9495" />
+<TGConnectingPoint num="0" id="9269" />
+<TGConnectingPoint num="1" id="9270" />
+<TGConnectingPoint num="2" id="9271" />
+<TGConnectingPoint num="3" id="9272" />
+<TGConnectingPoint num="4" id="9273" />
+<TGConnectingPoint num="5" id="9274" />
+<TGConnectingPoint num="6" id="9275" />
+<TGConnectingPoint num="7" id="9276" />
+<TGConnectingPoint num="8" id="9277" />
+<TGConnectingPoint num="9" id="9278" />
+<TGConnectingPoint num="10" id="9279" />
+<TGConnectingPoint num="11" id="9280" />
+<TGConnectingPoint num="12" id="9281" />
+<TGConnectingPoint num="13" id="9282" />
+<TGConnectingPoint num="14" id="9283" />
+<TGConnectingPoint num="15" id="9284" />
+<TGConnectingPoint num="16" id="9285" />
+<TGConnectingPoint num="17" id="9286" />
+<TGConnectingPoint num="18" id="9287" />
+<TGConnectingPoint num="19" id="9288" />
+<TGConnectingPoint num="20" id="9289" />
+<TGConnectingPoint num="21" id="9290" />
+<TGConnectingPoint num="22" id="9291" />
+<TGConnectingPoint num="23" id="9292" />
+<TGConnectingPoint num="24" id="9293" />
+<TGConnectingPoint num="25" id="9294" />
+<TGConnectingPoint num="26" id="9295" />
+<TGConnectingPoint num="27" id="9296" />
+<TGConnectingPoint num="28" id="9297" />
+<TGConnectingPoint num="29" id="9298" />
+<TGConnectingPoint num="30" id="9299" />
+<TGConnectingPoint num="31" id="9300" />
+<TGConnectingPoint num="32" id="9301" />
+<TGConnectingPoint num="33" id="9302" />
+<TGConnectingPoint num="34" id="9303" />
+<TGConnectingPoint num="35" id="9304" />
+<TGConnectingPoint num="36" id="9305" />
+<TGConnectingPoint num="37" id="9306" />
+<TGConnectingPoint num="38" id="9307" />
+<TGConnectingPoint num="39" id="9308" />
 <breakpoint />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="9507" >
+<COMPONENT type="5104" id="9320" >
 <cdparam x="442" y="214" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="start(duration)" />
-<TGConnectingPoint num="0" id="9497" />
-<TGConnectingPoint num="1" id="9498" />
-<TGConnectingPoint num="2" id="9499" />
-<TGConnectingPoint num="3" id="9500" />
-<TGConnectingPoint num="4" id="9501" />
-<TGConnectingPoint num="5" id="9502" />
-<TGConnectingPoint num="6" id="9503" />
-<TGConnectingPoint num="7" id="9504" />
-<TGConnectingPoint num="8" id="9505" />
-<TGConnectingPoint num="9" id="9506" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="9509" >
+<TGConnectingPoint num="0" id="9310" />
+<TGConnectingPoint num="1" id="9311" />
+<TGConnectingPoint num="2" id="9312" />
+<TGConnectingPoint num="3" id="9313" />
+<TGConnectingPoint num="4" id="9314" />
+<TGConnectingPoint num="5" id="9315" />
+<TGConnectingPoint num="6" id="9316" />
+<TGConnectingPoint num="7" id="9317" />
+<TGConnectingPoint num="8" id="9318" />
+<TGConnectingPoint num="9" id="9319" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="9322" >
 <cdparam x="423" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="9508" />
+<TGConnectingPoint num="0" id="9321" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="9520" >
+<COMPONENT type="5103" id="9333" >
 <cdparam x="619" y="353" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="9510" />
-<TGConnectingPoint num="1" id="9511" />
-<TGConnectingPoint num="2" id="9512" />
-<TGConnectingPoint num="3" id="9513" />
-<TGConnectingPoint num="4" id="9514" />
-<TGConnectingPoint num="5" id="9515" />
-<TGConnectingPoint num="6" id="9516" />
-<TGConnectingPoint num="7" id="9517" />
-<TGConnectingPoint num="8" id="9518" />
-<TGConnectingPoint num="9" id="9519" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9531" >
+<TGConnectingPoint num="0" id="9323" />
+<TGConnectingPoint num="1" id="9324" />
+<TGConnectingPoint num="2" id="9325" />
+<TGConnectingPoint num="3" id="9326" />
+<TGConnectingPoint num="4" id="9327" />
+<TGConnectingPoint num="5" id="9328" />
+<TGConnectingPoint num="6" id="9329" />
+<TGConnectingPoint num="7" id="9330" />
+<TGConnectingPoint num="8" id="9331" />
+<TGConnectingPoint num="9" id="9332" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9344" >
 <cdparam x="376" y="543" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="9521" />
-<TGConnectingPoint num="1" id="9522" />
-<TGConnectingPoint num="2" id="9523" />
-<TGConnectingPoint num="3" id="9524" />
-<TGConnectingPoint num="4" id="9525" />
-<TGConnectingPoint num="5" id="9526" />
-<TGConnectingPoint num="6" id="9527" />
-<TGConnectingPoint num="7" id="9528" />
-<TGConnectingPoint num="8" id="9529" />
-<TGConnectingPoint num="9" id="9530" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9542" >
+<TGConnectingPoint num="0" id="9334" />
+<TGConnectingPoint num="1" id="9335" />
+<TGConnectingPoint num="2" id="9336" />
+<TGConnectingPoint num="3" id="9337" />
+<TGConnectingPoint num="4" id="9338" />
+<TGConnectingPoint num="5" id="9339" />
+<TGConnectingPoint num="6" id="9340" />
+<TGConnectingPoint num="7" id="9341" />
+<TGConnectingPoint num="8" id="9342" />
+<TGConnectingPoint num="9" id="9343" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9355" >
 <cdparam x="619" y="587" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="9532" />
-<TGConnectingPoint num="1" id="9533" />
-<TGConnectingPoint num="2" id="9534" />
-<TGConnectingPoint num="3" id="9535" />
-<TGConnectingPoint num="4" id="9536" />
-<TGConnectingPoint num="5" id="9537" />
-<TGConnectingPoint num="6" id="9538" />
-<TGConnectingPoint num="7" id="9539" />
-<TGConnectingPoint num="8" id="9540" />
-<TGConnectingPoint num="9" id="9541" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9553" >
+<TGConnectingPoint num="0" id="9345" />
+<TGConnectingPoint num="1" id="9346" />
+<TGConnectingPoint num="2" id="9347" />
+<TGConnectingPoint num="3" id="9348" />
+<TGConnectingPoint num="4" id="9349" />
+<TGConnectingPoint num="5" id="9350" />
+<TGConnectingPoint num="6" id="9351" />
+<TGConnectingPoint num="7" id="9352" />
+<TGConnectingPoint num="8" id="9353" />
+<TGConnectingPoint num="9" id="9354" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9366" >
 <cdparam x="376" y="340" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="9543" />
-<TGConnectingPoint num="1" id="9544" />
-<TGConnectingPoint num="2" id="9545" />
-<TGConnectingPoint num="3" id="9546" />
-<TGConnectingPoint num="4" id="9547" />
-<TGConnectingPoint num="5" id="9548" />
-<TGConnectingPoint num="6" id="9549" />
-<TGConnectingPoint num="7" id="9550" />
-<TGConnectingPoint num="8" id="9551" />
-<TGConnectingPoint num="9" id="9552" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="9564" >
+<TGConnectingPoint num="0" id="9356" />
+<TGConnectingPoint num="1" id="9357" />
+<TGConnectingPoint num="2" id="9358" />
+<TGConnectingPoint num="3" id="9359" />
+<TGConnectingPoint num="4" id="9360" />
+<TGConnectingPoint num="5" id="9361" />
+<TGConnectingPoint num="6" id="9362" />
+<TGConnectingPoint num="7" id="9363" />
+<TGConnectingPoint num="8" id="9364" />
+<TGConnectingPoint num="9" id="9365" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="9377" >
 <cdparam x="640" y="509" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="9554" />
-<TGConnectingPoint num="1" id="9555" />
-<TGConnectingPoint num="2" id="9556" />
-<TGConnectingPoint num="3" id="9557" />
-<TGConnectingPoint num="4" id="9558" />
-<TGConnectingPoint num="5" id="9559" />
-<TGConnectingPoint num="6" id="9560" />
-<TGConnectingPoint num="7" id="9561" />
-<TGConnectingPoint num="8" id="9562" />
-<TGConnectingPoint num="9" id="9563" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="9575" >
+<TGConnectingPoint num="0" id="9367" />
+<TGConnectingPoint num="1" id="9368" />
+<TGConnectingPoint num="2" id="9369" />
+<TGConnectingPoint num="3" id="9370" />
+<TGConnectingPoint num="4" id="9371" />
+<TGConnectingPoint num="5" id="9372" />
+<TGConnectingPoint num="6" id="9373" />
+<TGConnectingPoint num="7" id="9374" />
+<TGConnectingPoint num="8" id="9375" />
+<TGConnectingPoint num="9" id="9376" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="9388" >
 <cdparam x="632" y="191" />
 <sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="9565" />
-<TGConnectingPoint num="1" id="9566" />
-<TGConnectingPoint num="2" id="9567" />
-<TGConnectingPoint num="3" id="9568" />
-<TGConnectingPoint num="4" id="9569" />
-<TGConnectingPoint num="5" id="9570" />
-<TGConnectingPoint num="6" id="9571" />
-<TGConnectingPoint num="7" id="9572" />
-<TGConnectingPoint num="8" id="9573" />
-<TGConnectingPoint num="9" id="9574" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9616" >
+<TGConnectingPoint num="0" id="9378" />
+<TGConnectingPoint num="1" id="9379" />
+<TGConnectingPoint num="2" id="9380" />
+<TGConnectingPoint num="3" id="9381" />
+<TGConnectingPoint num="4" id="9382" />
+<TGConnectingPoint num="5" id="9383" />
+<TGConnectingPoint num="6" id="9384" />
+<TGConnectingPoint num="7" id="9385" />
+<TGConnectingPoint num="8" id="9386" />
+<TGConnectingPoint num="9" id="9387" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9429" >
 <cdparam x="605" y="147" />
 <sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpened" />
-<TGConnectingPoint num="0" id="9576" />
-<TGConnectingPoint num="1" id="9577" />
-<TGConnectingPoint num="2" id="9578" />
-<TGConnectingPoint num="3" id="9579" />
-<TGConnectingPoint num="4" id="9580" />
-<TGConnectingPoint num="5" id="9581" />
-<TGConnectingPoint num="6" id="9582" />
-<TGConnectingPoint num="7" id="9583" />
-<TGConnectingPoint num="8" id="9584" />
-<TGConnectingPoint num="9" id="9585" />
-<TGConnectingPoint num="10" id="9586" />
-<TGConnectingPoint num="11" id="9587" />
-<TGConnectingPoint num="12" id="9588" />
-<TGConnectingPoint num="13" id="9589" />
-<TGConnectingPoint num="14" id="9590" />
-<TGConnectingPoint num="15" id="9591" />
-<TGConnectingPoint num="16" id="9592" />
-<TGConnectingPoint num="17" id="9593" />
-<TGConnectingPoint num="18" id="9594" />
-<TGConnectingPoint num="19" id="9595" />
-<TGConnectingPoint num="20" id="9596" />
-<TGConnectingPoint num="21" id="9597" />
-<TGConnectingPoint num="22" id="9598" />
-<TGConnectingPoint num="23" id="9599" />
-<TGConnectingPoint num="24" id="9600" />
-<TGConnectingPoint num="25" id="9601" />
-<TGConnectingPoint num="26" id="9602" />
-<TGConnectingPoint num="27" id="9603" />
-<TGConnectingPoint num="28" id="9604" />
-<TGConnectingPoint num="29" id="9605" />
-<TGConnectingPoint num="30" id="9606" />
-<TGConnectingPoint num="31" id="9607" />
-<TGConnectingPoint num="32" id="9608" />
-<TGConnectingPoint num="33" id="9609" />
-<TGConnectingPoint num="34" id="9610" />
-<TGConnectingPoint num="35" id="9611" />
-<TGConnectingPoint num="36" id="9612" />
-<TGConnectingPoint num="37" id="9613" />
-<TGConnectingPoint num="38" id="9614" />
-<TGConnectingPoint num="39" id="9615" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="9657" >
+<TGConnectingPoint num="0" id="9389" />
+<TGConnectingPoint num="1" id="9390" />
+<TGConnectingPoint num="2" id="9391" />
+<TGConnectingPoint num="3" id="9392" />
+<TGConnectingPoint num="4" id="9393" />
+<TGConnectingPoint num="5" id="9394" />
+<TGConnectingPoint num="6" id="9395" />
+<TGConnectingPoint num="7" id="9396" />
+<TGConnectingPoint num="8" id="9397" />
+<TGConnectingPoint num="9" id="9398" />
+<TGConnectingPoint num="10" id="9399" />
+<TGConnectingPoint num="11" id="9400" />
+<TGConnectingPoint num="12" id="9401" />
+<TGConnectingPoint num="13" id="9402" />
+<TGConnectingPoint num="14" id="9403" />
+<TGConnectingPoint num="15" id="9404" />
+<TGConnectingPoint num="16" id="9405" />
+<TGConnectingPoint num="17" id="9406" />
+<TGConnectingPoint num="18" id="9407" />
+<TGConnectingPoint num="19" id="9408" />
+<TGConnectingPoint num="20" id="9409" />
+<TGConnectingPoint num="21" id="9410" />
+<TGConnectingPoint num="22" id="9411" />
+<TGConnectingPoint num="23" id="9412" />
+<TGConnectingPoint num="24" id="9413" />
+<TGConnectingPoint num="25" id="9414" />
+<TGConnectingPoint num="26" id="9415" />
+<TGConnectingPoint num="27" id="9416" />
+<TGConnectingPoint num="28" id="9417" />
+<TGConnectingPoint num="29" id="9418" />
+<TGConnectingPoint num="30" id="9419" />
+<TGConnectingPoint num="31" id="9420" />
+<TGConnectingPoint num="32" id="9421" />
+<TGConnectingPoint num="33" id="9422" />
+<TGConnectingPoint num="34" id="9423" />
+<TGConnectingPoint num="35" id="9424" />
+<TGConnectingPoint num="36" id="9425" />
+<TGConnectingPoint num="37" id="9426" />
+<TGConnectingPoint num="38" id="9427" />
+<TGConnectingPoint num="39" id="9428" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="9470" >
 <cdparam x="571" y="424" />
 <sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="DoorOpenedWhileHeating" />
-<TGConnectingPoint num="0" id="9617" />
-<TGConnectingPoint num="1" id="9618" />
-<TGConnectingPoint num="2" id="9619" />
-<TGConnectingPoint num="3" id="9620" />
-<TGConnectingPoint num="4" id="9621" />
-<TGConnectingPoint num="5" id="9622" />
-<TGConnectingPoint num="6" id="9623" />
-<TGConnectingPoint num="7" id="9624" />
-<TGConnectingPoint num="8" id="9625" />
-<TGConnectingPoint num="9" id="9626" />
-<TGConnectingPoint num="10" id="9627" />
-<TGConnectingPoint num="11" id="9628" />
-<TGConnectingPoint num="12" id="9629" />
-<TGConnectingPoint num="13" id="9630" />
-<TGConnectingPoint num="14" id="9631" />
-<TGConnectingPoint num="15" id="9632" />
-<TGConnectingPoint num="16" id="9633" />
-<TGConnectingPoint num="17" id="9634" />
-<TGConnectingPoint num="18" id="9635" />
-<TGConnectingPoint num="19" id="9636" />
-<TGConnectingPoint num="20" id="9637" />
-<TGConnectingPoint num="21" id="9638" />
-<TGConnectingPoint num="22" id="9639" />
-<TGConnectingPoint num="23" id="9640" />
-<TGConnectingPoint num="24" id="9641" />
-<TGConnectingPoint num="25" id="9642" />
-<TGConnectingPoint num="26" id="9643" />
-<TGConnectingPoint num="27" id="9644" />
-<TGConnectingPoint num="28" id="9645" />
-<TGConnectingPoint num="29" id="9646" />
-<TGConnectingPoint num="30" id="9647" />
-<TGConnectingPoint num="31" id="9648" />
-<TGConnectingPoint num="32" id="9649" />
-<TGConnectingPoint num="33" id="9650" />
-<TGConnectingPoint num="34" id="9651" />
-<TGConnectingPoint num="35" id="9652" />
-<TGConnectingPoint num="36" id="9653" />
-<TGConnectingPoint num="37" id="9654" />
-<TGConnectingPoint num="38" id="9655" />
-<TGConnectingPoint num="39" id="9656" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="18984" >
+<TGConnectingPoint num="0" id="9430" />
+<TGConnectingPoint num="1" id="9431" />
+<TGConnectingPoint num="2" id="9432" />
+<TGConnectingPoint num="3" id="9433" />
+<TGConnectingPoint num="4" id="9434" />
+<TGConnectingPoint num="5" id="9435" />
+<TGConnectingPoint num="6" id="9436" />
+<TGConnectingPoint num="7" id="9437" />
+<TGConnectingPoint num="8" id="9438" />
+<TGConnectingPoint num="9" id="9439" />
+<TGConnectingPoint num="10" id="9440" />
+<TGConnectingPoint num="11" id="9441" />
+<TGConnectingPoint num="12" id="9442" />
+<TGConnectingPoint num="13" id="9443" />
+<TGConnectingPoint num="14" id="9444" />
+<TGConnectingPoint num="15" id="9445" />
+<TGConnectingPoint num="16" id="9446" />
+<TGConnectingPoint num="17" id="9447" />
+<TGConnectingPoint num="18" id="9448" />
+<TGConnectingPoint num="19" id="9449" />
+<TGConnectingPoint num="20" id="9450" />
+<TGConnectingPoint num="21" id="9451" />
+<TGConnectingPoint num="22" id="9452" />
+<TGConnectingPoint num="23" id="9453" />
+<TGConnectingPoint num="24" id="9454" />
+<TGConnectingPoint num="25" id="9455" />
+<TGConnectingPoint num="26" id="9456" />
+<TGConnectingPoint num="27" id="9457" />
+<TGConnectingPoint num="28" id="9458" />
+<TGConnectingPoint num="29" id="9459" />
+<TGConnectingPoint num="30" id="9460" />
+<TGConnectingPoint num="31" id="9461" />
+<TGConnectingPoint num="32" id="9462" />
+<TGConnectingPoint num="33" id="9463" />
+<TGConnectingPoint num="34" id="9464" />
+<TGConnectingPoint num="35" id="9465" />
+<TGConnectingPoint num="36" id="9466" />
+<TGConnectingPoint num="37" id="9467" />
+<TGConnectingPoint num="38" id="9468" />
+<TGConnectingPoint num="39" id="9469" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="9481" >
 <cdparam x="622" y="100" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="18974" />
-<TGConnectingPoint num="1" id="18975" />
-<TGConnectingPoint num="2" id="18976" />
-<TGConnectingPoint num="3" id="18977" />
-<TGConnectingPoint num="4" id="18978" />
-<TGConnectingPoint num="5" id="18979" />
-<TGConnectingPoint num="6" id="18980" />
-<TGConnectingPoint num="7" id="18981" />
-<TGConnectingPoint num="8" id="18982" />
-<TGConnectingPoint num="9" id="18983" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="9285" >
+<TGConnectingPoint num="0" id="9471" />
+<TGConnectingPoint num="1" id="9472" />
+<TGConnectingPoint num="2" id="9473" />
+<TGConnectingPoint num="3" id="9474" />
+<TGConnectingPoint num="4" id="9475" />
+<TGConnectingPoint num="5" id="9476" />
+<TGConnectingPoint num="6" id="9477" />
+<TGConnectingPoint num="7" id="9478" />
+<TGConnectingPoint num="8" id="9479" />
+<TGConnectingPoint num="9" id="9480" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="9492" >
 <cdparam x="631" y="385" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="unlockDoor()" />
-<TGConnectingPoint num="0" id="9275" />
-<TGConnectingPoint num="1" id="9276" />
-<TGConnectingPoint num="2" id="9277" />
-<TGConnectingPoint num="3" id="9278" />
-<TGConnectingPoint num="4" id="9279" />
-<TGConnectingPoint num="5" id="9280" />
-<TGConnectingPoint num="6" id="9281" />
-<TGConnectingPoint num="7" id="9282" />
-<TGConnectingPoint num="8" id="9283" />
-<TGConnectingPoint num="9" id="9284" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9698" >
+<TGConnectingPoint num="0" id="9482" />
+<TGConnectingPoint num="1" id="9483" />
+<TGConnectingPoint num="2" id="9484" />
+<TGConnectingPoint num="3" id="9485" />
+<TGConnectingPoint num="4" id="9486" />
+<TGConnectingPoint num="5" id="9487" />
+<TGConnectingPoint num="6" id="9488" />
+<TGConnectingPoint num="7" id="9489" />
+<TGConnectingPoint num="8" id="9490" />
+<TGConnectingPoint num="9" id="9491" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9533" >
 <cdparam x="251" y="271" />
 <sizeparam width="614" height="519" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="9658" />
-<TGConnectingPoint num="1" id="9659" />
-<TGConnectingPoint num="2" id="9660" />
-<TGConnectingPoint num="3" id="9661" />
-<TGConnectingPoint num="4" id="9662" />
-<TGConnectingPoint num="5" id="9663" />
-<TGConnectingPoint num="6" id="9664" />
-<TGConnectingPoint num="7" id="9665" />
-<TGConnectingPoint num="8" id="9666" />
-<TGConnectingPoint num="9" id="9667" />
-<TGConnectingPoint num="10" id="9668" />
-<TGConnectingPoint num="11" id="9669" />
-<TGConnectingPoint num="12" id="9670" />
-<TGConnectingPoint num="13" id="9671" />
-<TGConnectingPoint num="14" id="9672" />
-<TGConnectingPoint num="15" id="9673" />
-<TGConnectingPoint num="16" id="9674" />
-<TGConnectingPoint num="17" id="9675" />
-<TGConnectingPoint num="18" id="9676" />
-<TGConnectingPoint num="19" id="9677" />
-<TGConnectingPoint num="20" id="9678" />
-<TGConnectingPoint num="21" id="9679" />
-<TGConnectingPoint num="22" id="9680" />
-<TGConnectingPoint num="23" id="9681" />
-<TGConnectingPoint num="24" id="9682" />
-<TGConnectingPoint num="25" id="9683" />
-<TGConnectingPoint num="26" id="9684" />
-<TGConnectingPoint num="27" id="9685" />
-<TGConnectingPoint num="28" id="9686" />
-<TGConnectingPoint num="29" id="9687" />
-<TGConnectingPoint num="30" id="9688" />
-<TGConnectingPoint num="31" id="9689" />
-<TGConnectingPoint num="32" id="9690" />
-<TGConnectingPoint num="33" id="9691" />
-<TGConnectingPoint num="34" id="9692" />
-<TGConnectingPoint num="35" id="9693" />
-<TGConnectingPoint num="36" id="9694" />
-<TGConnectingPoint num="37" id="9695" />
-<TGConnectingPoint num="38" id="9696" />
-<TGConnectingPoint num="39" id="9697" />
+<TGConnectingPoint num="0" id="9493" />
+<TGConnectingPoint num="1" id="9494" />
+<TGConnectingPoint num="2" id="9495" />
+<TGConnectingPoint num="3" id="9496" />
+<TGConnectingPoint num="4" id="9497" />
+<TGConnectingPoint num="5" id="9498" />
+<TGConnectingPoint num="6" id="9499" />
+<TGConnectingPoint num="7" id="9500" />
+<TGConnectingPoint num="8" id="9501" />
+<TGConnectingPoint num="9" id="9502" />
+<TGConnectingPoint num="10" id="9503" />
+<TGConnectingPoint num="11" id="9504" />
+<TGConnectingPoint num="12" id="9505" />
+<TGConnectingPoint num="13" id="9506" />
+<TGConnectingPoint num="14" id="9507" />
+<TGConnectingPoint num="15" id="9508" />
+<TGConnectingPoint num="16" id="9509" />
+<TGConnectingPoint num="17" id="9510" />
+<TGConnectingPoint num="18" id="9511" />
+<TGConnectingPoint num="19" id="9512" />
+<TGConnectingPoint num="20" id="9513" />
+<TGConnectingPoint num="21" id="9514" />
+<TGConnectingPoint num="22" id="9515" />
+<TGConnectingPoint num="23" id="9516" />
+<TGConnectingPoint num="24" id="9517" />
+<TGConnectingPoint num="25" id="9518" />
+<TGConnectingPoint num="26" id="9519" />
+<TGConnectingPoint num="27" id="9520" />
+<TGConnectingPoint num="28" id="9521" />
+<TGConnectingPoint num="29" id="9522" />
+<TGConnectingPoint num="30" id="9523" />
+<TGConnectingPoint num="31" id="9524" />
+<TGConnectingPoint num="32" id="9525" />
+<TGConnectingPoint num="33" id="9526" />
+<TGConnectingPoint num="34" id="9527" />
+<TGConnectingPoint num="35" id="9528" />
+<TGConnectingPoint num="36" id="9529" />
+<TGConnectingPoint num="37" id="9530" />
+<TGConnectingPoint num="38" id="9531" />
+<TGConnectingPoint num="39" id="9532" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -21417,55 +21186,55 @@ or by a maintenance station
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="9711" >
+<CONNECTOR type="5102" id="9546" >
 <cdparam x="504" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9707" />
-<TGConnectingPoint num="1" id="9708" />
-<TGConnectingPoint num="2" id="9709" />
-<TGConnectingPoint num="3" id="9710" />
-<P1  x="504" y="232" id="9770" />
-<P2  x="454" y="123" id="9731" />
+<TGConnectingPoint num="0" id="9542" />
+<TGConnectingPoint num="1" id="9543" />
+<TGConnectingPoint num="2" id="9544" />
+<TGConnectingPoint num="3" id="9545" />
+<P1  x="504" y="232" id="9605" />
+<P2  x="454" y="123" id="9566" />
 <Point x="503" y="254" />
 <Point x="425" y="254" />
 <Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9699" >
-<father id="9711" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9534" >
+<father id="9546" num="0" />
 <cdparam x="503" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9700" >
-<father id="9711" num="1" />
+<SUBCOMPONENT type="-1" id="9535" >
+<father id="9546" num="1" />
 <cdparam x="425" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9701" >
-<father id="9711" num="2" />
+<SUBCOMPONENT type="-1" id="9536" >
+<father id="9546" num="2" />
 <cdparam x="426" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9706" >
-<father id="9711" num="3" />
+<SUBCOMPONENT type="-1" id="9541" >
+<father id="9546" num="3" />
 <cdparam x="465" y="275" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9702" />
-<TGConnectingPoint num="1" id="9703" />
-<TGConnectingPoint num="2" id="9704" />
-<TGConnectingPoint num="3" id="9705" />
+<TGConnectingPoint num="0" id="9537" />
+<TGConnectingPoint num="1" id="9538" />
+<TGConnectingPoint num="2" id="9539" />
+<TGConnectingPoint num="3" id="9540" />
 <extraparam>
 <guard value="[  ]" />
 <afterMin value="" />
@@ -21475,35 +21244,35 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9720" >
+<CONNECTOR type="5102" id="9555" >
 <cdparam x="504" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9718" />
-<TGConnectingPoint num="1" id="9719" />
-<P1  x="504" y="148" id="9734" />
-<P2  x="504" y="202" id="9769" />
+<TGConnectingPoint num="0" id="9553" />
+<TGConnectingPoint num="1" id="9554" />
+<P1  x="504" y="148" id="9569" />
+<P2  x="504" y="202" id="9604" />
 <Point x="504" y="175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9712" >
-<father id="9720" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9547" >
+<father id="9555" num="0" />
 <cdparam x="504" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9717" >
-<father id="9720" num="1" />
+<SUBCOMPONENT type="-1" id="9552" >
+<father id="9555" num="1" />
 <cdparam x="504" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9713" />
-<TGConnectingPoint num="1" id="9714" />
-<TGConnectingPoint num="2" id="9715" />
-<TGConnectingPoint num="3" id="9716" />
+<TGConnectingPoint num="0" id="9548" />
+<TGConnectingPoint num="1" id="9549" />
+<TGConnectingPoint num="2" id="9550" />
+<TGConnectingPoint num="3" id="9551" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21513,25 +21282,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9727" >
+<CONNECTOR type="5102" id="9562" >
 <cdparam x="385" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="9726" />
-<P1  x="481" y="74" id="9780" />
-<P2  x="504" y="98" id="9729" />
+<TGConnectingPoint num="0" id="9561" />
+<P1  x="481" y="74" id="9615" />
+<P2  x="504" y="98" id="9564" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9725" >
-<father id="9727" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9560" >
+<father id="9562" num="0" />
 <cdparam x="385" y="115" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9721" />
-<TGConnectingPoint num="1" id="9722" />
-<TGConnectingPoint num="2" id="9723" />
-<TGConnectingPoint num="3" id="9724" />
+<TGConnectingPoint num="0" id="9556" />
+<TGConnectingPoint num="1" id="9557" />
+<TGConnectingPoint num="2" id="9558" />
+<TGConnectingPoint num="3" id="9559" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21541,106 +21310,106 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="9768" >
+<COMPONENT type="5106" id="9603" >
 <cdparam x="454" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="9728" />
-<TGConnectingPoint num="1" id="9729" />
-<TGConnectingPoint num="2" id="9730" />
-<TGConnectingPoint num="3" id="9731" />
-<TGConnectingPoint num="4" id="9732" />
-<TGConnectingPoint num="5" id="9733" />
-<TGConnectingPoint num="6" id="9734" />
-<TGConnectingPoint num="7" id="9735" />
-<TGConnectingPoint num="8" id="9736" />
-<TGConnectingPoint num="9" id="9737" />
-<TGConnectingPoint num="10" id="9738" />
-<TGConnectingPoint num="11" id="9739" />
-<TGConnectingPoint num="12" id="9740" />
-<TGConnectingPoint num="13" id="9741" />
-<TGConnectingPoint num="14" id="9742" />
-<TGConnectingPoint num="15" id="9743" />
-<TGConnectingPoint num="16" id="9744" />
-<TGConnectingPoint num="17" id="9745" />
-<TGConnectingPoint num="18" id="9746" />
-<TGConnectingPoint num="19" id="9747" />
-<TGConnectingPoint num="20" id="9748" />
-<TGConnectingPoint num="21" id="9749" />
-<TGConnectingPoint num="22" id="9750" />
-<TGConnectingPoint num="23" id="9751" />
-<TGConnectingPoint num="24" id="9752" />
-<TGConnectingPoint num="25" id="9753" />
-<TGConnectingPoint num="26" id="9754" />
-<TGConnectingPoint num="27" id="9755" />
-<TGConnectingPoint num="28" id="9756" />
-<TGConnectingPoint num="29" id="9757" />
-<TGConnectingPoint num="30" id="9758" />
-<TGConnectingPoint num="31" id="9759" />
-<TGConnectingPoint num="32" id="9760" />
-<TGConnectingPoint num="33" id="9761" />
-<TGConnectingPoint num="34" id="9762" />
-<TGConnectingPoint num="35" id="9763" />
-<TGConnectingPoint num="36" id="9764" />
-<TGConnectingPoint num="37" id="9765" />
-<TGConnectingPoint num="38" id="9766" />
-<TGConnectingPoint num="39" id="9767" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="9779" >
+<TGConnectingPoint num="0" id="9563" />
+<TGConnectingPoint num="1" id="9564" />
+<TGConnectingPoint num="2" id="9565" />
+<TGConnectingPoint num="3" id="9566" />
+<TGConnectingPoint num="4" id="9567" />
+<TGConnectingPoint num="5" id="9568" />
+<TGConnectingPoint num="6" id="9569" />
+<TGConnectingPoint num="7" id="9570" />
+<TGConnectingPoint num="8" id="9571" />
+<TGConnectingPoint num="9" id="9572" />
+<TGConnectingPoint num="10" id="9573" />
+<TGConnectingPoint num="11" id="9574" />
+<TGConnectingPoint num="12" id="9575" />
+<TGConnectingPoint num="13" id="9576" />
+<TGConnectingPoint num="14" id="9577" />
+<TGConnectingPoint num="15" id="9578" />
+<TGConnectingPoint num="16" id="9579" />
+<TGConnectingPoint num="17" id="9580" />
+<TGConnectingPoint num="18" id="9581" />
+<TGConnectingPoint num="19" id="9582" />
+<TGConnectingPoint num="20" id="9583" />
+<TGConnectingPoint num="21" id="9584" />
+<TGConnectingPoint num="22" id="9585" />
+<TGConnectingPoint num="23" id="9586" />
+<TGConnectingPoint num="24" id="9587" />
+<TGConnectingPoint num="25" id="9588" />
+<TGConnectingPoint num="26" id="9589" />
+<TGConnectingPoint num="27" id="9590" />
+<TGConnectingPoint num="28" id="9591" />
+<TGConnectingPoint num="29" id="9592" />
+<TGConnectingPoint num="30" id="9593" />
+<TGConnectingPoint num="31" id="9594" />
+<TGConnectingPoint num="32" id="9595" />
+<TGConnectingPoint num="33" id="9596" />
+<TGConnectingPoint num="34" id="9597" />
+<TGConnectingPoint num="35" id="9598" />
+<TGConnectingPoint num="36" id="9599" />
+<TGConnectingPoint num="37" id="9600" />
+<TGConnectingPoint num="38" id="9601" />
+<TGConnectingPoint num="39" id="9602" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="9614" >
 <cdparam x="440" y="207" />
 <sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="9769" />
-<TGConnectingPoint num="1" id="9770" />
-<TGConnectingPoint num="2" id="9771" />
-<TGConnectingPoint num="3" id="9772" />
-<TGConnectingPoint num="4" id="9773" />
-<TGConnectingPoint num="5" id="9774" />
-<TGConnectingPoint num="6" id="9775" />
-<TGConnectingPoint num="7" id="9776" />
-<TGConnectingPoint num="8" id="9777" />
-<TGConnectingPoint num="9" id="9778" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="9781" >
+<TGConnectingPoint num="0" id="9604" />
+<TGConnectingPoint num="1" id="9605" />
+<TGConnectingPoint num="2" id="9606" />
+<TGConnectingPoint num="3" id="9607" />
+<TGConnectingPoint num="4" id="9608" />
+<TGConnectingPoint num="5" id="9609" />
+<TGConnectingPoint num="6" id="9610" />
+<TGConnectingPoint num="7" id="9611" />
+<TGConnectingPoint num="8" id="9612" />
+<TGConnectingPoint num="9" id="9613" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="9616" >
 <cdparam x="474" y="54" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="9780" />
+<TGConnectingPoint num="0" id="9615" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="9788" >
+<CONNECTOR type="5102" id="9623" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9787" />
-<P1  x="419" y="209" id="9858" />
-<P2  x="419" y="313" id="9817" />
+<TGConnectingPoint num="0" id="9622" />
+<P1  x="419" y="209" id="9693" />
+<P2  x="419" y="313" id="9652" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9786" >
-<father id="9788" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9621" >
+<father id="9623" num="0" />
 <cdparam x="429" y="249" />
 <sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9782" />
-<TGConnectingPoint num="1" id="9783" />
-<TGConnectingPoint num="2" id="9784" />
-<TGConnectingPoint num="3" id="9785" />
+<TGConnectingPoint num="0" id="9617" />
+<TGConnectingPoint num="1" id="9618" />
+<TGConnectingPoint num="2" id="9619" />
+<TGConnectingPoint num="3" id="9620" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21651,55 +21420,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9801" >
+<CONNECTOR type="5102" id="9636" >
 <cdparam x="419" y="209" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="9797" />
-<TGConnectingPoint num="1" id="9798" />
-<TGConnectingPoint num="2" id="9799" />
-<TGConnectingPoint num="3" id="9800" />
-<P1  x="419" y="363" id="9822" />
-<P2  x="369" y="123" id="9871" />
+<TGConnectingPoint num="0" id="9632" />
+<TGConnectingPoint num="1" id="9633" />
+<TGConnectingPoint num="2" id="9634" />
+<TGConnectingPoint num="3" id="9635" />
+<P1  x="419" y="363" id="9657" />
+<P2  x="369" y="123" id="9706" />
 <Point x="412" y="419" />
 <Point x="332" y="419" />
 <Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9789" >
-<father id="9801" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9624" >
+<father id="9636" num="0" />
 <cdparam x="412" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9790" >
-<father id="9801" num="1" />
+<SUBCOMPONENT type="-1" id="9625" >
+<father id="9636" num="1" />
 <cdparam x="332" y="419" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9791" >
-<father id="9801" num="2" />
+<SUBCOMPONENT type="-1" id="9626" >
+<father id="9636" num="2" />
 <cdparam x="332" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="9796" >
-<father id="9801" num="3" />
+<SUBCOMPONENT type="-1" id="9631" >
+<father id="9636" num="3" />
 <cdparam x="430" y="402" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9792" />
-<TGConnectingPoint num="1" id="9793" />
-<TGConnectingPoint num="2" id="9794" />
-<TGConnectingPoint num="3" id="9795" />
+<TGConnectingPoint num="0" id="9627" />
+<TGConnectingPoint num="1" id="9628" />
+<TGConnectingPoint num="2" id="9629" />
+<TGConnectingPoint num="3" id="9630" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21709,25 +21478,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9808" >
+<CONNECTOR type="5102" id="9643" >
 <cdparam x="420" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="9807" />
-<P1  x="419" y="148" id="9874" />
-<P2  x="419" y="179" id="9857" />
+<TGConnectingPoint num="0" id="9642" />
+<P1  x="419" y="148" id="9709" />
+<P2  x="419" y="179" id="9692" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9806" >
-<father id="9808" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9641" >
+<father id="9643" num="0" />
 <cdparam x="420" y="191" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9802" />
-<TGConnectingPoint num="1" id="9803" />
-<TGConnectingPoint num="2" id="9804" />
-<TGConnectingPoint num="3" id="9805" />
+<TGConnectingPoint num="0" id="9637" />
+<TGConnectingPoint num="1" id="9638" />
+<TGConnectingPoint num="2" id="9639" />
+<TGConnectingPoint num="3" id="9640" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21737,25 +21506,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="9815" >
+<CONNECTOR type="5102" id="9650" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="9814" />
-<P1  x="407" y="70" id="9909" />
-<P2  x="419" y="98" id="9869" />
+<TGConnectingPoint num="0" id="9649" />
+<P1  x="407" y="70" id="9744" />
+<P2  x="419" y="98" id="9704" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9813" >
-<father id="9815" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="9648" >
+<father id="9650" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="9809" />
-<TGConnectingPoint num="1" id="9810" />
-<TGConnectingPoint num="2" id="9811" />
-<TGConnectingPoint num="3" id="9812" />
+<TGConnectingPoint num="0" id="9644" />
+<TGConnectingPoint num="1" id="9645" />
+<TGConnectingPoint num="2" id="9646" />
+<TGConnectingPoint num="3" id="9647" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -21765,133 +21534,133 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="9856" >
+<COMPONENT type="5106" id="9691" >
 <cdparam x="369" y="313" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Ringing" />
-<TGConnectingPoint num="0" id="9816" />
-<TGConnectingPoint num="1" id="9817" />
-<TGConnectingPoint num="2" id="9818" />
-<TGConnectingPoint num="3" id="9819" />
-<TGConnectingPoint num="4" id="9820" />
-<TGConnectingPoint num="5" id="9821" />
-<TGConnectingPoint num="6" id="9822" />
-<TGConnectingPoint num="7" id="9823" />
-<TGConnectingPoint num="8" id="9824" />
-<TGConnectingPoint num="9" id="9825" />
-<TGConnectingPoint num="10" id="9826" />
-<TGConnectingPoint num="11" id="9827" />
-<TGConnectingPoint num="12" id="9828" />
-<TGConnectingPoint num="13" id="9829" />
-<TGConnectingPoint num="14" id="9830" />
-<TGConnectingPoint num="15" id="9831" />
-<TGConnectingPoint num="16" id="9832" />
-<TGConnectingPoint num="17" id="9833" />
-<TGConnectingPoint num="18" id="9834" />
-<TGConnectingPoint num="19" id="9835" />
-<TGConnectingPoint num="20" id="9836" />
-<TGConnectingPoint num="21" id="9837" />
-<TGConnectingPoint num="22" id="9838" />
-<TGConnectingPoint num="23" id="9839" />
-<TGConnectingPoint num="24" id="9840" />
-<TGConnectingPoint num="25" id="9841" />
-<TGConnectingPoint num="26" id="9842" />
-<TGConnectingPoint num="27" id="9843" />
-<TGConnectingPoint num="28" id="9844" />
-<TGConnectingPoint num="29" id="9845" />
-<TGConnectingPoint num="30" id="9846" />
-<TGConnectingPoint num="31" id="9847" />
-<TGConnectingPoint num="32" id="9848" />
-<TGConnectingPoint num="33" id="9849" />
-<TGConnectingPoint num="34" id="9850" />
-<TGConnectingPoint num="35" id="9851" />
-<TGConnectingPoint num="36" id="9852" />
-<TGConnectingPoint num="37" id="9853" />
-<TGConnectingPoint num="38" id="9854" />
-<TGConnectingPoint num="39" id="9855" />
+<TGConnectingPoint num="0" id="9651" />
+<TGConnectingPoint num="1" id="9652" />
+<TGConnectingPoint num="2" id="9653" />
+<TGConnectingPoint num="3" id="9654" />
+<TGConnectingPoint num="4" id="9655" />
+<TGConnectingPoint num="5" id="9656" />
+<TGConnectingPoint num="6" id="9657" />
+<TGConnectingPoint num="7" id="9658" />
+<TGConnectingPoint num="8" id="9659" />
+<TGConnectingPoint num="9" id="9660" />
+<TGConnectingPoint num="10" id="9661" />
+<TGConnectingPoint num="11" id="9662" />
+<TGConnectingPoint num="12" id="9663" />
+<TGConnectingPoint num="13" id="9664" />
+<TGConnectingPoint num="14" id="9665" />
+<TGConnectingPoint num="15" id="9666" />
+<TGConnectingPoint num="16" id="9667" />
+<TGConnectingPoint num="17" id="9668" />
+<TGConnectingPoint num="18" id="9669" />
+<TGConnectingPoint num="19" id="9670" />
+<TGConnectingPoint num="20" id="9671" />
+<TGConnectingPoint num="21" id="9672" />
+<TGConnectingPoint num="22" id="9673" />
+<TGConnectingPoint num="23" id="9674" />
+<TGConnectingPoint num="24" id="9675" />
+<TGConnectingPoint num="25" id="9676" />
+<TGConnectingPoint num="26" id="9677" />
+<TGConnectingPoint num="27" id="9678" />
+<TGConnectingPoint num="28" id="9679" />
+<TGConnectingPoint num="29" id="9680" />
+<TGConnectingPoint num="30" id="9681" />
+<TGConnectingPoint num="31" id="9682" />
+<TGConnectingPoint num="32" id="9683" />
+<TGConnectingPoint num="33" id="9684" />
+<TGConnectingPoint num="34" id="9685" />
+<TGConnectingPoint num="35" id="9686" />
+<TGConnectingPoint num="36" id="9687" />
+<TGConnectingPoint num="37" id="9688" />
+<TGConnectingPoint num="38" id="9689" />
+<TGConnectingPoint num="39" id="9690" />
 <extraparam>
 <entryCode value="" />
 <entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="9867" >
+<COMPONENT type="5104" id="9702" >
 <cdparam x="395" y="184" />
 <sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="ring()" />
-<TGConnectingPoint num="0" id="9857" />
-<TGConnectingPoint num="1" id="9858" />
-<TGConnectingPoint num="2" id="9859" />
-<TGConnectingPoint num="3" id="9860" />
-<TGConnectingPoint num="4" id="9861" />
-<TGConnectingPoint num="5" id="9862" />
-<TGConnectingPoint num="6" id="9863" />
-<TGConnectingPoint num="7" id="9864" />
-<TGConnectingPoint num="8" id="9865" />
-<TGConnectingPoint num="9" id="9866" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="9908" >
+<TGConnectingPoint num="0" id="9692" />
+<TGConnectingPoint num="1" id="9693" />
+<TGConnectingPoint num="2" id="9694" />
+<TGConnectingPoint num="3" id="9695" />
+<TGConnectingPoint num="4" id="9696" />
+<TGConnectingPoint num="5" id="9697" />
+<TGConnectingPoint num="6" id="9698" />
+<TGConnectingPoint num="7" id="9699" />
+<TGConnectingPoint num="8" id="9700" />
+<TGConnectingPoint num="9" id="9701" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="9743" >
 <cdparam x="369" y="98" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="9868" />
-<TGConnectingPoint num="1" id="9869" />
-<TGConnectingPoint num="2" id="9870" />
-<TGConnectingPoint num="3" id="9871" />
-<TGConnectingPoint num="4" id="9872" />
-<TGConnectingPoint num="5" id="9873" />
-<TGConnectingPoint num="6" id="9874" />
-<TGConnectingPoint num="7" id="9875" />
-<TGConnectingPoint num="8" id="9876" />
-<TGConnectingPoint num="9" id="9877" />
-<TGConnectingPoint num="10" id="9878" />
-<TGConnectingPoint num="11" id="9879" />
-<TGConnectingPoint num="12" id="9880" />
-<TGConnectingPoint num="13" id="9881" />
-<TGConnectingPoint num="14" id="9882" />
-<TGConnectingPoint num="15" id="9883" />
-<TGConnectingPoint num="16" id="9884" />
-<TGConnectingPoint num="17" id="9885" />
-<TGConnectingPoint num="18" id="9886" />
-<TGConnectingPoint num="19" id="9887" />
-<TGConnectingPoint num="20" id="9888" />
-<TGConnectingPoint num="21" id="9889" />
-<TGConnectingPoint num="22" id="9890" />
-<TGConnectingPoint num="23" id="9891" />
-<TGConnectingPoint num="24" id="9892" />
-<TGConnectingPoint num="25" id="9893" />
-<TGConnectingPoint num="26" id="9894" />
-<TGConnectingPoint num="27" id="9895" />
-<TGConnectingPoint num="28" id="9896" />
-<TGConnectingPoint num="29" id="9897" />
-<TGConnectingPoint num="30" id="9898" />
-<TGConnectingPoint num="31" id="9899" />
-<TGConnectingPoint num="32" id="9900" />
-<TGConnectingPoint num="33" id="9901" />
-<TGConnectingPoint num="34" id="9902" />
-<TGConnectingPoint num="35" id="9903" />
-<TGConnectingPoint num="36" id="9904" />
-<TGConnectingPoint num="37" id="9905" />
-<TGConnectingPoint num="38" id="9906" />
-<TGConnectingPoint num="39" id="9907" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="9910" >
+<TGConnectingPoint num="0" id="9703" />
+<TGConnectingPoint num="1" id="9704" />
+<TGConnectingPoint num="2" id="9705" />
+<TGConnectingPoint num="3" id="9706" />
+<TGConnectingPoint num="4" id="9707" />
+<TGConnectingPoint num="5" id="9708" />
+<TGConnectingPoint num="6" id="9709" />
+<TGConnectingPoint num="7" id="9710" />
+<TGConnectingPoint num="8" id="9711" />
+<TGConnectingPoint num="9" id="9712" />
+<TGConnectingPoint num="10" id="9713" />
+<TGConnectingPoint num="11" id="9714" />
+<TGConnectingPoint num="12" id="9715" />
+<TGConnectingPoint num="13" id="9716" />
+<TGConnectingPoint num="14" id="9717" />
+<TGConnectingPoint num="15" id="9718" />
+<TGConnectingPoint num="16" id="9719" />
+<TGConnectingPoint num="17" id="9720" />
+<TGConnectingPoint num="18" id="9721" />
+<TGConnectingPoint num="19" id="9722" />
+<TGConnectingPoint num="20" id="9723" />
+<TGConnectingPoint num="21" id="9724" />
+<TGConnectingPoint num="22" id="9725" />
+<TGConnectingPoint num="23" id="9726" />
+<TGConnectingPoint num="24" id="9727" />
+<TGConnectingPoint num="25" id="9728" />
+<TGConnectingPoint num="26" id="9729" />
+<TGConnectingPoint num="27" id="9730" />
+<TGConnectingPoint num="28" id="9731" />
+<TGConnectingPoint num="29" id="9732" />
+<TGConnectingPoint num="30" id="9733" />
+<TGConnectingPoint num="31" id="9734" />
+<TGConnectingPoint num="32" id="9735" />
+<TGConnectingPoint num="33" id="9736" />
+<TGConnectingPoint num="34" id="9737" />
+<TGConnectingPoint num="35" id="9738" />
+<TGConnectingPoint num="36" id="9739" />
+<TGConnectingPoint num="37" id="9740" />
+<TGConnectingPoint num="38" id="9741" />
+<TGConnectingPoint num="39" id="9742" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="9745" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="9909" />
+<TGConnectingPoint num="0" id="9744" />
 </COMPONENT>
 
 
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index a8a26d8179928ba9879710e453051bddf6e031f9..d73437813e6e297e343b0af8ee46ebb922dec54d 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.99-beta1">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="TML Component Design" nameTab="AppC" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="1724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" >
@@ -16,16 +16,16 @@
 <cdparam x="652" y="444" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="554" id="178" />
-<P2  x="971" y="502" id="106" />
+<P1  x="805" y="544" id="178" />
+<P2  x="971" y="481" id="106" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="3" >
 <cdparam x="652" y="418" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="522" id="180" />
-<P2  x="922" y="482" id="104" />
+<P1  x="805" y="512" id="180" />
+<P2  x="932" y="472" id="104" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="4" >
@@ -33,134 +33,134 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
 <P1  x="752" y="408" id="188" />
-<P2  x="831" y="376" id="149" />
+<P2  x="844" y="363" id="149" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="5" >
 <cdparam x="685" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="857" y="376" id="153" />
-<P2  x="922" y="368" id="114" />
+<P1  x="844" y="389" id="153" />
+<P2  x="932" y="358" id="114" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6" >
 <cdparam x="652" y="395" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="493" id="184" />
-<P2  x="922" y="459" id="112" />
+<P1  x="805" y="483" id="184" />
+<P2  x="932" y="449" id="112" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="7" >
 <cdparam x="652" y="369" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="461" id="182" />
-<P2  x="922" y="432" id="110" />
+<P1  x="805" y="451" id="182" />
+<P2  x="932" y="422" id="110" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="8" >
 <cdparam x="737" y="314" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="922" y="403" id="108" />
-<P2  x="816" y="432" id="186" />
+<P1  x="932" y="393" id="108" />
+<P2  x="805" y="422" id="186" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="9" >
 <cdparam x="735" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="919" y="336" id="116" />
-<P2  x="749" y="284" id="69" />
+<P1  x="932" y="323" id="116" />
+<P2  x="736" y="271" id="69" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="10" >
 <cdparam x="641" y="230" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="749" y="248" id="67" />
-<P2  x="919" y="297" id="118" />
+<P1  x="736" y="235" id="67" />
+<P2  x="932" y="284" id="118" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="11" >
 <cdparam x="641" y="195" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="749" y="204" id="65" />
-<P2  x="919" y="254" id="120" />
+<P1  x="736" y="191" id="65" />
+<P2  x="932" y="241" id="120" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="12" >
 <cdparam x="740" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="831" y="376" id="148" />
-<P2  x="749" y="315" id="63" />
+<P1  x="844" y="363" id="148" />
+<P2  x="736" y="302" id="63" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="13" >
 <cdparam x="460" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="522" y="304" id="73" />
-<P2  x="468" y="304" id="40" />
+<P1  x="535" y="291" id="73" />
+<P2  x="455" y="291" id="40" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="14" >
 <cdparam x="387" y="129" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="466" y="127" id="36" />
-<P2  x="525" y="127" id="61" />
+<P1  x="455" y="117" id="36" />
+<P2  x="535" y="117" id="61" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="15" >
 <cdparam x="389" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="468" y="216" id="42" />
-<P2  x="522" y="216" id="75" />
+<P1  x="455" y="203" id="42" />
+<P2  x="535" y="203" id="75" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="16" >
 <cdparam x="460" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="522" y="261" id="77" />
-<P2  x="468" y="261" id="44" />
+<P1  x="535" y="248" id="77" />
+<P2  x="455" y="248" id="44" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="17" >
 <cdparam x="460" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="536" y="349" id="79" />
-<P2  x="468" y="336" id="46" />
+<P1  x="536" y="323" id="79" />
+<P2  x="455" y="323" id="46" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="18" >
 <cdparam x="389" y="163" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="468" y="170" id="38" />
-<P2  x="522" y="170" id="71" />
+<P1  x="455" y="157" id="38" />
+<P2  x="535" y="157" id="71" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="19" >
 <cdparam x="967" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="919" y="204" id="122" />
-<P2  x="749" y="125" id="83" />
+<P1  x="932" y="191" id="122" />
+<P2  x="736" y="112" id="83" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="20" >
 <cdparam x="1028" y="535" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="630" y="347" id="59" />
+<P1  x="630" y="326" id="59" />
 <P2  x="671" y="408" id="176" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -168,24 +168,24 @@
 <cdparam x="1304" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1224" y="379" id="137" />
-<P2  x="1180" y="386" id="102" />
+<P1  x="1234" y="369" id="137" />
+<P2  x="1169" y="376" id="102" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="22" >
 <cdparam x="1168" y="455" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1180" y="421" id="100" />
-<P2  x="1224" y="414" id="135" />
+<P1  x="1169" y="411" id="100" />
+<P2  x="1234" y="404" id="135" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="25" >
 <cdparam x="1037" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1180" y="214" id="98" />
-<P2  x="1180" y="282" id="96" />
+<P1  x="1169" y="204" id="98" />
+<P2  x="1169" y="272" id="96" />
 <Point x="1224" y="226" />
 <Point x="1224" y="266" />
 <AutomaticDrawing  data="true" />
@@ -210,8 +210,8 @@
 <cdparam x="873" y="361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1180" y="461" id="94" />
-<P2  x="1224" y="442" id="133" />
+<P1  x="1169" y="451" id="94" />
+<P2  x="1234" y="432" id="133" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1205" id="35" >
@@ -6251,323 +6251,323 @@ the smart card and the terminal
 
 <Modeling type="TML Architecture" nameTab="Mapping2" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1457" >
+<COMPONENT type="1105" id="1495" >
 <cdparam x="420" y="527" />
 <sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1433" />
-<TGConnectingPoint num="1" id="1434" />
-<TGConnectingPoint num="2" id="1435" />
-<TGConnectingPoint num="3" id="1436" />
-<TGConnectingPoint num="4" id="1437" />
-<TGConnectingPoint num="5" id="1438" />
-<TGConnectingPoint num="6" id="1439" />
-<TGConnectingPoint num="7" id="1440" />
-<TGConnectingPoint num="8" id="1441" />
-<TGConnectingPoint num="9" id="1442" />
-<TGConnectingPoint num="10" id="1443" />
-<TGConnectingPoint num="11" id="1444" />
-<TGConnectingPoint num="12" id="1445" />
-<TGConnectingPoint num="13" id="1446" />
-<TGConnectingPoint num="14" id="1447" />
-<TGConnectingPoint num="15" id="1448" />
-<TGConnectingPoint num="16" id="1449" />
-<TGConnectingPoint num="17" id="1450" />
-<TGConnectingPoint num="18" id="1451" />
-<TGConnectingPoint num="19" id="1452" />
-<TGConnectingPoint num="20" id="1453" />
-<TGConnectingPoint num="21" id="1454" />
-<TGConnectingPoint num="22" id="1455" />
-<TGConnectingPoint num="23" id="1456" />
+<TGConnectingPoint num="0" id="1471" />
+<TGConnectingPoint num="1" id="1472" />
+<TGConnectingPoint num="2" id="1473" />
+<TGConnectingPoint num="3" id="1474" />
+<TGConnectingPoint num="4" id="1475" />
+<TGConnectingPoint num="5" id="1476" />
+<TGConnectingPoint num="6" id="1477" />
+<TGConnectingPoint num="7" id="1478" />
+<TGConnectingPoint num="8" id="1479" />
+<TGConnectingPoint num="9" id="1480" />
+<TGConnectingPoint num="10" id="1481" />
+<TGConnectingPoint num="11" id="1482" />
+<TGConnectingPoint num="12" id="1483" />
+<TGConnectingPoint num="13" id="1484" />
+<TGConnectingPoint num="14" id="1485" />
+<TGConnectingPoint num="15" id="1486" />
+<TGConnectingPoint num="16" id="1487" />
+<TGConnectingPoint num="17" id="1488" />
+<TGConnectingPoint num="18" id="1489" />
+<TGConnectingPoint num="19" id="1490" />
+<TGConnectingPoint num="20" id="1491" />
+<TGConnectingPoint num="21" id="1492" />
+<TGConnectingPoint num="22" id="1493" />
+<TGConnectingPoint num="23" id="1494" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="1482" >
+<COMPONENT type="1102" id="1520" >
 <cdparam x="389" y="438" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1458" />
-<TGConnectingPoint num="1" id="1459" />
-<TGConnectingPoint num="2" id="1460" />
-<TGConnectingPoint num="3" id="1461" />
-<TGConnectingPoint num="4" id="1462" />
-<TGConnectingPoint num="5" id="1463" />
-<TGConnectingPoint num="6" id="1464" />
-<TGConnectingPoint num="7" id="1465" />
-<TGConnectingPoint num="8" id="1466" />
-<TGConnectingPoint num="9" id="1467" />
-<TGConnectingPoint num="10" id="1468" />
-<TGConnectingPoint num="11" id="1469" />
-<TGConnectingPoint num="12" id="1470" />
-<TGConnectingPoint num="13" id="1471" />
-<TGConnectingPoint num="14" id="1472" />
-<TGConnectingPoint num="15" id="1473" />
-<TGConnectingPoint num="16" id="1474" />
-<TGConnectingPoint num="17" id="1475" />
-<TGConnectingPoint num="18" id="1476" />
-<TGConnectingPoint num="19" id="1477" />
-<TGConnectingPoint num="20" id="1478" />
-<TGConnectingPoint num="21" id="1479" />
-<TGConnectingPoint num="22" id="1480" />
-<TGConnectingPoint num="23" id="1481" />
+<TGConnectingPoint num="0" id="1496" />
+<TGConnectingPoint num="1" id="1497" />
+<TGConnectingPoint num="2" id="1498" />
+<TGConnectingPoint num="3" id="1499" />
+<TGConnectingPoint num="4" id="1500" />
+<TGConnectingPoint num="5" id="1501" />
+<TGConnectingPoint num="6" id="1502" />
+<TGConnectingPoint num="7" id="1503" />
+<TGConnectingPoint num="8" id="1504" />
+<TGConnectingPoint num="9" id="1505" />
+<TGConnectingPoint num="10" id="1506" />
+<TGConnectingPoint num="11" id="1507" />
+<TGConnectingPoint num="12" id="1508" />
+<TGConnectingPoint num="13" id="1509" />
+<TGConnectingPoint num="14" id="1510" />
+<TGConnectingPoint num="15" id="1511" />
+<TGConnectingPoint num="16" id="1512" />
+<TGConnectingPoint num="17" id="1513" />
+<TGConnectingPoint num="18" id="1514" />
+<TGConnectingPoint num="19" id="1515" />
+<TGConnectingPoint num="20" id="1516" />
+<TGConnectingPoint num="21" id="1517" />
+<TGConnectingPoint num="22" id="1518" />
+<TGConnectingPoint num="23" id="1519" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus0" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="5"  privacy="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="1516" >
+<COMPONENT type="1100" id="1554" >
 <cdparam x="685" y="396" />
 <sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1492" />
-<TGConnectingPoint num="1" id="1493" />
-<TGConnectingPoint num="2" id="1494" />
-<TGConnectingPoint num="3" id="1495" />
-<TGConnectingPoint num="4" id="1496" />
-<TGConnectingPoint num="5" id="1497" />
-<TGConnectingPoint num="6" id="1498" />
-<TGConnectingPoint num="7" id="1499" />
-<TGConnectingPoint num="8" id="1500" />
-<TGConnectingPoint num="9" id="1501" />
-<TGConnectingPoint num="10" id="1502" />
-<TGConnectingPoint num="11" id="1503" />
-<TGConnectingPoint num="12" id="1504" />
-<TGConnectingPoint num="13" id="1505" />
-<TGConnectingPoint num="14" id="1506" />
-<TGConnectingPoint num="15" id="1507" />
-<TGConnectingPoint num="16" id="1508" />
-<TGConnectingPoint num="17" id="1509" />
-<TGConnectingPoint num="18" id="1510" />
-<TGConnectingPoint num="19" id="1511" />
-<TGConnectingPoint num="20" id="1512" />
-<TGConnectingPoint num="21" id="1513" />
-<TGConnectingPoint num="22" id="1514" />
-<TGConnectingPoint num="23" id="1515" />
+<TGConnectingPoint num="0" id="1530" />
+<TGConnectingPoint num="1" id="1531" />
+<TGConnectingPoint num="2" id="1532" />
+<TGConnectingPoint num="3" id="1533" />
+<TGConnectingPoint num="4" id="1534" />
+<TGConnectingPoint num="5" id="1535" />
+<TGConnectingPoint num="6" id="1536" />
+<TGConnectingPoint num="7" id="1537" />
+<TGConnectingPoint num="8" id="1538" />
+<TGConnectingPoint num="9" id="1539" />
+<TGConnectingPoint num="10" id="1540" />
+<TGConnectingPoint num="11" id="1541" />
+<TGConnectingPoint num="12" id="1542" />
+<TGConnectingPoint num="13" id="1543" />
+<TGConnectingPoint num="14" id="1544" />
+<TGConnectingPoint num="15" id="1545" />
+<TGConnectingPoint num="16" id="1546" />
+<TGConnectingPoint num="17" id="1547" />
+<TGConnectingPoint num="18" id="1548" />
+<TGConnectingPoint num="19" id="1549" />
+<TGConnectingPoint num="20" id="1550" />
+<TGConnectingPoint num="21" id="1551" />
+<TGConnectingPoint num="22" id="1552" />
+<TGConnectingPoint num="23" id="1553" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU2" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1491" >
-<father id="1516" num="0" />
+<SUBCOMPONENT type="1101" id="1529" >
+<father id="1554" num="0" />
 <cdparam x="715" y="448" />
 <sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
 <infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1483" />
-<TGConnectingPoint num="1" id="1484" />
-<TGConnectingPoint num="2" id="1485" />
-<TGConnectingPoint num="3" id="1486" />
-<TGConnectingPoint num="4" id="1487" />
-<TGConnectingPoint num="5" id="1488" />
-<TGConnectingPoint num="6" id="1489" />
-<TGConnectingPoint num="7" id="1490" />
+<TGConnectingPoint num="0" id="1521" />
+<TGConnectingPoint num="1" id="1522" />
+<TGConnectingPoint num="2" id="1523" />
+<TGConnectingPoint num="3" id="1524" />
+<TGConnectingPoint num="4" id="1525" />
+<TGConnectingPoint num="5" id="1526" />
+<TGConnectingPoint num="6" id="1527" />
+<TGConnectingPoint num="7" id="1528" />
 <extraparam>
 <info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1550" >
+<COMPONENT type="1100" id="1588" >
 <cdparam x="167" y="400" />
 <sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1526" />
-<TGConnectingPoint num="1" id="1527" />
-<TGConnectingPoint num="2" id="1528" />
-<TGConnectingPoint num="3" id="1529" />
-<TGConnectingPoint num="4" id="1530" />
-<TGConnectingPoint num="5" id="1531" />
-<TGConnectingPoint num="6" id="1532" />
-<TGConnectingPoint num="7" id="1533" />
-<TGConnectingPoint num="8" id="1534" />
-<TGConnectingPoint num="9" id="1535" />
-<TGConnectingPoint num="10" id="1536" />
-<TGConnectingPoint num="11" id="1537" />
-<TGConnectingPoint num="12" id="1538" />
-<TGConnectingPoint num="13" id="1539" />
-<TGConnectingPoint num="14" id="1540" />
-<TGConnectingPoint num="15" id="1541" />
-<TGConnectingPoint num="16" id="1542" />
-<TGConnectingPoint num="17" id="1543" />
-<TGConnectingPoint num="18" id="1544" />
-<TGConnectingPoint num="19" id="1545" />
-<TGConnectingPoint num="20" id="1546" />
-<TGConnectingPoint num="21" id="1547" />
-<TGConnectingPoint num="22" id="1548" />
-<TGConnectingPoint num="23" id="1549" />
+<TGConnectingPoint num="0" id="1564" />
+<TGConnectingPoint num="1" id="1565" />
+<TGConnectingPoint num="2" id="1566" />
+<TGConnectingPoint num="3" id="1567" />
+<TGConnectingPoint num="4" id="1568" />
+<TGConnectingPoint num="5" id="1569" />
+<TGConnectingPoint num="6" id="1570" />
+<TGConnectingPoint num="7" id="1571" />
+<TGConnectingPoint num="8" id="1572" />
+<TGConnectingPoint num="9" id="1573" />
+<TGConnectingPoint num="10" id="1574" />
+<TGConnectingPoint num="11" id="1575" />
+<TGConnectingPoint num="12" id="1576" />
+<TGConnectingPoint num="13" id="1577" />
+<TGConnectingPoint num="14" id="1578" />
+<TGConnectingPoint num="15" id="1579" />
+<TGConnectingPoint num="16" id="1580" />
+<TGConnectingPoint num="17" id="1581" />
+<TGConnectingPoint num="18" id="1582" />
+<TGConnectingPoint num="19" id="1583" />
+<TGConnectingPoint num="20" id="1584" />
+<TGConnectingPoint num="21" id="1585" />
+<TGConnectingPoint num="22" id="1586" />
+<TGConnectingPoint num="23" id="1587" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU1" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1525" >
-<father id="1550" num="0" />
+<SUBCOMPONENT type="1101" id="1563" >
+<father id="1588" num="0" />
 <cdparam x="160" y="445" />
 <sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
 <infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1517" />
-<TGConnectingPoint num="1" id="1518" />
-<TGConnectingPoint num="2" id="1519" />
-<TGConnectingPoint num="3" id="1520" />
-<TGConnectingPoint num="4" id="1521" />
-<TGConnectingPoint num="5" id="1522" />
-<TGConnectingPoint num="6" id="1523" />
-<TGConnectingPoint num="7" id="1524" />
+<TGConnectingPoint num="0" id="1555" />
+<TGConnectingPoint num="1" id="1556" />
+<TGConnectingPoint num="2" id="1557" />
+<TGConnectingPoint num="3" id="1558" />
+<TGConnectingPoint num="4" id="1559" />
+<TGConnectingPoint num="5" id="1560" />
+<TGConnectingPoint num="6" id="1561" />
+<TGConnectingPoint num="7" id="1562" />
 <extraparam>
 <info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1602" >
+<COMPONENT type="1100" id="1640" >
 <cdparam x="389" y="243" />
 <sizeparam width="250" height="146" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1578" />
-<TGConnectingPoint num="1" id="1579" />
-<TGConnectingPoint num="2" id="1580" />
-<TGConnectingPoint num="3" id="1581" />
-<TGConnectingPoint num="4" id="1582" />
-<TGConnectingPoint num="5" id="1583" />
-<TGConnectingPoint num="6" id="1584" />
-<TGConnectingPoint num="7" id="1585" />
-<TGConnectingPoint num="8" id="1586" />
-<TGConnectingPoint num="9" id="1587" />
-<TGConnectingPoint num="10" id="1588" />
-<TGConnectingPoint num="11" id="1589" />
-<TGConnectingPoint num="12" id="1590" />
-<TGConnectingPoint num="13" id="1591" />
-<TGConnectingPoint num="14" id="1592" />
-<TGConnectingPoint num="15" id="1593" />
-<TGConnectingPoint num="16" id="1594" />
-<TGConnectingPoint num="17" id="1595" />
-<TGConnectingPoint num="18" id="1596" />
-<TGConnectingPoint num="19" id="1597" />
-<TGConnectingPoint num="20" id="1598" />
-<TGConnectingPoint num="21" id="1599" />
-<TGConnectingPoint num="22" id="1600" />
-<TGConnectingPoint num="23" id="1601" />
+<TGConnectingPoint num="0" id="1616" />
+<TGConnectingPoint num="1" id="1617" />
+<TGConnectingPoint num="2" id="1618" />
+<TGConnectingPoint num="3" id="1619" />
+<TGConnectingPoint num="4" id="1620" />
+<TGConnectingPoint num="5" id="1621" />
+<TGConnectingPoint num="6" id="1622" />
+<TGConnectingPoint num="7" id="1623" />
+<TGConnectingPoint num="8" id="1624" />
+<TGConnectingPoint num="9" id="1625" />
+<TGConnectingPoint num="10" id="1626" />
+<TGConnectingPoint num="11" id="1627" />
+<TGConnectingPoint num="12" id="1628" />
+<TGConnectingPoint num="13" id="1629" />
+<TGConnectingPoint num="14" id="1630" />
+<TGConnectingPoint num="15" id="1631" />
+<TGConnectingPoint num="16" id="1632" />
+<TGConnectingPoint num="17" id="1633" />
+<TGConnectingPoint num="18" id="1634" />
+<TGConnectingPoint num="19" id="1635" />
+<TGConnectingPoint num="20" id="1636" />
+<TGConnectingPoint num="21" id="1637" />
+<TGConnectingPoint num="22" id="1638" />
+<TGConnectingPoint num="23" id="1639" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU0" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1559" >
-<father id="1602" num="0" />
+<SUBCOMPONENT type="1101" id="1597" >
+<father id="1640" num="0" />
 <cdparam x="396" y="258" />
 <sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="141" minY="0" maxY="106" />
 <infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1551" />
-<TGConnectingPoint num="1" id="1552" />
-<TGConnectingPoint num="2" id="1553" />
-<TGConnectingPoint num="3" id="1554" />
-<TGConnectingPoint num="4" id="1555" />
-<TGConnectingPoint num="5" id="1556" />
-<TGConnectingPoint num="6" id="1557" />
-<TGConnectingPoint num="7" id="1558" />
+<TGConnectingPoint num="0" id="1589" />
+<TGConnectingPoint num="1" id="1590" />
+<TGConnectingPoint num="2" id="1591" />
+<TGConnectingPoint num="3" id="1592" />
+<TGConnectingPoint num="4" id="1593" />
+<TGConnectingPoint num="5" id="1594" />
+<TGConnectingPoint num="6" id="1595" />
+<TGConnectingPoint num="7" id="1596" />
 <extraparam>
 <info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1568" >
-<father id="1602" num="1" />
+<SUBCOMPONENT type="1101" id="1606" >
+<father id="1640" num="1" />
 <cdparam x="415" y="349" />
 <sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="106" minY="0" maxY="106" />
 <infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1560" />
-<TGConnectingPoint num="1" id="1561" />
-<TGConnectingPoint num="2" id="1562" />
-<TGConnectingPoint num="3" id="1563" />
-<TGConnectingPoint num="4" id="1564" />
-<TGConnectingPoint num="5" id="1565" />
-<TGConnectingPoint num="6" id="1566" />
-<TGConnectingPoint num="7" id="1567" />
+<TGConnectingPoint num="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" />
 <extraparam>
 <info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1577" >
-<father id="1602" num="2" />
+<SUBCOMPONENT type="1101" id="1615" >
+<father id="1640" num="2" />
 <cdparam x="486" y="303" />
 <sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="109" minY="0" maxY="106" />
 <infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<TGConnectingPoint num="2" id="1571" />
-<TGConnectingPoint num="3" id="1572" />
-<TGConnectingPoint num="4" id="1573" />
-<TGConnectingPoint num="5" id="1574" />
-<TGConnectingPoint num="6" id="1575" />
-<TGConnectingPoint num="7" id="1576" />
+<TGConnectingPoint num="0" id="1607" />
+<TGConnectingPoint num="1" id="1608" />
+<TGConnectingPoint num="2" id="1609" />
+<TGConnectingPoint num="3" id="1610" />
+<TGConnectingPoint num="4" id="1611" />
+<TGConnectingPoint num="5" id="1612" />
+<TGConnectingPoint num="6" id="1613" />
+<TGConnectingPoint num="7" id="1614" />
 <extraparam>
 <info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="1603" >
+<CONNECTOR type="125" id="1641" >
 <cdparam x="513" y="536" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="514" y="527" id="1434" />
-<P2  x="514" y="488" id="1464" />
+<P1  x="514" y="527" id="1472" />
+<P2  x="514" y="488" id="1502" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1604" >
+<CONNECTOR type="125" id="1642" >
 <cdparam x="301" y="469" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1  x="332" y="463" id="1530" />
-<P2  x="389" y="463" id="1461" />
+<P1  x="332" y="463" id="1568" />
+<P2  x="389" y="463" id="1499" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1605" >
+<CONNECTOR type="125" id="1643" >
 <cdparam x="773" y="479" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1  x="685" y="463" id="1495" />
-<P2  x="639" y="463" id="1462" />
+<P1  x="685" y="463" id="1533" />
+<P2  x="639" y="463" id="1500" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1606" >
+<CONNECTOR type="125" id="1644" >
 <cdparam x="499" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1  x="514" y="389" id="1584" />
-<P2  x="514" y="438" id="1459" />
+<P1  x="514" y="389" id="1622" />
+<P2  x="514" y="438" id="1497" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -6584,53 +6584,53 @@ the smart card and the terminal
 
 <Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
 <DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="1611" >
+<COMPONENT type="6003" id="1437" >
 <cdparam x="60" y="417" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="1607" />
-<TGConnectingPoint num="1" id="1608" />
-<TGConnectingPoint num="2" id="1609" />
-<TGConnectingPoint num="3" id="1610" />
+<TGConnectingPoint num="0" id="1433" />
+<TGConnectingPoint num="1" id="1434" />
+<TGConnectingPoint num="2" id="1435" />
+<TGConnectingPoint num="3" id="1436" />
 </COMPONENT>
 
-<COMPONENT type="6006" id="1616" >
+<COMPONENT type="6006" id="1442" >
 <cdparam x="600" y="100" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Com. Patterns" />
-<TGConnectingPoint num="0" id="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<TGConnectingPoint num="2" id="1614" />
-<TGConnectingPoint num="3" id="1615" />
+<TGConnectingPoint num="0" id="1438" />
+<TGConnectingPoint num="1" id="1439" />
+<TGConnectingPoint num="2" id="1440" />
+<TGConnectingPoint num="3" id="1441" />
 </COMPONENT>
 
-<COMPONENT type="6002" id="1625" >
+<COMPONENT type="6002" id="1451" >
 <cdparam x="518" y="306" />
 <sizeparam width="318" height="136" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-</COMPONENT>
-<SUBCOMPONENT type="6005" id="1617" >
-<father id="1625" num="0" />
+<TGConnectingPoint num="0" id="1445" />
+<TGConnectingPoint num="1" id="1446" />
+<TGConnectingPoint num="2" id="1447" />
+<TGConnectingPoint num="3" id="1448" />
+<TGConnectingPoint num="4" id="1449" />
+<TGConnectingPoint num="5" id="1450" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="1443" >
+<father id="1451" num="0" />
 <cdparam x="523" y="346" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
 <infoparam name="value " value="Mapping1" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1618" >
-<father id="1625" num="1" />
+<SUBCOMPONENT type="6005" id="1444" >
+<father id="1451" num="1" />
 <cdparam x="523" y="361" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6638,27 +6638,27 @@ the smart card and the terminal
 <infoparam name="value " value="Mapping2" />
 </SUBCOMPONENT>
 
-<COMPONENT type="6001" id="1632" >
+<COMPONENT type="6001" id="1458" >
 <cdparam x="850" y="100" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Architecture" />
-<TGConnectingPoint num="0" id="1628" />
-<TGConnectingPoint num="1" id="1629" />
-<TGConnectingPoint num="2" id="1630" />
-<TGConnectingPoint num="3" id="1631" />
+<TGConnectingPoint num="0" id="1454" />
+<TGConnectingPoint num="1" id="1455" />
+<TGConnectingPoint num="2" id="1456" />
+<TGConnectingPoint num="3" id="1457" />
 </COMPONENT>
-<SUBCOMPONENT type="6005" id="1626" >
-<father id="1632" num="0" />
+<SUBCOMPONENT type="6005" id="1452" >
+<father id="1458" num="0" />
 <cdparam x="855" y="140" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
 <infoparam name="value " value="Mapping1" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1627" >
-<father id="1632" num="1" />
+<SUBCOMPONENT type="6005" id="1453" >
+<father id="1458" num="1" />
 <cdparam x="855" y="155" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6666,19 +6666,19 @@ the smart card and the terminal
 <infoparam name="value " value="Mapping2" />
 </SUBCOMPONENT>
 
-<COMPONENT type="6000" id="1638" >
+<COMPONENT type="6000" id="1464" >
 <cdparam x="233" y="101" />
 <sizeparam width="334" height="161" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="1634" />
-<TGConnectingPoint num="1" id="1635" />
-<TGConnectingPoint num="2" id="1636" />
-<TGConnectingPoint num="3" id="1637" />
+<TGConnectingPoint num="0" id="1460" />
+<TGConnectingPoint num="1" id="1461" />
+<TGConnectingPoint num="2" id="1462" />
+<TGConnectingPoint num="3" id="1463" />
 </COMPONENT>
-<SUBCOMPONENT type="6005" id="1633" >
-<father id="1638" num="0" />
+<SUBCOMPONENT type="6005" id="1459" >
+<father id="1464" num="0" />
 <cdparam x="238" y="141" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6686,31 +6686,31 @@ the smart card and the terminal
 <infoparam name="value " value="AppC" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="6004" id="1640" >
+<CONNECTOR type="6004" id="1466" >
 <cdparam x="950" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1639" />
-<P1  x="950" y="220" id="1628" />
-<P2  x="740" y="306" id="1620" />
+<TGConnectingPoint num="0" id="1465" />
+<P1  x="950" y="220" id="1454" />
+<P2  x="740" y="306" id="1446" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="6004" id="1642" >
+<CONNECTOR type="6004" id="1468" >
 <cdparam x="700" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1641" />
-<P1  x="700" y="220" id="1612" />
-<P2  x="677" y="306" id="1621" />
+<TGConnectingPoint num="0" id="1467" />
+<P1  x="700" y="220" id="1438" />
+<P2  x="677" y="306" id="1447" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="6004" id="1644" >
+<CONNECTOR type="6004" id="1470" >
 <cdparam x="450" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1643" />
-<P1  x="400" y="262" id="1634" />
-<P2  x="613" y="306" id="1619" />
+<TGConnectingPoint num="0" id="1469" />
+<P1  x="400" y="262" id="1460" />
+<P2  x="613" y="306" id="1445" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
diff --git a/modeling/DIPLODOCUS/ZigBeeDEMO.xml b/modeling/DIPLODOCUS/ZigBeeDEMO.xml
index c027bcc88b54254807786d9c814430a61a5f0847..251513506e516a28bbb1a2576efd02a909f597e3 100644
--- a/modeling/DIPLODOCUS/ZigBeeDEMO.xml
+++ b/modeling/DIPLODOCUS/ZigBeeDEMO.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.99-beta2">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
 <DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
 <COMPONENT type="6003" id="5" >
-<cdparam x="50" y="150" />
+<cdparam x="63" y="99" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -29,11 +29,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="6005" id="6" >
 <father id="13" num="0" />
-<cdparam x="605" y="140" />
+<cdparam x="605" y="170" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="140" maxY="140" />
-<infoparam name="value " value="DMA_transfer" />
+<cdrectangleparam minX="605" maxX="605" minY="170" maxY="170" />
+<infoparam name="value " value="CP_Memory_Copy" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="7" >
 <father id="13" num="1" />
@@ -45,11 +45,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="8" >
 <father id="13" num="2" />
-<cdparam x="605" y="170" />
+<cdparam x="605" y="140" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="170" maxY="170" />
-<infoparam name="value " value="CP_Memory_Copy" />
+<cdrectangleparam minX="605" maxX="605" minY="140" maxY="140" />
+<infoparam name="value " value="DMA_transfer" />
 </SUBCOMPONENT>
 
 <COMPONENT type="6002" id="23" >
@@ -67,11 +67,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="6005" id="14" >
 <father id="23" num="0" />
-<cdparam x="605" y="340" />
+<cdparam x="605" y="370" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
-<infoparam name="value " value="Mapping_0" />
+<cdrectangleparam minX="605" maxX="605" minY="370" maxY="370" />
+<infoparam name="value " value="Mapping_2" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="15" >
 <father id="23" num="1" />
@@ -83,11 +83,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="16" >
 <father id="23" num="2" />
-<cdparam x="605" y="370" />
+<cdparam x="605" y="340" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="370" maxY="370" />
-<infoparam name="value " value="Mapping_2" />
+<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
+<infoparam name="value " value="Mapping_0" />
 </SUBCOMPONENT>
 
 <COMPONENT type="6001" id="29" >
@@ -171,8 +171,8 @@
 <cdparam x="1952" y="691" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="119" y="76" id="324" />
-<P2  x="125" y="80" id="283" />
+<P1  x="10" y="0" id="335" />
+<P2  x="10" y="0" id="300" />
 <Point x="1770" y="552" />
 <Point x="1770" y="425" />
 <AutomaticDrawing  data="true" />
@@ -197,8 +197,8 @@
 <cdparam x="1951" y="285" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="363" />
-<P2  x="125" y="80" id="287" />
+<P1  x="10" y="0" id="412" />
+<P2  x="10" y="0" id="296" />
 <Point x="1656" y="228" />
 <Point x="1656" y="386" />
 <AutomaticDrawing  data="true" />
@@ -223,8 +223,8 @@
 <cdparam x="1491" y="561" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="242" />
-<P2  x="119" y="76" id="322" />
+<P1  x="10" y="0" id="263" />
+<P2  x="10" y="0" id="337" />
 <Point x="1315" y="448" />
 <Point x="1315" y="550" />
 <AutomaticDrawing  data="true" />
@@ -249,8 +249,8 @@
 <cdparam x="1491" y="511" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="246" />
-<P2  x="1372" y="199" id="389" />
+<P1  x="10" y="0" id="259" />
+<P2  x="10" y="0" id="378" />
 <Point x="1317" y="408" />
 <Point x="1317" y="209" />
 <AutomaticDrawing  data="true" />
@@ -275,7 +275,7 @@
 <cdparam x="1945" y="539" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="115" y="75" id="339" />
+<P1  x="10" y="0" id="320" />
 <P2  x="1740" y="286" id="102" />
 <Point x="1740" y="431" />
 <AutomaticDrawing  data="true" />
@@ -292,48 +292,48 @@
 <cdparam x="1077" y="532" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="207" />
-<P2  x="125" y="80" id="248" />
+<P1  x="10" y="0" id="218" />
+<P2  x="10" y="0" id="257" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="57" >
 <cdparam x="1074" y="384" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="126" y="73" id="222" />
-<P2  x="116" y="74" id="263" />
+<P1  x="10" y="0" id="203" />
+<P2  x="10" y="0" id="242" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="58" >
 <cdparam x="661" y="525" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="168" />
-<P2  x="125" y="80" id="205" />
+<P1  x="10" y="0" id="179" />
+<P2  x="10" y="0" id="220" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="59" >
 <cdparam x="660" y="383" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="126" y="76" id="183" />
-<P2  x="126" y="73" id="220" />
+<P1  x="10" y="0" id="164" />
+<P2  x="10" y="0" id="205" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="60" >
 <cdparam x="262" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="131" />
-<P2  x="125" y="80" id="166" />
+<P1  x="10" y="0" id="142" />
+<P2  x="10" y="0" id="181" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="61" >
 <cdparam x="265" y="373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="128" y="72" id="144" />
-<P2  x="126" y="76" id="181" />
+<P1  x="10" y="0" id="129" />
+<P2  x="10" y="0" id="166" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="62" >
@@ -341,14 +341,14 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
 <P1  x="1753" y="280" id="97" />
-<P2  x="126" y="77" id="300" />
+<P2  x="10" y="0" id="283" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="64" >
 <cdparam x="1944" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="120" y="78" id="378" />
+<P1  x="10" y="0" id="397" />
 <P2  x="1740" y="274" id="100" />
 <Point x="1740" y="100" />
 <AutomaticDrawing  data="true" />
@@ -366,7 +366,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
 <P1  x="1296" y="300" id="114" />
-<P2  x="115" y="75" id="337" />
+<P2  x="10" y="0" id="322" />
 <Point x="1344" y="301" />
 <Point x="1344" y="425" />
 <AutomaticDrawing  data="true" />
@@ -391,8 +391,8 @@
 <cdparam x="1729" y="262" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1372" y="219" id="394" />
-<P2  x="125" y="80" id="361" />
+<P1  x="10" y="20" id="383" />
+<P2  x="10" y="0" id="414" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="70" >
@@ -400,7 +400,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
 <P1  x="1291" y="294" id="116" />
-<P2  x="1372" y="84" id="408" />
+<P2  x="10" y="0" id="359" />
 <Point x="1292" y="95" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="69" >
@@ -416,15 +416,15 @@
 <cdparam x="1729" y="119" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1372" y="104" id="413" />
-<P2  x="120" y="78" id="376" />
+<P1  x="10" y="20" id="364" />
+<P2  x="10" y="0" id="399" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="72" >
 <cdparam x="1485" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="116" y="74" id="261" />
+<P1  x="10" y="0" id="244" />
 <P2  x="1279" y="300" id="113" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -432,61 +432,61 @@
 <cdparam x="2385" y="443" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="285" />
-<P2  x="126" y="77" id="298" />
+<P1  x="10" y="0" id="298" />
+<P2  x="10" y="0" id="285" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="74" >
 <cdparam x="1911" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="359" />
-<P2  x="120" y="78" id="374" />
+<P1  x="10" y="0" id="416" />
+<P2  x="10" y="0" id="401" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="75" >
 <cdparam x="1912" y="621" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="119" y="76" id="320" />
-<P2  x="115" y="75" id="335" />
+<P1  x="10" y="0" id="339" />
+<P2  x="10" y="0" id="324" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="76" >
 <cdparam x="1457" y="435" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="244" />
-<P2  x="116" y="74" id="259" />
+<P1  x="10" y="0" id="261" />
+<P2  x="10" y="0" id="246" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="77" >
 <cdparam x="1041" y="456" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="203" />
-<P2  x="126" y="73" id="218" />
+<P1  x="10" y="0" id="222" />
+<P2  x="10" y="0" id="207" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="78" >
 <cdparam x="630" y="455" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="164" />
-<P2  x="126" y="76" id="179" />
+<P1  x="10" y="0" id="183" />
+<P2  x="10" y="0" id="168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="79" >
 <cdparam x="215" y="452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="125" y="80" id="129" />
-<P2  x="110" y="72" id="142" />
+<P1  x="10" y="0" id="144" />
+<P2  x="10" y="0" id="131" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="301" id="96" >
-<cdparam x="53" y="97" />
-<sizeparam width="345" height="43" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="0" y="0" />
+<sizeparam width="197" height="43" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="9" minY="0" maxY="6" />
 <infoparam name="UML Note" value="In this model THE PARAMETER SIZE
@@ -585,10 +585,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="141" >
 <father id="163" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="128" height="82" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
-<infoparam name="Primitive component" value="F_Source" />
+<cdrectangleparam minX="0" maxX="104" minY="0" maxY="174" />
+<infoparam name="Primitive component" value="X_Source" />
 <TGConnectingPoint num="0" id="133" />
 <TGConnectingPoint num="1" id="134" />
 <TGConnectingPoint num="2" id="135" />
@@ -598,20 +598,20 @@ processing tasks
 <TGConnectingPoint num="6" id="139" />
 <TGConnectingPoint num="7" id="140" />
 <extraparam>
-<Attribute access="2" id="size" value="127" type="0" typeOther="" />
+<Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="130" >
 <father id="141" num="0" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Request source_req" />
+<cdrectangleparam minX="-10" maxX="118" minY="-10" maxY="72" />
+<infoparam name="Primitive port" value="Channel Source_ch_out" />
 <TGConnectingPoint num="0" id="129" />
 <extraparam>
-<Prop commName="source_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="Source_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="true" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="Source_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -620,14 +620,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="132" >
 <father id="141" num="1" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event Source_evt_out" />
+<cdrectangleparam minX="-10" maxX="118" minY="-10" maxY="72" />
+<infoparam name="Primitive port" value="Request source_req" />
 <TGConnectingPoint num="0" id="131" />
 <extraparam>
-<Prop commName="Source_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="source_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -638,10 +638,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="154" >
 <father id="163" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="128" height="82" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="104" minY="0" maxY="174" />
-<infoparam name="Primitive component" value="X_Source" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
+<infoparam name="Primitive component" value="F_Source" />
 <TGConnectingPoint num="0" id="146" />
 <TGConnectingPoint num="1" id="147" />
 <TGConnectingPoint num="2" id="148" />
@@ -651,19 +651,19 @@ processing tasks
 <TGConnectingPoint num="6" id="152" />
 <TGConnectingPoint num="7" id="153" />
 <extraparam>
-<Attribute access="2" id="size" value="" type="0" typeOther="" />
+<Attribute access="2" id="size" value="127" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="143" >
 <father id="154" num="0" />
-<cdparam x="100" y="72" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="118" minY="-10" maxY="72" />
-<infoparam name="Primitive port" value="Request source_req" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event Source_evt_out" />
 <TGConnectingPoint num="0" id="142" />
 <extraparam>
-<Prop commName="source_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="Source_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -673,15 +673,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="145" >
 <father id="154" num="1" />
-<cdparam x="118" y="72" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="118" minY="-10" maxY="72" />
-<infoparam name="Primitive port" value="Channel Source_ch_out" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Request source_req" />
 <TGConnectingPoint num="0" id="144" />
 <extraparam>
-<Prop commName="Source_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="true" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="Source_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="source_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -710,10 +710,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="178" >
 <father id="202" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="126" height="86" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
-<infoparam name="Primitive component" value="F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="106" minY="0" maxY="170" />
+<infoparam name="Primitive component" value="X_Symbol2ChipSeq" />
 <TGConnectingPoint num="0" id="170" />
 <TGConnectingPoint num="1" id="171" />
 <TGConnectingPoint num="2" id="172" />
@@ -728,15 +728,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="165" >
 <father id="178" num="0" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Request bit2chip_req" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_out" />
 <TGConnectingPoint num="0" id="164" />
 <extraparam>
-<Prop commName="bit2chip_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="symbol2ChipSeq_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -745,15 +745,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="167" >
 <father id="178" num="1" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event bit2symbol_evt_in" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_in" />
 <TGConnectingPoint num="0" id="166" />
 <extraparam>
-<Prop commName="bit2symbol_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="symbol2ChipSeq_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -762,14 +762,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="169" >
 <father id="178" num="2" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event bit2symbol_evt_out" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Request bit2chip_req" />
 <TGConnectingPoint num="0" id="168" />
 <extraparam>
-<Prop commName="bit2symbol_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bit2chip_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -780,10 +780,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="193" >
 <father id="202" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="126" height="86" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="106" minY="0" maxY="170" />
-<infoparam name="Primitive component" value="X_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
+<infoparam name="Primitive component" value="F_Symbol2ChipSeq" />
 <TGConnectingPoint num="0" id="185" />
 <TGConnectingPoint num="1" id="186" />
 <TGConnectingPoint num="2" id="187" />
@@ -798,14 +798,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="180" >
 <father id="193" num="0" />
-<cdparam x="116" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Request bit2chip_req" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event bit2symbol_evt_out" />
 <TGConnectingPoint num="0" id="179" />
 <extraparam>
-<Prop commName="bit2chip_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="bit2symbol_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -815,15 +815,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="182" >
 <father id="193" num="1" />
-<cdparam x="116" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_in" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event bit2symbol_evt_in" />
 <TGConnectingPoint num="0" id="181" />
 <extraparam>
-<Prop commName="symbol2ChipSeq_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="bit2symbol_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -832,15 +832,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="184" >
 <father id="193" num="2" />
-<cdparam x="116" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Channel symbol2ChipSeq_ch_out" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Request bit2chip_req" />
 <TGConnectingPoint num="0" id="183" />
 <extraparam>
-<Prop commName="symbol2ChipSeq_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="bit2chip_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="bit2chip_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -869,10 +869,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="217" >
 <father id="241" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="126" height="83" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
-<infoparam name="Primitive component" value="F_Chip_to_Octet" />
+<cdrectangleparam minX="0" maxX="106" minY="0" maxY="173" />
+<infoparam name="Primitive component" value="X_Chip_to_Octet" />
 <TGConnectingPoint num="0" id="209" />
 <TGConnectingPoint num="1" id="210" />
 <TGConnectingPoint num="2" id="211" />
@@ -887,15 +887,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="204" >
 <father id="217" num="0" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Request chip2octet_req" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
+<infoparam name="Primitive port" value="Channel chip2octet_ch_out" />
 <TGConnectingPoint num="0" id="203" />
 <extraparam>
-<Prop commName="chip2octet_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chip2octet_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -904,15 +904,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="206" >
 <father id="217" num="1" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event chip2octet_evt_in" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
+<infoparam name="Primitive port" value="Channel chip2octet_ch_in" />
 <TGConnectingPoint num="0" id="205" />
 <extraparam>
-<Prop commName="chip2octet_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="chip2octet_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -921,14 +921,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="208" >
 <father id="217" num="2" />
-<cdparam x="115" y="80" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event chip2octet_evt_out" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
+<infoparam name="Primitive port" value="Request chip2octet_req" />
 <TGConnectingPoint num="0" id="207" />
 <extraparam>
-<Prop commName="chip2octet_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="chip2octet_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -939,10 +939,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="232" >
 <father id="241" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="126" height="83" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="106" minY="0" maxY="173" />
-<infoparam name="Primitive component" value="X_Chip_to_Octet" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
+<infoparam name="Primitive component" value="F_Chip_to_Octet" />
 <TGConnectingPoint num="0" id="224" />
 <TGConnectingPoint num="1" id="225" />
 <TGConnectingPoint num="2" id="226" />
@@ -957,14 +957,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="219" >
 <father id="232" num="0" />
-<cdparam x="116" y="73" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
-<infoparam name="Primitive port" value="Request chip2octet_req" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event chip2octet_evt_out" />
 <TGConnectingPoint num="0" id="218" />
 <extraparam>
-<Prop commName="chip2octet_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="chip2octet_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -974,15 +974,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="221" >
 <father id="232" num="1" />
-<cdparam x="116" y="73" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
-<infoparam name="Primitive port" value="Channel chip2octet_ch_in" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event chip2octet_evt_in" />
 <TGConnectingPoint num="0" id="220" />
 <extraparam>
-<Prop commName="chip2octet_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="chip2octet_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -991,15 +991,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="223" >
 <father id="232" num="2" />
-<cdparam x="116" y="73" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="73" />
-<infoparam name="Primitive port" value="Channel chip2octet_ch_out" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Request chip2octet_req" />
 <TGConnectingPoint num="0" id="222" />
 <extraparam>
-<Prop commName="chip2octet_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="chip2octet_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="chip2octet_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1025,36 +1025,36 @@ processing tasks
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1202" id="258" >
+<SUBCOMPONENT type="1202" id="256" >
 <father id="282" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="116" height="84" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
-<infoparam name="Primitive component" value="F_CWL" />
-<TGConnectingPoint num="0" id="250" />
-<TGConnectingPoint num="1" id="251" />
-<TGConnectingPoint num="2" id="252" />
-<TGConnectingPoint num="3" id="253" />
-<TGConnectingPoint num="4" id="254" />
-<TGConnectingPoint num="5" id="255" />
-<TGConnectingPoint num="6" id="256" />
-<TGConnectingPoint num="7" id="257" />
+<cdrectangleparam minX="0" maxX="116" minY="0" maxY="172" />
+<infoparam name="Primitive component" value="X_CWL" />
+<TGConnectingPoint num="0" id="248" />
+<TGConnectingPoint num="1" id="249" />
+<TGConnectingPoint num="2" id="250" />
+<TGConnectingPoint num="3" id="251" />
+<TGConnectingPoint num="4" id="252" />
+<TGConnectingPoint num="5" id="253" />
+<TGConnectingPoint num="6" id="254" />
+<TGConnectingPoint num="7" id="255" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="243" >
-<father id="258" num="0" />
-<cdparam x="115" y="80" />
+<father id="256" num="0" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event cwl_evt_out_1" />
+<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
+<infoparam name="Primitive port" value="Channel cwl_ch_in" />
 <TGConnectingPoint num="0" id="242" />
 <extraparam>
-<Prop commName="cwl_evt_out_1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwl_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1062,16 +1062,16 @@ processing tasks
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="245" >
-<father id="258" num="1" />
-<cdparam x="115" y="80" />
+<father id="256" num="1" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Request cwl_req" />
+<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
+<infoparam name="Primitive port" value="Channel cwl_ch_out" />
 <TGConnectingPoint num="0" id="244" />
 <extraparam>
-<Prop commName="cwl_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwl_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1079,32 +1079,15 @@ processing tasks
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="247" >
-<father id="258" num="2" />
-<cdparam x="115" y="80" />
+<father id="256" num="2" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event cwl_evt_out" />
+<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
+<infoparam name="Primitive port" value="Request cwl_req" />
 <TGConnectingPoint num="0" id="246" />
 <extraparam>
-<Prop commName="cwl_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="249" >
-<father id="258" num="3" />
-<cdparam x="115" y="80" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event cwl_evt_in" />
-<TGConnectingPoint num="0" id="248" />
-<extraparam>
-<Prop commName="cwl_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwl_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1115,10 +1098,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="273" >
 <father id="282" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="116" height="84" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="116" minY="0" maxY="172" />
-<infoparam name="Primitive component" value="X_CWL" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
+<infoparam name="Primitive component" value="F_CWL" />
 <TGConnectingPoint num="0" id="265" />
 <TGConnectingPoint num="1" id="266" />
 <TGConnectingPoint num="2" id="267" />
@@ -1131,16 +1114,16 @@ processing tasks
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="260" >
+<SUBCOMPONENT type="1203" id="258" >
 <father id="273" num="0" />
-<cdparam x="106" y="74" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
-<infoparam name="Primitive port" value="Request cwl_req" />
-<TGConnectingPoint num="0" id="259" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event cwl_evt_in" />
+<TGConnectingPoint num="0" id="257" />
 <extraparam>
-<Prop commName="cwl_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwl_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1148,34 +1131,51 @@ processing tasks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="262" >
+<SUBCOMPONENT type="1203" id="260" >
 <father id="273" num="1" />
-<cdparam x="106" y="74" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
-<infoparam name="Primitive port" value="Channel cwl_ch_out" />
-<TGConnectingPoint num="0" id="261" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event cwl_evt_out" />
+<TGConnectingPoint num="0" id="259" />
 <extraparam>
-<Prop commName="cwl_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_out" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwl_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="262" >
+<father id="273" num="2" />
+<cdparam x="0" y="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Request cwl_req" />
+<TGConnectingPoint num="0" id="261" />
+<extraparam>
+<Prop commName="cwl_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="264" >
-<father id="273" num="2" />
-<cdparam x="106" y="74" />
+<father id="273" num="3" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="106" minY="-10" maxY="74" />
-<infoparam name="Primitive port" value="Channel cwl_ch_in" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event cwl_evt_out_1" />
 <TGConnectingPoint num="0" id="263" />
 <extraparam>
-<Prop commName="cwl_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="cwl_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwl_evt_out_1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1201,37 +1201,36 @@ processing tasks
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1202" id="297" >
+<SUBCOMPONENT type="1202" id="295" >
 <father id="319" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="126" height="87" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="171" />
-<infoparam name="Primitive component" value="F_Sink" />
-<TGConnectingPoint num="0" id="289" />
-<TGConnectingPoint num="1" id="290" />
-<TGConnectingPoint num="2" id="291" />
-<TGConnectingPoint num="3" id="292" />
-<TGConnectingPoint num="4" id="293" />
-<TGConnectingPoint num="5" id="294" />
-<TGConnectingPoint num="6" id="295" />
-<TGConnectingPoint num="7" id="296" />
+<cdrectangleparam minX="0" maxX="106" minY="0" maxY="174" />
+<infoparam name="Primitive component" value="X_Sink" />
+<TGConnectingPoint num="0" id="287" />
+<TGConnectingPoint num="1" id="288" />
+<TGConnectingPoint num="2" id="289" />
+<TGConnectingPoint num="3" id="290" />
+<TGConnectingPoint num="4" id="291" />
+<TGConnectingPoint num="5" id="292" />
+<TGConnectingPoint num="6" id="293" />
+<TGConnectingPoint num="7" id="294" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
-<Attribute access="2" id="size_1" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="284" >
-<father id="297" num="0" />
-<cdparam x="115" y="80" />
+<father id="295" num="0" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event sink_evt_in_1" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="77" />
+<infoparam name="Primitive port" value="Channel sink_ch_in" />
 <TGConnectingPoint num="0" id="283" />
 <extraparam>
-<Prop commName="sink_evt_in_1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sink_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="true" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="sink_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1239,32 +1238,15 @@ processing tasks
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="286" >
-<father id="297" num="1" />
-<cdparam x="115" y="80" />
+<father id="295" num="1" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="77" />
 <infoparam name="Primitive port" value="Request sink_req" />
 <TGConnectingPoint num="0" id="285" />
 <extraparam>
-<Prop commName="sink_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="288" >
-<father id="297" num="2" />
-<cdparam x="115" y="80" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event sink_evt_in" />
-<TGConnectingPoint num="0" id="287" />
-<extraparam>
-<Prop commName="sink_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sink_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1275,10 +1257,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="310" >
 <father id="319" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="126" height="87" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="106" minY="0" maxY="174" />
-<infoparam name="Primitive component" value="X_Sink" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="171" />
+<infoparam name="Primitive component" value="F_Sink" />
 <TGConnectingPoint num="0" id="302" />
 <TGConnectingPoint num="1" id="303" />
 <TGConnectingPoint num="2" id="304" />
@@ -1289,18 +1271,36 @@ processing tasks
 <TGConnectingPoint num="7" id="309" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
+<Attribute access="2" id="size_1" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="299" >
+<SUBCOMPONENT type="1203" id="297" >
 <father id="310" num="0" />
-<cdparam x="116" y="77" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="77" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event sink_evt_in" />
+<TGConnectingPoint num="0" id="296" />
+<extraparam>
+<Prop commName="sink_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="299" >
+<father id="310" num="1" />
+<cdparam x="0" y="0" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
 <infoparam name="Primitive port" value="Request sink_req" />
 <TGConnectingPoint num="0" id="298" />
 <extraparam>
-<Prop commName="sink_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sink_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1309,16 +1309,16 @@ processing tasks
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="301" >
-<father id="310" num="1" />
-<cdparam x="116" y="77" />
+<father id="310" num="2" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="116" minY="-10" maxY="77" />
-<infoparam name="Primitive port" value="Channel sink_ch_in" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event sink_evt_in_1" />
 <TGConnectingPoint num="0" id="300" />
 <extraparam>
-<Prop commName="sink_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="true" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="sink_evt_in" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sink_evt_in_1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1347,10 +1347,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="334" >
 <father id="358" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="119" height="86" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="115" height="85" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="113" minY="0" maxY="170" />
-<infoparam name="Primitive component" value="F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="117" minY="0" maxY="171" />
+<infoparam name="Primitive component" value="X_CWP_Q" />
 <TGConnectingPoint num="0" id="326" />
 <TGConnectingPoint num="1" id="327" />
 <TGConnectingPoint num="2" id="328" />
@@ -1365,15 +1365,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="321" >
 <father id="334" num="0" />
-<cdparam x="109" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Request cwpQ_req" />
+<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
+<infoparam name="Primitive port" value="Channel cwpQ_ch_out" />
 <TGConnectingPoint num="0" id="320" />
 <extraparam>
-<Prop commName="cwpQ_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpQ_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1382,15 +1382,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="323" >
 <father id="334" num="1" />
-<cdparam x="109" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Event cwpQ_evt_in" />
+<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
+<infoparam name="Primitive port" value="Channel cwpQ_ch_in" />
 <TGConnectingPoint num="0" id="322" />
 <extraparam>
-<Prop commName="cwpQ_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpQ_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1399,14 +1399,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="325" >
 <father id="334" num="2" />
-<cdparam x="109" y="76" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
-<infoparam name="Primitive port" value="Event cwpQ_evt_out" />
+<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
+<infoparam name="Primitive port" value="Request cwpQ_req" />
 <TGConnectingPoint num="0" id="324" />
 <extraparam>
-<Prop commName="cwpQ_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpQ_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1417,10 +1417,10 @@ processing tasks
 <SUBCOMPONENT type="1202" id="349" >
 <father id="358" num="1" />
 <cdparam x="0" y="0" />
-<sizeparam width="115" height="85" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="119" height="86" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="117" minY="0" maxY="171" />
-<infoparam name="Primitive component" value="X_CWP_Q" />
+<cdrectangleparam minX="0" maxX="113" minY="0" maxY="170" />
+<infoparam name="Primitive component" value="F_CWP_Q" />
 <TGConnectingPoint num="0" id="341" />
 <TGConnectingPoint num="1" id="342" />
 <TGConnectingPoint num="2" id="343" />
@@ -1435,14 +1435,14 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="336" >
 <father id="349" num="0" />
-<cdparam x="105" y="75" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
-<infoparam name="Primitive port" value="Request cwpQ_req" />
+<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Event cwpQ_evt_out" />
 <TGConnectingPoint num="0" id="335" />
 <extraparam>
-<Prop commName="cwpQ_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpQ_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1452,15 +1452,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="338" >
 <father id="349" num="1" />
-<cdparam x="105" y="75" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
-<infoparam name="Primitive port" value="Channel cwpQ_ch_in" />
+<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Event cwpQ_evt_in" />
 <TGConnectingPoint num="0" id="337" />
 <extraparam>
-<Prop commName="cwpQ_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpQ_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1469,15 +1469,15 @@ processing tasks
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="340" >
 <father id="349" num="2" />
-<cdparam x="105" y="75" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="105" minY="-10" maxY="75" />
-<infoparam name="Primitive port" value="Channel cwpQ_ch_out" />
+<cdrectangleparam minX="-10" maxX="109" minY="-10" maxY="76" />
+<infoparam name="Primitive port" value="Request cwpQ_req" />
 <TGConnectingPoint num="0" id="339" />
 <extraparam>
-<Prop commName="cwpQ_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpQ_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1503,69 +1503,121 @@ processing tasks
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1202" id="373" >
+<SUBCOMPONENT type="1201" id="377" >
 <father id="435" num="0" />
 <cdparam x="0" y="0" />
-<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="20" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
-<infoparam name="Primitive component" value="F_CWP_I" />
-<TGConnectingPoint num="0" id="365" />
-<TGConnectingPoint num="1" id="366" />
-<TGConnectingPoint num="2" id="367" />
-<TGConnectingPoint num="3" id="368" />
-<TGConnectingPoint num="4" id="369" />
-<TGConnectingPoint num="5" id="370" />
-<TGConnectingPoint num="6" id="371" />
-<TGConnectingPoint num="7" id="372" />
+<cdrectangleparam minX="-10" maxX="222" minY="-10" maxY="246" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="359" />
+<TGConnectingPoint num="1" id="360" />
+<TGConnectingPoint num="2" id="361" />
+<TGConnectingPoint num="3" id="362" />
+<TGConnectingPoint num="4" id="363" />
+<TGConnectingPoint num="5" id="364" />
+<TGConnectingPoint num="6" id="365" />
+<TGConnectingPoint num="7" id="366" />
+<TGConnectingPoint num="8" id="367" />
+<TGConnectingPoint num="9" id="368" />
+<TGConnectingPoint num="10" id="369" />
+<TGConnectingPoint num="11" id="370" />
+<TGConnectingPoint num="12" id="371" />
+<TGConnectingPoint num="13" id="372" />
+<TGConnectingPoint num="14" id="373" />
+<TGConnectingPoint num="15" id="374" />
+<TGConnectingPoint num="16" id="375" />
+<TGConnectingPoint num="17" id="376" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="396" >
+<father id="435" num="1" />
+<cdparam x="0" y="0" />
+<sizeparam width="20" height="20" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="222" minY="-10" maxY="246" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="378" />
+<TGConnectingPoint num="1" id="379" />
+<TGConnectingPoint num="2" id="380" />
+<TGConnectingPoint num="3" id="381" />
+<TGConnectingPoint num="4" id="382" />
+<TGConnectingPoint num="5" id="383" />
+<TGConnectingPoint num="6" id="384" />
+<TGConnectingPoint num="7" id="385" />
+<TGConnectingPoint num="8" id="386" />
+<TGConnectingPoint num="9" id="387" />
+<TGConnectingPoint num="10" id="388" />
+<TGConnectingPoint num="11" id="389" />
+<TGConnectingPoint num="12" id="390" />
+<TGConnectingPoint num="13" id="391" />
+<TGConnectingPoint num="14" id="392" />
+<TGConnectingPoint num="15" id="393" />
+<TGConnectingPoint num="16" id="394" />
+<TGConnectingPoint num="17" id="395" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="411" >
+<father id="435" num="2" />
+<cdparam x="0" y="0" />
+<sizeparam width="120" height="88" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="112" minY="0" maxY="168" />
+<infoparam name="Primitive component" value="X_CWP_I" />
+<TGConnectingPoint num="0" id="403" />
+<TGConnectingPoint num="1" id="404" />
+<TGConnectingPoint num="2" id="405" />
+<TGConnectingPoint num="3" id="406" />
+<TGConnectingPoint num="4" id="407" />
+<TGConnectingPoint num="5" id="408" />
+<TGConnectingPoint num="6" id="409" />
+<TGConnectingPoint num="7" id="410" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="360" >
-<father id="373" num="0" />
-<cdparam x="115" y="80" />
+<SUBCOMPONENT type="1203" id="398" >
+<father id="411" num="0" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Request cwpI_req" />
-<TGConnectingPoint num="0" id="359" />
+<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
+<infoparam name="Primitive port" value="Channel cwpI_ch_out" />
+<TGConnectingPoint num="0" id="397" />
 <extraparam>
-<Prop commName="cwpI_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpI_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="362" >
-<father id="373" num="1" />
-<cdparam x="115" y="80" />
+<SUBCOMPONENT type="1203" id="400" >
+<father id="411" num="1" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event cwpI_evt_in" />
-<TGConnectingPoint num="0" id="361" />
+<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
+<infoparam name="Primitive port" value="Channel cwpI_ch_in" />
+<TGConnectingPoint num="0" id="399" />
 <extraparam>
-<Prop commName="cwpI_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwpI_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="364" >
-<father id="373" num="2" />
-<cdparam x="115" y="80" />
+<SUBCOMPONENT type="1203" id="402" >
+<father id="411" num="2" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
-<infoparam name="Primitive port" value="Event cwpI_evt_out" />
-<TGConnectingPoint num="0" id="363" />
+<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
+<infoparam name="Primitive port" value="Request cwpI_req" />
+<TGConnectingPoint num="0" id="401" />
 <extraparam>
-<Prop commName="cwpI_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpI_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1573,35 +1625,35 @@ processing tasks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="388" >
-<father id="435" num="1" />
+<SUBCOMPONENT type="1202" id="426" >
+<father id="435" num="3" />
 <cdparam x="0" y="0" />
-<sizeparam width="120" height="88" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="125" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="168" />
-<infoparam name="Primitive component" value="X_CWP_I" />
-<TGConnectingPoint num="0" id="380" />
-<TGConnectingPoint num="1" id="381" />
-<TGConnectingPoint num="2" id="382" />
-<TGConnectingPoint num="3" id="383" />
-<TGConnectingPoint num="4" id="384" />
-<TGConnectingPoint num="5" id="385" />
-<TGConnectingPoint num="6" id="386" />
-<TGConnectingPoint num="7" id="387" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="166" />
+<infoparam name="Primitive component" value="F_CWP_I" />
+<TGConnectingPoint num="0" id="418" />
+<TGConnectingPoint num="1" id="419" />
+<TGConnectingPoint num="2" id="420" />
+<TGConnectingPoint num="3" id="421" />
+<TGConnectingPoint num="4" id="422" />
+<TGConnectingPoint num="5" id="423" />
+<TGConnectingPoint num="6" id="424" />
+<TGConnectingPoint num="7" id="425" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="375" >
-<father id="388" num="0" />
-<cdparam x="110" y="78" />
+<SUBCOMPONENT type="1203" id="413" >
+<father id="426" num="0" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
-<infoparam name="Primitive port" value="Request cwpI_req" />
-<TGConnectingPoint num="0" id="374" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event cwpI_evt_out" />
+<TGConnectingPoint num="0" id="412" />
 <extraparam>
-<Prop commName="cwpI_req" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwpI_evt_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1609,108 +1661,148 @@ processing tasks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="377" >
-<father id="388" num="1" />
-<cdparam x="110" y="78" />
+<SUBCOMPONENT type="1203" id="415" >
+<father id="426" num="1" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
-<infoparam name="Primitive port" value="Channel cwpI_ch_in" />
-<TGConnectingPoint num="0" id="376" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Event cwpI_evt_in" />
+<TGConnectingPoint num="0" id="414" />
 <extraparam>
-<Prop commName="cwpI_ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpI_evt_in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="379" >
-<father id="388" num="2" />
-<cdparam x="110" y="78" />
+<SUBCOMPONENT type="1203" id="417" >
+<father id="426" num="2" />
+<cdparam x="0" y="0" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="110" minY="-10" maxY="78" />
-<infoparam name="Primitive port" value="Channel cwpI_ch_out" />
-<TGConnectingPoint num="0" id="378" />
+<cdrectangleparam minX="-10" maxX="115" minY="-10" maxY="80" />
+<infoparam name="Primitive port" value="Request cwpI_req" />
+<TGConnectingPoint num="0" id="416" />
 <extraparam>
-<Prop commName="cwpI_ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwpI_req" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="407" >
-<father id="435" num="2" />
-<cdparam x="1362" y="199" />
-<sizeparam width="20" height="20" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+
+</TMLComponentTaskDiagramPanel>
+
+<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1001" id="437" >
+<cdparam x="397" y="338" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="222" minY="-10" maxY="246" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="389" />
-<TGConnectingPoint num="1" id="390" />
-<TGConnectingPoint num="2" id="391" />
-<TGConnectingPoint num="3" id="392" />
-<TGConnectingPoint num="4" id="393" />
-<TGConnectingPoint num="5" id="394" />
-<TGConnectingPoint num="6" id="395" />
-<TGConnectingPoint num="7" id="396" />
-<TGConnectingPoint num="8" id="397" />
-<TGConnectingPoint num="9" id="398" />
-<TGConnectingPoint num="10" id="399" />
-<TGConnectingPoint num="11" id="400" />
-<TGConnectingPoint num="12" id="401" />
-<TGConnectingPoint num="13" id="402" />
-<TGConnectingPoint num="14" id="403" />
-<TGConnectingPoint num="15" id="404" />
-<TGConnectingPoint num="16" id="405" />
-<TGConnectingPoint num="17" id="406" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="426" >
-<father id="435" num="3" />
-<cdparam x="1362" y="84" />
-<sizeparam width="20" height="20" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="436" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="440" >
+<cdparam x="338" y="262" />
+<sizeparam width="139" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="222" minY="-10" maxY="246" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="408" />
-<TGConnectingPoint num="1" id="409" />
-<TGConnectingPoint num="2" id="410" />
-<TGConnectingPoint num="3" id="411" />
-<TGConnectingPoint num="4" id="412" />
-<TGConnectingPoint num="5" id="413" />
-<TGConnectingPoint num="6" id="414" />
-<TGConnectingPoint num="7" id="415" />
-<TGConnectingPoint num="8" id="416" />
-<TGConnectingPoint num="9" id="417" />
-<TGConnectingPoint num="10" id="418" />
-<TGConnectingPoint num="11" id="419" />
-<TGConnectingPoint num="12" id="420" />
-<TGConnectingPoint num="13" id="421" />
-<TGConnectingPoint num="14" id="422" />
-<TGConnectingPoint num="15" id="423" />
-<TGConnectingPoint num="16" id="424" />
-<TGConnectingPoint num="17" id="425" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="Source_evt_out(size)" />
+<TGConnectingPoint num="0" id="438" />
+<TGConnectingPoint num="1" id="439" />
+<extraparam>
+<Data eventName="Source_evt_out" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1007" id="443" >
+<cdparam x="351" y="188" />
+<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="source_req(size)" />
+<TGConnectingPoint num="0" id="441" />
+<TGConnectingPoint num="1" id="442" />
+<extraparam>
+<Data requestName="source_req" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
 
+<COMPONENT type="1011" id="446" >
+<cdparam x="370" y="116" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="action state" value="size = 127" />
+<TGConnectingPoint num="0" id="444" />
+<TGConnectingPoint num="1" id="445" />
+</COMPONENT>
 
-</TMLComponentTaskDiagramPanel>
+<COMPONENT type="1000" id="448" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="447" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="449" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="407" y="70" id="447" />
+<P2  x="407" y="111" id="444" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="450" >
+<cdparam x="407" y="141" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="407" y="141" id="445" />
+<P2  x="407" y="183" id="441" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="451" >
+<cdparam x="407" y="213" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="407" y="213" id="442" />
+<P2  x="407" y="257" id="438" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="452" >
+<cdparam x="407" y="287" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="407" y="287" id="439" />
+<P2  x="407" y="333" id="436" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_Source" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="439" >
+<COMPONENT type="1013" id="456" >
 <cdparam x="402" y="189" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="437" />
-<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="0" id="454" />
+<TGConnectingPoint num="1" id="455" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="436" >
-<father id="439" num="0" />
+<SUBCOMPONENT type="-1" id="453" >
+<father id="456" num="0" />
 <cdparam x="417" y="209" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1718,190 +1810,195 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="441" >
+<COMPONENT type="1001" id="458" >
 <cdparam x="397" y="342" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="440" />
+<TGConnectingPoint num="0" id="457" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="444" >
+<COMPONENT type="1006" id="461" >
 <cdparam x="340" y="270" />
 <sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="Source_ch_out(size)" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
+<TGConnectingPoint num="0" id="459" />
+<TGConnectingPoint num="1" id="460" />
 <extraparam>
 <Data channelName="Source_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="447" >
+<COMPONENT type="1034" id="464" >
 <cdparam x="351" y="113" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="445" />
-<TGConnectingPoint num="1" id="446" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="449" >
+<COMPONENT type="1000" id="466" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="448" />
+<TGConnectingPoint num="0" id="465" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="450" >
+<CONNECTOR type="115" id="467" >
 <cdparam x="462" y="222" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="224" id="438" />
-<P2  x="407" y="265" id="442" />
+<P1  x="407" y="224" id="455" />
+<P2  x="407" y="265" id="459" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="451" >
+<CONNECTOR type="115" id="468" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="70" id="448" />
-<P2  x="407" y="108" id="445" />
+<P1  x="407" y="70" id="465" />
+<P2  x="407" y="108" id="462" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="452" >
+<CONNECTOR type="115" id="469" >
 <cdparam x="402" y="256" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="295" id="443" />
-<P2  x="407" y="337" id="440" />
+<P1  x="407" y="295" id="460" />
+<P2  x="407" y="337" id="457" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="453" >
+<CONNECTOR type="115" id="470" >
 <cdparam x="407" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="138" id="446" />
-<P2  x="407" y="184" id="437" />
+<P1  x="407" y="138" id="463" />
+<P2  x="407" y="184" id="454" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="455" >
-<cdparam x="397" y="338" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="473" >
+<cdparam x="317" y="132" />
+<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="454" />
+<infoparam name="wait event" value="bit2symbol_evt_in(size) " />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<extraparam>
+<Data eventName="bit2symbol_evt_in" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="458" >
-<cdparam x="338" y="262" />
-<sizeparam width="139" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="475" >
+<cdparam x="385" y="354" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="Source_evt_out(size)" />
-<TGConnectingPoint num="0" id="456" />
-<TGConnectingPoint num="1" id="457" />
-<extraparam>
-<Data eventName="Source_evt_out" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="474" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="461" >
-<cdparam x="351" y="188" />
-<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="478" >
+<cdparam x="314" y="278" />
+<sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="source_req(size)" />
-<TGConnectingPoint num="0" id="459" />
-<TGConnectingPoint num="1" id="460" />
+<infoparam name="send event" value="bit2symbol_evt_out(size)" />
+<TGConnectingPoint num="0" id="476" />
+<TGConnectingPoint num="1" id="477" />
+<accessibility />
 <extraparam>
-<Data requestName="source_req" nbOfParams="5" />
+<Data eventName="bit2symbol_evt_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="464" >
-<cdparam x="370" y="116" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="481" >
+<cdparam x="335" y="204" />
+<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="action state" value="size = 127" />
-<TGConnectingPoint num="0" id="462" />
-<TGConnectingPoint num="1" id="463" />
+<infoparam name="send request" value="bit2chip_req(size)" />
+<TGConnectingPoint num="0" id="479" />
+<TGConnectingPoint num="1" id="480" />
+<extraparam>
+<Data requestName="bit2chip_req" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="466" >
-<cdparam x="400" y="50" />
+<COMPONENT type="1000" id="483" >
+<cdparam x="388" y="66" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="465" />
+<TGConnectingPoint num="0" id="482" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="467" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="115" id="484" >
+<cdparam x="395" y="229" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="70" id="465" />
-<P2  x="407" y="111" id="462" />
+<P1  x="395" y="229" id="480" />
+<P2  x="395" y="273" id="476" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="468" >
-<cdparam x="407" y="141" />
+<CONNECTOR type="115" id="485" >
+<cdparam x="395" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="141" id="463" />
-<P2  x="407" y="183" id="459" />
+<P1  x="395" y="303" id="477" />
+<P2  x="395" y="349" id="474" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="469" >
-<cdparam x="407" y="213" />
+<CONNECTOR type="115" id="486" >
+<cdparam x="395" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="213" id="460" />
-<P2  x="407" y="257" id="456" />
+<P1  x="395" y="86" id="482" />
+<P2  x="395" y="127" id="471" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="470" >
-<cdparam x="407" y="287" />
+<CONNECTOR type="115" id="487" >
+<cdparam x="435" y="149" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="287" id="457" />
-<P2  x="407" y="333" id="454" />
+<P1  x="395" y="157" id="472" />
+<P2  x="395" y="199" id="479" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1021" id="474" >
+<COMPONENT type="1021" id="491" >
 <cdparam x="393" y="289" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execC" value="null" />
-<TGConnectingPoint num="0" id="472" />
-<TGConnectingPoint num="1" id="473" />
+<TGConnectingPoint num="0" id="489" />
+<TGConnectingPoint num="1" id="490" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="471" >
-<father id="474" num="0" />
+<SUBCOMPONENT type="-1" id="488" >
+<father id="491" num="0" />
 <cdparam x="408" y="309" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1909,216 +2006,215 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="477" >
+<COMPONENT type="1009" id="494" >
 <cdparam x="305" y="213" />
 <sizeparam width="187" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="symbol2ChipSeq_ch_in(size) " />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
+<TGConnectingPoint num="0" id="492" />
+<TGConnectingPoint num="1" id="493" />
 <extraparam>
 <Data channelName="symbol2ChipSeq_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="479" >
+<COMPONENT type="1001" id="496" >
 <cdparam x="388" y="447" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="478" />
+<TGConnectingPoint num="0" id="495" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="482" >
+<COMPONENT type="1006" id="499" >
 <cdparam x="302" y="375" />
 <sizeparam width="193" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="symbol2ChipSeq_ch_out(size)" />
-<TGConnectingPoint num="0" id="480" />
-<TGConnectingPoint num="1" id="481" />
+<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="1" id="498" />
 <extraparam>
 <Data channelName="symbol2ChipSeq_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="485" >
+<COMPONENT type="1034" id="502" >
 <cdparam x="342" y="137" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="483" />
-<TGConnectingPoint num="1" id="484" />
+<TGConnectingPoint num="0" id="500" />
+<TGConnectingPoint num="1" id="501" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="487" >
+<COMPONENT type="1000" id="504" >
 <cdparam x="391" y="74" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="486" />
+<TGConnectingPoint num="0" id="503" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="488" >
+<CONNECTOR type="115" id="505" >
 <cdparam x="541" y="169" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="238" id="476" />
-<P2  x="398" y="284" id="472" />
+<P1  x="398" y="238" id="493" />
+<P2  x="398" y="284" id="489" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="489" >
+<CONNECTOR type="115" id="506" >
 <cdparam x="453" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="324" id="473" />
-<P2  x="398" y="370" id="480" />
+<P1  x="398" y="324" id="490" />
+<P2  x="398" y="370" id="497" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="490" >
+<CONNECTOR type="115" id="507" >
 <cdparam x="398" y="94" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="94" id="486" />
-<P2  x="398" y="132" id="483" />
+<P1  x="398" y="94" id="503" />
+<P2  x="398" y="132" id="500" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="491" >
+<CONNECTOR type="115" id="508" >
 <cdparam x="393" y="361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="400" id="481" />
-<P2  x="398" y="442" id="478" />
+<P1  x="398" y="400" id="498" />
+<P2  x="398" y="442" id="495" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="492" >
+<CONNECTOR type="115" id="509" >
 <cdparam x="398" y="179" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="162" id="484" />
-<P2  x="398" y="208" id="475" />
+<P1  x="398" y="162" id="501" />
+<P2  x="398" y="208" id="492" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="495" >
-<cdparam x="317" y="132" />
+<TMLActivityDiagramPanel name="F_Chip_to_Octet" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="512" >
+<cdparam x="333" y="128" />
 <sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="bit2symbol_evt_in(size) " />
-<TGConnectingPoint num="0" id="493" />
-<TGConnectingPoint num="1" id="494" />
+<infoparam name="wait event" value="chip2octet_evt_in(size) " />
+<TGConnectingPoint num="0" id="510" />
+<TGConnectingPoint num="1" id="511" />
 <extraparam>
-<Data eventName="bit2symbol_evt_in" nbOfParams="5" />
+<Data eventName="chip2octet_evt_in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="497" >
-<cdparam x="385" y="354" />
+<COMPONENT type="1001" id="514" >
+<cdparam x="401" y="350" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="496" />
+<TGConnectingPoint num="0" id="513" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="500" >
-<cdparam x="314" y="278" />
+<COMPONENT type="1008" id="517" >
+<cdparam x="330" y="274" />
 <sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="bit2symbol_evt_out(size)" />
-<TGConnectingPoint num="0" id="498" />
-<TGConnectingPoint num="1" id="499" />
-<accessibility />
+<infoparam name="send event" value="chip2octet_evt_out(size)" />
+<TGConnectingPoint num="0" id="515" />
+<TGConnectingPoint num="1" id="516" />
 <extraparam>
-<Data eventName="bit2symbol_evt_out" nbOfParams="5" />
+<Data eventName="chip2octet_evt_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="503" >
-<cdparam x="335" y="204" />
-<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="520" >
+<cdparam x="343" y="200" />
+<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="bit2chip_req(size)" />
-<TGConnectingPoint num="0" id="501" />
-<TGConnectingPoint num="1" id="502" />
+<infoparam name="send request" value="chip2octet_req(size)" />
+<TGConnectingPoint num="0" id="518" />
+<TGConnectingPoint num="1" id="519" />
 <extraparam>
-<Data requestName="bit2chip_req" nbOfParams="5" />
+<Data requestName="chip2octet_req" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="505" >
-<cdparam x="388" y="66" />
+<COMPONENT type="1000" id="522" >
+<cdparam x="404" y="62" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="504" />
+<TGConnectingPoint num="0" id="521" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="506" >
-<cdparam x="395" y="229" />
+<CONNECTOR type="115" id="523" >
+<cdparam x="411" y="225" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="395" y="229" id="502" />
-<P2  x="395" y="273" id="498" />
+<P1  x="411" y="225" id="519" />
+<P2  x="411" y="269" id="515" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="507" >
-<cdparam x="395" y="303" />
+<CONNECTOR type="115" id="524" >
+<cdparam x="411" y="299" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="395" y="303" id="499" />
-<P2  x="395" y="349" id="496" />
+<P1  x="411" y="299" id="516" />
+<P2  x="411" y="345" id="513" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="508" >
-<cdparam x="395" y="86" />
+<CONNECTOR type="115" id="525" >
+<cdparam x="411" y="82" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="395" y="86" id="504" />
-<P2  x="395" y="127" id="493" />
+<P1  x="411" y="82" id="521" />
+<P2  x="411" y="123" id="510" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="509" >
-<cdparam x="435" y="149" />
+<CONNECTOR type="115" id="526" >
+<cdparam x="451" y="145" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="395" y="157" id="494" />
-<P2  x="395" y="199" id="501" />
+<P1  x="411" y="153" id="511" />
+<P2  x="411" y="195" id="518" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_Chip_to_Octet" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1021" id="513" >
+<COMPONENT type="1021" id="530" >
 <cdparam x="377" y="300" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execC" value="null" />
-<TGConnectingPoint num="0" id="511" />
-<TGConnectingPoint num="1" id="512" />
+<TGConnectingPoint num="0" id="528" />
+<TGConnectingPoint num="1" id="529" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="510" >
-<father id="513" num="0" />
+<SUBCOMPONENT type="-1" id="527" >
+<father id="530" num="0" />
 <cdparam x="392" y="320" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2126,215 +2222,237 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="516" >
+<COMPONENT type="1009" id="533" >
 <cdparam x="306" y="215" />
 <sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="chip2octet_ch_in(size) " />
-<TGConnectingPoint num="0" id="514" />
-<TGConnectingPoint num="1" id="515" />
+<TGConnectingPoint num="0" id="531" />
+<TGConnectingPoint num="1" id="532" />
 <extraparam>
 <Data channelName="chip2octet_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="518" >
+<COMPONENT type="1001" id="535" >
 <cdparam x="372" y="449" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="0" id="534" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="521" >
+<COMPONENT type="1006" id="538" >
 <cdparam x="303" y="377" />
 <sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="chip2octet_ch_out(size)" />
-<TGConnectingPoint num="0" id="519" />
-<TGConnectingPoint num="1" id="520" />
+<TGConnectingPoint num="0" id="536" />
+<TGConnectingPoint num="1" id="537" />
 <extraparam>
 <Data channelName="chip2octet_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="524" >
+<COMPONENT type="1034" id="541" >
 <cdparam x="326" y="139" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="522" />
-<TGConnectingPoint num="1" id="523" />
+<TGConnectingPoint num="0" id="539" />
+<TGConnectingPoint num="1" id="540" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="526" >
+<COMPONENT type="1000" id="543" >
 <cdparam x="375" y="76" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="525" />
+<TGConnectingPoint num="0" id="542" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="527" >
+<CONNECTOR type="115" id="544" >
 <cdparam x="525" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="240" id="515" />
-<P2  x="382" y="295" id="511" />
+<P1  x="382" y="240" id="532" />
+<P2  x="382" y="295" id="528" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="528" >
+<CONNECTOR type="115" id="545" >
 <cdparam x="437" y="329" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="335" id="512" />
-<P2  x="382" y="372" id="519" />
+<P1  x="382" y="335" id="529" />
+<P2  x="382" y="372" id="536" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="529" >
+<CONNECTOR type="115" id="546" >
 <cdparam x="382" y="96" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="96" id="525" />
-<P2  x="382" y="134" id="522" />
+<P1  x="382" y="96" id="542" />
+<P2  x="382" y="134" id="539" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="530" >
+<CONNECTOR type="115" id="547" >
 <cdparam x="377" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="402" id="520" />
-<P2  x="382" y="444" id="517" />
+<P1  x="382" y="402" id="537" />
+<P2  x="382" y="444" id="534" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="531" >
+<CONNECTOR type="115" id="548" >
 <cdparam x="382" y="181" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="164" id="523" />
-<P2  x="382" y="210" id="514" />
+<P1  x="382" y="164" id="540" />
+<P2  x="382" y="210" id="531" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Chip_to_Octet" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="534" >
-<cdparam x="333" y="128" />
-<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="551" >
+<cdparam x="360" y="134" />
+<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="chip2octet_evt_in(size) " />
-<TGConnectingPoint num="0" id="532" />
-<TGConnectingPoint num="1" id="533" />
+<infoparam name="wait event" value="cwl_evt_in(size) " />
+<TGConnectingPoint num="0" id="549" />
+<TGConnectingPoint num="1" id="550" />
 <extraparam>
-<Data eventName="chip2octet_evt_in" nbOfParams="5" />
+<Data eventName="cwl_evt_in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="536" >
-<cdparam x="401" y="350" />
+<COMPONENT type="1001" id="553" >
+<cdparam x="407" y="397" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="535" />
+<TGConnectingPoint num="0" id="552" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="539" >
-<cdparam x="330" y="274" />
-<sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="556" >
+<cdparam x="370" y="206" />
+<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="chip2octet_evt_out(size)" />
-<TGConnectingPoint num="0" id="537" />
-<TGConnectingPoint num="1" id="538" />
+<infoparam name="send request" value="cwl_req(size)" />
+<TGConnectingPoint num="0" id="554" />
+<TGConnectingPoint num="1" id="555" />
 <extraparam>
-<Data eventName="chip2octet_evt_out" nbOfParams="5" />
+<Data requestName="cwl_req" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="542" >
-<cdparam x="343" y="200" />
-<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="558" >
+<cdparam x="407" y="68" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="chip2octet_req(size)" />
-<TGConnectingPoint num="0" id="540" />
-<TGConnectingPoint num="1" id="541" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="557" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="561" >
+<cdparam x="352" y="333" />
+<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="cwl_evt_out_1(size)" />
+<TGConnectingPoint num="0" id="559" />
+<TGConnectingPoint num="1" id="560" />
 <extraparam>
-<Data requestName="chip2octet_req" nbOfParams="5" />
+<Data eventName="cwl_evt_out_1" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="544" >
-<cdparam x="404" y="62" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="564" >
+<cdparam x="357" y="280" />
+<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="543" />
+<infoparam name="send event" value="cwl_evt_out(size)" />
+<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="1" id="563" />
+<extraparam>
+<Data eventName="cwl_evt_out" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="545" >
-<cdparam x="411" y="225" />
+<CONNECTOR type="115" id="565" >
+<cdparam x="416" y="358" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="411" y="225" id="541" />
-<P2  x="411" y="269" id="537" />
+<P1  x="416" y="358" id="560" />
+<P2  x="417" y="392" id="552" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="546" >
-<cdparam x="411" y="299" />
+<CONNECTOR type="115" id="566" >
+<cdparam x="414" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="411" y="299" id="538" />
-<P2  x="411" y="345" id="535" />
+<P1  x="414" y="231" id="555" />
+<P2  x="414" y="275" id="562" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="547" >
-<cdparam x="411" y="82" />
+<CONNECTOR type="115" id="567" >
+<cdparam x="414" y="305" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="411" y="82" id="543" />
-<P2  x="411" y="123" id="532" />
+<P1  x="414" y="305" id="563" />
+<P2  x="416" y="328" id="559" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="548" >
-<cdparam x="451" y="145" />
+<CONNECTOR type="115" id="568" >
+<cdparam x="414" y="88" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="414" y="88" id="557" />
+<P2  x="414" y="129" id="549" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="569" >
+<cdparam x="454" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="411" y="153" id="533" />
-<P2  x="411" y="195" id="540" />
+<P1  x="414" y="159" id="550" />
+<P2  x="414" y="201" id="554" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="552" >
+<COMPONENT type="1013" id="573" >
 <cdparam x="402" y="277" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="550" />
-<TGConnectingPoint num="1" id="551" />
+<TGConnectingPoint num="0" id="571" />
+<TGConnectingPoint num="1" id="572" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="549" >
-<father id="552" num="0" />
+<SUBCOMPONENT type="-1" id="570" >
+<father id="573" num="0" />
 <cdparam x="417" y="297" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2342,237 +2460,215 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="555" >
+<COMPONENT type="1009" id="576" >
 <cdparam x="355" y="196" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="cwl_ch_in(size) " />
-<TGConnectingPoint num="0" id="553" />
-<TGConnectingPoint num="1" id="554" />
+<TGConnectingPoint num="0" id="574" />
+<TGConnectingPoint num="1" id="575" />
 <extraparam>
 <Data channelName="cwl_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="557" >
+<COMPONENT type="1001" id="578" >
 <cdparam x="397" y="430" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="556" />
+<TGConnectingPoint num="0" id="577" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="560" >
+<COMPONENT type="1006" id="581" >
 <cdparam x="352" y="358" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="cwl_ch_out(size)" />
-<TGConnectingPoint num="0" id="558" />
-<TGConnectingPoint num="1" id="559" />
+<TGConnectingPoint num="0" id="579" />
+<TGConnectingPoint num="1" id="580" />
 <extraparam>
 <Data channelName="cwl_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="563" >
+<COMPONENT type="1034" id="584" >
 <cdparam x="351" y="120" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="561" />
-<TGConnectingPoint num="1" id="562" />
+<TGConnectingPoint num="0" id="582" />
+<TGConnectingPoint num="1" id="583" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="565" >
+<COMPONENT type="1000" id="586" >
 <cdparam x="400" y="57" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="564" />
+<TGConnectingPoint num="0" id="585" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="566" >
+<CONNECTOR type="115" id="587" >
 <cdparam x="550" y="152" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="221" id="554" />
-<P2  x="407" y="272" id="550" />
+<P1  x="407" y="221" id="575" />
+<P2  x="407" y="272" id="571" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="567" >
+<CONNECTOR type="115" id="588" >
 <cdparam x="462" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="312" id="551" />
-<P2  x="407" y="353" id="558" />
+<P1  x="407" y="312" id="572" />
+<P2  x="407" y="353" id="579" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="568" >
+<CONNECTOR type="115" id="589" >
 <cdparam x="407" y="77" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="77" id="564" />
-<P2  x="407" y="115" id="561" />
+<P1  x="407" y="77" id="585" />
+<P2  x="407" y="115" id="582" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="569" >
+<CONNECTOR type="115" id="590" >
 <cdparam x="402" y="344" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="383" id="559" />
-<P2  x="407" y="425" id="556" />
+<P1  x="407" y="383" id="580" />
+<P2  x="407" y="425" id="577" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="570" >
+<CONNECTOR type="115" id="591" >
 <cdparam x="407" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="145" id="562" />
-<P2  x="407" y="191" id="553" />
+<P1  x="407" y="145" id="583" />
+<P2  x="407" y="191" id="574" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="573" >
-<cdparam x="360" y="134" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="cwl_evt_in(size) " />
-<TGConnectingPoint num="0" id="571" />
-<TGConnectingPoint num="1" id="572" />
-<extraparam>
-<Data eventName="cwl_evt_in" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="575" >
-<cdparam x="407" y="397" />
+<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1001" id="593" >
+<cdparam x="396" y="355" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="574" />
+<TGConnectingPoint num="0" id="592" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="578" >
-<cdparam x="370" y="206" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="596" >
+<cdparam x="331" y="265" />
+<sizeparam width="150" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwl_req(size)" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
+<infoparam name="send request" value="sink_req(size + size_1)" />
+<TGConnectingPoint num="0" id="594" />
+<TGConnectingPoint num="1" id="595" />
 <extraparam>
-<Data requestName="cwl_req" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data requestName="sink_req" nbOfParams="5" />
+<Param index="0" value="size + size_1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="580" >
-<cdparam x="407" y="68" />
+<COMPONENT type="1000" id="598" >
+<cdparam x="400" y="73" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="579" />
+<TGConnectingPoint num="0" id="597" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="583" >
-<cdparam x="352" y="333" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="601" >
+<cdparam x="336" y="187" />
+<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwl_evt_out_1(size)" />
-<TGConnectingPoint num="0" id="581" />
-<TGConnectingPoint num="1" id="582" />
+<infoparam name="wait event" value="sink_evt_in_1(size_1) " />
+<TGConnectingPoint num="0" id="599" />
+<TGConnectingPoint num="1" id="600" />
 <extraparam>
-<Data eventName="cwl_evt_out_1" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data eventName="sink_evt_in_1" nbOfParams="5" />
+<Param index="0" value="size_1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="586" >
-<cdparam x="357" y="280" />
+<COMPONENT type="1010" id="604" >
+<cdparam x="350" y="139" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwl_evt_out(size)" />
-<TGConnectingPoint num="0" id="584" />
-<TGConnectingPoint num="1" id="585" />
+<infoparam name="wait event" value="sink_evt_in(size) " />
+<TGConnectingPoint num="0" id="602" />
+<TGConnectingPoint num="1" id="603" />
 <extraparam>
-<Data eventName="cwl_evt_out" nbOfParams="5" />
+<Data eventName="sink_evt_in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="587" >
-<cdparam x="416" y="358" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="416" y="358" id="582" />
-<P2  x="417" y="392" id="574" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="588" >
-<cdparam x="414" y="231" />
+<CONNECTOR type="115" id="605" >
+<cdparam x="407" y="212" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="414" y="231" id="577" />
-<P2  x="414" y="275" id="584" />
+<P1  x="407" y="212" id="600" />
+<P2  x="406" y="260" id="594" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="589" >
-<cdparam x="414" y="305" />
+<CONNECTOR type="115" id="606" >
+<cdparam x="406" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="414" y="305" id="585" />
-<P2  x="416" y="328" id="581" />
+<P1  x="406" y="290" id="595" />
+<P2  x="406" y="350" id="592" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="590" >
-<cdparam x="414" y="88" />
+<CONNECTOR type="115" id="607" >
+<cdparam x="407" y="93" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="414" y="88" id="579" />
-<P2  x="414" y="129" id="571" />
+<P1  x="407" y="93" id="597" />
+<P2  x="407" y="134" id="602" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="591" >
-<cdparam x="454" y="151" />
+<CONNECTOR type="115" id="608" >
+<cdparam x="447" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="414" y="159" id="572" />
-<P2  x="414" y="201" id="576" />
+<P1  x="407" y="164" id="603" />
+<P2  x="407" y="182" id="599" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="595" >
+<COMPONENT type="1013" id="612" >
 <cdparam x="445" y="298" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="593" />
-<TGConnectingPoint num="1" id="594" />
+<TGConnectingPoint num="0" id="610" />
+<TGConnectingPoint num="1" id="611" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="592" >
-<father id="595" num="0" />
+<SUBCOMPONENT type="-1" id="609" >
+<father id="612" num="0" />
 <cdparam x="460" y="318" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2580,194 +2676,194 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="598" >
+<COMPONENT type="1009" id="615" >
 <cdparam x="395" y="217" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="sink_ch_in(size) " />
-<TGConnectingPoint num="0" id="596" />
-<TGConnectingPoint num="1" id="597" />
+<TGConnectingPoint num="0" id="613" />
+<TGConnectingPoint num="1" id="614" />
 <extraparam>
 <Data channelName="sink_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="600" >
+<COMPONENT type="1001" id="617" >
 <cdparam x="440" y="384" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="599" />
+<TGConnectingPoint num="0" id="616" />
 </COMPONENT>
 
-<COMPONENT type="1034" id="603" >
+<COMPONENT type="1034" id="620" >
 <cdparam x="394" y="141" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="601" />
-<TGConnectingPoint num="1" id="602" />
+<TGConnectingPoint num="0" id="618" />
+<TGConnectingPoint num="1" id="619" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="605" >
+<COMPONENT type="1000" id="622" >
 <cdparam x="443" y="78" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="604" />
+<TGConnectingPoint num="0" id="621" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="606" >
+<CONNECTOR type="115" id="623" >
 <cdparam x="450" y="333" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="450" y="333" id="594" />
-<P2  x="450" y="379" id="599" />
+<P1  x="450" y="333" id="611" />
+<P2  x="450" y="379" id="616" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="607" >
+<CONNECTOR type="115" id="624" >
 <cdparam x="593" y="173" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="450" y="242" id="597" />
-<P2  x="450" y="293" id="593" />
+<P1  x="450" y="242" id="614" />
+<P2  x="450" y="293" id="610" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="608" >
+<CONNECTOR type="115" id="625" >
 <cdparam x="450" y="98" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="450" y="98" id="604" />
-<P2  x="450" y="136" id="601" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="609" >
-<cdparam x="450" y="183" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="450" y="166" id="602" />
-<P2  x="450" y="212" id="596" />
+<P1  x="450" y="98" id="621" />
+<P2  x="450" y="136" id="618" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="626" >
+<cdparam x="450" y="183" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="450" y="166" id="619" />
+<P2  x="450" y="212" id="613" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="611" >
-<cdparam x="396" y="355" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="610" />
-</COMPONENT>
-
-<COMPONENT type="1007" id="614" >
-<cdparam x="331" y="265" />
-<sizeparam width="150" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="629" >
+<cdparam x="342" y="117" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="sink_req(size + size_1)" />
-<TGConnectingPoint num="0" id="612" />
-<TGConnectingPoint num="1" id="613" />
+<infoparam name="wait event" value="cwpQ_evt_in(size) " />
+<TGConnectingPoint num="0" id="627" />
+<TGConnectingPoint num="1" id="628" />
 <extraparam>
-<Data requestName="sink_req" nbOfParams="5" />
-<Param index="0" value="size + size_1" />
+<Data eventName="cwpQ_evt_in" nbOfParams="5" />
+<Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="616" >
-<cdparam x="400" y="73" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="631" >
+<cdparam x="393" y="339" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="615" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="630" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="619" >
-<cdparam x="336" y="187" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="634" >
+<cdparam x="339" y="263" />
+<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="sink_evt_in_1(size_1) " />
-<TGConnectingPoint num="0" id="617" />
-<TGConnectingPoint num="1" id="618" />
+<infoparam name="send event" value="cwpQ_evt_out(size)" />
+<TGConnectingPoint num="0" id="632" />
+<TGConnectingPoint num="1" id="633" />
 <extraparam>
-<Data eventName="sink_evt_in_1" nbOfParams="5" />
-<Param index="0" value="size_1" />
+<Data eventName="cwpQ_evt_out" nbOfParams="5" />
+<Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="622" >
-<cdparam x="350" y="139" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="637" >
+<cdparam x="352" y="189" />
+<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="sink_evt_in(size) " />
-<TGConnectingPoint num="0" id="620" />
-<TGConnectingPoint num="1" id="621" />
+<infoparam name="send request" value="cwpQ_req(size)" />
+<TGConnectingPoint num="0" id="635" />
+<TGConnectingPoint num="1" id="636" />
 <extraparam>
-<Data eventName="sink_evt_in" nbOfParams="5" />
+<Data requestName="cwpQ_req" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="623" >
-<cdparam x="407" y="212" />
+<COMPONENT type="1000" id="639" >
+<cdparam x="396" y="51" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="638" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="640" >
+<cdparam x="403" y="214" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="212" id="618" />
-<P2  x="406" y="260" id="612" />
+<P1  x="403" y="214" id="636" />
+<P2  x="403" y="258" id="632" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="624" >
-<cdparam x="406" y="290" />
+<CONNECTOR type="115" id="641" >
+<cdparam x="403" y="288" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="406" y="290" id="613" />
-<P2  x="406" y="350" id="610" />
+<P1  x="403" y="288" id="633" />
+<P2  x="403" y="334" id="630" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="625" >
-<cdparam x="407" y="93" />
+<CONNECTOR type="115" id="642" >
+<cdparam x="403" y="71" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="93" id="615" />
-<P2  x="407" y="134" id="620" />
+<P1  x="403" y="71" id="638" />
+<P2  x="403" y="112" id="627" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="626" >
-<cdparam x="447" y="156" />
+<CONNECTOR type="115" id="643" >
+<cdparam x="443" y="134" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="164" id="621" />
-<P2  x="407" y="182" id="617" />
+<P1  x="403" y="142" id="628" />
+<P2  x="403" y="184" id="635" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="630" >
+<COMPONENT type="1013" id="647" >
 <cdparam x="365" y="275" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="628" />
-<TGConnectingPoint num="1" id="629" />
+<TGConnectingPoint num="0" id="645" />
+<TGConnectingPoint num="1" id="646" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="627" >
-<father id="630" num="0" />
+<SUBCOMPONENT type="-1" id="644" >
+<father id="647" num="0" />
 <cdparam x="380" y="295" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2775,215 +2871,215 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="633" >
+<COMPONENT type="1009" id="650" >
 <cdparam x="311" y="194" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="cwpQ_ch_in(size) " />
-<TGConnectingPoint num="0" id="631" />
-<TGConnectingPoint num="1" id="632" />
+<TGConnectingPoint num="0" id="648" />
+<TGConnectingPoint num="1" id="649" />
 <extraparam>
 <Data channelName="cwpQ_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="635" >
+<COMPONENT type="1001" id="652" >
 <cdparam x="360" y="428" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="634" />
+<TGConnectingPoint num="0" id="651" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="638" >
+<COMPONENT type="1006" id="655" >
 <cdparam x="308" y="356" />
 <sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="cwpQ_ch_out(size)" />
-<TGConnectingPoint num="0" id="636" />
-<TGConnectingPoint num="1" id="637" />
+<TGConnectingPoint num="0" id="653" />
+<TGConnectingPoint num="1" id="654" />
 <extraparam>
 <Data channelName="cwpQ_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="641" >
+<COMPONENT type="1034" id="658" >
 <cdparam x="314" y="118" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="639" />
-<TGConnectingPoint num="1" id="640" />
+<TGConnectingPoint num="0" id="656" />
+<TGConnectingPoint num="1" id="657" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="643" >
+<COMPONENT type="1000" id="660" >
 <cdparam x="363" y="55" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="642" />
+<TGConnectingPoint num="0" id="659" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="644" >
+<CONNECTOR type="115" id="661" >
 <cdparam x="513" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="219" id="632" />
-<P2  x="370" y="270" id="628" />
+<P1  x="370" y="219" id="649" />
+<P2  x="370" y="270" id="645" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="645" >
+<CONNECTOR type="115" id="662" >
 <cdparam x="425" y="308" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="310" id="629" />
-<P2  x="370" y="351" id="636" />
+<P1  x="370" y="310" id="646" />
+<P2  x="370" y="351" id="653" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="646" >
+<CONNECTOR type="115" id="663" >
 <cdparam x="370" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="75" id="642" />
-<P2  x="370" y="113" id="639" />
+<P1  x="370" y="75" id="659" />
+<P2  x="370" y="113" id="656" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="647" >
+<CONNECTOR type="115" id="664" >
 <cdparam x="365" y="342" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="381" id="637" />
-<P2  x="370" y="423" id="634" />
+<P1  x="370" y="381" id="654" />
+<P2  x="370" y="423" id="651" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="648" >
+<CONNECTOR type="115" id="665" >
 <cdparam x="370" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="143" id="640" />
-<P2  x="370" y="189" id="631" />
+<P1  x="370" y="143" id="657" />
+<P2  x="370" y="189" id="648" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="651" >
-<cdparam x="342" y="117" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1010" id="668" >
+<cdparam x="321" y="132" />
+<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="cwpQ_evt_in(size) " />
-<TGConnectingPoint num="0" id="649" />
-<TGConnectingPoint num="1" id="650" />
+<infoparam name="wait event" value="cwpI_evt_in(size) " />
+<TGConnectingPoint num="0" id="666" />
+<TGConnectingPoint num="1" id="667" />
 <extraparam>
-<Data eventName="cwpQ_evt_in" nbOfParams="5" />
+<Data eventName="cwpI_evt_in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="653" >
-<cdparam x="393" y="339" />
+<COMPONENT type="1001" id="670" >
+<cdparam x="369" y="354" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="0" id="669" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="656" >
-<cdparam x="339" y="263" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="673" >
+<cdparam x="318" y="278" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwpQ_evt_out(size)" />
-<TGConnectingPoint num="0" id="654" />
-<TGConnectingPoint num="1" id="655" />
+<infoparam name="send event" value="cwpI_evt_out(size)" />
+<TGConnectingPoint num="0" id="671" />
+<TGConnectingPoint num="1" id="672" />
 <extraparam>
-<Data eventName="cwpQ_evt_out" nbOfParams="5" />
+<Data eventName="cwpI_evt_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="659" >
-<cdparam x="352" y="189" />
-<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="676" >
+<cdparam x="331" y="204" />
+<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwpQ_req(size)" />
-<TGConnectingPoint num="0" id="657" />
-<TGConnectingPoint num="1" id="658" />
+<infoparam name="send request" value="cwpI_req(size)" />
+<TGConnectingPoint num="0" id="674" />
+<TGConnectingPoint num="1" id="675" />
 <extraparam>
-<Data requestName="cwpQ_req" nbOfParams="5" />
+<Data requestName="cwpI_req" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="661" >
-<cdparam x="396" y="51" />
+<COMPONENT type="1000" id="678" >
+<cdparam x="372" y="66" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="660" />
+<TGConnectingPoint num="0" id="677" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="662" >
-<cdparam x="403" y="214" />
+<CONNECTOR type="115" id="679" >
+<cdparam x="379" y="229" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="403" y="214" id="658" />
-<P2  x="403" y="258" id="654" />
+<P1  x="379" y="229" id="675" />
+<P2  x="379" y="273" id="671" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="663" >
-<cdparam x="403" y="288" />
+<CONNECTOR type="115" id="680" >
+<cdparam x="379" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="403" y="288" id="655" />
-<P2  x="403" y="334" id="652" />
+<P1  x="379" y="303" id="672" />
+<P2  x="379" y="349" id="669" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="664" >
-<cdparam x="403" y="71" />
+<CONNECTOR type="115" id="681" >
+<cdparam x="379" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="403" y="71" id="660" />
-<P2  x="403" y="112" id="649" />
+<P1  x="379" y="86" id="677" />
+<P2  x="379" y="127" id="666" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="665" >
-<cdparam x="443" y="134" />
+<CONNECTOR type="115" id="682" >
+<cdparam x="419" y="149" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="403" y="142" id="650" />
-<P2  x="403" y="184" id="657" />
+<P1  x="379" y="157" id="667" />
+<P2  x="379" y="199" id="674" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="669" >
+<COMPONENT type="1013" id="686" >
 <cdparam x="369" y="290" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="667" />
-<TGConnectingPoint num="1" id="668" />
+<TGConnectingPoint num="0" id="684" />
+<TGConnectingPoint num="1" id="685" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="666" >
-<father id="669" num="0" />
+<SUBCOMPONENT type="-1" id="683" >
+<father id="686" num="0" />
 <cdparam x="384" y="310" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2991,198 +3087,102 @@ processing tasks
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="672" >
+<COMPONENT type="1009" id="689" >
 <cdparam x="318" y="209" />
 <sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="cwpI_ch_in(size) " />
-<TGConnectingPoint num="0" id="670" />
-<TGConnectingPoint num="1" id="671" />
+<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="1" id="688" />
 <extraparam>
 <Data channelName="cwpI_ch_in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="674" >
+<COMPONENT type="1001" id="691" >
 <cdparam x="364" y="443" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="673" />
+<TGConnectingPoint num="0" id="690" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="677" >
+<COMPONENT type="1006" id="694" >
 <cdparam x="315" y="371" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="cwpI_ch_out(size)" />
-<TGConnectingPoint num="0" id="675" />
-<TGConnectingPoint num="1" id="676" />
+<TGConnectingPoint num="0" id="692" />
+<TGConnectingPoint num="1" id="693" />
 <extraparam>
 <Data channelName="cwpI_ch_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="680" >
+<COMPONENT type="1034" id="697" >
 <cdparam x="318" y="133" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="678" />
-<TGConnectingPoint num="1" id="679" />
+<TGConnectingPoint num="0" id="695" />
+<TGConnectingPoint num="1" id="696" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="682" >
+<COMPONENT type="1000" id="699" >
 <cdparam x="367" y="70" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="681" />
+<TGConnectingPoint num="0" id="698" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="683" >
+<CONNECTOR type="115" id="700" >
 <cdparam x="517" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="374" y="234" id="671" />
-<P2  x="374" y="285" id="667" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="684" >
-<cdparam x="429" y="323" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="374" y="325" id="668" />
-<P2  x="374" y="366" id="675" />
+<P1  x="374" y="234" id="688" />
+<P2  x="374" y="285" id="684" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="685" >
-<cdparam x="374" y="90" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="374" y="90" id="681" />
-<P2  x="374" y="128" id="678" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="686" >
-<cdparam x="369" y="357" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="374" y="396" id="676" />
-<P2  x="374" y="438" id="673" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="687" >
-<cdparam x="374" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="374" y="158" id="679" />
-<P2  x="374" y="204" id="670" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="690" >
-<cdparam x="321" y="132" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="cwpI_evt_in(size) " />
-<TGConnectingPoint num="0" id="688" />
-<TGConnectingPoint num="1" id="689" />
-<extraparam>
-<Data eventName="cwpI_evt_in" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="692" >
-<cdparam x="369" y="354" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="691" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="695" >
-<cdparam x="318" y="278" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwpI_evt_out(size)" />
-<TGConnectingPoint num="0" id="693" />
-<TGConnectingPoint num="1" id="694" />
-<extraparam>
-<Data eventName="cwpI_evt_out" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1007" id="698" >
-<cdparam x="331" y="204" />
-<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="cwpI_req(size)" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
-<extraparam>
-<Data requestName="cwpI_req" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="700" >
-<cdparam x="372" y="66" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="699" />
-</COMPONENT>
-
 <CONNECTOR type="115" id="701" >
-<cdparam x="379" y="229" />
+<cdparam x="429" y="323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="379" y="229" id="697" />
-<P2  x="379" y="273" id="693" />
+<P1  x="374" y="325" id="685" />
+<P2  x="374" y="366" id="692" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="702" >
-<cdparam x="379" y="303" />
+<cdparam x="374" y="90" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="379" y="303" id="694" />
-<P2  x="379" y="349" id="691" />
+<P1  x="374" y="90" id="698" />
+<P2  x="374" y="128" id="695" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="703" >
-<cdparam x="379" y="86" />
+<cdparam x="369" y="357" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="379" y="86" id="699" />
-<P2  x="379" y="127" id="688" />
+<P1  x="374" y="396" id="693" />
+<P2  x="374" y="438" id="690" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="704" >
-<cdparam x="419" y="149" />
+<cdparam x="374" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="379" y="157" id="689" />
-<P2  x="379" y="199" id="696" />
+<P1  x="374" y="158" id="696" />
+<P2  x="374" y="204" id="687" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -3220,7 +3220,7 @@ processing tasks
 
 <COMPONENT type="301" id="727" >
 <cdparam x="559" y="109" />
-<sizeparam width="387" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="354" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Some parameters are mapping dependent:
@@ -3853,7 +3853,7 @@ processing tasks
 
 <COMPONENT type="301" id="1111" >
 <cdparam x="606" y="40" />
-<sizeparam width="358" height="75" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="313" height="75" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Some parameters are mapping dependent:
@@ -4874,7 +4874,7 @@ CPU via interrupts (no polling messages)
 
 <COMPONENT type="301" id="1743" >
 <cdparam x="448" y="98" />
-<sizeparam width="429" height="75" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="396" height="75" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Some parameters are mapping dependent:
@@ -8311,7 +8311,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1105" id="3756" >
-<cdparam x="354" y="243" />
+<cdparam x="377" y="225" />
 <sizeparam width="200" height="152" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -8347,7 +8347,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1100" id="3790" >
-<cdparam x="29" y="215" />
+<cdparam x="90" y="201" />
 <sizeparam width="252" height="181" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -8383,7 +8383,7 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="3765" >
 <father id="3790" num="0" />
-<cdparam x="48" y="315" />
+<cdparam x="109" y="301" />
 <sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="106" minY="0" maxY="141" />
@@ -8510,11 +8510,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="3849" >
 <father id="3937" num="0" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
 <TGConnectingPoint num="0" id="3841" />
 <TGConnectingPoint num="1" id="3842" />
 <TGConnectingPoint num="2" id="3843" />
@@ -8524,16 +8524,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3847" />
 <TGConnectingPoint num="7" id="3848" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3858" >
 <father id="3937" num="1" />
-<cdparam x="1685" y="459" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
 <TGConnectingPoint num="0" id="3850" />
 <TGConnectingPoint num="1" id="3851" />
 <TGConnectingPoint num="2" id="3852" />
@@ -8543,16 +8543,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3856" />
 <TGConnectingPoint num="7" id="3857" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3867" >
 <father id="3937" num="2" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
 <TGConnectingPoint num="0" id="3859" />
 <TGConnectingPoint num="1" id="3860" />
 <TGConnectingPoint num="2" id="3861" />
@@ -8562,16 +8562,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3865" />
 <TGConnectingPoint num="7" id="3866" />
 <extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3876" >
 <father id="3937" num="3" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
 <TGConnectingPoint num="0" id="3868" />
 <TGConnectingPoint num="1" id="3869" />
 <TGConnectingPoint num="2" id="3870" />
@@ -8581,16 +8581,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3874" />
 <TGConnectingPoint num="7" id="3875" />
 <extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3885" >
 <father id="3937" num="4" />
-<cdparam x="1466" y="518" />
-<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
 <TGConnectingPoint num="0" id="3877" />
 <TGConnectingPoint num="1" id="3878" />
 <TGConnectingPoint num="2" id="3879" />
@@ -8600,16 +8600,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3883" />
 <TGConnectingPoint num="7" id="3884" />
 <extraparam>
-<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3894" >
 <father id="3937" num="5" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
 <TGConnectingPoint num="0" id="3886" />
 <TGConnectingPoint num="1" id="3887" />
 <TGConnectingPoint num="2" id="3888" />
@@ -8619,16 +8619,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3892" />
 <TGConnectingPoint num="7" id="3893" />
 <extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3903" >
 <father id="3937" num="6" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdparam x="1685" y="459" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
 <TGConnectingPoint num="0" id="3895" />
 <TGConnectingPoint num="1" id="3896" />
 <TGConnectingPoint num="2" id="3897" />
@@ -8638,16 +8638,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3901" />
 <TGConnectingPoint num="7" id="3902" />
 <extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="3912" >
 <father id="3937" num="7" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
 <TGConnectingPoint num="0" id="3904" />
 <TGConnectingPoint num="1" id="3905" />
 <TGConnectingPoint num="2" id="3906" />
@@ -8657,7 +8657,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="3910" />
 <TGConnectingPoint num="7" id="3911" />
 <extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8734,7 +8734,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1102" id="4012" >
-<cdparam x="231" y="635" />
+<cdparam x="354" y="618" />
 <sizeparam width="845" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -9005,7 +9005,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1105" id="4196" >
-<cdparam x="895" y="193" />
+<cdparam x="991" y="187" />
 <sizeparam width="255" height="183" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -9041,7 +9041,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1100" id="4248" >
-<cdparam x="619" y="199" />
+<cdparam x="680" y="193" />
 <sizeparam width="238" height="185" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -9077,11 +9077,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="4205" >
 <father id="4248" num="0" />
-<cdparam x="639" y="239" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="732" y="283" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
 <TGConnectingPoint num="0" id="4197" />
 <TGConnectingPoint num="1" id="4198" />
 <TGConnectingPoint num="2" id="4199" />
@@ -9091,12 +9091,12 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4203" />
 <TGConnectingPoint num="7" id="4204" />
 <extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4214" >
 <father id="4248" num="1" />
-<cdparam x="640" y="335" />
+<cdparam x="701" y="329" />
 <sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="76" minY="0" maxY="145" />
@@ -9115,11 +9115,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4223" >
 <father id="4248" num="2" />
-<cdparam x="671" y="289" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="700" y="233" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
 <TGConnectingPoint num="0" id="4215" />
 <TGConnectingPoint num="1" id="4216" />
 <TGConnectingPoint num="2" id="4217" />
@@ -9129,7 +9129,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4221" />
 <TGConnectingPoint num="7" id="4222" />
 <extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9206,7 +9206,7 @@ sequence diagram.
 </COMPONENT>
 
 <COMPONENT type="1100" id="4323" >
-<cdparam x="1174" y="850" />
+<cdparam x="1141" y="748" />
 <sizeparam width="150" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
@@ -9419,8 +9419,19 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4448" />
 <TGConnectingPoint num="7" id="4449" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="MAPPER_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="Crossbar, INTL_Bridge, INTL_Bus, MAPPER_Bridge, MAPPER_Bus" />
+<mappedAttributes type="int" name="destinationAddress" value="123" />
+<mappedAttributes type="int" name="sourceAddress" value="123" />
+<mappedAttributes type="int" name="counter" value="1" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="4441" >
@@ -9458,8 +9469,17 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4466" />
 <TGConnectingPoint num="7" id="4467" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="INTL_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="Crossbar, INTL_Bridge, INTL_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
+<mappedAttributes type="int" name="counter" value="1" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="4459" >
@@ -9497,8 +9517,26 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4484" />
 <TGConnectingPoint num="7" id="4485" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_sink" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_sink" cpMEC="Double DMA" transferType1="0" transferType2="0" />
+<attributes reference="Double_DMA_transfer" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_2" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_2" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_2" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_2" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_6" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_5" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_8" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_7" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
+<mappedAttributes type="int" name="counter1" value="2" />
+<mappedAttributes type="int" name="counter2" value="2" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="4477" >
@@ -9536,13 +9574,21 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4502" />
 <TGConnectingPoint num="7" id="4503" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="Memory Copy" transferType1="0" transferType2="0" />
+<attributes reference="CP_Memory_Copy" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="CPU_Controller" architectureUnit="MainCPU" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Src_Storage_Instance" architectureUnit="DDR" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Dst_Storage_Instance" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Transfer_Instance_1" architectureUnit="MainBus" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Transfer_Instance2" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappedAttributes type="addr" name="sourceAddress" value="0x123" />
+<mappedAttributes type="addr" name="destinationAddress" value="0x456" />
+<mappedAttributes type="int" name="counter" value="8" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="4495" >
 <father id="4504" num="0" />
-<cdparam x="280" y="1181" />
+<cdparam x="157" y="1179" />
 <sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="174" minY="0" maxY="45" />
@@ -9565,7 +9611,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="1367" y="660" id="3966" />
-<P2  x="1076" y="660" id="3992" />
+<P2  x="1199" y="643" id="3992" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9577,7 +9623,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="1147" y="508" id="4152" />
-<P2  x="1076" y="635" id="3990" />
+<P2  x="1199" y="618" id="3990" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9588,8 +9634,8 @@ sequence diagram.
 <cdparam x="1298" y="875" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="1249" y="850" id="4300" />
-<P2  x="1076" y="685" id="3995" />
+<P1  x="1216" y="748" id="4300" />
+<P2  x="1199" y="668" id="3995" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9601,7 +9647,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="970" y="780" id="4325" />
-<P2  x="864" y="685" id="4003" />
+<P2  x="987" y="668" id="4003" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9613,7 +9659,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="960" y="566" id="4255" />
-<P2  x="864" y="635" id="3997" />
+<P2  x="987" y="618" id="3997" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9649,7 +9695,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="560" y="807" id="3682" />
-<P2  x="442" y="685" id="4002" />
+<P2  x="565" y="668" id="4002" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9697,7 +9743,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="356" y="580" id="3797" />
-<P2  x="231" y="635" id="3988" />
+<P2  x="354" y="618" id="3988" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9721,7 +9767,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="543" y="522" id="3712" />
-<P2  x="442" y="635" id="3996" />
+<P2  x="565" y="618" id="3996" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9744,7 +9790,7 @@ sequence diagram.
 <cdparam x="549" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="454" y="395" id="3738" />
+<P1  x="477" y="377" id="3738" />
 <P2  x="418" y="447" id="4131" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -9756,7 +9802,7 @@ sequence diagram.
 <cdparam x="155" y="323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="155" y="396" id="3772" />
+<P1  x="216" y="382" id="3772" />
 <P2  x="293" y="447" id="4130" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -9769,7 +9815,7 @@ sequence diagram.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
 <P1  x="356" y="737" id="4014" />
-<P2  x="231" y="685" id="3993" />
+<P2  x="354" y="668" id="3993" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -9828,7 +9874,7 @@ sequence diagram.
 <cdparam x="1189" y="374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="1022" y="376" id="4178" />
+<P1  x="1118" y="370" id="4178" />
 <P2  x="1022" y="433" id="4283" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -9840,7 +9886,7 @@ sequence diagram.
 <cdparam x="795" y="360" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="738" y="384" id="4230" />
+<P1  x="799" y="378" id="4230" />
 <P2  x="897" y="433" id="4282" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -9864,7 +9910,7 @@ sequence diagram.
 <cdparam x="1173" y="906" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="1174" y="900" id="4302" />
+<P1  x="1141" y="798" id="4302" />
 <P2  x="1095" y="900" id="4412" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -10178,11 +10224,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="4700" >
 <father id="4788" num="0" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
 <TGConnectingPoint num="0" id="4692" />
 <TGConnectingPoint num="1" id="4693" />
 <TGConnectingPoint num="2" id="4694" />
@@ -10192,16 +10238,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4698" />
 <TGConnectingPoint num="7" id="4699" />
 <extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4709" >
 <father id="4788" num="1" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1685" y="459" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
 <TGConnectingPoint num="0" id="4701" />
 <TGConnectingPoint num="1" id="4702" />
 <TGConnectingPoint num="2" id="4703" />
@@ -10211,16 +10257,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4707" />
 <TGConnectingPoint num="7" id="4708" />
 <extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4718" >
 <father id="4788" num="2" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
 <TGConnectingPoint num="0" id="4710" />
 <TGConnectingPoint num="1" id="4711" />
 <TGConnectingPoint num="2" id="4712" />
@@ -10230,16 +10276,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4716" />
 <TGConnectingPoint num="7" id="4717" />
 <extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4727" >
 <father id="4788" num="3" />
-<cdparam x="1466" y="518" />
-<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
 <TGConnectingPoint num="0" id="4719" />
 <TGConnectingPoint num="1" id="4720" />
 <TGConnectingPoint num="2" id="4721" />
@@ -10249,16 +10295,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4725" />
 <TGConnectingPoint num="7" id="4726" />
 <extraparam>
-<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4736" >
 <father id="4788" num="4" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
 <TGConnectingPoint num="0" id="4728" />
 <TGConnectingPoint num="1" id="4729" />
 <TGConnectingPoint num="2" id="4730" />
@@ -10268,16 +10314,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4734" />
 <TGConnectingPoint num="7" id="4735" />
 <extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4745" >
 <father id="4788" num="5" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
 <TGConnectingPoint num="0" id="4737" />
 <TGConnectingPoint num="1" id="4738" />
 <TGConnectingPoint num="2" id="4739" />
@@ -10287,16 +10333,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4743" />
 <TGConnectingPoint num="7" id="4744" />
 <extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4754" >
 <father id="4788" num="6" />
-<cdparam x="1685" y="459" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
 <TGConnectingPoint num="0" id="4746" />
 <TGConnectingPoint num="1" id="4747" />
 <TGConnectingPoint num="2" id="4748" />
@@ -10306,16 +10352,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4752" />
 <TGConnectingPoint num="7" id="4753" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="4763" >
 <father id="4788" num="7" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
 <TGConnectingPoint num="0" id="4755" />
 <TGConnectingPoint num="1" id="4756" />
 <TGConnectingPoint num="2" id="4757" />
@@ -10325,7 +10371,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="4761" />
 <TGConnectingPoint num="7" id="4762" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10745,11 +10791,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="5056" >
 <father id="5099" num="0" />
-<cdparam x="671" y="289" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="639" y="239" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
 <TGConnectingPoint num="0" id="5048" />
 <TGConnectingPoint num="1" id="5049" />
 <TGConnectingPoint num="2" id="5050" />
@@ -10759,7 +10805,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5054" />
 <TGConnectingPoint num="7" id="5055" />
 <extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5065" >
@@ -10783,11 +10829,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5074" >
 <father id="5099" num="2" />
-<cdparam x="639" y="239" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="671" y="289" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
 <TGConnectingPoint num="0" id="5066" />
 <TGConnectingPoint num="1" id="5067" />
 <TGConnectingPoint num="2" id="5068" />
@@ -10797,7 +10843,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5072" />
 <TGConnectingPoint num="7" id="5073" />
 <extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -11087,8 +11133,19 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5299" />
 <TGConnectingPoint num="7" id="5300" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="ADAIF_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="ADAIF_Bridge, MainBus, MainBridge, Crossbar, ADAIF_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="ADAIF_Bridge, MainBus, MainBridge, Crossbar, ADAIF_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, MAPPER_Bridge, MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="ADAIF_Bridge, Crossbar, INTL_Bridge, INTL_Bus, ADAIF_Bus" />
+<mappedAttributes type="int" name="destinationAddress" value="123" />
+<mappedAttributes type="int" name="sourceAddress" value="123" />
+<mappedAttributes type="int" name="counter" value="123" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="5292" >
@@ -11126,8 +11183,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5317" />
 <TGConnectingPoint num="7" id="5318" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="INTL_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="Crossbar, INTL_Bridge, INTL_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="5310" >
@@ -11165,8 +11230,24 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5335" />
 <TGConnectingPoint num="7" id="5336" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_sink" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_sink" cpMEC="Double DMA" transferType1="0" transferType2="0" />
+<attributes reference="Double_DMA_transfer" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_2" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_2" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_2" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_2" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_6" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_5" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_8" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_7" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="5328" >
@@ -11204,8 +11285,14 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5353" />
 <TGConnectingPoint num="7" id="5354" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="Memory Copy" transferType1="0" transferType2="0" />
+<attributes reference="CP_Memory_Copy" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Dst_Storage_Instance" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Src_Storage_Instance" architectureUnit="DDR" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="CPU_Controller" architectureUnit="MainCPU" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Transfer_Instance_1" architectureUnit="MainBus" />
+<mappingInfo CPname="CP_Memory_Copy" instanceName="Transfer_Instance2" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappedAttributes type="addr" name="sourceAddress" value="0x123" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="5346" >
@@ -11846,11 +11933,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="5551" >
 <father id="5639" num="0" />
-<cdparam x="1686" y="522" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1465" y="339" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
 <TGConnectingPoint num="0" id="5543" />
 <TGConnectingPoint num="1" id="5544" />
 <TGConnectingPoint num="2" id="5545" />
@@ -11860,16 +11947,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5549" />
 <TGConnectingPoint num="7" id="5550" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5560" >
 <father id="5639" num="1" />
-<cdparam x="1685" y="459" />
-<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="395" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
+<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
 <TGConnectingPoint num="0" id="5552" />
 <TGConnectingPoint num="1" id="5553" />
 <TGConnectingPoint num="2" id="5554" />
@@ -11879,16 +11966,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5558" />
 <TGConnectingPoint num="7" id="5559" />
 <extraparam>
-<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
+<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5569" >
 <father id="5639" num="2" />
-<cdparam x="1691" y="345" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="456" />
+<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
 <TGConnectingPoint num="0" id="5561" />
 <TGConnectingPoint num="1" id="5562" />
 <TGConnectingPoint num="2" id="5563" />
@@ -11898,16 +11985,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5567" />
 <TGConnectingPoint num="7" id="5568" />
 <extraparam>
-<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5578" >
 <father id="5639" num="3" />
-<cdparam x="1688" y="405" />
-<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1466" y="518" />
+<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
+<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
 <TGConnectingPoint num="0" id="5570" />
 <TGConnectingPoint num="1" id="5571" />
 <TGConnectingPoint num="2" id="5572" />
@@ -11917,16 +12004,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5576" />
 <TGConnectingPoint num="7" id="5577" />
 <extraparam>
-<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5587" >
 <father id="5639" num="4" />
-<cdparam x="1466" y="518" />
-<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1688" y="405" />
+<sizeparam width="146" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="211" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Chip_to_Octet" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_Sink" />
 <TGConnectingPoint num="0" id="5579" />
 <TGConnectingPoint num="1" id="5580" />
 <TGConnectingPoint num="2" id="5581" />
@@ -11936,16 +12023,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5585" />
 <TGConnectingPoint num="7" id="5586" />
 <extraparam>
-<info value="Zigbee_TX::F_Chip_to_Octet" taskName="F_Chip_to_Octet" referenceTaskName="Zigbee_TX" priority="0" operation="F_Chip_to_Octet" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_Sink" taskName="F_Sink" referenceTaskName="Zigbee_TX" priority="0" operation="F_Sink" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5596" >
 <father id="5639" num="5" />
-<cdparam x="1466" y="456" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1691" y="345" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Symbol2ChipSeq" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWL" />
 <TGConnectingPoint num="0" id="5588" />
 <TGConnectingPoint num="1" id="5589" />
 <TGConnectingPoint num="2" id="5590" />
@@ -11955,16 +12042,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5594" />
 <TGConnectingPoint num="7" id="5595" />
 <extraparam>
-<info value="Zigbee_TX::F_Symbol2ChipSeq" taskName="F_Symbol2ChipSeq" referenceTaskName="Zigbee_TX" priority="0" operation="F_Symbol2ChipSeq" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWL" taskName="F_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWL" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5605" >
 <father id="5639" num="6" />
-<cdparam x="1466" y="395" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1685" y="459" />
+<sizeparam width="162" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_Source" />
+<cdrectangleparam minX="0" maxX="255" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_Q" />
 <TGConnectingPoint num="0" id="5597" />
 <TGConnectingPoint num="1" id="5598" />
 <TGConnectingPoint num="2" id="5599" />
@@ -11974,16 +12061,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5603" />
 <TGConnectingPoint num="7" id="5604" />
 <extraparam>
-<info value="Zigbee_TX::X_Source" taskName="X_Source" referenceTaskName="Zigbee_TX" priority="0" operation="X_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_Q" taskName="F_CWP_Q" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_Q" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5614" >
 <father id="5639" num="7" />
-<cdparam x="1465" y="339" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1686" y="522" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="253" minY="0" maxY="253" />
-<infoparam name="TGComponent" value="Zigbee_TX::F_Source" />
+<cdrectangleparam minX="0" maxX="261" minY="0" maxY="253" />
+<infoparam name="TGComponent" value="Zigbee_TX::F_CWP_I" />
 <TGConnectingPoint num="0" id="5606" />
 <TGConnectingPoint num="1" id="5607" />
 <TGConnectingPoint num="2" id="5608" />
@@ -11993,7 +12080,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5612" />
 <TGConnectingPoint num="7" id="5613" />
 <extraparam>
-<info value="Zigbee_TX::F_Source" taskName="F_Source" referenceTaskName="Zigbee_TX" priority="0" operation="F_Source" fatherComponentMECType="0" />
+<info value="Zigbee_TX::F_CWP_I" taskName="F_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="F_CWP_I" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -12413,11 +12500,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="5907" >
 <father id="5950" num="0" />
-<cdparam x="639" y="239" />
-<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="671" y="289" />
+<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
 <TGConnectingPoint num="0" id="5899" />
 <TGConnectingPoint num="1" id="5900" />
 <TGConnectingPoint num="2" id="5901" />
@@ -12427,7 +12514,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5905" />
 <TGConnectingPoint num="7" id="5906" />
 <extraparam>
-<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5916" >
@@ -12451,11 +12538,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="5925" >
 <father id="5950" num="2" />
-<cdparam x="671" y="289" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="639" y="239" />
+<sizeparam width="145" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="145" />
-<infoparam name="TGComponent" value="Zigbee_TX::X_CWP_I" />
+<cdrectangleparam minX="0" maxX="93" minY="0" maxY="145" />
+<infoparam name="TGComponent" value="Zigbee_TX::X_CWL" />
 <TGConnectingPoint num="0" id="5917" />
 <TGConnectingPoint num="1" id="5918" />
 <TGConnectingPoint num="2" id="5919" />
@@ -12465,7 +12552,7 @@ sequence diagram.
 <TGConnectingPoint num="6" id="5923" />
 <TGConnectingPoint num="7" id="5924" />
 <extraparam>
-<info value="Zigbee_TX::X_CWP_I" taskName="X_CWP_I" referenceTaskName="Zigbee_TX" priority="0" operation="CWP" fatherComponentMECType="1" />
+<info value="Zigbee_TX::X_CWL" taskName="X_CWL" referenceTaskName="Zigbee_TX" priority="0" operation="CWL" fatherComponentMECType="1" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -12755,8 +12842,19 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6150" />
 <TGConnectingPoint num="7" id="6151" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Symbol2ChipSeq_Chips2Octet" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="MAPPER_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="Crossbar, INTL_Bridge, INTL_Bus, MAPPER_Bridge, MAPPER_Bus" />
+<mappedAttributes type="int" name="destinationAddress" value="123" />
+<mappedAttributes type="int" name="sourceAddress" value="123" />
+<mappedAttributes type="int" name="counter" value="123" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="6143" >
@@ -12794,8 +12892,16 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6168" />
 <TGConnectingPoint num="7" id="6169" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Chip2Octet_CWL" cpMEC="Single DMA" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="INTL_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="INTL_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="Crossbar, INTL_Bridge, INTL_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, INTL_Bridge, INTL_Bus" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="6161" >
@@ -12833,8 +12939,24 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6186" />
 <TGConnectingPoint num="7" id="6187" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_sink" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_sink" cpMEC="Double DMA" transferType1="0" transferType2="0" />
+<attributes reference="Double_DMA_transfer" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Src_Storage_Instance_2" architectureUnit="FEP_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="DMA_Controller_2" architectureUnit="FEP_DMA" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_2" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="ADAIF_MSS" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="CPU_Controller_2" architectureUnit="MainCPU" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_6" architectureUnit="FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_5" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_8" architectureUnit="MainBus, MainBridge, Crossbar, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
+<mappingInfo CPname="Double_DMA_transfer" instanceName="Transfer_Instance_7" architectureUnit="ADAIF_Bridge, Crossbar, ADAIF_Bus, FEP_Bridge, FEP_Bus" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="6179" >
@@ -12872,8 +12994,17 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6204" />
 <TGConnectingPoint num="7" id="6205" />
 <extraparam>
-<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="VOID" transferType1="-1" transferType2="-1" />
-<attributes reference="" />
+<info stereotype="CP" nodeName="CP_Source_to_Bits2Symbol" cpMEC="Memory Copy" transferType1="0" transferType2="0" />
+<attributes reference="DMA_transfer" />
+<mappingInfo CPname="DMA_transfer" instanceName="Src_Storage_Instance_1" architectureUnit="DDR" />
+<mappingInfo CPname="DMA_transfer" instanceName="Dst_Storage_Instance_1" architectureUnit="MAPPER_MSS" />
+<mappingInfo CPname="DMA_transfer" instanceName="DMA_Controller_1" architectureUnit="MAPPER_DMA" />
+<mappingInfo CPname="DMA_transfer" instanceName="CPU_Controller_1" architectureUnit="MainCPU" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_1" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_4" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_3" architectureUnit="MAPPER_Bus" />
+<mappingInfo CPname="DMA_transfer" instanceName="Transfer_Instance_2" architectureUnit="MainBus, MainBridge, Crossbar, MAPPER_Bridge, MAPPER_Bus" />
+<mappedAttributes type="addr" name="sourceAddress" value="0x123" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="1110" id="6197" >
@@ -13246,16 +13377,16 @@ sequence diagram.
 <cdparam x="1029" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="1029" y="409" id="7088" />
-<P2  x="1044" y="406" id="7123" />
+<P1  x="1029" y="409" id="7175" />
+<P2  x="1044" y="406" id="7142" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6240" >
 <cdparam x="16" y="272" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="241" y="448" id="6376" />
-<P2  x="541" y="448" id="6399" />
+<P1  x="241" y="448" id="6382" />
+<P2  x="541" y="448" id="6401" />
 <Point x="220" y="526" />
 <Point x="220" y="560" />
 <Point x="570" y="560" />
@@ -13298,8 +13429,8 @@ sequence diagram.
 <cdparam x="207" y="242" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="541" y="448" id="6397" />
-<P2  x="241" y="448" id="6378" />
+<P1  x="541" y="448" id="6403" />
+<P2  x="241" y="448" id="6380" />
 <Point x="587" y="478" />
 <Point x="587" y="578" />
 <Point x="208" y="578" />
@@ -13342,8 +13473,8 @@ sequence diagram.
 <cdparam x="487" y="102" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="994" y="242" id="6357" />
-<P2  x="241" y="448" id="6374" />
+<P1  x="994" y="242" id="6359" />
+<P2  x="241" y="448" id="6384" />
 <Point x="1005" y="242" />
 <Point x="1005" y="282" />
 <Point x="201" y="282" />
@@ -13386,8 +13517,8 @@ sequence diagram.
 <cdparam x="487" y="88" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="994" y="218" id="6355" />
-<P2  x="241" y="448" id="6384" />
+<P1  x="994" y="218" id="6361" />
+<P2  x="241" y="448" id="6374" />
 <Point x="1020" y="220" />
 <Point x="1020" y="291" />
 <Point x="215" y="291" />
@@ -13430,120 +13561,120 @@ sequence diagram.
 <cdparam x="1124" y="324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="1064" y="465" id="7156" />
-<P2  x="1113" y="457" id="7208" />
+<P1  x="1064" y="465" id="7099" />
+<P2  x="1113" y="457" id="7210" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6257" >
 <cdparam x="1124" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="1064" y="406" id="7118" />
-<P2  x="1113" y="419" id="7210" />
+<P1  x="1064" y="406" id="7137" />
+<P2  x="1113" y="419" id="7208" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6258" >
 <cdparam x="987" y="323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="912" y="442" id="7071" />
-<P2  x="936" y="442" id="7137" />
+<P1  x="912" y="442" id="7069" />
+<P2  x="936" y="442" id="7118" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6259" >
 <cdparam x="987" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="912" y="420" id="7069" />
-<P2  x="936" y="415" id="7099" />
+<P1  x="912" y="420" id="7071" />
+<P2  x="936" y="415" id="7156" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6260" >
 <cdparam x="869" y="320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="793" y="441" id="7024" />
-<P2  x="821" y="441" id="7067" />
+<P1  x="793" y="441" id="6967" />
+<P2  x="821" y="441" id="7073" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6261" >
 <cdparam x="869" y="299" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="793" y="420" id="6986" />
-<P2  x="821" y="420" id="7073" />
+<P1  x="793" y="420" id="7005" />
+<P2  x="821" y="420" id="7067" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6262" >
 <cdparam x="734" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="658" y="420" id="6418" />
-<P2  x="683" y="420" id="6967" />
+<P1  x="658" y="420" id="6420" />
+<P2  x="683" y="420" id="7024" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6263" >
 <cdparam x="734" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="658" y="441" id="6420" />
-<P2  x="683" y="441" id="7005" />
+<P1  x="658" y="441" id="6418" />
+<P2  x="683" y="441" id="6986" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6264" >
 <cdparam x="617" y="298" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="541" y="420" id="6401" />
-<P2  x="567" y="420" id="6422" />
+<P1  x="541" y="420" id="6399" />
+<P2  x="567" y="420" id="6416" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6265" >
 <cdparam x="617" y="320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="541" y="440" id="6403" />
-<P2  x="567" y="440" id="6416" />
+<P1  x="541" y="440" id="6397" />
+<P2  x="567" y="440" id="6422" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6266" >
 <cdparam x="519" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="441" y="448" id="6924" />
-<P2  x="470" y="448" id="6395" />
+<P1  x="441" y="448" id="6795" />
+<P2  x="470" y="448" id="6405" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6267" >
 <cdparam x="519" y="333" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="441" y="448" id="6795" />
-<P2  x="470" y="448" id="6405" />
+<P1  x="441" y="448" id="6924" />
+<P2  x="470" y="448" id="6395" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6268" >
 <cdparam x="389" y="379" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="312" y="448" id="6382" />
-<P2  x="333" y="448" id="6814" />
+<P1  x="312" y="448" id="6376" />
+<P2  x="333" y="448" id="6905" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6269" >
 <cdparam x="389" y="359" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="312" y="448" id="6380" />
-<P2  x="333" y="448" id="6833" />
+<P1  x="312" y="448" id="6378" />
+<P2  x="333" y="448" id="6886" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6274" >
 <cdparam x="782" y="137" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="994" y="170" id="6359" />
-<P2  x="333" y="395" id="6852" />
+<P1  x="994" y="170" id="6357" />
+<P2  x="333" y="395" id="6867" />
 <Point x="1058" y="170" />
 <Point x="1058" y="328" />
 <Point x="302" y="328" />
@@ -13586,8 +13717,8 @@ sequence diagram.
 <cdparam x="782" y="159" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="994" y="190" id="6361" />
-<P2  x="333" y="416" id="6871" />
+<P1  x="994" y="190" id="6355" />
+<P2  x="333" y="416" id="6848" />
 <Point x="1047" y="189" />
 <Point x="1047" y="321" />
 <Point x="288" y="321" />
@@ -13630,344 +13761,344 @@ sequence diagram.
 <cdparam x="693" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="890" y="221" id="6752" />
-<P2  x="923" y="221" id="6353" />
+<P1  x="890" y="221" id="6695" />
+<P2  x="923" y="221" id="6363" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6281" >
 <cdparam x="693" y="172" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="890" y="199" id="6714" />
-<P2  x="923" y="199" id="6363" />
+<P1  x="890" y="199" id="6733" />
+<P2  x="923" y="199" id="6353" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6282" >
 <cdparam x="557" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Composite port" value="Connector between ports" />
-<P1  x="753" y="219" id="6522" />
-<P2  x="780" y="219" id="6733" />
+<P1  x="753" y="219" id="6465" />
+<P2  x="780" y="219" id="6714" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6283" >
 <cdparam x="557" y="170" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Composite port" value="Connector between ports" />
-<P1  x="753" y="199" id="6484" />
-<P2  x="780" y="199" id="6695" />
+<P1  x="753" y="199" id="6503" />
+<P2  x="780" y="199" id="6752" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6284" >
 <cdparam x="427" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="635" y="199" id="6340" />
-<P2  x="643" y="199" id="6503" />
+<P1  x="635" y="199" id="6338" />
+<P2  x="643" y="199" id="6484" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6285" >
 <cdparam x="427" y="170" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="635" y="219" id="6338" />
-<P2  x="643" y="219" id="6465" />
+<P1  x="635" y="219" id="6340" />
+<P2  x="643" y="219" id="6522" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6286" >
 <cdparam x="320" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="513" y="205" id="6637" />
-<P2  x="534" y="215" id="6336" />
+<P1  x="513" y="205" id="6580" />
+<P2  x="534" y="215" id="6342" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6287" >
 <cdparam x="320" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="513" y="176" id="6599" />
-<P2  x="534" y="195" id="6342" />
+<P1  x="513" y="176" id="6618" />
+<P2  x="534" y="195" id="6336" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6288" >
 <cdparam x="188" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="322" y="216" id="6437" />
-<P2  x="348" y="212" id="6618" />
+<P1  x="322" y="216" id="6435" />
+<P2  x="348" y="212" id="6599" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6289" >
 <cdparam x="188" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="322" y="195" id="6435" />
-<P2  x="348" y="178" id="6580" />
+<P1  x="322" y="195" id="6437" />
+<P2  x="348" y="178" id="6637" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6290" >
 <cdparam x="67" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="195" y="213" id="6323" />
-<P2  x="221" y="215" id="6433" />
+<P1  x="195" y="213" id="6325" />
+<P2  x="221" y="215" id="6439" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6291" >
 <cdparam x="67" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="195" y="193" id="6325" />
-<P2  x="221" y="195" id="6439" />
+<P1  x="195" y="193" id="6323" />
+<P2  x="221" y="195" id="6433" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6292" >
 <cdparam x="480" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="480" y="223" id="6660" />
-<P2  x="493" y="205" id="6642" />
+<P1  x="480" y="223" id="6565" />
+<P2  x="493" y="205" id="6585" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6293" >
 <cdparam x="484" y="239" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="450" y="173" id="6569" />
-<P2  x="493" y="176" id="6604" />
+<P1  x="450" y="173" id="6656" />
+<P2  x="493" y="176" id="6623" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6294" >
 <cdparam x="403" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="368" y="212" id="6623" />
-<P2  x="389" y="223" id="6658" />
+<P1  x="368" y="212" id="6604" />
+<P2  x="389" y="223" id="6567" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6295" >
 <cdparam x="403" y="274" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="368" y="178" id="6585" />
-<P2  x="381" y="170" id="6567" />
+<P1  x="368" y="178" id="6642" />
+<P2  x="381" y="170" id="6658" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6296" >
 <cdparam x="469" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="410" y="191" id="6565" />
-<P2  x="416" y="191" id="6656" />
+<P1  x="410" y="191" id="6660" />
+<P2  x="416" y="191" id="6569" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6297" >
 <cdparam x="756" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="727" y="248" id="6541" />
-<P2  x="733" y="219" id="6527" />
+<P1  x="727" y="248" id="6454" />
+<P2  x="733" y="219" id="6470" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6298" >
 <cdparam x="760" y="229" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="728" y="176" id="6450" />
-<P2  x="733" y="199" id="6489" />
+<P1  x="728" y="176" id="6545" />
+<P2  x="733" y="199" id="6508" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6299" >
 <cdparam x="679" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="663" y="199" id="6508" />
-<P2  x="668" y="248" id="6543" />
+<P1  x="663" y="199" id="6489" />
+<P2  x="668" y="248" id="6452" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6300" >
 <cdparam x="679" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="663" y="219" id="6470" />
-<P2  x="667" y="173" id="6452" />
+<P1  x="663" y="219" id="6527" />
+<P2  x="667" y="173" id="6543" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6301" >
 <cdparam x="745" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="696" y="194" id="6454" />
-<P2  x="697" y="213" id="6545" />
+<P1  x="696" y="194" id="6541" />
+<P2  x="697" y="213" id="6450" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6302" >
 <cdparam x="928" y="350" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="868" y="249" id="6775" />
-<P2  x="870" y="221" id="6757" />
+<P1  x="868" y="249" id="6680" />
+<P2  x="870" y="221" id="6700" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6303" >
 <cdparam x="932" y="252" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="864" y="180" id="6684" />
-<P2  x="870" y="199" id="6719" />
+<P1  x="864" y="180" id="6771" />
+<P2  x="870" y="199" id="6738" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6304" >
 <cdparam x="851" y="313" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="800" y="219" id="6738" />
-<P2  x="802" y="249" id="6773" />
+<P1  x="800" y="219" id="6719" />
+<P2  x="802" y="249" id="6682" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6305" >
 <cdparam x="851" y="287" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="800" y="199" id="6700" />
-<P2  x="802" y="176" id="6682" />
+<P1  x="800" y="199" id="6757" />
+<P2  x="802" y="176" id="6773" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6306" >
 <cdparam x="917" y="391" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="829" y="200" id="6680" />
-<P2  x="833" y="215" id="6771" />
+<P1  x="829" y="200" id="6775" />
+<P2  x="833" y="215" id="6684" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6307" >
 <cdparam x="698" y="478" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="420" y="484" id="6890" />
-<P2  x="421" y="448" id="6929" />
+<P1  x="420" y="484" id="6837" />
+<P2  x="421" y="448" id="6800" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6308" >
 <cdparam x="696" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="418" y="433" id="6907" />
-<P2  x="421" y="448" id="6800" />
+<P1  x="418" y="433" id="6820" />
+<P2  x="421" y="448" id="6929" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6309" >
 <cdparam x="619" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="353" y="448" id="6819" />
-<P2  x="362" y="493" id="6896" />
+<P1  x="353" y="448" id="6910" />
+<P2  x="362" y="493" id="6831" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6310" >
 <cdparam x="619" y="386" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="353" y="416" id="6876" />
-<P2  x="362" y="476" id="6894" />
+<P1  x="353" y="416" id="6853" />
+<P2  x="362" y="476" id="6833" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6311" >
 <cdparam x="619" y="453" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="353" y="448" id="6838" />
-<P2  x="360" y="438" id="6913" />
+<P1  x="353" y="448" id="6891" />
+<P2  x="360" y="438" id="6814" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6312" >
 <cdparam x="619" y="360" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="353" y="395" id="6857" />
-<P2  x="360" y="421" id="6911" />
+<P1  x="353" y="395" id="6872" />
+<P2  x="360" y="421" id="6816" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6313" >
 <cdparam x="571" y="583" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="389" y="453" id="6909" />
-<P2  x="390" y="467" id="6892" />
+<P1  x="389" y="453" id="6818" />
+<P2  x="390" y="467" id="6835" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6314" >
 <cdparam x="918" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="768" y="435" id="7047" />
-<P2  x="773" y="441" id="7029" />
+<P1  x="768" y="435" id="6952" />
+<P2  x="773" y="441" id="6972" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6315" >
 <cdparam x="922" y="311" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="770" y="398" id="6956" />
-<P2  x="773" y="420" id="6991" />
+<P1  x="770" y="398" id="7043" />
+<P2  x="773" y="420" id="7010" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6316" >
 <cdparam x="841" y="372" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="703" y="441" id="7010" />
-<P2  x="705" y="435" id="7045" />
+<P1  x="703" y="441" id="6991" />
+<P2  x="705" y="435" id="6954" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6317" >
 <cdparam x="841" y="346" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="703" y="420" id="6972" />
-<P2  x="704" y="394" id="6954" />
+<P1  x="703" y="420" id="7029" />
+<P2  x="704" y="394" id="7045" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6318" >
 <cdparam x="907" y="450" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="733" y="423" id="6952" />
-<P2  x="733" y="406" id="7043" />
+<P1  x="733" y="423" id="7047" />
+<P2  x="733" y="406" id="6956" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6319" >
 <cdparam x="1272" y="373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Composite port" value="Connector between ports" />
-<P1  x="1033" y="469" id="7179" />
-<P2  x="1044" y="465" id="7161" />
+<P1  x="1033" y="469" id="7084" />
+<P2  x="1044" y="465" id="7104" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6320" >
 <cdparam x="1195" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="956" y="442" id="7142" />
-<P2  x="970" y="473" id="7177" />
+<P1  x="956" y="442" id="7123" />
+<P2  x="970" y="473" id="7086" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6321" >
 <cdparam x="1195" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Composite port to Primitive port" value="Connector between ports" />
-<P1  x="956" y="415" id="7104" />
-<P2  x="963" y="408" id="7086" />
+<P1  x="956" y="415" id="7161" />
+<P2  x="963" y="408" id="7177" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6322" >
 <cdparam x="1261" y="414" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="992" y="434" id="7084" />
-<P2  x="1004" y="448" id="7175" />
+<P1  x="992" y="434" id="7179" />
+<P2  x="1004" y="448" id="7088" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1202" id="6335" >
@@ -13991,15 +14122,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="6324" >
 <father id="6335" num="0" />
-<cdparam x="174" y="203" />
+<cdparam x="174" y="183" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="72" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Event src_out" />
+<infoparam name="Primitive port" value="Channel src_out" />
 <TGConnectingPoint num="0" id="6323" />
 <extraparam>
-<Prop commName="src_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="src_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14008,15 +14139,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6326" >
 <father id="6335" num="1" />
-<cdparam x="174" y="183" />
+<cdparam x="174" y="203" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="72" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Channel src_out" />
+<infoparam name="Primitive port" value="Event src_out" />
 <TGConnectingPoint num="0" id="6325" />
 <extraparam>
-<Prop commName="src_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="src_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14049,15 +14180,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="6337" >
 <father id="6352" num="0" />
-<cdparam x="534" y="205" />
+<cdparam x="534" y="185" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6336" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14066,15 +14197,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6339" >
 <father id="6352" num="1" />
-<cdparam x="614" y="209" />
+<cdparam x="614" y="189" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Channel ovlp_out" />
+<infoparam name="Primitive port" value="Event ovlp_out" />
 <TGConnectingPoint num="0" id="6338" />
 <extraparam>
-<Prop commName="ovlp_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="ovlp_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14083,15 +14214,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6341" >
 <father id="6352" num="2" />
-<cdparam x="614" y="189" />
+<cdparam x="614" y="209" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Event ovlp_out" />
+<infoparam name="Primitive port" value="Channel ovlp_out" />
 <TGConnectingPoint num="0" id="6340" />
 <extraparam>
-<Prop commName="ovlp_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="ovlp_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14100,15 +14231,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6343" >
 <father id="6352" num="3" />
-<cdparam x="534" y="185" />
+<cdparam x="534" y="205" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="45" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6342" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14137,15 +14268,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="6354" >
 <father id="6373" num="0" />
-<cdparam x="923" y="211" />
+<cdparam x="923" y="189" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6353" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14154,15 +14285,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6356" >
 <father id="6373" num="1" />
-<cdparam x="973" y="208" />
+<cdparam x="973" y="180" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel dmx_out2" />
+<infoparam name="Primitive port" value="Event dmx_out1" />
 <TGConnectingPoint num="0" id="6355" />
 <extraparam>
-<Prop commName="dmx_out2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="dmx_out1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14171,15 +14302,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6358" >
 <father id="6373" num="2" />
-<cdparam x="973" y="232" />
+<cdparam x="973" y="160" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event dmx_out2" />
+<infoparam name="Primitive port" value="Channel dmx_out1" />
 <TGConnectingPoint num="0" id="6357" />
 <extraparam>
-<Prop commName="dmx_out2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dmx_out1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14188,15 +14319,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6360" >
 <father id="6373" num="3" />
-<cdparam x="973" y="160" />
+<cdparam x="973" y="232" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel dmx_out1" />
+<infoparam name="Primitive port" value="Event dmx_out2" />
 <TGConnectingPoint num="0" id="6359" />
 <extraparam>
-<Prop commName="dmx_out1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="dmx_out2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14205,15 +14336,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6362" >
 <father id="6373" num="4" />
-<cdparam x="973" y="180" />
+<cdparam x="973" y="208" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event dmx_out1" />
+<infoparam name="Primitive port" value="Channel dmx_out2" />
 <TGConnectingPoint num="0" id="6361" />
 <extraparam>
-<Prop commName="dmx_out1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dmx_out2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14222,15 +14353,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6364" >
 <father id="6373" num="5" />
-<cdparam x="923" y="189" />
+<cdparam x="923" y="211" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6363" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14263,11 +14394,11 @@ sequence diagram.
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event in1" />
+<infoparam name="Primitive port" value="Channel dmx_out2" />
 <TGConnectingPoint num="0" id="6374" />
 <extraparam>
-<Prop commName="in1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dmx_out2" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14276,14 +14407,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6377" >
 <father id="6394" num="1" />
-<cdparam x="241" y="438" />
+<cdparam x="291" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event in2" />
+<infoparam name="Primitive port" value="Event mx_out" />
 <TGConnectingPoint num="0" id="6376" />
 <extraparam>
-<Prop commName="in2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="mx_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14293,14 +14424,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6379" >
 <father id="6394" num="2" />
-<cdparam x="241" y="438" />
+<cdparam x="291" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel in2" />
+<infoparam name="Primitive port" value="Channel mx_out" />
 <TGConnectingPoint num="0" id="6378" />
 <extraparam>
-<Prop commName="in2" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="mx_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14310,14 +14441,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6381" >
 <father id="6394" num="3" />
-<cdparam x="291" y="438" />
+<cdparam x="241" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel mx_out" />
+<infoparam name="Primitive port" value="Channel in2" />
 <TGConnectingPoint num="0" id="6380" />
 <extraparam>
-<Prop commName="mx_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="in2" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14327,14 +14458,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6383" >
 <father id="6394" num="4" />
-<cdparam x="291" y="438" />
+<cdparam x="241" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event mx_out" />
+<infoparam name="Primitive port" value="Event in2" />
 <TGConnectingPoint num="0" id="6382" />
 <extraparam>
-<Prop commName="mx_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="in2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14348,11 +14479,11 @@ sequence diagram.
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel dmx_out2" />
+<infoparam name="Primitive port" value="Event in1" />
 <TGConnectingPoint num="0" id="6384" />
 <extraparam>
-<Prop commName="dmx_out2" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14386,11 +14517,11 @@ sequence diagram.
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6395" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14399,15 +14530,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6398" >
 <father id="6415" num="1" />
-<cdparam x="520" y="438" />
+<cdparam x="520" y="430" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel dmx1_out2" />
+<infoparam name="Primitive port" value="Event dmx1_out1" />
 <TGConnectingPoint num="0" id="6397" />
 <extraparam>
-<Prop commName="dmx1_out2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="dmx1_out1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14416,15 +14547,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6400" >
 <father id="6415" num="2" />
-<cdparam x="520" y="438" />
+<cdparam x="520" y="410" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event dmx1_out2" />
+<infoparam name="Primitive port" value="Channel dmx1_out1" />
 <TGConnectingPoint num="0" id="6399" />
 <extraparam>
-<Prop commName="dmx1_out2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dmx1_out1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14433,15 +14564,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6402" >
 <father id="6415" num="3" />
-<cdparam x="520" y="410" />
+<cdparam x="520" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel dmx1_out1" />
+<infoparam name="Primitive port" value="Event dmx1_out2" />
 <TGConnectingPoint num="0" id="6401" />
 <extraparam>
-<Prop commName="dmx1_out1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="dmx1_out2" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14450,15 +14581,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6404" >
 <father id="6415" num="4" />
-<cdparam x="520" y="430" />
+<cdparam x="520" y="438" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Event dmx1_out1" />
+<infoparam name="Primitive port" value="Channel dmx1_out2" />
 <TGConnectingPoint num="0" id="6403" />
 <extraparam>
-<Prop commName="dmx1_out1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dmx1_out2" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14471,11 +14602,11 @@ sequence diagram.
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="40" minY="-10" maxY="97" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6405" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14506,15 +14637,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="6417" >
 <father id="6432" num="0" />
-<cdparam x="567" y="430" />
+<cdparam x="567" y="410" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6416" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14523,15 +14654,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6419" >
 <father id="6432" num="1" />
-<cdparam x="637" y="410" />
+<cdparam x="637" y="431" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel rep_out" />
+<infoparam name="Primitive port" value="Event rep_out" />
 <TGConnectingPoint num="0" id="6418" />
 <extraparam>
-<Prop commName="rep_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="rep_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14540,15 +14671,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6421" >
 <father id="6432" num="2" />
-<cdparam x="637" y="431" />
+<cdparam x="637" y="410" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event rep_out" />
+<infoparam name="Primitive port" value="Channel rep_out" />
 <TGConnectingPoint num="0" id="6420" />
 <extraparam>
-<Prop commName="rep_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="rep_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14557,15 +14688,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6423" >
 <father id="6432" num="3" />
-<cdparam x="567" y="410" />
+<cdparam x="567" y="430" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6422" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14595,15 +14726,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="6434" >
 <father id="6449" num="0" />
-<cdparam x="221" y="205" />
+<cdparam x="221" y="185" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6433" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14612,15 +14743,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6436" >
 <father id="6449" num="1" />
-<cdparam x="301" y="185" />
+<cdparam x="301" y="206" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel feed_out" />
+<infoparam name="Primitive port" value="Event feed_out" />
 <TGConnectingPoint num="0" id="6435" />
 <extraparam>
-<Prop commName="feed_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="feed_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14629,15 +14760,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6438" >
 <father id="6449" num="2" />
-<cdparam x="301" y="206" />
+<cdparam x="301" y="185" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event feed_out" />
+<infoparam name="Primitive port" value="Channel feed_out" />
 <TGConnectingPoint num="0" id="6437" />
 <extraparam>
-<Prop commName="feed_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="feed_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14646,15 +14777,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6440" >
 <father id="6449" num="3" />
-<cdparam x="221" y="185" />
+<cdparam x="221" y="205" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="70" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6439" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14682,11 +14813,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1202" id="6464" >
 <father id="6564" num="0" />
-<cdparam x="675" y="150" />
-<sizeparam width="45" height="36" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="676" y="221" />
+<sizeparam width="43" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="114" />
-<infoparam name="Primitive component" value="X_fft" />
+<cdrectangleparam minX="0" maxX="47" minY="0" maxY="110" />
+<infoparam name="Primitive component" value="F_fft" />
 <TGConnectingPoint num="0" id="6456" />
 <TGConnectingPoint num="1" id="6457" />
 <TGConnectingPoint num="2" id="6458" />
@@ -14701,15 +14832,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6451" >
 <father id="6464" num="0" />
-<cdparam x="712" y="168" />
+<cdparam x="689" y="213" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Channel fft_out" />
+<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Request r_fft" />
 <TGConnectingPoint num="0" id="6450" />
 <extraparam>
-<Prop commName="fft_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_fft" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14718,15 +14849,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6453" >
 <father id="6464" num="1" />
-<cdparam x="667" y="165" />
+<cdparam x="668" y="240" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Channel in" />
+<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6452" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14735,14 +14866,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6455" >
 <father id="6464" num="2" />
-<cdparam x="688" y="178" />
+<cdparam x="711" y="240" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Request r_fft" />
+<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Event fft_out" />
 <TGConnectingPoint num="0" id="6454" />
 <extraparam>
-<Prop commName="r_fft" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fft_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14752,7 +14883,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6483" >
 <father id="6564" num="1" />
-<cdparam x="643" y="209" />
+<cdparam x="733" y="209" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -14778,7 +14909,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6502" >
 <father id="6564" num="2" />
-<cdparam x="733" y="189" />
+<cdparam x="643" y="189" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -14804,7 +14935,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6521" >
 <father id="6564" num="3" />
-<cdparam x="643" y="189" />
+<cdparam x="733" y="189" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -14830,7 +14961,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6540" >
 <father id="6564" num="4" />
-<cdparam x="733" y="209" />
+<cdparam x="643" y="209" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -14856,11 +14987,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1202" id="6555" >
 <father id="6564" num="5" />
-<cdparam x="676" y="221" />
-<sizeparam width="43" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="675" y="150" />
+<sizeparam width="45" height="36" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="47" minY="0" maxY="110" />
-<infoparam name="Primitive component" value="F_fft" />
+<cdrectangleparam minX="0" maxX="45" minY="0" maxY="114" />
+<infoparam name="Primitive component" value="X_fft" />
 <TGConnectingPoint num="0" id="6547" />
 <TGConnectingPoint num="1" id="6548" />
 <TGConnectingPoint num="2" id="6549" />
@@ -14875,14 +15006,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6542" >
 <father id="6555" num="0" />
-<cdparam x="711" y="240" />
+<cdparam x="688" y="178" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event fft_out" />
+<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Request r_fft" />
 <TGConnectingPoint num="0" id="6541" />
 <extraparam>
-<Prop commName="fft_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_fft" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14892,15 +15023,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6544" >
 <father id="6555" num="1" />
-<cdparam x="668" y="240" />
+<cdparam x="667" y="165" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event in" />
+<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6543" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14909,15 +15040,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6546" >
 <father id="6555" num="2" />
-<cdparam x="689" y="213" />
+<cdparam x="712" y="168" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="35" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Request r_fft" />
+<cdrectangleparam minX="-8" maxX="37" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Channel fft_out" />
 <TGConnectingPoint num="0" id="6545" />
 <extraparam>
-<Prop commName="r_fft" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="fft_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14945,11 +15076,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1202" id="6579" >
 <father id="6679" num="0" />
-<cdparam x="389" y="147" />
-<sizeparam width="53" height="36" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="397" y="199" />
+<sizeparam width="75" height="61" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="92" minY="0" maxY="117" />
-<infoparam name="Primitive component" value="X_dma" />
+<cdrectangleparam minX="0" maxX="70" minY="0" maxY="92" />
+<infoparam name="Primitive component" value="F_dma" />
 <TGConnectingPoint num="0" id="6571" />
 <TGConnectingPoint num="1" id="6572" />
 <TGConnectingPoint num="2" id="6573" />
@@ -14959,19 +15090,19 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6577" />
 <TGConnectingPoint num="7" id="6578" />
 <extraparam>
-<Attribute access="2" id="size" value="" type="0" typeOther="" />
+<Attribute access="2" id="size" value="0" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6566" >
 <father id="6579" num="0" />
-<cdparam x="402" y="175" />
+<cdparam x="464" y="215" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Request r_dma" />
+<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
+<infoparam name="Primitive port" value="Event dma_out" />
 <TGConnectingPoint num="0" id="6565" />
 <extraparam>
-<Prop commName="r_dma" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dma_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14981,15 +15112,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6568" >
 <father id="6579" num="1" />
-<cdparam x="381" y="162" />
+<cdparam x="389" y="215" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Channel in" />
+<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6567" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14998,15 +15129,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6570" >
 <father id="6579" num="2" />
-<cdparam x="434" y="165" />
+<cdparam x="408" y="191" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
-<infoparam name="Primitive port" value="Channel dma_out" />
+<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
+<infoparam name="Primitive port" value="Request r_dma" />
 <TGConnectingPoint num="0" id="6569" />
 <extraparam>
-<Prop commName="dma_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_dma" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15015,7 +15146,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6598" >
 <father id="6679" num="1" />
-<cdparam x="348" y="168" />
+<cdparam x="493" y="195" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="135" minY="-10" maxY="143" />
@@ -15041,7 +15172,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6617" >
 <father id="6679" num="2" />
-<cdparam x="493" y="166" />
+<cdparam x="348" y="202" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="135" minY="-10" maxY="143" />
@@ -15067,7 +15198,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6636" >
 <father id="6679" num="3" />
-<cdparam x="348" y="202" />
+<cdparam x="493" y="166" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="135" minY="-10" maxY="143" />
@@ -15093,7 +15224,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6655" >
 <father id="6679" num="4" />
-<cdparam x="493" y="195" />
+<cdparam x="348" y="168" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="135" minY="-10" maxY="143" />
@@ -15119,11 +15250,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1202" id="6670" >
 <father id="6679" num="5" />
-<cdparam x="397" y="199" />
-<sizeparam width="75" height="61" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="389" y="147" />
+<sizeparam width="53" height="36" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="70" minY="0" maxY="92" />
-<infoparam name="Primitive component" value="F_dma" />
+<cdrectangleparam minX="0" maxX="92" minY="0" maxY="117" />
+<infoparam name="Primitive component" value="X_dma" />
 <TGConnectingPoint num="0" id="6662" />
 <TGConnectingPoint num="1" id="6663" />
 <TGConnectingPoint num="2" id="6664" />
@@ -15133,20 +15264,20 @@ sequence diagram.
 <TGConnectingPoint num="6" id="6668" />
 <TGConnectingPoint num="7" id="6669" />
 <extraparam>
-<Attribute access="2" id="size" value="0" type="0" typeOther="" />
+<Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6657" >
 <father id="6670" num="0" />
-<cdparam x="408" y="191" />
+<cdparam x="434" y="165" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
-<infoparam name="Primitive port" value="Request r_dma" />
+<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Channel dma_out" />
 <TGConnectingPoint num="0" id="6656" />
 <extraparam>
-<Prop commName="r_dma" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dma_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15155,15 +15286,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6659" >
 <father id="6670" num="1" />
-<cdparam x="389" y="215" />
+<cdparam x="381" y="162" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
-<infoparam name="Primitive port" value="Event in" />
+<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6658" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15172,14 +15303,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6661" >
 <father id="6670" num="2" />
-<cdparam x="464" y="215" />
+<cdparam x="402" y="175" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="67" minY="-8" maxY="53" />
-<infoparam name="Primitive port" value="Event dma_out" />
+<cdrectangleparam minX="-8" maxX="45" minY="-8" maxY="28" />
+<infoparam name="Primitive port" value="Request r_dma" />
 <TGConnectingPoint num="0" id="6660" />
 <extraparam>
-<Prop commName="dma_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_dma" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15208,11 +15339,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1202" id="6694" >
 <father id="6794" num="0" />
-<cdparam x="810" y="154" />
-<sizeparam width="46" height="38" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="810" y="223" />
+<sizeparam width="50" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="44" minY="0" maxY="112" />
-<infoparam name="Primitive component" value="X_cwm" />
+<cdrectangleparam minX="0" maxX="40" minY="0" maxY="110" />
+<infoparam name="Primitive component" value="F_cwm" />
 <TGConnectingPoint num="0" id="6686" />
 <TGConnectingPoint num="1" id="6687" />
 <TGConnectingPoint num="2" id="6688" />
@@ -15227,14 +15358,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6681" >
 <father id="6694" num="0" />
-<cdparam x="821" y="184" />
+<cdparam x="852" y="241" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Request r_cwm" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Event cwm_out" />
 <TGConnectingPoint num="0" id="6680" />
 <extraparam>
-<Prop commName="r_cwm" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="cwm_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15244,15 +15375,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6683" >
 <father id="6694" num="1" />
-<cdparam x="802" y="168" />
+<cdparam x="802" y="241" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Channel in" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6682" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15261,15 +15392,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6685" >
 <father id="6694" num="2" />
-<cdparam x="848" y="172" />
+<cdparam x="825" y="215" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Channel cwm_out" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
+<infoparam name="Primitive port" value="Request r_cwm" />
 <TGConnectingPoint num="0" id="6684" />
 <extraparam>
-<Prop commName="cwm_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_cwm" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15278,7 +15409,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6713" >
 <father id="6794" num="1" />
-<cdparam x="780" y="189" />
+<cdparam x="870" y="211" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15304,7 +15435,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6732" >
 <father id="6794" num="2" />
-<cdparam x="870" y="189" />
+<cdparam x="780" y="209" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15330,7 +15461,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6751" >
 <father id="6794" num="3" />
-<cdparam x="780" y="209" />
+<cdparam x="870" y="189" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15356,7 +15487,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6770" >
 <father id="6794" num="4" />
-<cdparam x="870" y="211" />
+<cdparam x="780" y="189" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15382,11 +15513,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1202" id="6785" >
 <father id="6794" num="5" />
-<cdparam x="810" y="223" />
-<sizeparam width="50" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="810" y="154" />
+<sizeparam width="46" height="38" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="40" minY="0" maxY="110" />
-<infoparam name="Primitive component" value="F_cwm" />
+<cdrectangleparam minX="0" maxX="44" minY="0" maxY="112" />
+<infoparam name="Primitive component" value="X_cwm" />
 <TGConnectingPoint num="0" id="6777" />
 <TGConnectingPoint num="1" id="6778" />
 <TGConnectingPoint num="2" id="6779" />
@@ -15401,15 +15532,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6772" >
 <father id="6785" num="0" />
-<cdparam x="825" y="215" />
+<cdparam x="848" y="172" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Request r_cwm" />
+<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Channel cwm_out" />
 <TGConnectingPoint num="0" id="6771" />
 <extraparam>
-<Prop commName="r_cwm" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwm_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15418,15 +15549,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6774" >
 <father id="6785" num="1" />
-<cdparam x="802" y="241" />
+<cdparam x="802" y="168" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event in" />
+<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="6773" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15435,14 +15566,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6776" >
 <father id="6785" num="2" />
-<cdparam x="852" y="241" />
+<cdparam x="821" y="184" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event cwm_out" />
+<cdrectangleparam minX="-8" maxX="38" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Request r_cwm" />
 <TGConnectingPoint num="0" id="6775" />
 <extraparam>
-<Prop commName="cwm_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_cwm" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15494,174 +15625,70 @@ sequence diagram.
 <TGConnectingPoint num="15" id="6810" />
 <TGConnectingPoint num="16" id="6811" />
 <TGConnectingPoint num="17" id="6812" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="6832" >
-<father id="6951" num="1" />
-<cdparam x="333" y="438" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="6814" />
-<TGConnectingPoint num="1" id="6815" />
-<TGConnectingPoint num="2" id="6816" />
-<TGConnectingPoint num="3" id="6817" />
-<TGConnectingPoint num="4" id="6818" />
-<TGConnectingPoint num="5" id="6819" />
-<TGConnectingPoint num="6" id="6820" />
-<TGConnectingPoint num="7" id="6821" />
-<TGConnectingPoint num="8" id="6822" />
-<TGConnectingPoint num="9" id="6823" />
-<TGConnectingPoint num="10" id="6824" />
-<TGConnectingPoint num="11" id="6825" />
-<TGConnectingPoint num="12" id="6826" />
-<TGConnectingPoint num="13" id="6827" />
-<TGConnectingPoint num="14" id="6828" />
-<TGConnectingPoint num="15" id="6829" />
-<TGConnectingPoint num="16" id="6830" />
-<TGConnectingPoint num="17" id="6831" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="6851" >
-<father id="6951" num="2" />
-<cdparam x="333" y="438" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="6833" />
-<TGConnectingPoint num="1" id="6834" />
-<TGConnectingPoint num="2" id="6835" />
-<TGConnectingPoint num="3" id="6836" />
-<TGConnectingPoint num="4" id="6837" />
-<TGConnectingPoint num="5" id="6838" />
-<TGConnectingPoint num="6" id="6839" />
-<TGConnectingPoint num="7" id="6840" />
-<TGConnectingPoint num="8" id="6841" />
-<TGConnectingPoint num="9" id="6842" />
-<TGConnectingPoint num="10" id="6843" />
-<TGConnectingPoint num="11" id="6844" />
-<TGConnectingPoint num="12" id="6845" />
-<TGConnectingPoint num="13" id="6846" />
-<TGConnectingPoint num="14" id="6847" />
-<TGConnectingPoint num="15" id="6848" />
-<TGConnectingPoint num="16" id="6849" />
-<TGConnectingPoint num="17" id="6850" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="6870" >
-<father id="6951" num="3" />
-<cdparam x="333" y="385" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="6852" />
-<TGConnectingPoint num="1" id="6853" />
-<TGConnectingPoint num="2" id="6854" />
-<TGConnectingPoint num="3" id="6855" />
-<TGConnectingPoint num="4" id="6856" />
-<TGConnectingPoint num="5" id="6857" />
-<TGConnectingPoint num="6" id="6858" />
-<TGConnectingPoint num="7" id="6859" />
-<TGConnectingPoint num="8" id="6860" />
-<TGConnectingPoint num="9" id="6861" />
-<TGConnectingPoint num="10" id="6862" />
-<TGConnectingPoint num="11" id="6863" />
-<TGConnectingPoint num="12" id="6864" />
-<TGConnectingPoint num="13" id="6865" />
-<TGConnectingPoint num="14" id="6866" />
-<TGConnectingPoint num="15" id="6867" />
-<TGConnectingPoint num="16" id="6868" />
-<TGConnectingPoint num="17" id="6869" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="6889" >
-<father id="6951" num="4" />
-<cdparam x="333" y="406" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="6871" />
-<TGConnectingPoint num="1" id="6872" />
-<TGConnectingPoint num="2" id="6873" />
-<TGConnectingPoint num="3" id="6874" />
-<TGConnectingPoint num="4" id="6875" />
-<TGConnectingPoint num="5" id="6876" />
-<TGConnectingPoint num="6" id="6877" />
-<TGConnectingPoint num="7" id="6878" />
-<TGConnectingPoint num="8" id="6879" />
-<TGConnectingPoint num="9" id="6880" />
-<TGConnectingPoint num="10" id="6881" />
-<TGConnectingPoint num="11" id="6882" />
-<TGConnectingPoint num="12" id="6883" />
-<TGConnectingPoint num="13" id="6884" />
-<TGConnectingPoint num="14" id="6885" />
-<TGConnectingPoint num="15" id="6886" />
-<TGConnectingPoint num="16" id="6887" />
-<TGConnectingPoint num="17" id="6888" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="6906" >
-<father id="6951" num="5" />
-<cdparam x="370" y="475" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="6830" >
+<father id="6951" num="1" />
+<cdparam x="368" y="405" />
 <sizeparam width="42" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="46" minY="0" maxY="106" />
-<infoparam name="Primitive component" value="F_cwa" />
-<TGConnectingPoint num="0" id="6898" />
-<TGConnectingPoint num="1" id="6899" />
-<TGConnectingPoint num="2" id="6900" />
-<TGConnectingPoint num="3" id="6901" />
-<TGConnectingPoint num="4" id="6902" />
-<TGConnectingPoint num="5" id="6903" />
-<TGConnectingPoint num="6" id="6904" />
-<TGConnectingPoint num="7" id="6905" />
+<infoparam name="Primitive component" value="X_cwa" />
+<TGConnectingPoint num="0" id="6822" />
+<TGConnectingPoint num="1" id="6823" />
+<TGConnectingPoint num="2" id="6824" />
+<TGConnectingPoint num="3" id="6825" />
+<TGConnectingPoint num="4" id="6826" />
+<TGConnectingPoint num="5" id="6827" />
+<TGConnectingPoint num="6" id="6828" />
+<TGConnectingPoint num="7" id="6829" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6891" >
-<father id="6906" num="0" />
-<cdparam x="404" y="476" />
+<SUBCOMPONENT type="1203" id="6815" >
+<father id="6830" num="0" />
+<cdparam x="360" y="430" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event cwa_out" />
-<TGConnectingPoint num="0" id="6890" />
+<infoparam name="Primitive port" value="Channel in2" />
+<TGConnectingPoint num="0" id="6814" />
 <extraparam>
-<Prop commName="cwa_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6893" >
-<father id="6906" num="1" />
-<cdparam x="382" y="467" />
+<SUBCOMPONENT type="1203" id="6817" >
+<father id="6830" num="1" />
+<cdparam x="360" y="413" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Request r_cwa" />
-<TGConnectingPoint num="0" id="6892" />
+<infoparam name="Primitive port" value="Channel in1" />
+<TGConnectingPoint num="0" id="6816" />
 <extraparam>
-<Prop commName="r_cwa" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in1" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6895" >
-<father id="6906" num="2" />
-<cdparam x="362" y="468" />
+<SUBCOMPONENT type="1203" id="6819" >
+<father id="6830" num="2" />
+<cdparam x="381" y="437" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event in1" />
-<TGConnectingPoint num="0" id="6894" />
+<infoparam name="Primitive port" value="Request r_cwa" />
+<TGConnectingPoint num="0" id="6818" />
 <extraparam>
-<Prop commName="in1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_cwa" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15669,69 +15696,69 @@ sequence diagram.
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6897" >
-<father id="6906" num="3" />
-<cdparam x="362" y="485" />
+<SUBCOMPONENT type="1203" id="6821" >
+<father id="6830" num="3" />
+<cdparam x="402" y="425" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Event in2" />
-<TGConnectingPoint num="0" id="6896" />
+<infoparam name="Primitive port" value="Channel cwa_out" />
+<TGConnectingPoint num="0" id="6820" />
 <extraparam>
-<Prop commName="in2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="cwa_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="6923" >
-<father id="6951" num="6" />
-<cdparam x="368" y="405" />
+<SUBCOMPONENT type="1202" id="6847" >
+<father id="6951" num="2" />
+<cdparam x="370" y="475" />
 <sizeparam width="42" height="40" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="46" minY="0" maxY="106" />
-<infoparam name="Primitive component" value="X_cwa" />
-<TGConnectingPoint num="0" id="6915" />
-<TGConnectingPoint num="1" id="6916" />
-<TGConnectingPoint num="2" id="6917" />
-<TGConnectingPoint num="3" id="6918" />
-<TGConnectingPoint num="4" id="6919" />
-<TGConnectingPoint num="5" id="6920" />
-<TGConnectingPoint num="6" id="6921" />
-<TGConnectingPoint num="7" id="6922" />
+<infoparam name="Primitive component" value="F_cwa" />
+<TGConnectingPoint num="0" id="6839" />
+<TGConnectingPoint num="1" id="6840" />
+<TGConnectingPoint num="2" id="6841" />
+<TGConnectingPoint num="3" id="6842" />
+<TGConnectingPoint num="4" id="6843" />
+<TGConnectingPoint num="5" id="6844" />
+<TGConnectingPoint num="6" id="6845" />
+<TGConnectingPoint num="7" id="6846" />
 <extraparam>
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6908" >
-<father id="6923" num="0" />
-<cdparam x="402" y="425" />
+<SUBCOMPONENT type="1203" id="6832" >
+<father id="6847" num="0" />
+<cdparam x="362" y="485" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Channel cwa_out" />
-<TGConnectingPoint num="0" id="6907" />
+<infoparam name="Primitive port" value="Event in2" />
+<TGConnectingPoint num="0" id="6831" />
 <extraparam>
-<Prop commName="cwa_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in2" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6910" >
-<father id="6923" num="1" />
-<cdparam x="381" y="437" />
+<SUBCOMPONENT type="1203" id="6834" >
+<father id="6847" num="1" />
+<cdparam x="362" y="468" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Request r_cwa" />
-<TGConnectingPoint num="0" id="6909" />
+<infoparam name="Primitive port" value="Event in1" />
+<TGConnectingPoint num="0" id="6833" />
 <extraparam>
-<Prop commName="r_cwa" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="in1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15739,40 +15766,144 @@ sequence diagram.
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6912" >
-<father id="6923" num="2" />
-<cdparam x="360" y="413" />
+<SUBCOMPONENT type="1203" id="6836" >
+<father id="6847" num="2" />
+<cdparam x="382" y="467" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Channel in1" />
-<TGConnectingPoint num="0" id="6911" />
+<infoparam name="Primitive port" value="Request r_cwa" />
+<TGConnectingPoint num="0" id="6835" />
 <extraparam>
-<Prop commName="in1" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_cwa" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="6914" >
-<father id="6923" num="3" />
-<cdparam x="360" y="430" />
+<SUBCOMPONENT type="1203" id="6838" >
+<father id="6847" num="3" />
+<cdparam x="404" y="476" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-8" maxX="34" minY="-8" maxY="32" />
-<infoparam name="Primitive port" value="Channel in2" />
-<TGConnectingPoint num="0" id="6913" />
+<infoparam name="Primitive port" value="Event cwa_out" />
+<TGConnectingPoint num="0" id="6837" />
 <extraparam>
-<Prop commName="in2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="cwa_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="6866" >
+<father id="6951" num="3" />
+<cdparam x="333" y="406" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="6848" />
+<TGConnectingPoint num="1" id="6849" />
+<TGConnectingPoint num="2" id="6850" />
+<TGConnectingPoint num="3" id="6851" />
+<TGConnectingPoint num="4" id="6852" />
+<TGConnectingPoint num="5" id="6853" />
+<TGConnectingPoint num="6" id="6854" />
+<TGConnectingPoint num="7" id="6855" />
+<TGConnectingPoint num="8" id="6856" />
+<TGConnectingPoint num="9" id="6857" />
+<TGConnectingPoint num="10" id="6858" />
+<TGConnectingPoint num="11" id="6859" />
+<TGConnectingPoint num="12" id="6860" />
+<TGConnectingPoint num="13" id="6861" />
+<TGConnectingPoint num="14" id="6862" />
+<TGConnectingPoint num="15" id="6863" />
+<TGConnectingPoint num="16" id="6864" />
+<TGConnectingPoint num="17" id="6865" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="6885" >
+<father id="6951" num="4" />
+<cdparam x="333" y="385" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="6867" />
+<TGConnectingPoint num="1" id="6868" />
+<TGConnectingPoint num="2" id="6869" />
+<TGConnectingPoint num="3" id="6870" />
+<TGConnectingPoint num="4" id="6871" />
+<TGConnectingPoint num="5" id="6872" />
+<TGConnectingPoint num="6" id="6873" />
+<TGConnectingPoint num="7" id="6874" />
+<TGConnectingPoint num="8" id="6875" />
+<TGConnectingPoint num="9" id="6876" />
+<TGConnectingPoint num="10" id="6877" />
+<TGConnectingPoint num="11" id="6878" />
+<TGConnectingPoint num="12" id="6879" />
+<TGConnectingPoint num="13" id="6880" />
+<TGConnectingPoint num="14" id="6881" />
+<TGConnectingPoint num="15" id="6882" />
+<TGConnectingPoint num="16" id="6883" />
+<TGConnectingPoint num="17" id="6884" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="6904" >
+<father id="6951" num="5" />
+<cdparam x="333" y="438" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="6886" />
+<TGConnectingPoint num="1" id="6887" />
+<TGConnectingPoint num="2" id="6888" />
+<TGConnectingPoint num="3" id="6889" />
+<TGConnectingPoint num="4" id="6890" />
+<TGConnectingPoint num="5" id="6891" />
+<TGConnectingPoint num="6" id="6892" />
+<TGConnectingPoint num="7" id="6893" />
+<TGConnectingPoint num="8" id="6894" />
+<TGConnectingPoint num="9" id="6895" />
+<TGConnectingPoint num="10" id="6896" />
+<TGConnectingPoint num="11" id="6897" />
+<TGConnectingPoint num="12" id="6898" />
+<TGConnectingPoint num="13" id="6899" />
+<TGConnectingPoint num="14" id="6900" />
+<TGConnectingPoint num="15" id="6901" />
+<TGConnectingPoint num="16" id="6902" />
+<TGConnectingPoint num="17" id="6903" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1201" id="6923" >
+<father id="6951" num="6" />
+<cdparam x="333" y="438" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="78" minY="-10" maxY="136" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="6905" />
+<TGConnectingPoint num="1" id="6906" />
+<TGConnectingPoint num="2" id="6907" />
+<TGConnectingPoint num="3" id="6908" />
+<TGConnectingPoint num="4" id="6909" />
+<TGConnectingPoint num="5" id="6910" />
+<TGConnectingPoint num="6" id="6911" />
+<TGConnectingPoint num="7" id="6912" />
+<TGConnectingPoint num="8" id="6913" />
+<TGConnectingPoint num="9" id="6914" />
+<TGConnectingPoint num="10" id="6915" />
+<TGConnectingPoint num="11" id="6916" />
+<TGConnectingPoint num="12" id="6917" />
+<TGConnectingPoint num="13" id="6918" />
+<TGConnectingPoint num="14" id="6919" />
+<TGConnectingPoint num="15" id="6920" />
+<TGConnectingPoint num="16" id="6921" />
+<TGConnectingPoint num="17" id="6922" />
+</SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6942" >
 <father id="6951" num="7" />
 <cdparam x="421" y="438" />
@@ -15820,11 +15951,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1202" id="6966" >
 <father id="7066" num="0" />
-<cdparam x="712" y="372" />
-<sizeparam width="50" height="43" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="713" y="414" />
+<sizeparam width="47" height="43" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="40" minY="0" maxY="107" />
-<infoparam name="Primitive component" value="X_sum" />
+<cdrectangleparam minX="0" maxX="43" minY="0" maxY="107" />
+<infoparam name="Primitive component" value="F_sum" />
 <TGConnectingPoint num="0" id="6958" />
 <TGConnectingPoint num="1" id="6959" />
 <TGConnectingPoint num="2" id="6960" />
@@ -15839,14 +15970,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6953" >
 <father id="6966" num="0" />
-<cdparam x="725" y="407" />
+<cdparam x="752" y="427" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Request r_sum" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Event sum_out" />
 <TGConnectingPoint num="0" id="6952" />
 <extraparam>
-<Prop commName="r_sum" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sum_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15856,15 +15987,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6955" >
 <father id="6966" num="1" />
-<cdparam x="704" y="386" />
+<cdparam x="705" y="427" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Channel in" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="6954" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15873,15 +16004,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="6957" >
 <father id="6966" num="2" />
-<cdparam x="754" y="390" />
+<cdparam x="725" y="406" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Channel sum_out" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Request r_sum" />
 <TGConnectingPoint num="0" id="6956" />
 <extraparam>
-<Prop commName="sum_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_sum" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -15890,7 +16021,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="6985" >
 <father id="7066" num="1" />
-<cdparam x="683" y="410" />
+<cdparam x="773" y="431" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15916,7 +16047,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7004" >
 <father id="7066" num="2" />
-<cdparam x="773" y="410" />
+<cdparam x="683" y="431" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15942,7 +16073,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7023" >
 <father id="7066" num="3" />
-<cdparam x="683" y="431" />
+<cdparam x="773" y="410" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15968,7 +16099,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7042" >
 <father id="7066" num="4" />
-<cdparam x="773" y="431" />
+<cdparam x="683" y="410" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="80" minY="-10" maxY="140" />
@@ -15994,11 +16125,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1202" id="7057" >
 <father id="7066" num="5" />
-<cdparam x="713" y="414" />
-<sizeparam width="47" height="43" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="712" y="372" />
+<sizeparam width="50" height="43" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="43" minY="0" maxY="107" />
-<infoparam name="Primitive component" value="F_sum" />
+<cdrectangleparam minX="0" maxX="40" minY="0" maxY="107" />
+<infoparam name="Primitive component" value="X_sum" />
 <TGConnectingPoint num="0" id="7049" />
 <TGConnectingPoint num="1" id="7050" />
 <TGConnectingPoint num="2" id="7051" />
@@ -16013,15 +16144,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7044" >
 <father id="7057" num="0" />
-<cdparam x="725" y="406" />
+<cdparam x="754" y="390" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Request r_sum" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Channel sum_out" />
 <TGConnectingPoint num="0" id="7043" />
 <extraparam>
-<Prop commName="r_sum" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sum_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16030,15 +16161,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7046" >
 <father id="7057" num="1" />
-<cdparam x="705" y="427" />
+<cdparam x="704" y="386" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Event in" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="7045" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16047,14 +16178,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7048" >
 <father id="7057" num="2" />
-<cdparam x="752" y="427" />
+<cdparam x="725" y="407" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="35" />
-<infoparam name="Primitive port" value="Event sum_out" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="35" />
+<infoparam name="Primitive port" value="Request r_sum" />
 <TGConnectingPoint num="0" id="7047" />
 <extraparam>
-<Prop commName="sum_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_sum" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16086,15 +16217,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="7068" >
 <father id="7083" num="0" />
-<cdparam x="821" y="431" />
+<cdparam x="821" y="410" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="7067" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16103,15 +16234,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7070" >
 <father id="7083" num="1" />
-<cdparam x="891" y="410" />
+<cdparam x="891" y="432" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel res_out" />
+<infoparam name="Primitive port" value="Event res_out" />
 <TGConnectingPoint num="0" id="7069" />
 <extraparam>
-<Prop commName="res_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="res_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16120,15 +16251,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7072" >
 <father id="7083" num="2" />
-<cdparam x="891" y="432" />
+<cdparam x="891" y="410" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event res_out" />
+<infoparam name="Primitive port" value="Channel res_out" />
 <TGConnectingPoint num="0" id="7071" />
 <extraparam>
-<Prop commName="res_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="res_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16137,15 +16268,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7074" >
 <father id="7083" num="3" />
-<cdparam x="821" y="410" />
+<cdparam x="821" y="431" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="7073" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16173,11 +16304,11 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1202" id="7098" >
 <father id="7198" num="0" />
-<cdparam x="971" y="388" />
-<sizeparam width="50" height="38" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="978" y="456" />
+<sizeparam width="47" height="41" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="58" minY="0" maxY="128" />
-<infoparam name="Primitive component" value="X_dma1" />
+<cdrectangleparam minX="0" maxX="61" minY="0" maxY="125" />
+<infoparam name="Primitive component" value="F_dma1" />
 <TGConnectingPoint num="0" id="7090" />
 <TGConnectingPoint num="1" id="7091" />
 <TGConnectingPoint num="2" id="7092" />
@@ -16192,14 +16323,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7085" >
 <father id="7098" num="0" />
-<cdparam x="984" y="418" />
+<cdparam x="1017" y="461" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Request r_dma1" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
+<infoparam name="Primitive port" value="Event dma1_out" />
 <TGConnectingPoint num="0" id="7084" />
 <extraparam>
-<Prop commName="r_dma1" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dma1_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16209,15 +16340,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7087" >
 <father id="7098" num="1" />
-<cdparam x="963" y="400" />
+<cdparam x="970" y="465" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Channel in" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="7086" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16226,15 +16357,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7089" >
 <father id="7098" num="2" />
-<cdparam x="1013" y="401" />
+<cdparam x="996" y="448" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
-<infoparam name="Primitive port" value="Channel dma1_out" />
+<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
+<infoparam name="Primitive port" value="Request r_dma1" />
 <TGConnectingPoint num="0" id="7088" />
 <extraparam>
-<Prop commName="dma1_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="r_dma1" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16243,7 +16374,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7117" >
 <father id="7198" num="1" />
-<cdparam x="936" y="405" />
+<cdparam x="1044" y="455" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="98" minY="-10" maxY="156" />
@@ -16269,7 +16400,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7136" >
 <father id="7198" num="2" />
-<cdparam x="1044" y="396" />
+<cdparam x="936" y="432" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="98" minY="-10" maxY="156" />
@@ -16295,7 +16426,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7155" >
 <father id="7198" num="3" />
-<cdparam x="936" y="432" />
+<cdparam x="1044" y="396" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="98" minY="-10" maxY="156" />
@@ -16321,7 +16452,7 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1201" id="7174" >
 <father id="7198" num="4" />
-<cdparam x="1044" y="455" />
+<cdparam x="936" y="405" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="98" minY="-10" maxY="156" />
@@ -16347,11 +16478,11 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1202" id="7189" >
 <father id="7198" num="5" />
-<cdparam x="978" y="456" />
-<sizeparam width="47" height="41" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="971" y="388" />
+<sizeparam width="50" height="38" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="61" minY="0" maxY="125" />
-<infoparam name="Primitive component" value="F_dma1" />
+<cdrectangleparam minX="0" maxX="58" minY="0" maxY="128" />
+<infoparam name="Primitive component" value="X_dma1" />
 <TGConnectingPoint num="0" id="7181" />
 <TGConnectingPoint num="1" id="7182" />
 <TGConnectingPoint num="2" id="7183" />
@@ -16366,15 +16497,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7176" >
 <father id="7189" num="0" />
-<cdparam x="996" y="448" />
+<cdparam x="1013" y="401" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
-<infoparam name="Primitive port" value="Request r_dma1" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Channel dma1_out" />
 <TGConnectingPoint num="0" id="7175" />
 <extraparam>
-<Prop commName="r_dma1" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dma1_out" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16383,15 +16514,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7178" >
 <father id="7189" num="1" />
-<cdparam x="970" y="465" />
+<cdparam x="963" y="400" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
-<infoparam name="Primitive port" value="Event in" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="7177" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16400,14 +16531,14 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7180" >
 <father id="7189" num="2" />
-<cdparam x="1017" y="461" />
+<cdparam x="984" y="418" />
 <sizeparam width="16" height="16" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-8" maxX="39" minY="-8" maxY="33" />
-<infoparam name="Primitive port" value="Event dma1_out" />
+<cdrectangleparam minX="-8" maxX="42" minY="-8" maxY="30" />
+<infoparam name="Primitive port" value="Request r_dma1" />
 <TGConnectingPoint num="0" id="7179" />
 <extraparam>
-<Prop commName="dma1_out" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="r_dma1" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16459,15 +16590,15 @@ sequence diagram.
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="7209" >
 <father id="7220" num="0" />
-<cdparam x="1113" y="447" />
+<cdparam x="1113" y="409" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Event in" />
+<infoparam name="Primitive port" value="Channel in" />
 <TGConnectingPoint num="0" id="7208" />
 <extraparam>
-<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -16476,15 +16607,15 @@ sequence diagram.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="7211" >
 <father id="7220" num="1" />
-<cdparam x="1113" y="409" />
+<cdparam x="1113" y="447" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="60" minY="-10" maxY="46" />
-<infoparam name="Primitive port" value="Channel in" />
+<infoparam name="Primitive port" value="Event in" />
 <TGConnectingPoint num="0" id="7210" />
 <extraparam>
-<Prop commName="in" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="in" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17952,114 +18083,18 @@ sequence diagram.
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_fft" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1007" id="7523" >
-<cdparam x="440" y="222" />
-<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="r_fft(size)" />
-<TGConnectingPoint num="0" id="7521" />
-<TGConnectingPoint num="1" id="7522" />
-<extraparam>
-<Data requestName="r_fft" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1001" id="7525" >
-<cdparam x="463" y="351" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7524" />
-</COMPONENT>
-
-<COMPONENT type="1008" id="7528" >
-<cdparam x="432" y="292" />
-<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="fft_out(size)" />
-<TGConnectingPoint num="0" id="7526" />
-<TGConnectingPoint num="1" id="7527" />
-<extraparam>
-<Data eventName="fft_out" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="7531" >
-<cdparam x="444" y="163" />
-<sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="in(size) " />
-<TGConnectingPoint num="0" id="7529" />
-<TGConnectingPoint num="1" id="7530" />
-<extraparam>
-<Data eventName="in" nbOfParams="5" />
-<Param index="0" value="size" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1000" id="7533" >
-<cdparam x="466" y="103" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7532" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="7534" >
-<cdparam x="473" y="123" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1  x="473" y="123" id="7532" />
-<P2  x="473" y="158" id="7529" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="7535" >
-<cdparam x="473" y="317" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1  x="473" y="317" id="7527" />
-<P2  x="473" y="346" id="7524" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="7536" >
-<cdparam x="473" y="188" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send request" value="null" />
-<P1  x="473" y="188" id="7530" />
-<P2  x="473" y="217" id="7521" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="7537" >
-<cdparam x="481" y="244" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send event" value="null" />
-<P1  x="473" y="247" id="7522" />
-<P2  x="473" y="287" id="7526" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
 <TMLActivityDiagramPanel name="X_fft" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="7541" >
+<COMPONENT type="1013" id="7524" >
 <cdparam x="539" y="207" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7539" />
-<TGConnectingPoint num="1" id="7540" />
+<TGConnectingPoint num="0" id="7522" />
+<TGConnectingPoint num="1" id="7523" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="7538" >
-<father id="7541" num="0" />
+<SUBCOMPONENT type="-1" id="7521" >
+<father id="7524" num="0" />
 <cdparam x="554" y="227" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18067,238 +18102,237 @@ sequence diagram.
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="7543" >
+<COMPONENT type="1001" id="7526" >
 <cdparam x="535" y="335" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7542" />
+<TGConnectingPoint num="0" id="7525" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="7546" >
+<COMPONENT type="1006" id="7529" >
 <cdparam x="503" y="273" />
 <sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="fft_out(size)" />
-<TGConnectingPoint num="0" id="7544" />
-<TGConnectingPoint num="1" id="7545" />
+<TGConnectingPoint num="0" id="7527" />
+<TGConnectingPoint num="1" id="7528" />
 <extraparam>
 <Data channelName="fft_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="7549" >
+<COMPONENT type="1009" id="7532" >
 <cdparam x="515" y="153" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="in(size) " />
-<TGConnectingPoint num="0" id="7547" />
-<TGConnectingPoint num="1" id="7548" />
+<TGConnectingPoint num="0" id="7530" />
+<TGConnectingPoint num="1" id="7531" />
 <extraparam>
 <Data channelName="in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7552" >
+<COMPONENT type="1034" id="7535" >
 <cdparam x="489" y="100" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7550" />
-<TGConnectingPoint num="1" id="7551" />
+<TGConnectingPoint num="0" id="7533" />
+<TGConnectingPoint num="1" id="7534" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7554" >
+<COMPONENT type="1000" id="7537" >
 <cdparam x="538" y="57" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7553" />
+<TGConnectingPoint num="0" id="7536" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7555" >
+<CONNECTOR type="115" id="7538" >
 <cdparam x="545" y="77" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to read args" value="null" />
-<P1  x="545" y="77" id="7553" />
-<P2  x="545" y="95" id="7550" />
+<P1  x="545" y="77" id="7536" />
+<P2  x="545" y="95" id="7533" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7556" >
+<CONNECTOR type="115" id="7539" >
 <cdparam x="545" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read args to read channel" value="null" />
-<P1  x="545" y="125" id="7551" />
-<P2  x="544" y="148" id="7547" />
+<P1  x="545" y="125" id="7534" />
+<P2  x="544" y="148" id="7530" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7557" >
+<CONNECTOR type="115" id="7540" >
 <cdparam x="544" y="178" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="544" y="178" id="7548" />
-<P2  x="544" y="202" id="7539" />
+<P1  x="544" y="178" id="7531" />
+<P2  x="544" y="202" id="7522" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7558" >
+<CONNECTOR type="115" id="7541" >
 <cdparam x="544" y="242" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="544" y="242" id="7540" />
-<P2  x="544" y="268" id="7544" />
+<P1  x="544" y="242" id="7523" />
+<P2  x="544" y="268" id="7527" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7559" >
+<CONNECTOR type="115" id="7542" >
 <cdparam x="544" y="298" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="544" y="298" id="7545" />
-<P2  x="545" y="330" id="7542" />
+<P1  x="544" y="298" id="7528" />
+<P2  x="545" y="330" id="7525" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_dma" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1007" id="7562" >
-<cdparam x="380" y="223" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_fft" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1007" id="7545" >
+<cdparam x="440" y="222" />
+<sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="r_dma(size)" />
-<TGConnectingPoint num="0" id="7560" />
-<TGConnectingPoint num="1" id="7561" />
-<breakpoint />
+<infoparam name="send request" value="r_fft(size)" />
+<TGConnectingPoint num="0" id="7543" />
+<TGConnectingPoint num="1" id="7544" />
 <extraparam>
-<Data requestName="r_dma" nbOfParams="5" />
+<Data requestName="r_fft" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="7564" >
-<cdparam x="410" y="352" />
+<COMPONENT type="1001" id="7547" >
+<cdparam x="463" y="351" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7563" />
+<TGConnectingPoint num="0" id="7546" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="7567" >
-<cdparam x="372" y="293" />
-<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="7550" >
+<cdparam x="432" y="292" />
+<sizeparam width="83" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="dma_out(size)" />
-<TGConnectingPoint num="0" id="7565" />
-<TGConnectingPoint num="1" id="7566" />
+<infoparam name="send event" value="fft_out(size)" />
+<TGConnectingPoint num="0" id="7548" />
+<TGConnectingPoint num="1" id="7549" />
 <extraparam>
-<Data eventName="dma_out" nbOfParams="5" />
+<Data eventName="fft_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="7570" >
-<cdparam x="391" y="164" />
+<COMPONENT type="1010" id="7553" >
+<cdparam x="444" y="163" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="in(size) " />
-<TGConnectingPoint num="0" id="7568" />
-<TGConnectingPoint num="1" id="7569" />
+<TGConnectingPoint num="0" id="7551" />
+<TGConnectingPoint num="1" id="7552" />
 <extraparam>
 <Data eventName="in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7572" >
-<cdparam x="413" y="104" />
+<COMPONENT type="1000" id="7555" >
+<cdparam x="466" y="103" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7571" />
+<TGConnectingPoint num="0" id="7554" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7573" >
-<cdparam x="420" y="124" />
+<CONNECTOR type="115" id="7556" >
+<cdparam x="473" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to wait event" value="null" />
-<P1  x="420" y="124" id="7571" />
-<P2  x="420" y="159" id="7568" />
+<P1  x="473" y="123" id="7554" />
+<P2  x="473" y="158" id="7551" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7574" >
-<cdparam x="420" y="318" />
+<CONNECTOR type="115" id="7557" >
+<cdparam x="473" y="317" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="420" y="318" id="7566" />
-<P2  x="420" y="347" id="7563" />
+<P1  x="473" y="317" id="7549" />
+<P2  x="473" y="346" id="7546" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7575" >
-<cdparam x="420" y="189" />
+<CONNECTOR type="115" id="7558" >
+<cdparam x="473" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send request" value="null" />
-<P1  x="420" y="189" id="7569" />
-<P2  x="420" y="218" id="7560" />
+<P1  x="473" y="188" id="7552" />
+<P2  x="473" y="217" id="7543" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7576" >
-<cdparam x="428" y="245" />
+<CONNECTOR type="115" id="7559" >
+<cdparam x="481" y="244" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="420" y="248" id="7561" />
-<P2  x="420" y="288" id="7565" />
+<P1  x="473" y="247" id="7544" />
+<P2  x="473" y="287" id="7548" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_dma" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="7578" >
+<COMPONENT type="1001" id="7561" >
 <cdparam x="397" y="328" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7577" />
+<TGConnectingPoint num="0" id="7560" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="7581" >
+<COMPONENT type="1006" id="7564" >
 <cdparam x="358" y="266" />
 <sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dma_out(size)" />
-<TGConnectingPoint num="0" id="7579" />
-<TGConnectingPoint num="1" id="7580" />
+<TGConnectingPoint num="0" id="7562" />
+<TGConnectingPoint num="1" id="7563" />
 <extraparam>
 <Data channelName="dma_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="7585" >
+<COMPONENT type="1013" id="7568" >
 <cdparam x="401" y="200" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7583" />
-<TGConnectingPoint num="1" id="7584" />
+<TGConnectingPoint num="0" id="7566" />
+<TGConnectingPoint num="1" id="7567" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="7582" >
-<father id="7585" num="0" />
+<SUBCOMPONENT type="-1" id="7565" >
+<father id="7568" num="0" />
 <cdparam x="416" y="220" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18306,193 +18340,194 @@ sequence diagram.
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="7588" >
+<COMPONENT type="1009" id="7571" >
 <cdparam x="377" y="146" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="in(size) " />
-<TGConnectingPoint num="0" id="7586" />
-<TGConnectingPoint num="1" id="7587" />
+<TGConnectingPoint num="0" id="7569" />
+<TGConnectingPoint num="1" id="7570" />
 <extraparam>
 <Data channelName="in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7591" >
+<COMPONENT type="1034" id="7574" >
 <cdparam x="351" y="93" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7589" />
-<TGConnectingPoint num="1" id="7590" />
+<TGConnectingPoint num="0" id="7572" />
+<TGConnectingPoint num="1" id="7573" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7593" >
+<COMPONENT type="1000" id="7576" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7592" />
+<TGConnectingPoint num="0" id="7575" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7594" >
+<CONNECTOR type="115" id="7577" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to read args" value="null" />
-<P1  x="407" y="70" id="7592" />
-<P2  x="407" y="88" id="7589" />
+<P1  x="407" y="70" id="7575" />
+<P2  x="407" y="88" id="7572" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7595" >
+<CONNECTOR type="115" id="7578" >
 <cdparam x="407" y="118" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read args to read channel" value="null" />
-<P1  x="407" y="118" id="7590" />
-<P2  x="406" y="141" id="7586" />
+<P1  x="407" y="118" id="7573" />
+<P2  x="406" y="141" id="7569" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7596" >
+<CONNECTOR type="115" id="7579" >
 <cdparam x="406" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="406" y="171" id="7587" />
-<P2  x="406" y="195" id="7583" />
+<P1  x="406" y="171" id="7570" />
+<P2  x="406" y="195" id="7566" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7597" >
+<CONNECTOR type="115" id="7580" >
 <cdparam x="406" y="235" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="406" y="235" id="7584" />
-<P2  x="406" y="261" id="7579" />
+<P1  x="406" y="235" id="7567" />
+<P2  x="406" y="261" id="7562" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7598" >
+<CONNECTOR type="115" id="7581" >
 <cdparam x="406" y="291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="406" y="291" id="7580" />
-<P2  x="407" y="323" id="7577" />
+<P1  x="406" y="291" id="7563" />
+<P2  x="407" y="323" id="7560" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_cwm" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1007" id="7601" >
-<cdparam x="454" y="238" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_dma" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1007" id="7584" >
+<cdparam x="380" y="223" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="r_cwm(size)" />
-<TGConnectingPoint num="0" id="7599" />
-<TGConnectingPoint num="1" id="7600" />
+<infoparam name="send request" value="r_dma(size)" />
+<TGConnectingPoint num="0" id="7582" />
+<TGConnectingPoint num="1" id="7583" />
+<breakpoint />
 <extraparam>
-<Data requestName="r_cwm" nbOfParams="5" />
+<Data requestName="r_dma" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="7603" >
-<cdparam x="483" y="367" />
+<COMPONENT type="1001" id="7586" >
+<cdparam x="410" y="352" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7602" />
+<TGConnectingPoint num="0" id="7585" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="7606" >
-<cdparam x="448" y="308" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="7589" >
+<cdparam x="372" y="293" />
+<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="cwm_out(size)" />
-<TGConnectingPoint num="0" id="7604" />
-<TGConnectingPoint num="1" id="7605" />
+<infoparam name="send event" value="dma_out(size)" />
+<TGConnectingPoint num="0" id="7587" />
+<TGConnectingPoint num="1" id="7588" />
 <extraparam>
-<Data eventName="cwm_out" nbOfParams="5" />
+<Data eventName="dma_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="7609" >
-<cdparam x="466" y="179" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="7592" >
+<cdparam x="391" y="164" />
+<sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="in(size) " />
-<TGConnectingPoint num="0" id="7607" />
-<TGConnectingPoint num="1" id="7608" />
+<TGConnectingPoint num="0" id="7590" />
+<TGConnectingPoint num="1" id="7591" />
 <extraparam>
 <Data eventName="in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7611" >
-<cdparam x="486" y="119" />
+<COMPONENT type="1000" id="7594" >
+<cdparam x="413" y="104" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7610" />
+<TGConnectingPoint num="0" id="7593" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7612" >
-<cdparam x="493" y="139" />
+<CONNECTOR type="115" id="7595" >
+<cdparam x="420" y="124" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to wait event" value="null" />
-<P1  x="493" y="139" id="7610" />
-<P2  x="493" y="174" id="7607" />
+<P1  x="420" y="124" id="7593" />
+<P2  x="420" y="159" id="7590" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7613" >
-<cdparam x="493" y="333" />
+<CONNECTOR type="115" id="7596" >
+<cdparam x="420" y="318" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="493" y="333" id="7605" />
-<P2  x="493" y="362" id="7602" />
+<P1  x="420" y="318" id="7588" />
+<P2  x="420" y="347" id="7585" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7614" >
-<cdparam x="493" y="204" />
+<CONNECTOR type="115" id="7597" >
+<cdparam x="420" y="189" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send request" value="null" />
-<P1  x="493" y="204" id="7608" />
-<P2  x="493" y="233" id="7599" />
+<P1  x="420" y="189" id="7591" />
+<P2  x="420" y="218" id="7582" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7615" >
-<cdparam x="501" y="260" />
+<CONNECTOR type="115" id="7598" >
+<cdparam x="428" y="245" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="493" y="263" id="7600" />
-<P2  x="493" y="303" id="7604" />
+<P1  x="420" y="248" id="7583" />
+<P2  x="420" y="288" id="7587" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_cwm" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="7619" >
+<COMPONENT type="1013" id="7602" >
 <cdparam x="591" y="239" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7617" />
-<TGConnectingPoint num="1" id="7618" />
+<TGConnectingPoint num="0" id="7600" />
+<TGConnectingPoint num="1" id="7601" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="7616" >
-<father id="7619" num="0" />
+<SUBCOMPONENT type="-1" id="7599" >
+<father id="7602" num="0" />
 <cdparam x="606" y="259" />
 <sizeparam width="87" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18500,265 +18535,220 @@ sequence diagram.
 <infoparam name="value of the delay" value="10 * size + 10" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="7621" >
+<COMPONENT type="1001" id="7604" >
 <cdparam x="587" y="367" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7620" />
+<TGConnectingPoint num="0" id="7603" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="7624" >
+<COMPONENT type="1006" id="7607" >
 <cdparam x="548" y="305" />
 <sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="cwm_out(size)" />
-<TGConnectingPoint num="0" id="7622" />
-<TGConnectingPoint num="1" id="7623" />
+<TGConnectingPoint num="0" id="7605" />
+<TGConnectingPoint num="1" id="7606" />
 <extraparam>
 <Data channelName="cwm_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="7627" >
+<COMPONENT type="1009" id="7610" >
 <cdparam x="567" y="185" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="in(size) " />
-<TGConnectingPoint num="0" id="7625" />
-<TGConnectingPoint num="1" id="7626" />
+<TGConnectingPoint num="0" id="7608" />
+<TGConnectingPoint num="1" id="7609" />
 <accessibility />
 <extraparam>
 <Data channelName="in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7630" >
+<COMPONENT type="1034" id="7613" >
 <cdparam x="541" y="132" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7628" />
-<TGConnectingPoint num="1" id="7629" />
+<TGConnectingPoint num="0" id="7611" />
+<TGConnectingPoint num="1" id="7612" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7632" >
+<COMPONENT type="1000" id="7615" >
 <cdparam x="590" y="89" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7631" />
+<TGConnectingPoint num="0" id="7614" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7633" >
+<CONNECTOR type="115" id="7616" >
 <cdparam x="597" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to read args" value="null" />
-<P1  x="597" y="109" id="7631" />
-<P2  x="597" y="127" id="7628" />
+<P1  x="597" y="109" id="7614" />
+<P2  x="597" y="127" id="7611" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7634" >
+<CONNECTOR type="115" id="7617" >
 <cdparam x="597" y="157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read args to read channel" value="null" />
-<P1  x="597" y="157" id="7629" />
-<P2  x="596" y="180" id="7625" />
+<P1  x="597" y="157" id="7612" />
+<P2  x="596" y="180" id="7608" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7635" >
+<CONNECTOR type="115" id="7618" >
 <cdparam x="596" y="210" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="596" y="210" id="7626" />
-<P2  x="596" y="234" id="7617" />
+<P1  x="596" y="210" id="7609" />
+<P2  x="596" y="234" id="7600" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7636" >
+<CONNECTOR type="115" id="7619" >
 <cdparam x="596" y="274" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="596" y="274" id="7618" />
-<P2  x="596" y="300" id="7622" />
+<P1  x="596" y="274" id="7601" />
+<P2  x="596" y="300" id="7605" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7637" >
+<CONNECTOR type="115" id="7620" >
 <cdparam x="596" y="330" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="596" y="330" id="7623" />
-<P2  x="597" y="362" id="7620" />
+<P1  x="596" y="330" id="7606" />
+<P2  x="597" y="362" id="7603" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_cwa" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1009" id="7640" >
-<cdparam x="547" y="267" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_cwm" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1007" id="7623" >
+<cdparam x="454" y="238" />
+<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="in2(size) " />
-<TGConnectingPoint num="0" id="7638" />
-<TGConnectingPoint num="1" id="7639" />
+<infoparam name="send request" value="r_cwm(size)" />
+<TGConnectingPoint num="0" id="7621" />
+<TGConnectingPoint num="1" id="7622" />
 <extraparam>
-<Data channelName="in2" nbOfSamples="size" secPattern="" />
+<Data requestName="r_cwm" nbOfParams="5" />
+<Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="7644" >
-<cdparam x="574" y="317" />
-<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7642" />
-<TGConnectingPoint num="1" id="7643" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="7641" >
-<father id="7644" num="0" />
-<cdparam x="589" y="337" />
-<sizeparam width="57" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
-<infoparam name="value of the delay" value="size + 10" />
-</SUBCOMPONENT>
-
-<COMPONENT type="1001" id="7646" >
-<cdparam x="568" y="436" />
+<COMPONENT type="1001" id="7625" >
+<cdparam x="483" y="367" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7645" />
-</COMPONENT>
-
-<COMPONENT type="1006" id="7649" >
-<cdparam x="531" y="375" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="cwa_out(size)" />
-<TGConnectingPoint num="0" id="7647" />
-<TGConnectingPoint num="1" id="7648" />
-<extraparam>
-<Data channelName="cwa_out" nbOfSamples="size" secPattern="" />
-</extraparam>
+<TGConnectingPoint num="0" id="7624" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="7652" >
-<cdparam x="547" y="232" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="7628" >
+<cdparam x="448" y="308" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="in1(size) " />
-<TGConnectingPoint num="0" id="7650" />
-<TGConnectingPoint num="1" id="7651" />
+<infoparam name="send event" value="cwm_out(size)" />
+<TGConnectingPoint num="0" id="7626" />
+<TGConnectingPoint num="1" id="7627" />
 <extraparam>
-<Data channelName="in1" nbOfSamples="size" secPattern="" />
+<Data eventName="cwm_out" nbOfParams="5" />
+<Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7655" >
-<cdparam x="525" y="179" />
-<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="7631" >
+<cdparam x="466" y="179" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7653" />
-<TGConnectingPoint num="1" id="7654" />
+<infoparam name="wait event" value="in(size) " />
+<TGConnectingPoint num="0" id="7629" />
+<TGConnectingPoint num="1" id="7630" />
 <extraparam>
-<Data nbOfParams="5" />
+<Data eventName="in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7657" >
-<cdparam x="574" y="136" />
+<COMPONENT type="1000" id="7633" >
+<cdparam x="486" y="119" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7656" />
+<TGConnectingPoint num="0" id="7632" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7658" >
-<cdparam x="582" y="294" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to execI" value="null" />
-<P1  x="580" y="292" id="7639" />
-<P2  x="579" y="312" id="7642" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="7659" >
-<cdparam x="581" y="156" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to read args" value="null" />
-<P1  x="581" y="156" id="7656" />
-<P2  x="581" y="174" id="7653" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="7660" >
-<cdparam x="581" y="204" />
+<CONNECTOR type="115" id="7634" >
+<cdparam x="493" y="139" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read args to read channel" value="null" />
-<P1  x="581" y="204" id="7654" />
-<P2  x="580" y="227" id="7650" />
+<infoparam name="connector from start state to wait event" value="null" />
+<P1  x="493" y="139" id="7632" />
+<P2  x="493" y="174" id="7629" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7661" >
-<cdparam x="577" y="343" />
+<CONNECTOR type="115" id="7635" >
+<cdparam x="493" y="333" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from execI to write channel" value="null" />
-<P1  x="579" y="352" id="7643" />
-<P2  x="578" y="370" id="7647" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1  x="493" y="333" id="7627" />
+<P2  x="493" y="362" id="7624" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7662" >
-<cdparam x="577" y="399" />
+<CONNECTOR type="115" id="7636" >
+<cdparam x="493" y="204" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="578" y="400" id="7648" />
-<P2  x="578" y="431" id="7645" />
+<infoparam name="connector from wait event to send request" value="null" />
+<P1  x="493" y="204" id="7630" />
+<P2  x="493" y="233" id="7621" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7663" >
-<cdparam x="580" y="257" />
+<CONNECTOR type="115" id="7637" >
+<cdparam x="501" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to read channel" value="null" />
-<P1  x="580" y="257" id="7651" />
-<P2  x="580" y="262" id="7638" />
+<infoparam name="connector from send request to send event" value="null" />
+<P1  x="493" y="263" id="7622" />
+<P2  x="493" y="303" id="7626" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="F_cwa" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1016" id="7671" >
+<COMPONENT type="1016" id="7645" >
 <cdparam x="487" y="138" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="7665" />
-<TGConnectingPoint num="1" id="7666" />
-<TGConnectingPoint num="2" id="7667" />
-<TGConnectingPoint num="3" id="7668" />
-<TGConnectingPoint num="4" id="7669" />
-<TGConnectingPoint num="5" id="7670" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="7664" >
-<father id="7671" num="0" />
+<TGConnectingPoint num="0" id="7639" />
+<TGConnectingPoint num="1" id="7640" />
+<TGConnectingPoint num="2" id="7641" />
+<TGConnectingPoint num="3" id="7642" />
+<TGConnectingPoint num="4" id="7643" />
+<TGConnectingPoint num="5" id="7644" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="7638" >
+<father id="7645" num="0" />
 <cdparam x="641" y="145" />
 <sizeparam width="20" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18766,39 +18756,39 @@ sequence diagram.
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="7673" >
+<COMPONENT type="1001" id="7647" >
 <cdparam x="437" y="323" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7672" />
+<TGConnectingPoint num="0" id="7646" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="7675" >
+<COMPONENT type="1001" id="7649" >
 <cdparam x="356" y="319" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7674" />
+<TGConnectingPoint num="0" id="7648" />
 </COMPONENT>
 
-<COMPONENT type="1032" id="7683" >
+<COMPONENT type="1032" id="7657" >
 <cdparam x="342" y="208" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="random sequence" value="null" />
-<TGConnectingPoint num="0" id="7677" />
-<TGConnectingPoint num="1" id="7678" />
-<TGConnectingPoint num="2" id="7679" />
-<TGConnectingPoint num="3" id="7680" />
-<TGConnectingPoint num="4" id="7681" />
-<TGConnectingPoint num="5" id="7682" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="7676" >
-<father id="7683" num="0" />
+<TGConnectingPoint num="0" id="7651" />
+<TGConnectingPoint num="1" id="7652" />
+<TGConnectingPoint num="2" id="7653" />
+<TGConnectingPoint num="3" id="7654" />
+<TGConnectingPoint num="4" id="7655" />
+<TGConnectingPoint num="5" id="7656" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="7650" >
+<father id="7657" num="0" />
 <cdparam x="496" y="215" />
 <sizeparam width="20" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18806,263 +18796,308 @@ sequence diagram.
 <infoparam name="Random sequence" value="&lt;&gt;" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1007" id="7686" >
+<COMPONENT type="1007" id="7660" >
 <cdparam x="625" y="206" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send request" value="r_cwa(size)" />
-<TGConnectingPoint num="0" id="7684" />
-<TGConnectingPoint num="1" id="7685" />
+<TGConnectingPoint num="0" id="7658" />
+<TGConnectingPoint num="1" id="7659" />
 <extraparam>
 <Data requestName="r_cwa" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="7688" >
+<COMPONENT type="1001" id="7662" >
 <cdparam x="654" y="335" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7687" />
+<TGConnectingPoint num="0" id="7661" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="7691" >
+<COMPONENT type="1008" id="7665" >
 <cdparam x="617" y="276" />
 <sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="cwa_out(size)" />
-<TGConnectingPoint num="0" id="7689" />
-<TGConnectingPoint num="1" id="7690" />
+<TGConnectingPoint num="0" id="7663" />
+<TGConnectingPoint num="1" id="7664" />
 <extraparam>
 <Data eventName="cwa_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7693" >
+<COMPONENT type="1000" id="7667" >
 <cdparam x="555" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7692" />
+<TGConnectingPoint num="0" id="7666" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="7696" >
+<COMPONENT type="1010" id="7670" >
 <cdparam x="333" y="259" />
 <sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="in1(size) " />
-<TGConnectingPoint num="0" id="7694" />
-<TGConnectingPoint num="1" id="7695" />
+<TGConnectingPoint num="0" id="7668" />
+<TGConnectingPoint num="1" id="7669" />
 <extraparam>
 <Data eventName="in1" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="7699" >
+<COMPONENT type="1010" id="7673" >
 <cdparam x="414" y="259" />
 <sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="in2(size) " />
-<TGConnectingPoint num="0" id="7697" />
-<TGConnectingPoint num="1" id="7698" />
+<TGConnectingPoint num="0" id="7671" />
+<TGConnectingPoint num="1" id="7672" />
 <extraparam>
 <Data eventName="in2" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="7700" >
+<CONNECTOR type="115" id="7674" >
 <cdparam x="597" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to send request" value="null" />
-<P1  x="587" y="143" id="7669" />
-<P2  x="664" y="201" id="7684" />
+<P1  x="587" y="143" id="7643" />
+<P2  x="664" y="201" id="7658" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7701" >
+<CONNECTOR type="115" id="7675" >
 <cdparam x="522" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to random sequence" value="null" />
-<P1  x="512" y="143" id="7666" />
-<P2  x="417" y="208" id="7677" />
+<P1  x="512" y="143" id="7640" />
+<P2  x="417" y="208" id="7651" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7702" >
+<CONNECTOR type="115" id="7676" >
 <cdparam x="391" y="213" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from random sequence to wait event" value="null" />
-<P1  x="391" y="213" id="7679" />
-<P2  x="366" y="254" id="7694" />
+<P1  x="391" y="213" id="7653" />
+<P2  x="366" y="254" id="7668" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7703" >
+<CONNECTOR type="115" id="7677" >
 <cdparam x="391" y="213" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from random sequence to wait event" value="null" />
-<P1  x="442" y="213" id="7681" />
-<P2  x="447" y="254" id="7697" />
+<P1  x="442" y="213" id="7655" />
+<P2  x="447" y="254" id="7671" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7704" >
+<CONNECTOR type="115" id="7678" >
 <cdparam x="664" y="301" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="664" y="301" id="7690" />
-<P2  x="664" y="330" id="7687" />
+<P1  x="664" y="301" id="7664" />
+<P2  x="664" y="330" id="7661" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7705" >
+<CONNECTOR type="115" id="7679" >
 <cdparam x="672" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="664" y="231" id="7685" />
-<P2  x="664" y="271" id="7689" />
+<P1  x="664" y="231" id="7659" />
+<P2  x="664" y="271" id="7663" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7706" >
+<CONNECTOR type="115" id="7680" >
 <cdparam x="366" y="284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="366" y="284" id="7695" />
-<P2  x="366" y="314" id="7674" />
+<P1  x="366" y="284" id="7669" />
+<P2  x="366" y="314" id="7648" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7707" >
+<CONNECTOR type="115" id="7681" >
 <cdparam x="447" y="284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="447" y="284" id="7698" />
-<P2  x="447" y="318" id="7672" />
+<P1  x="447" y="284" id="7672" />
+<P2  x="447" y="318" id="7646" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7708" >
+<CONNECTOR type="115" id="7682" >
 <cdparam x="572" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to sequence" value="null" />
-<P1  x="562" y="100" id="7692" />
-<P2  x="562" y="138" id="7665" />
+<P1  x="562" y="100" id="7666" />
+<P2  x="562" y="138" id="7639" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_sum" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1007" id="7711" >
-<cdparam x="473" y="176" />
-<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="X_cwa" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1009" id="7685" >
+<cdparam x="547" y="267" />
+<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="r_sum(size)" />
-<TGConnectingPoint num="0" id="7709" />
-<TGConnectingPoint num="1" id="7710" />
+<infoparam name="read channel" value="in2(size) " />
+<TGConnectingPoint num="0" id="7683" />
+<TGConnectingPoint num="1" id="7684" />
 <extraparam>
-<Data requestName="r_sum" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data channelName="in2" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="7713" >
-<cdparam x="501" y="305" />
+<COMPONENT type="1013" id="7689" >
+<cdparam x="574" y="317" />
+<sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="execI" value="null" />
+<TGConnectingPoint num="0" id="7687" />
+<TGConnectingPoint num="1" id="7688" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="7686" >
+<father id="7689" num="0" />
+<cdparam x="589" y="337" />
+<sizeparam width="57" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
+<infoparam name="value of the delay" value="size + 10" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1001" id="7691" >
+<cdparam x="568" y="436" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7712" />
+<TGConnectingPoint num="0" id="7690" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="7716" >
-<cdparam x="467" y="246" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="7694" >
+<cdparam x="531" y="375" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="sum_out(size)" />
-<TGConnectingPoint num="0" id="7714" />
-<TGConnectingPoint num="1" id="7715" />
+<infoparam name="write channel" value="cwa_out(size)" />
+<TGConnectingPoint num="0" id="7692" />
+<TGConnectingPoint num="1" id="7693" />
 <extraparam>
-<Data eventName="sum_out" nbOfParams="5" />
-<Param index="0" value="size" />
+<Data channelName="cwa_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="7719" >
-<cdparam x="484" y="117" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="7697" >
+<cdparam x="547" y="232" />
+<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="in(size) " />
-<TGConnectingPoint num="0" id="7717" />
-<TGConnectingPoint num="1" id="7718" />
+<infoparam name="read channel" value="in1(size) " />
+<TGConnectingPoint num="0" id="7695" />
+<TGConnectingPoint num="1" id="7696" />
 <extraparam>
-<Data eventName="in" nbOfParams="5" />
+<Data channelName="in1" nbOfSamples="size" secPattern="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1034" id="7700" >
+<cdparam x="525" y="179" />
+<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="read args" value="getReqArg (size)" />
+<TGConnectingPoint num="0" id="7698" />
+<TGConnectingPoint num="1" id="7699" />
+<extraparam>
+<Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7721" >
-<cdparam x="504" y="57" />
+<COMPONENT type="1000" id="7702" >
+<cdparam x="574" y="136" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7720" />
+<TGConnectingPoint num="0" id="7701" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7722" >
-<cdparam x="511" y="77" />
+<CONNECTOR type="115" id="7703" >
+<cdparam x="582" y="294" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1  x="511" y="77" id="7720" />
-<P2  x="511" y="112" id="7717" />
+<infoparam name="connector from read channel to execI" value="null" />
+<P1  x="580" y="292" id="7684" />
+<P2  x="579" y="312" id="7687" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7723" >
-<cdparam x="511" y="271" />
+<CONNECTOR type="115" id="7704" >
+<cdparam x="581" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1  x="511" y="271" id="7715" />
-<P2  x="511" y="300" id="7712" />
+<infoparam name="connector from start state to read args" value="null" />
+<P1  x="581" y="156" id="7701" />
+<P2  x="581" y="174" id="7698" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7724" >
-<cdparam x="511" y="142" />
+<CONNECTOR type="115" id="7705" >
+<cdparam x="581" y="204" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send request" value="null" />
-<P1  x="511" y="142" id="7718" />
-<P2  x="511" y="171" id="7709" />
+<infoparam name="connector from read args to read channel" value="null" />
+<P1  x="581" y="204" id="7699" />
+<P2  x="580" y="227" id="7695" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7725" >
-<cdparam x="519" y="198" />
+<CONNECTOR type="115" id="7706" >
+<cdparam x="577" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send event" value="null" />
-<P1  x="511" y="201" id="7710" />
-<P2  x="511" y="241" id="7714" />
+<infoparam name="connector from execI to write channel" value="null" />
+<P1  x="579" y="352" id="7688" />
+<P2  x="578" y="370" id="7692" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="7707" >
+<cdparam x="577" y="399" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1  x="578" y="400" id="7693" />
+<P2  x="578" y="431" id="7690" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="7708" >
+<cdparam x="580" y="257" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to read channel" value="null" />
+<P1  x="580" y="257" id="7696" />
+<P2  x="580" y="262" id="7683" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_sum" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="7729" >
+<COMPONENT type="1013" id="7712" >
 <cdparam x="563" y="213" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7727" />
-<TGConnectingPoint num="1" id="7728" />
+<TGConnectingPoint num="0" id="7710" />
+<TGConnectingPoint num="1" id="7711" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="7726" >
-<father id="7729" num="0" />
+<SUBCOMPONENT type="-1" id="7709" >
+<father id="7712" num="0" />
 <cdparam x="578" y="233" />
 <sizeparam width="57" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -19070,215 +19105,215 @@ sequence diagram.
 <infoparam name="value of the delay" value="size + 10" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="7731" >
+<COMPONENT type="1001" id="7714" >
 <cdparam x="559" y="341" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7730" />
+<TGConnectingPoint num="0" id="7713" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="7734" >
+<COMPONENT type="1006" id="7717" >
 <cdparam x="520" y="279" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="sum_out(size)" />
-<TGConnectingPoint num="0" id="7732" />
-<TGConnectingPoint num="1" id="7733" />
+<TGConnectingPoint num="0" id="7715" />
+<TGConnectingPoint num="1" id="7716" />
 <extraparam>
 <Data channelName="sum_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="7737" >
+<COMPONENT type="1009" id="7720" >
 <cdparam x="539" y="159" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="in(size) " />
-<TGConnectingPoint num="0" id="7735" />
-<TGConnectingPoint num="1" id="7736" />
+<TGConnectingPoint num="0" id="7718" />
+<TGConnectingPoint num="1" id="7719" />
 <extraparam>
 <Data channelName="in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7740" >
+<COMPONENT type="1034" id="7723" >
 <cdparam x="513" y="106" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7738" />
-<TGConnectingPoint num="1" id="7739" />
+<TGConnectingPoint num="0" id="7721" />
+<TGConnectingPoint num="1" id="7722" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7742" >
+<COMPONENT type="1000" id="7725" >
 <cdparam x="562" y="63" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7741" />
+<TGConnectingPoint num="0" id="7724" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7743" >
+<CONNECTOR type="115" id="7726" >
 <cdparam x="569" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to read args" value="null" />
-<P1  x="569" y="83" id="7741" />
-<P2  x="569" y="101" id="7738" />
+<P1  x="569" y="83" id="7724" />
+<P2  x="569" y="101" id="7721" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7744" >
+<CONNECTOR type="115" id="7727" >
 <cdparam x="569" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read args to read channel" value="null" />
-<P1  x="569" y="131" id="7739" />
-<P2  x="568" y="154" id="7735" />
+<P1  x="569" y="131" id="7722" />
+<P2  x="568" y="154" id="7718" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7745" >
+<CONNECTOR type="115" id="7728" >
 <cdparam x="568" y="184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="568" y="184" id="7736" />
-<P2  x="568" y="208" id="7727" />
+<P1  x="568" y="184" id="7719" />
+<P2  x="568" y="208" id="7710" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7746" >
+<CONNECTOR type="115" id="7729" >
 <cdparam x="568" y="248" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="568" y="248" id="7728" />
-<P2  x="568" y="274" id="7732" />
+<P1  x="568" y="248" id="7711" />
+<P2  x="568" y="274" id="7715" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7747" >
+<CONNECTOR type="115" id="7730" >
 <cdparam x="568" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="568" y="304" id="7733" />
-<P2  x="569" y="336" id="7730" />
+<P1  x="568" y="304" id="7716" />
+<P2  x="569" y="336" id="7713" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_dma1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1007" id="7750" >
-<cdparam x="387" y="227" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="F_sum" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1007" id="7733" >
+<cdparam x="473" y="176" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="r_dma1(size)" />
-<TGConnectingPoint num="0" id="7748" />
-<TGConnectingPoint num="1" id="7749" />
+<infoparam name="send request" value="r_sum(size)" />
+<TGConnectingPoint num="0" id="7731" />
+<TGConnectingPoint num="1" id="7732" />
 <extraparam>
-<Data requestName="r_dma1" nbOfParams="5" />
+<Data requestName="r_sum" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="7752" >
-<cdparam x="420" y="356" />
+<COMPONENT type="1001" id="7735" >
+<cdparam x="501" y="305" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7751" />
+<TGConnectingPoint num="0" id="7734" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="7755" >
-<cdparam x="381" y="297" />
-<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="7738" >
+<cdparam x="467" y="246" />
+<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="dma1_out(size)" />
-<TGConnectingPoint num="0" id="7753" />
-<TGConnectingPoint num="1" id="7754" />
+<infoparam name="send event" value="sum_out(size)" />
+<TGConnectingPoint num="0" id="7736" />
+<TGConnectingPoint num="1" id="7737" />
 <extraparam>
-<Data eventName="dma1_out" nbOfParams="5" />
+<Data eventName="sum_out" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="7758" >
-<cdparam x="403" y="168" />
+<COMPONENT type="1010" id="7741" >
+<cdparam x="484" y="117" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="in(size) " />
-<TGConnectingPoint num="0" id="7756" />
-<TGConnectingPoint num="1" id="7757" />
+<TGConnectingPoint num="0" id="7739" />
+<TGConnectingPoint num="1" id="7740" />
 <extraparam>
 <Data eventName="in" nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7760" >
-<cdparam x="423" y="108" />
+<COMPONENT type="1000" id="7743" >
+<cdparam x="504" y="57" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7759" />
+<TGConnectingPoint num="0" id="7742" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7761" >
-<cdparam x="430" y="128" />
+<CONNECTOR type="115" id="7744" >
+<cdparam x="511" y="77" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to wait event" value="null" />
-<P1  x="430" y="128" id="7759" />
-<P2  x="430" y="163" id="7756" />
+<P1  x="511" y="77" id="7742" />
+<P2  x="511" y="112" id="7739" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7762" >
-<cdparam x="430" y="322" />
+<CONNECTOR type="115" id="7745" >
+<cdparam x="511" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="430" y="322" id="7754" />
-<P2  x="430" y="351" id="7751" />
+<P1  x="511" y="271" id="7737" />
+<P2  x="511" y="300" id="7734" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7763" >
-<cdparam x="430" y="193" />
+<CONNECTOR type="115" id="7746" >
+<cdparam x="511" y="142" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send request" value="null" />
-<P1  x="430" y="193" id="7757" />
-<P2  x="430" y="222" id="7748" />
+<P1  x="511" y="142" id="7740" />
+<P2  x="511" y="171" id="7731" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7764" >
-<cdparam x="438" y="249" />
+<CONNECTOR type="115" id="7747" >
+<cdparam x="519" y="198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="430" y="252" id="7749" />
-<P2  x="430" y="292" id="7753" />
+<P1  x="511" y="201" id="7732" />
+<P2  x="511" y="241" id="7736" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="X_dma1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1013" id="7768" >
+<COMPONENT type="1013" id="7751" >
 <cdparam x="544" y="266" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="7766" />
-<TGConnectingPoint num="1" id="7767" />
+<TGConnectingPoint num="0" id="7749" />
+<TGConnectingPoint num="1" id="7750" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="7765" >
-<father id="7768" num="0" />
+<SUBCOMPONENT type="-1" id="7748" >
+<father id="7751" num="0" />
 <cdparam x="559" y="286" />
 <sizeparam width="23" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -19286,102 +19321,198 @@ sequence diagram.
 <infoparam name="value of the delay" value="size" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="7770" >
+<COMPONENT type="1001" id="7753" >
 <cdparam x="540" y="394" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="7769" />
+<TGConnectingPoint num="0" id="7752" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="7773" >
+<COMPONENT type="1006" id="7756" >
 <cdparam x="497" y="332" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dma1_out(size)" />
-<TGConnectingPoint num="0" id="7771" />
-<TGConnectingPoint num="1" id="7772" />
+<TGConnectingPoint num="0" id="7754" />
+<TGConnectingPoint num="1" id="7755" />
 <extraparam>
 <Data channelName="dma1_out" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="7776" >
+<COMPONENT type="1009" id="7759" >
 <cdparam x="520" y="212" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="in(size) " />
-<TGConnectingPoint num="0" id="7774" />
-<TGConnectingPoint num="1" id="7775" />
+<TGConnectingPoint num="0" id="7757" />
+<TGConnectingPoint num="1" id="7758" />
 <extraparam>
 <Data channelName="in" nbOfSamples="size" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1034" id="7779" >
+<COMPONENT type="1034" id="7762" >
 <cdparam x="494" y="159" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read args" value="getReqArg (size)" />
-<TGConnectingPoint num="0" id="7777" />
-<TGConnectingPoint num="1" id="7778" />
+<TGConnectingPoint num="0" id="7760" />
+<TGConnectingPoint num="1" id="7761" />
 <extraparam>
 <Data nbOfParams="5" />
 <Param index="0" value="size" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="7781" >
+<COMPONENT type="1000" id="7764" >
 <cdparam x="543" y="116" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7780" />
+<TGConnectingPoint num="0" id="7763" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="7782" >
+<CONNECTOR type="115" id="7765" >
 <cdparam x="550" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to read args" value="null" />
-<P1  x="550" y="136" id="7780" />
-<P2  x="550" y="154" id="7777" />
+<P1  x="550" y="136" id="7763" />
+<P2  x="550" y="154" id="7760" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7783" >
+<CONNECTOR type="115" id="7766" >
 <cdparam x="550" y="184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read args to read channel" value="null" />
-<P1  x="550" y="184" id="7778" />
-<P2  x="549" y="207" id="7774" />
+<P1  x="550" y="184" id="7761" />
+<P2  x="549" y="207" id="7757" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7784" >
+<CONNECTOR type="115" id="7767" >
 <cdparam x="549" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="549" y="237" id="7775" />
-<P2  x="549" y="261" id="7766" />
+<P1  x="549" y="237" id="7758" />
+<P2  x="549" y="261" id="7749" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7785" >
+<CONNECTOR type="115" id="7768" >
 <cdparam x="549" y="301" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="549" y="301" id="7767" />
-<P2  x="549" y="327" id="7771" />
+<P1  x="549" y="301" id="7750" />
+<P2  x="549" y="327" id="7754" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="7786" >
+<CONNECTOR type="115" id="7769" >
 <cdparam x="549" y="357" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="549" y="357" id="7772" />
-<P2  x="550" y="389" id="7769" />
+<P1  x="549" y="357" id="7755" />
+<P2  x="550" y="389" id="7752" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="F_dma1" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1007" id="7772" >
+<cdparam x="387" y="227" />
+<sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send request" value="r_dma1(size)" />
+<TGConnectingPoint num="0" id="7770" />
+<TGConnectingPoint num="1" id="7771" />
+<extraparam>
+<Data requestName="r_dma1" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="7774" >
+<cdparam x="420" y="356" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="7773" />
+</COMPONENT>
+
+<COMPONENT type="1008" id="7777" >
+<cdparam x="381" y="297" />
+<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="dma1_out(size)" />
+<TGConnectingPoint num="0" id="7775" />
+<TGConnectingPoint num="1" id="7776" />
+<extraparam>
+<Data eventName="dma1_out" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1010" id="7780" >
+<cdparam x="403" y="168" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="in(size) " />
+<TGConnectingPoint num="0" id="7778" />
+<TGConnectingPoint num="1" id="7779" />
+<extraparam>
+<Data eventName="in" nbOfParams="5" />
+<Param index="0" value="size" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="7782" >
+<cdparam x="423" y="108" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="7781" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="7783" >
+<cdparam x="430" y="128" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to wait event" value="null" />
+<P1  x="430" y="128" id="7781" />
+<P2  x="430" y="163" id="7778" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="7784" >
+<cdparam x="430" y="322" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1  x="430" y="322" id="7776" />
+<P2  x="430" y="351" id="7773" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="7785" >
+<cdparam x="430" y="193" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to send request" value="null" />
+<P1  x="430" y="193" id="7779" />
+<P2  x="430" y="222" id="7770" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="7786" >
+<cdparam x="438" y="249" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to send event" value="null" />
+<P1  x="430" y="252" id="7771" />
+<P2  x="430" y="292" id="7775" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
diff --git a/modeling/SysMLSec/AliceAndBob.xml b/modeling/SysMLSec/AliceAndBob.xml
index 16c14c0e50d4f697de90adf4d626615510212190..becf080e27479bc609c615bd2c1771b7ac3c3d78 100644
--- a/modeling/SysMLSec/AliceAndBob.xml
+++ b/modeling/SysMLSec/AliceAndBob.xml
@@ -154,11 +154,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="66" >
 <father id="116" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
 <TGConnectingPoint num="0" id="42" />
 <TGConnectingPoint num="1" id="43" />
 <TGConnectingPoint num="2" id="44" />
@@ -185,10 +185,10 @@
 <TGConnectingPoint num="23" id="65" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -215,11 +215,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="91" >
 <father id="116" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
 <TGConnectingPoint num="0" id="67" />
 <TGConnectingPoint num="1" id="68" />
 <TGConnectingPoint num="2" id="69" />
@@ -246,10 +246,10 @@
 <TGConnectingPoint num="23" id="90" />
 <extraparam>
 <CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -291,19 +291,19 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
 <CONNECTOR type="5102" id="125" >
-<cdparam x="416" y="379" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
+<cdparam x="407" y="310" />
+<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="124" />
-<P1  x="416" y="379" id="160" />
-<P2  x="420" y="424" id="196" />
+<P1  x="407" y="310" id="196" />
+<P2  x="416" y="356" id="155" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="123" >
 <father id="125" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="449" y="353" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -317,22 +317,21 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="132" >
-<cdparam x="407" y="273" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
+<cdparam x="492" y="446" />
+<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="131" />
-<P1  x="407" y="273" id="242" />
-<P2  x="416" y="339" id="155" />
+<P1  x="416" y="406" id="160" />
+<P2  x="434" y="446" id="206" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="130" >
 <father id="132" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="134" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="449" y="440" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -346,21 +345,20 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="139" >
-<cdparam x="406" y="201" />
+<cdparam x="407" y="251" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
+<infoparam name="connector from state0 to stop state" value="null" />
 <TGConnectingPoint num="0" id="138" />
-<P1  x="406" y="201" id="278" />
-<P2  x="407" y="233" id="237" />
+<P1  x="407" y="251" id="214" />
+<P2  x="407" y="280" id="195" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="137" >
 <father id="139" num="0" />
-<cdparam x="406" y="241" />
+<cdparam x="407" y="291" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -379,17 +377,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="146" >
-<cdparam x="406" y="141" />
+<cdparam x="407" y="132" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
+<infoparam name="connector from state0 to state0" value="null" />
 <TGConnectingPoint num="0" id="145" />
-<P1  x="406" y="141" id="294" />
-<P2  x="406" y="171" id="277" />
+<P1  x="407" y="132" id="255" />
+<P2  x="407" y="211" id="209" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="144" >
 <father id="146" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="415" y="162" />
+<sizeparam width="134" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -403,6 +401,8 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -411,8 +411,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
 <TGConnectingPoint num="0" id="152" />
-<P1  x="407" y="70" id="329" />
-<P2  x="406" y="101" id="289" />
+<P1  x="407" y="70" id="290" />
+<P2  x="407" y="92" id="250" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="151" >
 <father id="153" num="0" />
@@ -435,11 +435,11 @@
 </SUBCOMPONENT>
 
 <COMPONENT type="5106" id="194" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="366" y="356" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
+<infoparam name="State" value="beforeFinish" />
 <TGConnectingPoint num="0" id="154" />
 <TGConnectingPoint num="1" id="155" />
 <TGConnectingPoint num="2" id="156" />
@@ -484,12 +484,12 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="235" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="205" >
+<cdparam x="370" y="285" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
+<infoparam name="Send signal" value="chout(m1)" />
 <TGConnectingPoint num="0" id="195" />
 <TGConnectingPoint num="1" id="196" />
 <TGConnectingPoint num="2" id="197" />
@@ -500,246 +500,207 @@
 <TGConnectingPoint num="7" id="202" />
 <TGConnectingPoint num="8" id="203" />
 <TGConnectingPoint num="9" id="204" />
-<TGConnectingPoint num="10" id="205" />
-<TGConnectingPoint num="11" id="206" />
-<TGConnectingPoint num="12" id="207" />
-<TGConnectingPoint num="13" id="208" />
-<TGConnectingPoint num="14" id="209" />
-<TGConnectingPoint num="15" id="210" />
-<TGConnectingPoint num="16" id="211" />
-<TGConnectingPoint num="17" id="212" />
-<TGConnectingPoint num="18" id="213" />
-<TGConnectingPoint num="19" id="214" />
-<TGConnectingPoint num="20" id="215" />
-<TGConnectingPoint num="21" id="216" />
-<TGConnectingPoint num="22" id="217" />
-<TGConnectingPoint num="23" id="218" />
-<TGConnectingPoint num="24" id="219" />
-<TGConnectingPoint num="25" id="220" />
-<TGConnectingPoint num="26" id="221" />
-<TGConnectingPoint num="27" id="222" />
-<TGConnectingPoint num="28" id="223" />
-<TGConnectingPoint num="29" id="224" />
-<TGConnectingPoint num="30" id="225" />
-<TGConnectingPoint num="31" id="226" />
-<TGConnectingPoint num="32" id="227" />
-<TGConnectingPoint num="33" id="228" />
-<TGConnectingPoint num="34" id="229" />
-<TGConnectingPoint num="35" id="230" />
-<TGConnectingPoint num="36" id="231" />
-<TGConnectingPoint num="37" id="232" />
-<TGConnectingPoint num="38" id="233" />
-<TGConnectingPoint num="39" id="234" />
-<extraparam>
-</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="276" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="207" >
+<cdparam x="424" y="451" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="236" />
-<TGConnectingPoint num="1" id="237" />
-<TGConnectingPoint num="2" id="238" />
-<TGConnectingPoint num="3" id="239" />
-<TGConnectingPoint num="4" id="240" />
-<TGConnectingPoint num="5" id="241" />
-<TGConnectingPoint num="6" id="242" />
-<TGConnectingPoint num="7" id="243" />
-<TGConnectingPoint num="8" id="244" />
-<TGConnectingPoint num="9" id="245" />
-<TGConnectingPoint num="10" id="246" />
-<TGConnectingPoint num="11" id="247" />
-<TGConnectingPoint num="12" id="248" />
-<TGConnectingPoint num="13" id="249" />
-<TGConnectingPoint num="14" id="250" />
-<TGConnectingPoint num="15" id="251" />
-<TGConnectingPoint num="16" id="252" />
-<TGConnectingPoint num="17" id="253" />
-<TGConnectingPoint num="18" id="254" />
-<TGConnectingPoint num="19" id="255" />
-<TGConnectingPoint num="20" id="256" />
-<TGConnectingPoint num="21" id="257" />
-<TGConnectingPoint num="22" id="258" />
-<TGConnectingPoint num="23" id="259" />
-<TGConnectingPoint num="24" id="260" />
-<TGConnectingPoint num="25" id="261" />
-<TGConnectingPoint num="26" id="262" />
-<TGConnectingPoint num="27" id="263" />
-<TGConnectingPoint num="28" id="264" />
-<TGConnectingPoint num="29" id="265" />
-<TGConnectingPoint num="30" id="266" />
-<TGConnectingPoint num="31" id="267" />
-<TGConnectingPoint num="32" id="268" />
-<TGConnectingPoint num="33" id="269" />
-<TGConnectingPoint num="34" id="270" />
-<TGConnectingPoint num="35" id="271" />
-<TGConnectingPoint num="36" id="272" />
-<TGConnectingPoint num="37" id="273" />
-<TGConnectingPoint num="38" id="274" />
-<TGConnectingPoint num="39" id="275" />
-<extraparam>
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="206" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="287" >
-<cdparam x="370" y="176" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="248" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="277" />
-<TGConnectingPoint num="1" id="278" />
-<TGConnectingPoint num="2" id="279" />
-<TGConnectingPoint num="3" id="280" />
-<TGConnectingPoint num="4" id="281" />
-<TGConnectingPoint num="5" id="282" />
-<TGConnectingPoint num="6" id="283" />
-<TGConnectingPoint num="7" id="284" />
-<TGConnectingPoint num="8" id="285" />
-<TGConnectingPoint num="9" id="286" />
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="208" />
+<TGConnectingPoint num="1" id="209" />
+<TGConnectingPoint num="2" id="210" />
+<TGConnectingPoint num="3" id="211" />
+<TGConnectingPoint num="4" id="212" />
+<TGConnectingPoint num="5" id="213" />
+<TGConnectingPoint num="6" id="214" />
+<TGConnectingPoint num="7" id="215" />
+<TGConnectingPoint num="8" id="216" />
+<TGConnectingPoint num="9" id="217" />
+<TGConnectingPoint num="10" id="218" />
+<TGConnectingPoint num="11" id="219" />
+<TGConnectingPoint num="12" id="220" />
+<TGConnectingPoint num="13" id="221" />
+<TGConnectingPoint num="14" id="222" />
+<TGConnectingPoint num="15" id="223" />
+<TGConnectingPoint num="16" id="224" />
+<TGConnectingPoint num="17" id="225" />
+<TGConnectingPoint num="18" id="226" />
+<TGConnectingPoint num="19" id="227" />
+<TGConnectingPoint num="20" id="228" />
+<TGConnectingPoint num="21" id="229" />
+<TGConnectingPoint num="22" id="230" />
+<TGConnectingPoint num="23" id="231" />
+<TGConnectingPoint num="24" id="232" />
+<TGConnectingPoint num="25" id="233" />
+<TGConnectingPoint num="26" id="234" />
+<TGConnectingPoint num="27" id="235" />
+<TGConnectingPoint num="28" id="236" />
+<TGConnectingPoint num="29" id="237" />
+<TGConnectingPoint num="30" id="238" />
+<TGConnectingPoint num="31" id="239" />
+<TGConnectingPoint num="32" id="240" />
+<TGConnectingPoint num="33" id="241" />
+<TGConnectingPoint num="34" id="242" />
+<TGConnectingPoint num="35" id="243" />
+<TGConnectingPoint num="36" id="244" />
+<TGConnectingPoint num="37" id="245" />
+<TGConnectingPoint num="38" id="246" />
+<TGConnectingPoint num="39" id="247" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="328" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="289" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="288" />
-<TGConnectingPoint num="1" id="289" />
-<TGConnectingPoint num="2" id="290" />
-<TGConnectingPoint num="3" id="291" />
-<TGConnectingPoint num="4" id="292" />
-<TGConnectingPoint num="5" id="293" />
-<TGConnectingPoint num="6" id="294" />
-<TGConnectingPoint num="7" id="295" />
-<TGConnectingPoint num="8" id="296" />
-<TGConnectingPoint num="9" id="297" />
-<TGConnectingPoint num="10" id="298" />
-<TGConnectingPoint num="11" id="299" />
-<TGConnectingPoint num="12" id="300" />
-<TGConnectingPoint num="13" id="301" />
-<TGConnectingPoint num="14" id="302" />
-<TGConnectingPoint num="15" id="303" />
-<TGConnectingPoint num="16" id="304" />
-<TGConnectingPoint num="17" id="305" />
-<TGConnectingPoint num="18" id="306" />
-<TGConnectingPoint num="19" id="307" />
-<TGConnectingPoint num="20" id="308" />
-<TGConnectingPoint num="21" id="309" />
-<TGConnectingPoint num="22" id="310" />
-<TGConnectingPoint num="23" id="311" />
-<TGConnectingPoint num="24" id="312" />
-<TGConnectingPoint num="25" id="313" />
-<TGConnectingPoint num="26" id="314" />
-<TGConnectingPoint num="27" id="315" />
-<TGConnectingPoint num="28" id="316" />
-<TGConnectingPoint num="29" id="317" />
-<TGConnectingPoint num="30" id="318" />
-<TGConnectingPoint num="31" id="319" />
-<TGConnectingPoint num="32" id="320" />
-<TGConnectingPoint num="33" id="321" />
-<TGConnectingPoint num="34" id="322" />
-<TGConnectingPoint num="35" id="323" />
-<TGConnectingPoint num="36" id="324" />
-<TGConnectingPoint num="37" id="325" />
-<TGConnectingPoint num="38" id="326" />
-<TGConnectingPoint num="39" id="327" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="249" />
+<TGConnectingPoint num="1" id="250" />
+<TGConnectingPoint num="2" id="251" />
+<TGConnectingPoint num="3" id="252" />
+<TGConnectingPoint num="4" id="253" />
+<TGConnectingPoint num="5" id="254" />
+<TGConnectingPoint num="6" id="255" />
+<TGConnectingPoint num="7" id="256" />
+<TGConnectingPoint num="8" id="257" />
+<TGConnectingPoint num="9" id="258" />
+<TGConnectingPoint num="10" id="259" />
+<TGConnectingPoint num="11" id="260" />
+<TGConnectingPoint num="12" id="261" />
+<TGConnectingPoint num="13" id="262" />
+<TGConnectingPoint num="14" id="263" />
+<TGConnectingPoint num="15" id="264" />
+<TGConnectingPoint num="16" id="265" />
+<TGConnectingPoint num="17" id="266" />
+<TGConnectingPoint num="18" id="267" />
+<TGConnectingPoint num="19" id="268" />
+<TGConnectingPoint num="20" id="269" />
+<TGConnectingPoint num="21" id="270" />
+<TGConnectingPoint num="22" id="271" />
+<TGConnectingPoint num="23" id="272" />
+<TGConnectingPoint num="24" id="273" />
+<TGConnectingPoint num="25" id="274" />
+<TGConnectingPoint num="26" id="275" />
+<TGConnectingPoint num="27" id="276" />
+<TGConnectingPoint num="28" id="277" />
+<TGConnectingPoint num="29" id="278" />
+<TGConnectingPoint num="30" id="279" />
+<TGConnectingPoint num="31" id="280" />
+<TGConnectingPoint num="32" id="281" />
+<TGConnectingPoint num="33" id="282" />
+<TGConnectingPoint num="34" id="283" />
+<TGConnectingPoint num="35" id="284" />
+<TGConnectingPoint num="36" id="285" />
+<TGConnectingPoint num="37" id="286" />
+<TGConnectingPoint num="38" id="287" />
+<TGConnectingPoint num="39" id="288" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="330" >
+<COMPONENT type="5100" id="291" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="329" />
+<TGConnectingPoint num="0" id="290" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="337" >
-<cdparam x="407" y="310" />
-<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="336" />
-<P1  x="407" y="310" id="408" />
-<P2  x="416" y="356" id="367" />
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="298" >
+<cdparam x="416" y="379" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="297" />
+<P1  x="416" y="379" id="333" />
+<P2  x="420" y="424" id="369" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="335" >
-<father id="337" num="0" />
-<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="296" >
+<father id="298" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="331" />
-<TGConnectingPoint num="1" id="332" />
-<TGConnectingPoint num="2" id="333" />
-<TGConnectingPoint num="3" id="334" />
+<TGConnectingPoint num="0" id="292" />
+<TGConnectingPoint num="1" id="293" />
+<TGConnectingPoint num="2" id="294" />
+<TGConnectingPoint num="3" id="295" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="344" >
-<cdparam x="492" y="446" />
-<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="343" />
-<P1  x="416" y="406" id="372" />
-<P2  x="434" y="446" id="418" />
+<CONNECTOR type="5102" id="305" >
+<cdparam x="407" y="273" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="304" />
+<P1  x="407" y="273" id="415" />
+<P2  x="416" y="339" id="328" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="342" >
-<father id="344" num="0" />
-<cdparam x="449" y="440" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="303" >
+<father id="305" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="134" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="338" />
-<TGConnectingPoint num="1" id="339" />
-<TGConnectingPoint num="2" id="340" />
-<TGConnectingPoint num="3" id="341" />
+<TGConnectingPoint num="0" id="299" />
+<TGConnectingPoint num="1" id="300" />
+<TGConnectingPoint num="2" id="301" />
+<TGConnectingPoint num="3" id="302" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="351" >
-<cdparam x="407" y="251" />
+<CONNECTOR type="5102" id="312" >
+<cdparam x="406" y="201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="350" />
-<P1  x="407" y="251" id="426" />
-<P2  x="407" y="280" id="407" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="311" />
+<P1  x="406" y="201" id="451" />
+<P2  x="407" y="233" id="410" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="349" >
-<father id="351" num="0" />
-<cdparam x="407" y="291" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="310" >
+<father id="312" num="0" />
+<cdparam x="406" y="241" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
-<TGConnectingPoint num="3" id="348" />
+<TGConnectingPoint num="0" id="306" />
+<TGConnectingPoint num="1" id="307" />
+<TGConnectingPoint num="2" id="308" />
+<TGConnectingPoint num="3" id="309" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -749,55 +710,53 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="358" >
-<cdparam x="407" y="132" />
+<CONNECTOR type="5102" id="319" >
+<cdparam x="406" y="141" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="357" />
-<P1  x="407" y="132" id="467" />
-<P2  x="407" y="211" id="421" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="318" />
+<P1  x="406" y="141" id="467" />
+<P2  x="406" y="171" id="450" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="356" >
-<father id="358" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="134" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="317" >
+<father id="319" num="0" />
+<cdparam x="406" y="181" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="352" />
-<TGConnectingPoint num="1" id="353" />
-<TGConnectingPoint num="2" id="354" />
-<TGConnectingPoint num="3" id="355" />
+<TGConnectingPoint num="0" id="313" />
+<TGConnectingPoint num="1" id="314" />
+<TGConnectingPoint num="2" id="315" />
+<TGConnectingPoint num="3" id="316" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="365" >
+<CONNECTOR type="5102" id="326" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="0" id="325" />
 <P1  x="407" y="70" id="502" />
-<P2  x="407" y="92" id="462" />
+<P2  x="406" y="101" id="462" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="363" >
-<father id="365" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="324" >
+<father id="326" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="359" />
-<TGConnectingPoint num="1" id="360" />
-<TGConnectingPoint num="2" id="361" />
-<TGConnectingPoint num="3" id="362" />
+<TGConnectingPoint num="0" id="320" />
+<TGConnectingPoint num="1" id="321" />
+<TGConnectingPoint num="2" id="322" />
+<TGConnectingPoint num="3" id="323" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -807,139 +766,180 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="406" >
-<cdparam x="366" y="356" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="367" >
+<cdparam x="327" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="366" />
-<TGConnectingPoint num="1" id="367" />
-<TGConnectingPoint num="2" id="368" />
-<TGConnectingPoint num="3" id="369" />
-<TGConnectingPoint num="4" id="370" />
-<TGConnectingPoint num="5" id="371" />
-<TGConnectingPoint num="6" id="372" />
-<TGConnectingPoint num="7" id="373" />
-<TGConnectingPoint num="8" id="374" />
-<TGConnectingPoint num="9" id="375" />
-<TGConnectingPoint num="10" id="376" />
-<TGConnectingPoint num="11" id="377" />
-<TGConnectingPoint num="12" id="378" />
-<TGConnectingPoint num="13" id="379" />
-<TGConnectingPoint num="14" id="380" />
-<TGConnectingPoint num="15" id="381" />
-<TGConnectingPoint num="16" id="382" />
-<TGConnectingPoint num="17" id="383" />
-<TGConnectingPoint num="18" id="384" />
-<TGConnectingPoint num="19" id="385" />
-<TGConnectingPoint num="20" id="386" />
-<TGConnectingPoint num="21" id="387" />
-<TGConnectingPoint num="22" id="388" />
-<TGConnectingPoint num="23" id="389" />
-<TGConnectingPoint num="24" id="390" />
-<TGConnectingPoint num="25" id="391" />
-<TGConnectingPoint num="26" id="392" />
-<TGConnectingPoint num="27" id="393" />
-<TGConnectingPoint num="28" id="394" />
-<TGConnectingPoint num="29" id="395" />
-<TGConnectingPoint num="30" id="396" />
-<TGConnectingPoint num="31" id="397" />
-<TGConnectingPoint num="32" id="398" />
-<TGConnectingPoint num="33" id="399" />
-<TGConnectingPoint num="34" id="400" />
-<TGConnectingPoint num="35" id="401" />
-<TGConnectingPoint num="36" id="402" />
-<TGConnectingPoint num="37" id="403" />
-<TGConnectingPoint num="38" id="404" />
-<TGConnectingPoint num="39" id="405" />
+<infoparam name="state0" value="messageDecrypted" />
+<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" />
+<TGConnectingPoint num="10" id="337" />
+<TGConnectingPoint num="11" id="338" />
+<TGConnectingPoint num="12" id="339" />
+<TGConnectingPoint num="13" id="340" />
+<TGConnectingPoint num="14" id="341" />
+<TGConnectingPoint num="15" id="342" />
+<TGConnectingPoint num="16" id="343" />
+<TGConnectingPoint num="17" id="344" />
+<TGConnectingPoint num="18" id="345" />
+<TGConnectingPoint num="19" id="346" />
+<TGConnectingPoint num="20" id="347" />
+<TGConnectingPoint num="21" id="348" />
+<TGConnectingPoint num="22" id="349" />
+<TGConnectingPoint num="23" id="350" />
+<TGConnectingPoint num="24" id="351" />
+<TGConnectingPoint num="25" id="352" />
+<TGConnectingPoint num="26" id="353" />
+<TGConnectingPoint num="27" id="354" />
+<TGConnectingPoint num="28" id="355" />
+<TGConnectingPoint num="29" id="356" />
+<TGConnectingPoint num="30" id="357" />
+<TGConnectingPoint num="31" id="358" />
+<TGConnectingPoint num="32" id="359" />
+<TGConnectingPoint num="33" id="360" />
+<TGConnectingPoint num="34" id="361" />
+<TGConnectingPoint num="35" id="362" />
+<TGConnectingPoint num="36" id="363" />
+<TGConnectingPoint num="37" id="364" />
+<TGConnectingPoint num="38" id="365" />
+<TGConnectingPoint num="39" id="366" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="417" >
-<cdparam x="370" y="285" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="408" >
+<cdparam x="350" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="407" />
-<TGConnectingPoint num="1" id="408" />
-<TGConnectingPoint num="2" id="409" />
-<TGConnectingPoint num="3" id="410" />
-<TGConnectingPoint num="4" id="411" />
-<TGConnectingPoint num="5" id="412" />
-<TGConnectingPoint num="6" id="413" />
-<TGConnectingPoint num="7" id="414" />
-<TGConnectingPoint num="8" id="415" />
-<TGConnectingPoint num="9" id="416" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="368" />
+<TGConnectingPoint num="1" id="369" />
+<TGConnectingPoint num="2" id="370" />
+<TGConnectingPoint num="3" id="371" />
+<TGConnectingPoint num="4" id="372" />
+<TGConnectingPoint num="5" id="373" />
+<TGConnectingPoint num="6" id="374" />
+<TGConnectingPoint num="7" id="375" />
+<TGConnectingPoint num="8" id="376" />
+<TGConnectingPoint num="9" id="377" />
+<TGConnectingPoint num="10" id="378" />
+<TGConnectingPoint num="11" id="379" />
+<TGConnectingPoint num="12" id="380" />
+<TGConnectingPoint num="13" id="381" />
+<TGConnectingPoint num="14" id="382" />
+<TGConnectingPoint num="15" id="383" />
+<TGConnectingPoint num="16" id="384" />
+<TGConnectingPoint num="17" id="385" />
+<TGConnectingPoint num="18" id="386" />
+<TGConnectingPoint num="19" id="387" />
+<TGConnectingPoint num="20" id="388" />
+<TGConnectingPoint num="21" id="389" />
+<TGConnectingPoint num="22" id="390" />
+<TGConnectingPoint num="23" id="391" />
+<TGConnectingPoint num="24" id="392" />
+<TGConnectingPoint num="25" id="393" />
+<TGConnectingPoint num="26" id="394" />
+<TGConnectingPoint num="27" id="395" />
+<TGConnectingPoint num="28" id="396" />
+<TGConnectingPoint num="29" id="397" />
+<TGConnectingPoint num="30" id="398" />
+<TGConnectingPoint num="31" id="399" />
+<TGConnectingPoint num="32" id="400" />
+<TGConnectingPoint num="33" id="401" />
+<TGConnectingPoint num="34" id="402" />
+<TGConnectingPoint num="35" id="403" />
+<TGConnectingPoint num="36" id="404" />
+<TGConnectingPoint num="37" id="405" />
+<TGConnectingPoint num="38" id="406" />
+<TGConnectingPoint num="39" id="407" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="419" >
-<cdparam x="424" y="451" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="449" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="418" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="409" />
+<TGConnectingPoint num="1" id="410" />
+<TGConnectingPoint num="2" id="411" />
+<TGConnectingPoint num="3" id="412" />
+<TGConnectingPoint num="4" id="413" />
+<TGConnectingPoint num="5" id="414" />
+<TGConnectingPoint num="6" id="415" />
+<TGConnectingPoint num="7" id="416" />
+<TGConnectingPoint num="8" id="417" />
+<TGConnectingPoint num="9" id="418" />
+<TGConnectingPoint num="10" id="419" />
+<TGConnectingPoint num="11" id="420" />
+<TGConnectingPoint num="12" id="421" />
+<TGConnectingPoint num="13" id="422" />
+<TGConnectingPoint num="14" id="423" />
+<TGConnectingPoint num="15" id="424" />
+<TGConnectingPoint num="16" id="425" />
+<TGConnectingPoint num="17" id="426" />
+<TGConnectingPoint num="18" id="427" />
+<TGConnectingPoint num="19" id="428" />
+<TGConnectingPoint num="20" id="429" />
+<TGConnectingPoint num="21" id="430" />
+<TGConnectingPoint num="22" id="431" />
+<TGConnectingPoint num="23" id="432" />
+<TGConnectingPoint num="24" id="433" />
+<TGConnectingPoint num="25" id="434" />
+<TGConnectingPoint num="26" id="435" />
+<TGConnectingPoint num="27" id="436" />
+<TGConnectingPoint num="28" id="437" />
+<TGConnectingPoint num="29" id="438" />
+<TGConnectingPoint num="30" id="439" />
+<TGConnectingPoint num="31" id="440" />
+<TGConnectingPoint num="32" id="441" />
+<TGConnectingPoint num="33" id="442" />
+<TGConnectingPoint num="34" id="443" />
+<TGConnectingPoint num="35" id="444" />
+<TGConnectingPoint num="36" id="445" />
+<TGConnectingPoint num="37" id="446" />
+<TGConnectingPoint num="38" id="447" />
+<TGConnectingPoint num="39" id="448" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="460" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="460" >
+<cdparam x="370" y="176" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="420" />
-<TGConnectingPoint num="1" id="421" />
-<TGConnectingPoint num="2" id="422" />
-<TGConnectingPoint num="3" id="423" />
-<TGConnectingPoint num="4" id="424" />
-<TGConnectingPoint num="5" id="425" />
-<TGConnectingPoint num="6" id="426" />
-<TGConnectingPoint num="7" id="427" />
-<TGConnectingPoint num="8" id="428" />
-<TGConnectingPoint num="9" id="429" />
-<TGConnectingPoint num="10" id="430" />
-<TGConnectingPoint num="11" id="431" />
-<TGConnectingPoint num="12" id="432" />
-<TGConnectingPoint num="13" id="433" />
-<TGConnectingPoint num="14" id="434" />
-<TGConnectingPoint num="15" id="435" />
-<TGConnectingPoint num="16" id="436" />
-<TGConnectingPoint num="17" id="437" />
-<TGConnectingPoint num="18" id="438" />
-<TGConnectingPoint num="19" id="439" />
-<TGConnectingPoint num="20" id="440" />
-<TGConnectingPoint num="21" id="441" />
-<TGConnectingPoint num="22" id="442" />
-<TGConnectingPoint num="23" id="443" />
-<TGConnectingPoint num="24" id="444" />
-<TGConnectingPoint num="25" id="445" />
-<TGConnectingPoint num="26" id="446" />
-<TGConnectingPoint num="27" id="447" />
-<TGConnectingPoint num="28" id="448" />
-<TGConnectingPoint num="29" id="449" />
-<TGConnectingPoint num="30" id="450" />
-<TGConnectingPoint num="31" id="451" />
-<TGConnectingPoint num="32" id="452" />
-<TGConnectingPoint num="33" id="453" />
-<TGConnectingPoint num="34" id="454" />
-<TGConnectingPoint num="35" id="455" />
-<TGConnectingPoint num="36" id="456" />
-<TGConnectingPoint num="37" id="457" />
-<TGConnectingPoint num="38" id="458" />
-<TGConnectingPoint num="39" id="459" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="450" />
+<TGConnectingPoint num="1" id="451" />
+<TGConnectingPoint num="2" id="452" />
+<TGConnectingPoint num="3" id="453" />
+<TGConnectingPoint num="4" id="454" />
+<TGConnectingPoint num="5" id="455" />
+<TGConnectingPoint num="6" id="456" />
+<TGConnectingPoint num="7" id="457" />
+<TGConnectingPoint num="8" id="458" />
+<TGConnectingPoint num="9" id="459" />
 </COMPONENT>
 
 <COMPONENT type="5106" id="501" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="340" y="101" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
+<infoparam name="state0" value="waitingForMessage" />
 <TGConnectingPoint num="0" id="461" />
 <TGConnectingPoint num="1" id="462" />
 <TGConnectingPoint num="2" id="463" />
@@ -1155,11 +1155,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="569" >
 <father id="619" num="0" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
 <TGConnectingPoint num="0" id="545" />
 <TGConnectingPoint num="1" id="546" />
 <TGConnectingPoint num="2" id="547" />
@@ -1186,13 +1186,13 @@
 <TGConnectingPoint num="23" id="568" />
 <extraparam>
 <CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -1219,11 +1219,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="594" >
 <father id="619" num="1" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
 <TGConnectingPoint num="0" id="570" />
 <TGConnectingPoint num="1" id="571" />
 <TGConnectingPoint num="2" id="572" />
@@ -1250,13 +1250,13 @@
 <TGConnectingPoint num="23" id="593" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
 <Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -1298,19 +1298,19 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
 <CONNECTOR type="5102" id="628" >
-<cdparam x="411" y="567" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
+<cdparam x="418" y="632" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
 <TGConnectingPoint num="0" id="627" />
-<P1  x="411" y="567" id="831" />
-<P2  x="420" y="613" id="790" />
+<P1  x="418" y="632" id="795" />
+<P2  x="422" y="677" id="831" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="626" >
 <father id="628" num="0" />
-<cdparam x="453" y="610" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="433" y="656" />
+<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1324,21 +1324,22 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="635" >
-<cdparam x="496" y="703" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
+<cdparam x="409" y="526" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
 <TGConnectingPoint num="0" id="634" />
-<P1  x="420" y="663" id="795" />
-<P2  x="438" y="703" id="841" />
+<P1  x="409" y="526" id="877" />
+<P2  x="418" y="592" id="790" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="633" >
 <father id="635" num="0" />
-<cdparam x="453" y="697" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="431" y="551" />
+<sizeparam width="157" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1352,20 +1353,22 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sk = DH(alicePubK, privK)" />
+<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="642" >
-<cdparam x="411" y="508" />
+<cdparam x="408" y="454" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
+<infoparam name="connector from Send signal to state0" value="null" />
 <TGConnectingPoint num="0" id="641" />
-<P1  x="411" y="508" id="849" />
-<P2  x="411" y="537" id="830" />
+<P1  x="408" y="454" id="913" />
+<P2  x="409" y="486" id="872" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="640" >
 <father id="642" num="0" />
-<cdparam x="411" y="548" />
+<cdparam x="408" y="494" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1384,17 +1387,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="649" >
-<cdparam x="411" y="389" />
+<cdparam x="408" y="394" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
+<infoparam name="connector from state0 to Send signal" value="null" />
 <TGConnectingPoint num="0" id="648" />
-<P1  x="411" y="389" id="890" />
-<P2  x="411" y="468" id="844" />
+<P1  x="408" y="394" id="929" />
+<P2  x="408" y="424" id="912" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="647" >
 <father id="649" num="0" />
-<cdparam x="439" y="414" />
-<sizeparam width="152" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="408" y="434" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1408,9 +1411,6 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sk = DH(bobPubK, privK)" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1419,8 +1419,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
 <TGConnectingPoint num="0" id="655" />
-<P1  x="407" y="70" id="925" />
-<P2  x="405" y="91" id="749" />
+<P1  x="407" y="70" id="964" />
+<P2  x="407" y="95" id="749" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="654" >
 <father id="656" num="0" />
@@ -1443,16 +1443,16 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="663" >
-<cdparam x="392" y="122" />
+<cdparam x="407" y="127" />
 <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="662" />
-<P1  x="392" y="122" id="777" />
-<P2  x="392" y="150" id="737" />
+<P1  x="407" y="127" id="754" />
+<P2  x="407" y="153" id="737" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="661" >
 <father id="663" num="0" />
-<cdparam x="411" y="142" />
+<cdparam x="428" y="145" />
 <sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1472,16 +1472,16 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="670" >
-<cdparam x="391" y="166" />
+<cdparam x="407" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="669" />
-<P1  x="392" y="180" id="738" />
-<P2  x="380" y="224" id="713" />
+<P1  x="407" y="183" id="738" />
+<P2  x="408" y="213" id="697" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="668" >
 <father id="670" num="0" />
-<cdparam x="390" y="188" />
+<cdparam x="408" y="199" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1500,16 +1500,16 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="677" >
-<cdparam x="380" y="258" />
+<cdparam x="409" 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="676" />
-<P1  x="380" y="258" id="725" />
-<P2  x="386" y="287" id="685" />
+<P1  x="408" y="251" id="702" />
+<P2  x="406" y="285" id="685" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="675" >
 <father id="677" num="0" />
-<cdparam x="377" y="267" />
+<cdparam x="409" y="281" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1528,17 +1528,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="684" >
-<cdparam x="375" y="306" />
+<cdparam x="410" y="327" />
 <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="683" />
-<P1  x="386" y="317" id="686" />
-<P2  x="377" y="349" id="892" />
+<P1  x="406" y="315" id="686" />
+<P2  x="408" y="354" id="924" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="682" >
 <father id="684" num="0" />
-<cdparam x="396" y="336" />
-<sizeparam width="150" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="337" />
+<sizeparam width="155" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1552,12 +1552,12 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="bobPubK.data = m.data" />
+<actions value="alicePubK.data = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="5104" id="695" >
-<cdparam x="354" y="292" />
+<cdparam x="374" y="290" />
 <sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1575,8 +1575,8 @@
 </COMPONENT>
 
 <COMPONENT type="5106" id="736" >
-<cdparam x="338" y="224" />
-<sizeparam width="114" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="347" y="213" />
+<sizeparam width="123" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="receivingPubK" />
@@ -1625,7 +1625,7 @@
 </COMPONENT>
 
 <COMPONENT type="5103" id="747" >
-<cdparam x="359" y="155" />
+<cdparam x="374" y="158" />
 <sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1643,8 +1643,8 @@
 </COMPONENT>
 
 <COMPONENT type="5106" id="788" >
-<cdparam x="355" y="91" />
-<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="351" y="95" />
+<sizeparam width="113" height="32" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="sendingPubK" />
@@ -1693,11 +1693,11 @@
 </COMPONENT>
 
 <COMPONENT type="5106" id="829" >
-<cdparam x="370" y="613" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="329" y="592" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="beforeFinish" />
+<infoparam name="state0" value="messageDecrypted" />
 <TGConnectingPoint num="0" id="789" />
 <TGConnectingPoint num="1" id="790" />
 <TGConnectingPoint num="2" id="791" />
@@ -1742,12 +1742,12 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="840" >
-<cdparam x="374" y="542" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="870" >
+<cdparam x="352" y="677" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
+<infoparam name="state0" value="SecretDataReceived" />
 <TGConnectingPoint num="0" id="830" />
 <TGConnectingPoint num="1" id="831" />
 <TGConnectingPoint num="2" id="832" />
@@ -1758,208 +1758,246 @@
 <TGConnectingPoint num="7" id="837" />
 <TGConnectingPoint num="8" id="838" />
 <TGConnectingPoint num="9" id="839" />
+<TGConnectingPoint num="10" id="840" />
+<TGConnectingPoint num="11" id="841" />
+<TGConnectingPoint num="12" id="842" />
+<TGConnectingPoint num="13" id="843" />
+<TGConnectingPoint num="14" id="844" />
+<TGConnectingPoint num="15" id="845" />
+<TGConnectingPoint num="16" id="846" />
+<TGConnectingPoint num="17" id="847" />
+<TGConnectingPoint num="18" id="848" />
+<TGConnectingPoint num="19" id="849" />
+<TGConnectingPoint num="20" id="850" />
+<TGConnectingPoint num="21" id="851" />
+<TGConnectingPoint num="22" id="852" />
+<TGConnectingPoint num="23" id="853" />
+<TGConnectingPoint num="24" id="854" />
+<TGConnectingPoint num="25" id="855" />
+<TGConnectingPoint num="26" id="856" />
+<TGConnectingPoint num="27" id="857" />
+<TGConnectingPoint num="28" id="858" />
+<TGConnectingPoint num="29" id="859" />
+<TGConnectingPoint num="30" id="860" />
+<TGConnectingPoint num="31" id="861" />
+<TGConnectingPoint num="32" id="862" />
+<TGConnectingPoint num="33" id="863" />
+<TGConnectingPoint num="34" id="864" />
+<TGConnectingPoint num="35" id="865" />
+<TGConnectingPoint num="36" id="866" />
+<TGConnectingPoint num="37" id="867" />
+<TGConnectingPoint num="38" id="868" />
+<TGConnectingPoint num="39" id="869" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="842" >
-<cdparam x="428" y="708" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="911" >
+<cdparam x="338" y="486" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="841" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="871" />
+<TGConnectingPoint num="1" id="872" />
+<TGConnectingPoint num="2" id="873" />
+<TGConnectingPoint num="3" id="874" />
+<TGConnectingPoint num="4" id="875" />
+<TGConnectingPoint num="5" id="876" />
+<TGConnectingPoint num="6" id="877" />
+<TGConnectingPoint num="7" id="878" />
+<TGConnectingPoint num="8" id="879" />
+<TGConnectingPoint num="9" id="880" />
+<TGConnectingPoint num="10" id="881" />
+<TGConnectingPoint num="11" id="882" />
+<TGConnectingPoint num="12" id="883" />
+<TGConnectingPoint num="13" id="884" />
+<TGConnectingPoint num="14" id="885" />
+<TGConnectingPoint num="15" id="886" />
+<TGConnectingPoint num="16" id="887" />
+<TGConnectingPoint num="17" id="888" />
+<TGConnectingPoint num="18" id="889" />
+<TGConnectingPoint num="19" id="890" />
+<TGConnectingPoint num="20" id="891" />
+<TGConnectingPoint num="21" id="892" />
+<TGConnectingPoint num="22" id="893" />
+<TGConnectingPoint num="23" id="894" />
+<TGConnectingPoint num="24" id="895" />
+<TGConnectingPoint num="25" id="896" />
+<TGConnectingPoint num="26" id="897" />
+<TGConnectingPoint num="27" id="898" />
+<TGConnectingPoint num="28" id="899" />
+<TGConnectingPoint num="29" id="900" />
+<TGConnectingPoint num="30" id="901" />
+<TGConnectingPoint num="31" id="902" />
+<TGConnectingPoint num="32" id="903" />
+<TGConnectingPoint num="33" id="904" />
+<TGConnectingPoint num="34" id="905" />
+<TGConnectingPoint num="35" id="906" />
+<TGConnectingPoint num="36" id="907" />
+<TGConnectingPoint num="37" id="908" />
+<TGConnectingPoint num="38" id="909" />
+<TGConnectingPoint num="39" id="910" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="883" >
-<cdparam x="340" y="468" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="922" >
+<cdparam x="372" y="429" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="843" />
-<TGConnectingPoint num="1" id="844" />
-<TGConnectingPoint num="2" id="845" />
-<TGConnectingPoint num="3" id="846" />
-<TGConnectingPoint num="4" id="847" />
-<TGConnectingPoint num="5" id="848" />
-<TGConnectingPoint num="6" id="849" />
-<TGConnectingPoint num="7" id="850" />
-<TGConnectingPoint num="8" id="851" />
-<TGConnectingPoint num="9" id="852" />
-<TGConnectingPoint num="10" id="853" />
-<TGConnectingPoint num="11" id="854" />
-<TGConnectingPoint num="12" id="855" />
-<TGConnectingPoint num="13" id="856" />
-<TGConnectingPoint num="14" id="857" />
-<TGConnectingPoint num="15" id="858" />
-<TGConnectingPoint num="16" id="859" />
-<TGConnectingPoint num="17" id="860" />
-<TGConnectingPoint num="18" id="861" />
-<TGConnectingPoint num="19" id="862" />
-<TGConnectingPoint num="20" id="863" />
-<TGConnectingPoint num="21" id="864" />
-<TGConnectingPoint num="22" id="865" />
-<TGConnectingPoint num="23" id="866" />
-<TGConnectingPoint num="24" id="867" />
-<TGConnectingPoint num="25" id="868" />
-<TGConnectingPoint num="26" id="869" />
-<TGConnectingPoint num="27" id="870" />
-<TGConnectingPoint num="28" id="871" />
-<TGConnectingPoint num="29" id="872" />
-<TGConnectingPoint num="30" id="873" />
-<TGConnectingPoint num="31" id="874" />
-<TGConnectingPoint num="32" id="875" />
-<TGConnectingPoint num="33" id="876" />
-<TGConnectingPoint num="34" id="877" />
-<TGConnectingPoint num="35" id="878" />
-<TGConnectingPoint num="36" id="879" />
-<TGConnectingPoint num="37" id="880" />
-<TGConnectingPoint num="38" id="881" />
-<TGConnectingPoint num="39" id="882" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="912" />
+<TGConnectingPoint num="1" id="913" />
+<TGConnectingPoint num="2" id="914" />
+<TGConnectingPoint num="3" id="915" />
+<TGConnectingPoint num="4" id="916" />
+<TGConnectingPoint num="5" id="917" />
+<TGConnectingPoint num="6" id="918" />
+<TGConnectingPoint num="7" id="919" />
+<TGConnectingPoint num="8" id="920" />
+<TGConnectingPoint num="9" id="921" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="924" >
-<cdparam x="344" y="349" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="963" >
+<cdparam x="342" y="354" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
-<TGConnectingPoint num="2" id="886" />
-<TGConnectingPoint num="3" id="887" />
-<TGConnectingPoint num="4" id="888" />
-<TGConnectingPoint num="5" id="889" />
-<TGConnectingPoint num="6" id="890" />
-<TGConnectingPoint num="7" id="891" />
-<TGConnectingPoint num="8" id="892" />
-<TGConnectingPoint num="9" id="893" />
-<TGConnectingPoint num="10" id="894" />
-<TGConnectingPoint num="11" id="895" />
-<TGConnectingPoint num="12" id="896" />
-<TGConnectingPoint num="13" id="897" />
-<TGConnectingPoint num="14" id="898" />
-<TGConnectingPoint num="15" id="899" />
-<TGConnectingPoint num="16" id="900" />
-<TGConnectingPoint num="17" id="901" />
-<TGConnectingPoint num="18" id="902" />
-<TGConnectingPoint num="19" id="903" />
-<TGConnectingPoint num="20" id="904" />
-<TGConnectingPoint num="21" id="905" />
-<TGConnectingPoint num="22" id="906" />
-<TGConnectingPoint num="23" id="907" />
-<TGConnectingPoint num="24" id="908" />
-<TGConnectingPoint num="25" id="909" />
-<TGConnectingPoint num="26" id="910" />
-<TGConnectingPoint num="27" id="911" />
-<TGConnectingPoint num="28" id="912" />
-<TGConnectingPoint num="29" id="913" />
-<TGConnectingPoint num="30" id="914" />
-<TGConnectingPoint num="31" id="915" />
-<TGConnectingPoint num="32" id="916" />
-<TGConnectingPoint num="33" id="917" />
-<TGConnectingPoint num="34" id="918" />
-<TGConnectingPoint num="35" id="919" />
-<TGConnectingPoint num="36" id="920" />
-<TGConnectingPoint num="37" id="921" />
-<TGConnectingPoint num="38" id="922" />
-<TGConnectingPoint num="39" id="923" />
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="923" />
+<TGConnectingPoint num="1" id="924" />
+<TGConnectingPoint num="2" id="925" />
+<TGConnectingPoint num="3" id="926" />
+<TGConnectingPoint num="4" id="927" />
+<TGConnectingPoint num="5" id="928" />
+<TGConnectingPoint num="6" id="929" />
+<TGConnectingPoint num="7" id="930" />
+<TGConnectingPoint num="8" id="931" />
+<TGConnectingPoint num="9" id="932" />
+<TGConnectingPoint num="10" id="933" />
+<TGConnectingPoint num="11" id="934" />
+<TGConnectingPoint num="12" id="935" />
+<TGConnectingPoint num="13" id="936" />
+<TGConnectingPoint num="14" id="937" />
+<TGConnectingPoint num="15" id="938" />
+<TGConnectingPoint num="16" id="939" />
+<TGConnectingPoint num="17" id="940" />
+<TGConnectingPoint num="18" id="941" />
+<TGConnectingPoint num="19" id="942" />
+<TGConnectingPoint num="20" id="943" />
+<TGConnectingPoint num="21" id="944" />
+<TGConnectingPoint num="22" id="945" />
+<TGConnectingPoint num="23" id="946" />
+<TGConnectingPoint num="24" id="947" />
+<TGConnectingPoint num="25" id="948" />
+<TGConnectingPoint num="26" id="949" />
+<TGConnectingPoint num="27" id="950" />
+<TGConnectingPoint num="28" id="951" />
+<TGConnectingPoint num="29" id="952" />
+<TGConnectingPoint num="30" id="953" />
+<TGConnectingPoint num="31" id="954" />
+<TGConnectingPoint num="32" id="955" />
+<TGConnectingPoint num="33" id="956" />
+<TGConnectingPoint num="34" id="957" />
+<TGConnectingPoint num="35" id="958" />
+<TGConnectingPoint num="36" id="959" />
+<TGConnectingPoint num="37" id="960" />
+<TGConnectingPoint num="38" id="961" />
+<TGConnectingPoint num="39" id="962" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="926" >
+<COMPONENT type="5100" id="965" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="925" />
+<TGConnectingPoint num="0" id="964" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="933" >
-<cdparam x="418" y="632" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="932" />
-<P1  x="418" y="632" id="1100" />
-<P2  x="422" y="677" id="1136" />
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="972" >
+<cdparam x="411" y="567" />
+<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="971" />
+<P1  x="411" y="567" id="1175" />
+<P2  x="420" y="613" id="1134" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="931" >
-<father id="933" num="0" />
-<cdparam x="433" y="656" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="970" >
+<father id="972" num="0" />
+<cdparam x="453" y="610" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="927" />
-<TGConnectingPoint num="1" id="928" />
-<TGConnectingPoint num="2" id="929" />
-<TGConnectingPoint num="3" id="930" />
+<TGConnectingPoint num="0" id="966" />
+<TGConnectingPoint num="1" id="967" />
+<TGConnectingPoint num="2" id="968" />
+<TGConnectingPoint num="3" id="969" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="940" >
-<cdparam x="409" y="526" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="939" />
-<P1  x="409" y="526" id="1182" />
-<P2  x="418" y="592" id="1095" />
+<CONNECTOR type="5102" id="979" >
+<cdparam x="496" y="703" />
+<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="978" />
+<P1  x="420" y="663" id="1139" />
+<P2  x="438" y="703" id="1185" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="938" >
-<father id="940" num="0" />
-<cdparam x="431" y="551" />
-<sizeparam width="157" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="977" >
+<father id="979" num="0" />
+<cdparam x="453" y="697" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="934" />
-<TGConnectingPoint num="1" id="935" />
-<TGConnectingPoint num="2" id="936" />
-<TGConnectingPoint num="3" id="937" />
+<TGConnectingPoint num="0" id="973" />
+<TGConnectingPoint num="1" id="974" />
+<TGConnectingPoint num="2" id="975" />
+<TGConnectingPoint num="3" id="976" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sk = DH(alicePubK, privK)" />
-<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="947" >
-<cdparam x="408" y="454" />
+<CONNECTOR type="5102" id="986" >
+<cdparam x="411" y="508" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="946" />
-<P1  x="408" y="454" id="1218" />
-<P2  x="409" y="486" id="1177" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="985" />
+<P1  x="411" y="508" id="1193" />
+<P2  x="411" y="537" id="1174" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="945" >
-<father id="947" num="0" />
-<cdparam x="408" y="494" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="984" >
+<father id="986" num="0" />
+<cdparam x="411" y="548" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="941" />
-<TGConnectingPoint num="1" id="942" />
-<TGConnectingPoint num="2" id="943" />
-<TGConnectingPoint num="3" id="944" />
+<TGConnectingPoint num="0" id="980" />
+<TGConnectingPoint num="1" id="981" />
+<TGConnectingPoint num="2" id="982" />
+<TGConnectingPoint num="3" id="983" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1969,53 +2007,56 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="954" >
-<cdparam x="408" y="394" />
+<CONNECTOR type="5102" id="993" >
+<cdparam x="411" y="389" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="953" />
-<P1  x="408" y="394" id="1234" />
-<P2  x="408" y="424" id="1217" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="992" />
+<P1  x="411" y="389" id="1234" />
+<P2  x="411" y="468" id="1188" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="952" >
-<father id="954" num="0" />
-<cdparam x="408" y="434" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="991" >
+<father id="993" num="0" />
+<cdparam x="439" y="414" />
+<sizeparam width="152" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="948" />
-<TGConnectingPoint num="1" id="949" />
-<TGConnectingPoint num="2" id="950" />
-<TGConnectingPoint num="3" id="951" />
+<TGConnectingPoint num="0" id="987" />
+<TGConnectingPoint num="1" id="988" />
+<TGConnectingPoint num="2" id="989" />
+<TGConnectingPoint num="3" id="990" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sk = DH(bobPubK, privK)" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="961" >
+<CONNECTOR type="5102" id="1000" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="960" />
+<TGConnectingPoint num="0" id="999" />
 <P1  x="407" y="70" id="1269" />
-<P2  x="407" y="95" id="1054" />
+<P2  x="405" y="91" id="1093" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="959" >
-<father id="961" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="998" >
+<father id="1000" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="955" />
-<TGConnectingPoint num="1" id="956" />
-<TGConnectingPoint num="2" id="957" />
-<TGConnectingPoint num="3" id="958" />
+<TGConnectingPoint num="0" id="994" />
+<TGConnectingPoint num="1" id="995" />
+<TGConnectingPoint num="2" id="996" />
+<TGConnectingPoint num="3" id="997" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2025,25 +2066,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="968" >
-<cdparam x="407" y="127" />
+<CONNECTOR type="5102" id="1007" >
+<cdparam x="392" y="122" />
 <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="967" />
-<P1  x="407" y="127" id="1059" />
-<P2  x="407" y="153" id="1042" />
+<TGConnectingPoint num="0" id="1006" />
+<P1  x="392" y="122" id="1121" />
+<P2  x="392" y="150" id="1081" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="966" >
-<father id="968" num="0" />
-<cdparam x="428" y="145" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1005" >
+<father id="1007" num="0" />
+<cdparam x="411" y="142" />
 <sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="962" />
-<TGConnectingPoint num="1" id="963" />
-<TGConnectingPoint num="2" id="964" />
-<TGConnectingPoint num="3" id="965" />
+<TGConnectingPoint num="0" id="1001" />
+<TGConnectingPoint num="1" id="1002" />
+<TGConnectingPoint num="2" id="1003" />
+<TGConnectingPoint num="3" id="1004" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2054,25 +2095,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="975" >
-<cdparam x="407" y="183" />
+<CONNECTOR type="5102" id="1014" >
+<cdparam x="391" 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="974" />
-<P1  x="407" y="183" id="1043" />
-<P2  x="408" y="213" id="1002" />
+<TGConnectingPoint num="0" id="1013" />
+<P1  x="392" y="180" id="1082" />
+<P2  x="380" y="224" id="1057" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="973" >
-<father id="975" num="0" />
-<cdparam x="408" y="199" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1012" >
+<father id="1014" num="0" />
+<cdparam x="390" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="969" />
-<TGConnectingPoint num="1" id="970" />
-<TGConnectingPoint num="2" id="971" />
-<TGConnectingPoint num="3" id="972" />
+<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="1" id="1009" />
+<TGConnectingPoint num="2" id="1010" />
+<TGConnectingPoint num="3" id="1011" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2082,25 +2123,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="982" >
-<cdparam x="409" y="265" />
+<CONNECTOR type="5102" id="1021" >
+<cdparam x="380" y="258" />
 <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="981" />
-<P1  x="408" y="251" id="1007" />
-<P2  x="406" y="285" id="990" />
+<TGConnectingPoint num="0" id="1020" />
+<P1  x="380" y="258" id="1069" />
+<P2  x="386" y="287" id="1029" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="980" >
-<father id="982" num="0" />
-<cdparam x="409" y="281" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1019" >
+<father id="1021" num="0" />
+<cdparam x="377" y="267" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="976" />
-<TGConnectingPoint num="1" id="977" />
-<TGConnectingPoint num="2" id="978" />
-<TGConnectingPoint num="3" id="979" />
+<TGConnectingPoint num="0" id="1015" />
+<TGConnectingPoint num="1" id="1016" />
+<TGConnectingPoint num="2" id="1017" />
+<TGConnectingPoint num="3" id="1018" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2110,345 +2151,304 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="989" >
-<cdparam x="410" y="327" />
+<CONNECTOR type="5102" id="1028" >
+<cdparam x="375" y="306" />
 <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="988" />
-<P1  x="406" y="315" id="991" />
-<P2  x="408" y="354" id="1229" />
+<TGConnectingPoint num="0" id="1027" />
+<P1  x="386" y="317" id="1030" />
+<P2  x="377" y="349" id="1236" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="987" >
-<father id="989" num="0" />
-<cdparam x="426" y="337" />
-<sizeparam width="155" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1026" >
+<father id="1028" num="0" />
+<cdparam x="396" y="336" />
+<sizeparam width="150" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="983" />
-<TGConnectingPoint num="1" id="984" />
-<TGConnectingPoint num="2" id="985" />
-<TGConnectingPoint num="3" id="986" />
+<TGConnectingPoint num="0" id="1022" />
+<TGConnectingPoint num="1" id="1023" />
+<TGConnectingPoint num="2" id="1024" />
+<TGConnectingPoint num="3" id="1025" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="alicePubK.data = m.data" />
+<actions value="bobPubK.data = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1000" >
-<cdparam x="374" y="290" />
+<COMPONENT type="5104" id="1039" >
+<cdparam x="354" y="292" />
 <sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="990" />
-<TGConnectingPoint num="1" id="991" />
-<TGConnectingPoint num="2" id="992" />
-<TGConnectingPoint num="3" id="993" />
-<TGConnectingPoint num="4" id="994" />
-<TGConnectingPoint num="5" id="995" />
-<TGConnectingPoint num="6" id="996" />
-<TGConnectingPoint num="7" id="997" />
-<TGConnectingPoint num="8" id="998" />
-<TGConnectingPoint num="9" id="999" />
+<TGConnectingPoint num="0" id="1029" />
+<TGConnectingPoint num="1" id="1030" />
+<TGConnectingPoint num="2" id="1031" />
+<TGConnectingPoint num="3" id="1032" />
+<TGConnectingPoint num="4" id="1033" />
+<TGConnectingPoint num="5" id="1034" />
+<TGConnectingPoint num="6" id="1035" />
+<TGConnectingPoint num="7" id="1036" />
+<TGConnectingPoint num="8" id="1037" />
+<TGConnectingPoint num="9" id="1038" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1041" >
-<cdparam x="347" y="213" />
-<sizeparam width="123" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1080" >
+<cdparam x="338" y="224" />
+<sizeparam width="114" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="receivingPubK" />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
-<TGConnectingPoint num="2" id="1003" />
-<TGConnectingPoint num="3" id="1004" />
-<TGConnectingPoint num="4" id="1005" />
-<TGConnectingPoint num="5" id="1006" />
-<TGConnectingPoint num="6" id="1007" />
-<TGConnectingPoint num="7" id="1008" />
-<TGConnectingPoint num="8" id="1009" />
-<TGConnectingPoint num="9" id="1010" />
-<TGConnectingPoint num="10" id="1011" />
-<TGConnectingPoint num="11" id="1012" />
-<TGConnectingPoint num="12" id="1013" />
-<TGConnectingPoint num="13" id="1014" />
-<TGConnectingPoint num="14" id="1015" />
-<TGConnectingPoint num="15" id="1016" />
-<TGConnectingPoint num="16" id="1017" />
-<TGConnectingPoint num="17" id="1018" />
-<TGConnectingPoint num="18" id="1019" />
-<TGConnectingPoint num="19" id="1020" />
-<TGConnectingPoint num="20" id="1021" />
-<TGConnectingPoint num="21" id="1022" />
-<TGConnectingPoint num="22" id="1023" />
-<TGConnectingPoint num="23" id="1024" />
-<TGConnectingPoint num="24" id="1025" />
-<TGConnectingPoint num="25" id="1026" />
-<TGConnectingPoint num="26" id="1027" />
-<TGConnectingPoint num="27" id="1028" />
-<TGConnectingPoint num="28" id="1029" />
-<TGConnectingPoint num="29" id="1030" />
-<TGConnectingPoint num="30" id="1031" />
-<TGConnectingPoint num="31" id="1032" />
-<TGConnectingPoint num="32" id="1033" />
-<TGConnectingPoint num="33" id="1034" />
-<TGConnectingPoint num="34" id="1035" />
-<TGConnectingPoint num="35" id="1036" />
-<TGConnectingPoint num="36" id="1037" />
-<TGConnectingPoint num="37" id="1038" />
-<TGConnectingPoint num="38" id="1039" />
-<TGConnectingPoint num="39" id="1040" />
+<TGConnectingPoint num="0" id="1040" />
+<TGConnectingPoint num="1" id="1041" />
+<TGConnectingPoint num="2" id="1042" />
+<TGConnectingPoint num="3" id="1043" />
+<TGConnectingPoint num="4" id="1044" />
+<TGConnectingPoint num="5" id="1045" />
+<TGConnectingPoint num="6" id="1046" />
+<TGConnectingPoint num="7" id="1047" />
+<TGConnectingPoint num="8" id="1048" />
+<TGConnectingPoint num="9" id="1049" />
+<TGConnectingPoint num="10" id="1050" />
+<TGConnectingPoint num="11" id="1051" />
+<TGConnectingPoint num="12" id="1052" />
+<TGConnectingPoint num="13" id="1053" />
+<TGConnectingPoint num="14" id="1054" />
+<TGConnectingPoint num="15" id="1055" />
+<TGConnectingPoint num="16" id="1056" />
+<TGConnectingPoint num="17" id="1057" />
+<TGConnectingPoint num="18" id="1058" />
+<TGConnectingPoint num="19" id="1059" />
+<TGConnectingPoint num="20" id="1060" />
+<TGConnectingPoint num="21" id="1061" />
+<TGConnectingPoint num="22" id="1062" />
+<TGConnectingPoint num="23" id="1063" />
+<TGConnectingPoint num="24" id="1064" />
+<TGConnectingPoint num="25" id="1065" />
+<TGConnectingPoint num="26" id="1066" />
+<TGConnectingPoint num="27" id="1067" />
+<TGConnectingPoint num="28" id="1068" />
+<TGConnectingPoint num="29" id="1069" />
+<TGConnectingPoint num="30" id="1070" />
+<TGConnectingPoint num="31" id="1071" />
+<TGConnectingPoint num="32" id="1072" />
+<TGConnectingPoint num="33" id="1073" />
+<TGConnectingPoint num="34" id="1074" />
+<TGConnectingPoint num="35" id="1075" />
+<TGConnectingPoint num="36" id="1076" />
+<TGConnectingPoint num="37" id="1077" />
+<TGConnectingPoint num="38" id="1078" />
+<TGConnectingPoint num="39" id="1079" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1052" >
-<cdparam x="374" y="158" />
+<COMPONENT type="5103" id="1091" >
+<cdparam x="359" y="155" />
 <sizeparam width="67" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="chout(m)" />
-<TGConnectingPoint num="0" id="1042" />
-<TGConnectingPoint num="1" id="1043" />
-<TGConnectingPoint num="2" id="1044" />
-<TGConnectingPoint num="3" id="1045" />
-<TGConnectingPoint num="4" id="1046" />
-<TGConnectingPoint num="5" id="1047" />
-<TGConnectingPoint num="6" id="1048" />
-<TGConnectingPoint num="7" id="1049" />
-<TGConnectingPoint num="8" id="1050" />
-<TGConnectingPoint num="9" id="1051" />
+<TGConnectingPoint num="0" id="1081" />
+<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="2" id="1083" />
+<TGConnectingPoint num="3" id="1084" />
+<TGConnectingPoint num="4" id="1085" />
+<TGConnectingPoint num="5" id="1086" />
+<TGConnectingPoint num="6" id="1087" />
+<TGConnectingPoint num="7" id="1088" />
+<TGConnectingPoint num="8" id="1089" />
+<TGConnectingPoint num="9" id="1090" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1093" >
-<cdparam x="351" y="95" />
-<sizeparam width="113" height="32" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1132" >
+<cdparam x="355" y="91" />
+<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="sendingPubK" />
-<TGConnectingPoint num="0" id="1053" />
-<TGConnectingPoint num="1" id="1054" />
-<TGConnectingPoint num="2" id="1055" />
-<TGConnectingPoint num="3" id="1056" />
-<TGConnectingPoint num="4" id="1057" />
-<TGConnectingPoint num="5" id="1058" />
-<TGConnectingPoint num="6" id="1059" />
-<TGConnectingPoint num="7" id="1060" />
-<TGConnectingPoint num="8" id="1061" />
-<TGConnectingPoint num="9" id="1062" />
-<TGConnectingPoint num="10" id="1063" />
-<TGConnectingPoint num="11" id="1064" />
-<TGConnectingPoint num="12" id="1065" />
-<TGConnectingPoint num="13" id="1066" />
-<TGConnectingPoint num="14" id="1067" />
-<TGConnectingPoint num="15" id="1068" />
-<TGConnectingPoint num="16" id="1069" />
-<TGConnectingPoint num="17" id="1070" />
-<TGConnectingPoint num="18" id="1071" />
-<TGConnectingPoint num="19" id="1072" />
-<TGConnectingPoint num="20" id="1073" />
-<TGConnectingPoint num="21" id="1074" />
-<TGConnectingPoint num="22" id="1075" />
-<TGConnectingPoint num="23" id="1076" />
-<TGConnectingPoint num="24" id="1077" />
-<TGConnectingPoint num="25" id="1078" />
-<TGConnectingPoint num="26" id="1079" />
-<TGConnectingPoint num="27" id="1080" />
-<TGConnectingPoint num="28" id="1081" />
-<TGConnectingPoint num="29" id="1082" />
-<TGConnectingPoint num="30" id="1083" />
-<TGConnectingPoint num="31" id="1084" />
-<TGConnectingPoint num="32" id="1085" />
-<TGConnectingPoint num="33" id="1086" />
-<TGConnectingPoint num="34" id="1087" />
-<TGConnectingPoint num="35" id="1088" />
-<TGConnectingPoint num="36" id="1089" />
-<TGConnectingPoint num="37" id="1090" />
-<TGConnectingPoint num="38" id="1091" />
-<TGConnectingPoint num="39" id="1092" />
+<TGConnectingPoint num="0" id="1092" />
+<TGConnectingPoint num="1" id="1093" />
+<TGConnectingPoint num="2" id="1094" />
+<TGConnectingPoint num="3" id="1095" />
+<TGConnectingPoint num="4" id="1096" />
+<TGConnectingPoint num="5" id="1097" />
+<TGConnectingPoint num="6" id="1098" />
+<TGConnectingPoint num="7" id="1099" />
+<TGConnectingPoint num="8" id="1100" />
+<TGConnectingPoint num="9" id="1101" />
+<TGConnectingPoint num="10" id="1102" />
+<TGConnectingPoint num="11" id="1103" />
+<TGConnectingPoint num="12" id="1104" />
+<TGConnectingPoint num="13" id="1105" />
+<TGConnectingPoint num="14" id="1106" />
+<TGConnectingPoint num="15" id="1107" />
+<TGConnectingPoint num="16" id="1108" />
+<TGConnectingPoint num="17" id="1109" />
+<TGConnectingPoint num="18" id="1110" />
+<TGConnectingPoint num="19" id="1111" />
+<TGConnectingPoint num="20" id="1112" />
+<TGConnectingPoint num="21" id="1113" />
+<TGConnectingPoint num="22" id="1114" />
+<TGConnectingPoint num="23" id="1115" />
+<TGConnectingPoint num="24" id="1116" />
+<TGConnectingPoint num="25" id="1117" />
+<TGConnectingPoint num="26" id="1118" />
+<TGConnectingPoint num="27" id="1119" />
+<TGConnectingPoint num="28" id="1120" />
+<TGConnectingPoint num="29" id="1121" />
+<TGConnectingPoint num="30" id="1122" />
+<TGConnectingPoint num="31" id="1123" />
+<TGConnectingPoint num="32" id="1124" />
+<TGConnectingPoint num="33" id="1125" />
+<TGConnectingPoint num="34" id="1126" />
+<TGConnectingPoint num="35" id="1127" />
+<TGConnectingPoint num="36" id="1128" />
+<TGConnectingPoint num="37" id="1129" />
+<TGConnectingPoint num="38" id="1130" />
+<TGConnectingPoint num="39" id="1131" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1134" >
-<cdparam x="329" y="592" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1173" >
+<cdparam x="370" y="613" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="1094" />
-<TGConnectingPoint num="1" id="1095" />
-<TGConnectingPoint num="2" id="1096" />
-<TGConnectingPoint num="3" id="1097" />
-<TGConnectingPoint num="4" id="1098" />
-<TGConnectingPoint num="5" id="1099" />
-<TGConnectingPoint num="6" id="1100" />
-<TGConnectingPoint num="7" id="1101" />
-<TGConnectingPoint num="8" id="1102" />
-<TGConnectingPoint num="9" id="1103" />
-<TGConnectingPoint num="10" id="1104" />
-<TGConnectingPoint num="11" id="1105" />
-<TGConnectingPoint num="12" id="1106" />
-<TGConnectingPoint num="13" id="1107" />
-<TGConnectingPoint num="14" id="1108" />
-<TGConnectingPoint num="15" id="1109" />
-<TGConnectingPoint num="16" id="1110" />
-<TGConnectingPoint num="17" id="1111" />
-<TGConnectingPoint num="18" id="1112" />
-<TGConnectingPoint num="19" id="1113" />
-<TGConnectingPoint num="20" id="1114" />
-<TGConnectingPoint num="21" id="1115" />
-<TGConnectingPoint num="22" id="1116" />
-<TGConnectingPoint num="23" id="1117" />
-<TGConnectingPoint num="24" id="1118" />
-<TGConnectingPoint num="25" id="1119" />
-<TGConnectingPoint num="26" id="1120" />
-<TGConnectingPoint num="27" id="1121" />
-<TGConnectingPoint num="28" id="1122" />
-<TGConnectingPoint num="29" id="1123" />
-<TGConnectingPoint num="30" id="1124" />
-<TGConnectingPoint num="31" id="1125" />
-<TGConnectingPoint num="32" id="1126" />
-<TGConnectingPoint num="33" id="1127" />
-<TGConnectingPoint num="34" id="1128" />
-<TGConnectingPoint num="35" id="1129" />
-<TGConnectingPoint num="36" id="1130" />
-<TGConnectingPoint num="37" id="1131" />
-<TGConnectingPoint num="38" id="1132" />
-<TGConnectingPoint num="39" id="1133" />
+<infoparam name="State" value="beforeFinish" />
+<TGConnectingPoint num="0" id="1133" />
+<TGConnectingPoint num="1" id="1134" />
+<TGConnectingPoint num="2" id="1135" />
+<TGConnectingPoint num="3" id="1136" />
+<TGConnectingPoint num="4" id="1137" />
+<TGConnectingPoint num="5" id="1138" />
+<TGConnectingPoint num="6" id="1139" />
+<TGConnectingPoint num="7" id="1140" />
+<TGConnectingPoint num="8" id="1141" />
+<TGConnectingPoint num="9" id="1142" />
+<TGConnectingPoint num="10" id="1143" />
+<TGConnectingPoint num="11" id="1144" />
+<TGConnectingPoint num="12" id="1145" />
+<TGConnectingPoint num="13" id="1146" />
+<TGConnectingPoint num="14" id="1147" />
+<TGConnectingPoint num="15" id="1148" />
+<TGConnectingPoint num="16" id="1149" />
+<TGConnectingPoint num="17" id="1150" />
+<TGConnectingPoint num="18" id="1151" />
+<TGConnectingPoint num="19" id="1152" />
+<TGConnectingPoint num="20" id="1153" />
+<TGConnectingPoint num="21" id="1154" />
+<TGConnectingPoint num="22" id="1155" />
+<TGConnectingPoint num="23" id="1156" />
+<TGConnectingPoint num="24" id="1157" />
+<TGConnectingPoint num="25" id="1158" />
+<TGConnectingPoint num="26" id="1159" />
+<TGConnectingPoint num="27" id="1160" />
+<TGConnectingPoint num="28" id="1161" />
+<TGConnectingPoint num="29" id="1162" />
+<TGConnectingPoint num="30" id="1163" />
+<TGConnectingPoint num="31" id="1164" />
+<TGConnectingPoint num="32" id="1165" />
+<TGConnectingPoint num="33" id="1166" />
+<TGConnectingPoint num="34" id="1167" />
+<TGConnectingPoint num="35" id="1168" />
+<TGConnectingPoint num="36" id="1169" />
+<TGConnectingPoint num="37" id="1170" />
+<TGConnectingPoint num="38" id="1171" />
+<TGConnectingPoint num="39" id="1172" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1175" >
-<cdparam x="352" y="677" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1184" >
+<cdparam x="374" y="542" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="1135" />
-<TGConnectingPoint num="1" id="1136" />
-<TGConnectingPoint num="2" id="1137" />
-<TGConnectingPoint num="3" id="1138" />
-<TGConnectingPoint num="4" id="1139" />
-<TGConnectingPoint num="5" id="1140" />
-<TGConnectingPoint num="6" id="1141" />
-<TGConnectingPoint num="7" id="1142" />
-<TGConnectingPoint num="8" id="1143" />
-<TGConnectingPoint num="9" id="1144" />
-<TGConnectingPoint num="10" id="1145" />
-<TGConnectingPoint num="11" id="1146" />
-<TGConnectingPoint num="12" id="1147" />
-<TGConnectingPoint num="13" id="1148" />
-<TGConnectingPoint num="14" id="1149" />
-<TGConnectingPoint num="15" id="1150" />
-<TGConnectingPoint num="16" id="1151" />
-<TGConnectingPoint num="17" id="1152" />
-<TGConnectingPoint num="18" id="1153" />
-<TGConnectingPoint num="19" id="1154" />
-<TGConnectingPoint num="20" id="1155" />
-<TGConnectingPoint num="21" id="1156" />
-<TGConnectingPoint num="22" id="1157" />
-<TGConnectingPoint num="23" id="1158" />
-<TGConnectingPoint num="24" id="1159" />
-<TGConnectingPoint num="25" id="1160" />
-<TGConnectingPoint num="26" id="1161" />
-<TGConnectingPoint num="27" id="1162" />
-<TGConnectingPoint num="28" id="1163" />
-<TGConnectingPoint num="29" id="1164" />
-<TGConnectingPoint num="30" id="1165" />
-<TGConnectingPoint num="31" id="1166" />
-<TGConnectingPoint num="32" id="1167" />
-<TGConnectingPoint num="33" id="1168" />
-<TGConnectingPoint num="34" id="1169" />
-<TGConnectingPoint num="35" id="1170" />
-<TGConnectingPoint num="36" id="1171" />
-<TGConnectingPoint num="37" id="1172" />
-<TGConnectingPoint num="38" id="1173" />
-<TGConnectingPoint num="39" id="1174" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="1174" />
+<TGConnectingPoint num="1" id="1175" />
+<TGConnectingPoint num="2" id="1176" />
+<TGConnectingPoint num="3" id="1177" />
+<TGConnectingPoint num="4" id="1178" />
+<TGConnectingPoint num="5" id="1179" />
+<TGConnectingPoint num="6" id="1180" />
+<TGConnectingPoint num="7" id="1181" />
+<TGConnectingPoint num="8" id="1182" />
+<TGConnectingPoint num="9" id="1183" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1216" >
-<cdparam x="338" y="486" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1186" >
+<cdparam x="428" y="708" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="1176" />
-<TGConnectingPoint num="1" id="1177" />
-<TGConnectingPoint num="2" id="1178" />
-<TGConnectingPoint num="3" id="1179" />
-<TGConnectingPoint num="4" id="1180" />
-<TGConnectingPoint num="5" id="1181" />
-<TGConnectingPoint num="6" id="1182" />
-<TGConnectingPoint num="7" id="1183" />
-<TGConnectingPoint num="8" id="1184" />
-<TGConnectingPoint num="9" id="1185" />
-<TGConnectingPoint num="10" id="1186" />
-<TGConnectingPoint num="11" id="1187" />
-<TGConnectingPoint num="12" id="1188" />
-<TGConnectingPoint num="13" id="1189" />
-<TGConnectingPoint num="14" id="1190" />
-<TGConnectingPoint num="15" id="1191" />
-<TGConnectingPoint num="16" id="1192" />
-<TGConnectingPoint num="17" id="1193" />
-<TGConnectingPoint num="18" id="1194" />
-<TGConnectingPoint num="19" id="1195" />
-<TGConnectingPoint num="20" id="1196" />
-<TGConnectingPoint num="21" id="1197" />
-<TGConnectingPoint num="22" id="1198" />
-<TGConnectingPoint num="23" id="1199" />
-<TGConnectingPoint num="24" id="1200" />
-<TGConnectingPoint num="25" id="1201" />
-<TGConnectingPoint num="26" id="1202" />
-<TGConnectingPoint num="27" id="1203" />
-<TGConnectingPoint num="28" id="1204" />
-<TGConnectingPoint num="29" id="1205" />
-<TGConnectingPoint num="30" id="1206" />
-<TGConnectingPoint num="31" id="1207" />
-<TGConnectingPoint num="32" id="1208" />
-<TGConnectingPoint num="33" id="1209" />
-<TGConnectingPoint num="34" id="1210" />
-<TGConnectingPoint num="35" id="1211" />
-<TGConnectingPoint num="36" id="1212" />
-<TGConnectingPoint num="37" id="1213" />
-<TGConnectingPoint num="38" id="1214" />
-<TGConnectingPoint num="39" id="1215" />
-<extraparam>
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1185" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1227" >
-<cdparam x="372" y="429" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1227" >
+<cdparam x="340" y="468" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="1217" />
-<TGConnectingPoint num="1" id="1218" />
-<TGConnectingPoint num="2" id="1219" />
-<TGConnectingPoint num="3" id="1220" />
-<TGConnectingPoint num="4" id="1221" />
-<TGConnectingPoint num="5" id="1222" />
-<TGConnectingPoint num="6" id="1223" />
-<TGConnectingPoint num="7" id="1224" />
-<TGConnectingPoint num="8" id="1225" />
-<TGConnectingPoint num="9" id="1226" />
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="1187" />
+<TGConnectingPoint num="1" id="1188" />
+<TGConnectingPoint num="2" id="1189" />
+<TGConnectingPoint num="3" id="1190" />
+<TGConnectingPoint num="4" id="1191" />
+<TGConnectingPoint num="5" id="1192" />
+<TGConnectingPoint num="6" id="1193" />
+<TGConnectingPoint num="7" id="1194" />
+<TGConnectingPoint num="8" id="1195" />
+<TGConnectingPoint num="9" id="1196" />
+<TGConnectingPoint num="10" id="1197" />
+<TGConnectingPoint num="11" id="1198" />
+<TGConnectingPoint num="12" id="1199" />
+<TGConnectingPoint num="13" id="1200" />
+<TGConnectingPoint num="14" id="1201" />
+<TGConnectingPoint num="15" id="1202" />
+<TGConnectingPoint num="16" id="1203" />
+<TGConnectingPoint num="17" id="1204" />
+<TGConnectingPoint num="18" id="1205" />
+<TGConnectingPoint num="19" id="1206" />
+<TGConnectingPoint num="20" id="1207" />
+<TGConnectingPoint num="21" id="1208" />
+<TGConnectingPoint num="22" id="1209" />
+<TGConnectingPoint num="23" id="1210" />
+<TGConnectingPoint num="24" id="1211" />
+<TGConnectingPoint num="25" id="1212" />
+<TGConnectingPoint num="26" id="1213" />
+<TGConnectingPoint num="27" id="1214" />
+<TGConnectingPoint num="28" id="1215" />
+<TGConnectingPoint num="29" id="1216" />
+<TGConnectingPoint num="30" id="1217" />
+<TGConnectingPoint num="31" id="1218" />
+<TGConnectingPoint num="32" id="1219" />
+<TGConnectingPoint num="33" id="1220" />
+<TGConnectingPoint num="34" id="1221" />
+<TGConnectingPoint num="35" id="1222" />
+<TGConnectingPoint num="36" id="1223" />
+<TGConnectingPoint num="37" id="1224" />
+<TGConnectingPoint num="38" id="1225" />
+<TGConnectingPoint num="39" id="1226" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="1268" >
-<cdparam x="342" y="354" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="344" y="349" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
+<infoparam name="state0" value="makingMessage" />
 <TGConnectingPoint num="0" id="1228" />
 <TGConnectingPoint num="1" id="1229" />
 <TGConnectingPoint num="2" id="1230" />
@@ -2676,11 +2676,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="1336" >
 <father id="1411" num="0" />
-<cdparam x="115" y="249" />
-<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="108" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
-<infoparam name="Block0" value="CA" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
+<infoparam name="Block0" value="Bob" />
 <TGConnectingPoint num="0" id="1312" />
 <TGConnectingPoint num="1" id="1313" />
 <TGConnectingPoint num="2" id="1314" />
@@ -2707,30 +2707,22 @@
 <TGConnectingPoint num="23" id="1335" />
 <extraparam>
 <CryptoBlock value="true" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
 <Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="aliceID" value="" type="8" typeOther="" />
-<Attribute access="0" id="bobID" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="newCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="newID" value="" type="8" typeOther="" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
+<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
 <Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
 <Method value="Message MAC(Message msg, Key k)" />
 <Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
 <Method value="Message concat2(Message msg1, Message msg2)" />
@@ -2739,6 +2731,16 @@
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="1361" >
@@ -2812,11 +2814,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="1386" >
 <father id="1411" num="2" />
-<cdparam x="263" y="108" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="115" y="249" />
+<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
+<infoparam name="Block0" value="CA" />
 <TGConnectingPoint num="0" id="1362" />
 <TGConnectingPoint num="1" id="1363" />
 <TGConnectingPoint num="2" id="1364" />
@@ -2843,22 +2845,30 @@
 <TGConnectingPoint num="23" id="1385" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
 <Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="aliceID" value="" type="8" typeOther="" />
+<Attribute access="0" id="bobID" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="newCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certOK" value="" type="4" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newID" value="" type="8" typeOther="" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
 <Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 <Method value="Message MAC(Message msg, Key k)" />
 <Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
 <Method value="Message concat2(Message msg1, Message msg2)" />
@@ -2867,16 +2877,6 @@
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2896,28 +2896,48 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1420" >
-<cdparam x="407" y="70" />
+<AVATARStateMachineDiagramPanel name="CA" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="1424" >
+<cdparam x="331" y="296" />
 <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="1419" />
-<P1  x="407" y="70" id="1738" />
-<P2  x="413" y="90" id="1523" />
+<TGConnectingPoint num="0" id="1421" />
+<TGConnectingPoint num="1" id="1422" />
+<TGConnectingPoint num="2" id="1423" />
+<P1  x="338" y="295" id="1522" />
+<P2  x="399" y="127" id="1596" />
+<Point x="90" y="296" />
+<Point x="90" y="127" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1418" >
-<father id="1420" num="0" />
-<cdparam x="404" y="80" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1414" >
+<father id="1424" num="0" />
+<cdparam x="90" y="296" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1415" >
+<father id="1424" num="1" />
+<cdparam x="90" y="127" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1420" >
+<father id="1424" num="2" />
+<cdparam x="101" y="203" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1414" />
-<TGConnectingPoint num="1" id="1415" />
-<TGConnectingPoint num="2" id="1416" />
-<TGConnectingPoint num="3" id="1417" />
+<TGConnectingPoint num="0" id="1416" />
+<TGConnectingPoint num="1" id="1417" />
+<TGConnectingPoint num="2" id="1418" />
+<TGConnectingPoint num="3" id="1419" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -2925,140 +2945,247 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1427" >
-<cdparam x="418" y="632" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1426" />
-<P1  x="418" y="632" id="1569" />
-<P2  x="422" y="677" id="1605" />
+<CONNECTOR type="5102" id="1437" >
+<cdparam x="799" y="260" />
+<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="1433" />
+<TGConnectingPoint num="1" id="1434" />
+<TGConnectingPoint num="2" id="1435" />
+<TGConnectingPoint num="3" id="1436" />
+<P1  x="799" y="260" id="1509" />
+<P2  x="499" y="127" id="1597" />
+<Point x="799" y="295" />
+<Point x="1095" y="295" />
+<Point x="1095" y="127" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1425" >
-<father id="1427" num="0" />
-<cdparam x="433" y="656" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="1437" num="0" />
+<cdparam x="799" y="295" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1426" >
+<father id="1437" num="1" />
+<cdparam x="1095" y="295" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1427" >
+<father id="1437" num="2" />
+<cdparam x="1095" y="127" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1432" >
+<father id="1437" num="3" />
+<cdparam x="649" y="193" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1421" />
-<TGConnectingPoint num="1" id="1422" />
-<TGConnectingPoint num="2" id="1423" />
-<TGConnectingPoint num="3" id="1424" />
+<TGConnectingPoint num="0" id="1428" />
+<TGConnectingPoint num="1" id="1429" />
+<TGConnectingPoint num="2" id="1430" />
+<TGConnectingPoint num="3" id="1431" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1434" >
-<cdparam x="409" y="526" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1433" />
-<P1  x="409" y="526" id="1651" />
-<P2  x="418" y="592" id="1564" />
+<CONNECTOR type="5102" id="1450" >
+<cdparam x="474" y="253" />
+<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="1446" />
+<TGConnectingPoint num="1" id="1447" />
+<TGConnectingPoint num="2" id="1448" />
+<TGConnectingPoint num="3" id="1449" />
+<P1  x="474" y="253" id="1561" />
+<P2  x="499" y="112" id="1615" />
+<Point x="474" y="351" />
+<Point x="1122" y="352" />
+<Point x="1122" y="112" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1432" >
-<father id="1434" num="0" />
-<cdparam x="431" y="551" />
-<sizeparam width="157" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1438" >
+<father id="1450" num="0" />
+<cdparam x="474" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1439" >
+<father id="1450" num="1" />
+<cdparam x="1122" y="352" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1440" >
+<father id="1450" num="2" />
+<cdparam x="1122" y="112" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1445" >
+<father id="1450" num="3" />
+<cdparam x="486" y="182" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1428" />
-<TGConnectingPoint num="1" id="1429" />
-<TGConnectingPoint num="2" id="1430" />
-<TGConnectingPoint num="3" id="1431" />
+<TGConnectingPoint num="0" id="1441" />
+<TGConnectingPoint num="1" id="1442" />
+<TGConnectingPoint num="2" id="1443" />
+<TGConnectingPoint num="3" id="1444" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sk = DH(alicePubK, privK)" />
-<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1441" >
-<cdparam x="408" y="454" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1440" />
-<P1  x="408" y="454" id="1687" />
-<P2  x="409" y="486" id="1646" />
+<CONNECTOR type="5102" id="1459" >
+<cdparam x="499" y="137" />
+<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="1457" />
+<TGConnectingPoint num="1" id="1458" />
+<P1  x="499" y="137" id="1606" />
+<P2  x="799" y="230" id="1508" />
+<Point x="799" y="137" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1439" >
-<father id="1441" num="0" />
-<cdparam x="408" y="494" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1451" >
+<father id="1459" num="0" />
+<cdparam x="799" y="137" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1456" >
+<father id="1459" num="1" />
+<cdparam x="816" y="160" />
+<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1435" />
-<TGConnectingPoint num="1" id="1436" />
-<TGConnectingPoint num="2" id="1437" />
-<TGConnectingPoint num="3" id="1438" />
+<TGConnectingPoint num="0" id="1452" />
+<TGConnectingPoint num="1" id="1453" />
+<TGConnectingPoint num="2" id="1454" />
+<TGConnectingPoint num="3" id="1455" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m1.data = bobPubK.data" />
+<actions value="m2.data = bobID" />
+<actions value="m = concat2(m1, m2)" />
+<actions value="m1 = sign(m, privK)" />
+<actions value="newCert = concat2(m, m1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1448" >
-<cdparam x="408" y="394" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1447" />
-<P1  x="408" y="394" id="1703" />
-<P2  x="408" y="424" id="1686" />
+<CONNECTOR type="5102" id="1466" >
+<cdparam x="391" y="326" />
+<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="1465" />
+<P1  x="388" y="320" id="1525" />
+<P2  x="381" y="428" id="1571" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1446" >
-<father id="1448" num="0" />
-<cdparam x="408" y="434" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1464" >
+<father id="1466" num="0" />
+<cdparam x="126" y="354" />
+<sizeparam width="267" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1442" />
-<TGConnectingPoint num="1" id="1443" />
-<TGConnectingPoint num="2" id="1444" />
-<TGConnectingPoint num="3" id="1445" />
+<TGConnectingPoint num="0" id="1460" />
+<TGConnectingPoint num="1" id="1461" />
+<TGConnectingPoint num="2" id="1462" />
+<TGConnectingPoint num="3" id="1463" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ (newID != aliceID) and (newID != bobID) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m1.data = newK.data" />
+<actions value="m2.data = newID" />
+<actions value="m = concat2(m1, m2)" />
+<actions value="m1 = sign(m, privK)" />
+<actions value="newCert = concat2(m, m1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1455" >
-<cdparam x="409" y="265" />
+<CONNECTOR type="5102" id="1479" >
+<cdparam x="381" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1454" />
-<P1  x="413" y="128" id="1528" />
-<P2  x="412" y="159" id="1511" />
+<TGConnectingPoint num="0" id="1475" />
+<TGConnectingPoint num="1" id="1476" />
+<TGConnectingPoint num="2" id="1477" />
+<TGConnectingPoint num="3" id="1478" />
+<P1  x="381" y="458" id="1572" />
+<P2  x="399" y="117" id="1603" />
+<Point x="381" y="519" />
+<Point x="44" y="519" />
+<Point x="44" y="117" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1453" >
-<father id="1455" num="0" />
-<cdparam x="409" y="281" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1467" >
+<father id="1479" num="0" />
+<cdparam x="381" y="519" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1468" >
+<father id="1479" num="1" />
+<cdparam x="44" y="519" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1469" >
+<father id="1479" num="2" />
+<cdparam x="44" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1474" >
+<father id="1479" num="3" />
+<cdparam x="390" y="203" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1449" />
-<TGConnectingPoint num="1" id="1450" />
-<TGConnectingPoint num="2" id="1451" />
-<TGConnectingPoint num="3" id="1452" />
+<TGConnectingPoint num="0" id="1470" />
+<TGConnectingPoint num="1" id="1471" />
+<TGConnectingPoint num="2" id="1472" />
+<TGConnectingPoint num="3" id="1473" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3068,436 +3195,409 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1462" >
-<cdparam x="410" y="327" />
+<CONNECTOR type="5102" id="1486" >
+<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="1461" />
-<P1  x="412" y="189" id="1512" />
-<P2  x="410" y="267" id="1471" />
+<TGConnectingPoint num="0" id="1485" />
+<P1  x="411" y="71" id="1634" />
+<P2  x="411" y="108" id="1609" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1460" >
-<father id="1462" num="0" />
-<cdparam x="456" y="193" />
-<sizeparam width="228" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1484" >
+<father id="1486" num="0" />
+<cdparam x="409" y="89" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1456" />
-<TGConnectingPoint num="1" id="1457" />
-<TGConnectingPoint num="2" id="1458" />
-<TGConnectingPoint num="3" id="1459" />
+<TGConnectingPoint num="0" id="1480" />
+<TGConnectingPoint num="1" id="1481" />
+<TGConnectingPoint num="2" id="1482" />
+<TGConnectingPoint num="3" id="1483" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m, m1, sig)" />
-<actions value="get2(m1, m, m2)" />
-<actions value="m2.data = aliceID" />
-<actions value="m1 = concat2(m, m2)" />
-<actions value="certOK = verifySign(m1, sig, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1469" >
-<cdparam x="423" y="345" />
+<CONNECTOR type="5102" id="1493" >
+<cdparam x="399" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1468" />
-<P1  x="435" y="297" id="1485" />
-<P2  x="423" y="354" id="1715" />
+<TGConnectingPoint num="0" id="1492" />
+<P1  x="399" y="147" id="1598" />
+<P2  x="381" y="176" id="1582" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1467" >
-<father id="1469" num="0" />
-<cdparam x="450" y="315" />
-<sizeparam width="155" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1491" >
+<father id="1493" num="0" />
+<cdparam x="390" y="161" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1463" />
-<TGConnectingPoint num="1" id="1464" />
-<TGConnectingPoint num="2" id="1465" />
-<TGConnectingPoint num="3" id="1466" />
+<TGConnectingPoint num="0" id="1487" />
+<TGConnectingPoint num="1" id="1488" />
+<TGConnectingPoint num="2" id="1489" />
+<TGConnectingPoint num="3" id="1490" />
 <extraparam>
-<guard value="[ certOK ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="alicePubK.data = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1510" >
-<cdparam x="360" y="267" />
-<sizeparam width="100" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1500" >
+<cdparam x="381" y="206" />
+<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="1499" />
+<P1  x="381" y="206" id="1583" />
+<P2  x="388" y="270" id="1520" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1498" >
+<father id="1500" num="0" />
+<cdparam x="216" y="224" />
+<sizeparam width="135" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="verifyCert" />
-<TGConnectingPoint num="0" id="1470" />
-<TGConnectingPoint num="1" id="1471" />
-<TGConnectingPoint num="2" id="1472" />
-<TGConnectingPoint num="3" id="1473" />
-<TGConnectingPoint num="4" id="1474" />
-<TGConnectingPoint num="5" id="1475" />
-<TGConnectingPoint num="6" id="1476" />
-<TGConnectingPoint num="7" id="1477" />
-<TGConnectingPoint num="8" id="1478" />
-<TGConnectingPoint num="9" id="1479" />
-<TGConnectingPoint num="10" id="1480" />
-<TGConnectingPoint num="11" id="1481" />
-<TGConnectingPoint num="12" id="1482" />
-<TGConnectingPoint num="13" id="1483" />
-<TGConnectingPoint num="14" id="1484" />
-<TGConnectingPoint num="15" id="1485" />
-<TGConnectingPoint num="16" id="1486" />
-<TGConnectingPoint num="17" id="1487" />
-<TGConnectingPoint num="18" id="1488" />
-<TGConnectingPoint num="19" id="1489" />
-<TGConnectingPoint num="20" id="1490" />
-<TGConnectingPoint num="21" id="1491" />
-<TGConnectingPoint num="22" id="1492" />
-<TGConnectingPoint num="23" id="1493" />
-<TGConnectingPoint num="24" id="1494" />
-<TGConnectingPoint num="25" id="1495" />
-<TGConnectingPoint num="26" id="1496" />
-<TGConnectingPoint num="27" id="1497" />
-<TGConnectingPoint num="28" id="1498" />
-<TGConnectingPoint num="29" id="1499" />
-<TGConnectingPoint num="30" id="1500" />
-<TGConnectingPoint num="31" id="1501" />
-<TGConnectingPoint num="32" id="1502" />
-<TGConnectingPoint num="33" id="1503" />
-<TGConnectingPoint num="34" id="1504" />
-<TGConnectingPoint num="35" id="1505" />
-<TGConnectingPoint num="36" id="1506" />
-<TGConnectingPoint num="37" id="1507" />
-<TGConnectingPoint num="38" id="1508" />
-<TGConnectingPoint num="39" id="1509" />
+<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="1494" />
+<TGConnectingPoint num="1" id="1495" />
+<TGConnectingPoint num="2" id="1496" />
+<TGConnectingPoint num="3" id="1497" />
 <extraparam>
+<guard value="[  ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get2(m, m1, m2)" />
+<actions value="newK.data = m1.data" />
+<actions value="newID = m2.data" />
 </extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1521" >
-<cdparam x="380" y="164" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="1511" />
-<TGConnectingPoint num="1" id="1512" />
-<TGConnectingPoint num="2" id="1513" />
-<TGConnectingPoint num="3" id="1514" />
-<TGConnectingPoint num="4" id="1515" />
-<TGConnectingPoint num="5" id="1516" />
-<TGConnectingPoint num="6" id="1517" />
-<TGConnectingPoint num="7" id="1518" />
-<TGConnectingPoint num="8" id="1519" />
-<TGConnectingPoint num="9" id="1520" />
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1562" >
-<cdparam x="341" y="90" />
-<sizeparam width="144" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1507" >
+<cdparam x="499" y="147" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1506" />
+<P1  x="474" y="147" id="1608" />
+<P2  x="474" y="223" id="1560" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1505" >
+<father id="1507" num="0" />
+<cdparam x="496" y="166" />
+<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="receivingAliceCert" />
-<TGConnectingPoint num="0" id="1522" />
-<TGConnectingPoint num="1" id="1523" />
-<TGConnectingPoint num="2" id="1524" />
-<TGConnectingPoint num="3" id="1525" />
-<TGConnectingPoint num="4" id="1526" />
-<TGConnectingPoint num="5" id="1527" />
-<TGConnectingPoint num="6" id="1528" />
-<TGConnectingPoint num="7" id="1529" />
-<TGConnectingPoint num="8" id="1530" />
-<TGConnectingPoint num="9" id="1531" />
-<TGConnectingPoint num="10" id="1532" />
-<TGConnectingPoint num="11" id="1533" />
-<TGConnectingPoint num="12" id="1534" />
-<TGConnectingPoint num="13" id="1535" />
-<TGConnectingPoint num="14" id="1536" />
-<TGConnectingPoint num="15" id="1537" />
-<TGConnectingPoint num="16" id="1538" />
-<TGConnectingPoint num="17" id="1539" />
-<TGConnectingPoint num="18" id="1540" />
-<TGConnectingPoint num="19" id="1541" />
-<TGConnectingPoint num="20" id="1542" />
-<TGConnectingPoint num="21" id="1543" />
-<TGConnectingPoint num="22" id="1544" />
-<TGConnectingPoint num="23" id="1545" />
-<TGConnectingPoint num="24" id="1546" />
-<TGConnectingPoint num="25" id="1547" />
-<TGConnectingPoint num="26" id="1548" />
-<TGConnectingPoint num="27" id="1549" />
-<TGConnectingPoint num="28" id="1550" />
-<TGConnectingPoint num="29" id="1551" />
-<TGConnectingPoint num="30" id="1552" />
-<TGConnectingPoint num="31" id="1553" />
-<TGConnectingPoint num="32" id="1554" />
-<TGConnectingPoint num="33" id="1555" />
-<TGConnectingPoint num="34" id="1556" />
-<TGConnectingPoint num="35" id="1557" />
-<TGConnectingPoint num="36" id="1558" />
-<TGConnectingPoint num="37" id="1559" />
-<TGConnectingPoint num="38" id="1560" />
-<TGConnectingPoint num="39" id="1561" />
+<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="1501" />
+<TGConnectingPoint num="1" id="1502" />
+<TGConnectingPoint num="2" id="1503" />
+<TGConnectingPoint num="3" id="1504" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="m1.data = alicePubK.data" />
+<actions value="m2.data = aliceID" />
+<actions value="m = concat2(m1, m2)" />
+<actions value="m1 = sign(m, privK)" />
+<actions value="newCert = concat2(m, m1)" />
 </extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5103" id="1518" >
+<cdparam x="746" y="235" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(newCert)" />
+<TGConnectingPoint num="0" id="1508" />
+<TGConnectingPoint num="1" id="1509" />
+<TGConnectingPoint num="2" id="1510" />
+<TGConnectingPoint num="3" id="1511" />
+<TGConnectingPoint num="4" id="1512" />
+<TGConnectingPoint num="5" id="1513" />
+<TGConnectingPoint num="6" id="1514" />
+<TGConnectingPoint num="7" id="1515" />
+<TGConnectingPoint num="8" id="1516" />
+<TGConnectingPoint num="9" id="1517" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1603" >
-<cdparam x="329" y="592" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1559" >
+<cdparam x="338" y="270" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="1563" />
-<TGConnectingPoint num="1" id="1564" />
-<TGConnectingPoint num="2" id="1565" />
-<TGConnectingPoint num="3" id="1566" />
-<TGConnectingPoint num="4" id="1567" />
-<TGConnectingPoint num="5" id="1568" />
-<TGConnectingPoint num="6" id="1569" />
-<TGConnectingPoint num="7" id="1570" />
-<TGConnectingPoint num="8" id="1571" />
-<TGConnectingPoint num="9" id="1572" />
-<TGConnectingPoint num="10" id="1573" />
-<TGConnectingPoint num="11" id="1574" />
-<TGConnectingPoint num="12" id="1575" />
-<TGConnectingPoint num="13" id="1576" />
-<TGConnectingPoint num="14" id="1577" />
-<TGConnectingPoint num="15" id="1578" />
-<TGConnectingPoint num="16" id="1579" />
-<TGConnectingPoint num="17" id="1580" />
-<TGConnectingPoint num="18" id="1581" />
-<TGConnectingPoint num="19" id="1582" />
-<TGConnectingPoint num="20" id="1583" />
-<TGConnectingPoint num="21" id="1584" />
-<TGConnectingPoint num="22" id="1585" />
-<TGConnectingPoint num="23" id="1586" />
-<TGConnectingPoint num="24" id="1587" />
-<TGConnectingPoint num="25" id="1588" />
-<TGConnectingPoint num="26" id="1589" />
-<TGConnectingPoint num="27" id="1590" />
-<TGConnectingPoint num="28" id="1591" />
-<TGConnectingPoint num="29" id="1592" />
-<TGConnectingPoint num="30" id="1593" />
-<TGConnectingPoint num="31" id="1594" />
-<TGConnectingPoint num="32" id="1595" />
-<TGConnectingPoint num="33" id="1596" />
-<TGConnectingPoint num="34" id="1597" />
-<TGConnectingPoint num="35" id="1598" />
-<TGConnectingPoint num="36" id="1599" />
-<TGConnectingPoint num="37" id="1600" />
-<TGConnectingPoint num="38" id="1601" />
-<TGConnectingPoint num="39" id="1602" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="verifyID" />
+<TGConnectingPoint num="0" id="1519" />
+<TGConnectingPoint num="1" id="1520" />
+<TGConnectingPoint num="2" id="1521" />
+<TGConnectingPoint num="3" id="1522" />
+<TGConnectingPoint num="4" id="1523" />
+<TGConnectingPoint num="5" id="1524" />
+<TGConnectingPoint num="6" id="1525" />
+<TGConnectingPoint num="7" id="1526" />
+<TGConnectingPoint num="8" id="1527" />
+<TGConnectingPoint num="9" id="1528" />
+<TGConnectingPoint num="10" id="1529" />
+<TGConnectingPoint num="11" id="1530" />
+<TGConnectingPoint num="12" id="1531" />
+<TGConnectingPoint num="13" id="1532" />
+<TGConnectingPoint num="14" id="1533" />
+<TGConnectingPoint num="15" id="1534" />
+<TGConnectingPoint num="16" id="1535" />
+<TGConnectingPoint num="17" id="1536" />
+<TGConnectingPoint num="18" id="1537" />
+<TGConnectingPoint num="19" id="1538" />
+<TGConnectingPoint num="20" id="1539" />
+<TGConnectingPoint num="21" id="1540" />
+<TGConnectingPoint num="22" id="1541" />
+<TGConnectingPoint num="23" id="1542" />
+<TGConnectingPoint num="24" id="1543" />
+<TGConnectingPoint num="25" id="1544" />
+<TGConnectingPoint num="26" id="1545" />
+<TGConnectingPoint num="27" id="1546" />
+<TGConnectingPoint num="28" id="1547" />
+<TGConnectingPoint num="29" id="1548" />
+<TGConnectingPoint num="30" id="1549" />
+<TGConnectingPoint num="31" id="1550" />
+<TGConnectingPoint num="32" id="1551" />
+<TGConnectingPoint num="33" id="1552" />
+<TGConnectingPoint num="34" id="1553" />
+<TGConnectingPoint num="35" id="1554" />
+<TGConnectingPoint num="36" id="1555" />
+<TGConnectingPoint num="37" id="1556" />
+<TGConnectingPoint num="38" id="1557" />
+<TGConnectingPoint num="39" id="1558" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1644" >
-<cdparam x="352" y="677" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1570" >
+<cdparam x="421" y="228" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="1604" />
-<TGConnectingPoint num="1" id="1605" />
-<TGConnectingPoint num="2" id="1606" />
-<TGConnectingPoint num="3" id="1607" />
-<TGConnectingPoint num="4" id="1608" />
-<TGConnectingPoint num="5" id="1609" />
-<TGConnectingPoint num="6" id="1610" />
-<TGConnectingPoint num="7" id="1611" />
-<TGConnectingPoint num="8" id="1612" />
-<TGConnectingPoint num="9" id="1613" />
-<TGConnectingPoint num="10" id="1614" />
-<TGConnectingPoint num="11" id="1615" />
-<TGConnectingPoint num="12" id="1616" />
-<TGConnectingPoint num="13" id="1617" />
-<TGConnectingPoint num="14" id="1618" />
-<TGConnectingPoint num="15" id="1619" />
-<TGConnectingPoint num="16" id="1620" />
-<TGConnectingPoint num="17" id="1621" />
-<TGConnectingPoint num="18" id="1622" />
-<TGConnectingPoint num="19" id="1623" />
-<TGConnectingPoint num="20" id="1624" />
-<TGConnectingPoint num="21" id="1625" />
-<TGConnectingPoint num="22" id="1626" />
-<TGConnectingPoint num="23" id="1627" />
-<TGConnectingPoint num="24" id="1628" />
-<TGConnectingPoint num="25" id="1629" />
-<TGConnectingPoint num="26" id="1630" />
-<TGConnectingPoint num="27" id="1631" />
-<TGConnectingPoint num="28" id="1632" />
-<TGConnectingPoint num="29" id="1633" />
-<TGConnectingPoint num="30" id="1634" />
-<TGConnectingPoint num="31" id="1635" />
-<TGConnectingPoint num="32" id="1636" />
-<TGConnectingPoint num="33" id="1637" />
-<TGConnectingPoint num="34" id="1638" />
-<TGConnectingPoint num="35" id="1639" />
-<TGConnectingPoint num="36" id="1640" />
-<TGConnectingPoint num="37" id="1641" />
-<TGConnectingPoint num="38" id="1642" />
-<TGConnectingPoint num="39" id="1643" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(newCert)" />
+<TGConnectingPoint num="0" id="1560" />
+<TGConnectingPoint num="1" id="1561" />
+<TGConnectingPoint num="2" id="1562" />
+<TGConnectingPoint num="3" id="1563" />
+<TGConnectingPoint num="4" id="1564" />
+<TGConnectingPoint num="5" id="1565" />
+<TGConnectingPoint num="6" id="1566" />
+<TGConnectingPoint num="7" id="1567" />
+<TGConnectingPoint num="8" id="1568" />
+<TGConnectingPoint num="9" id="1569" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1685" >
-<cdparam x="338" y="486" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1581" >
+<cdparam x="328" y="433" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="1645" />
-<TGConnectingPoint num="1" id="1646" />
-<TGConnectingPoint num="2" id="1647" />
-<TGConnectingPoint num="3" id="1648" />
-<TGConnectingPoint num="4" id="1649" />
-<TGConnectingPoint num="5" id="1650" />
-<TGConnectingPoint num="6" id="1651" />
-<TGConnectingPoint num="7" id="1652" />
-<TGConnectingPoint num="8" id="1653" />
-<TGConnectingPoint num="9" id="1654" />
-<TGConnectingPoint num="10" id="1655" />
-<TGConnectingPoint num="11" id="1656" />
-<TGConnectingPoint num="12" id="1657" />
-<TGConnectingPoint num="13" id="1658" />
-<TGConnectingPoint num="14" id="1659" />
-<TGConnectingPoint num="15" id="1660" />
-<TGConnectingPoint num="16" id="1661" />
-<TGConnectingPoint num="17" id="1662" />
-<TGConnectingPoint num="18" id="1663" />
-<TGConnectingPoint num="19" id="1664" />
-<TGConnectingPoint num="20" id="1665" />
-<TGConnectingPoint num="21" id="1666" />
-<TGConnectingPoint num="22" id="1667" />
-<TGConnectingPoint num="23" id="1668" />
-<TGConnectingPoint num="24" id="1669" />
-<TGConnectingPoint num="25" id="1670" />
-<TGConnectingPoint num="26" id="1671" />
-<TGConnectingPoint num="27" id="1672" />
-<TGConnectingPoint num="28" id="1673" />
-<TGConnectingPoint num="29" id="1674" />
-<TGConnectingPoint num="30" id="1675" />
-<TGConnectingPoint num="31" id="1676" />
-<TGConnectingPoint num="32" id="1677" />
-<TGConnectingPoint num="33" id="1678" />
-<TGConnectingPoint num="34" id="1679" />
-<TGConnectingPoint num="35" id="1680" />
-<TGConnectingPoint num="36" id="1681" />
-<TGConnectingPoint num="37" id="1682" />
-<TGConnectingPoint num="38" id="1683" />
-<TGConnectingPoint num="39" id="1684" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(newCert)" />
+<TGConnectingPoint num="0" id="1571" />
+<TGConnectingPoint num="1" id="1572" />
+<TGConnectingPoint num="2" id="1573" />
+<TGConnectingPoint num="3" id="1574" />
+<TGConnectingPoint num="4" id="1575" />
+<TGConnectingPoint num="5" id="1576" />
+<TGConnectingPoint num="6" id="1577" />
+<TGConnectingPoint num="7" id="1578" />
+<TGConnectingPoint num="8" id="1579" />
+<TGConnectingPoint num="9" id="1580" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1696" >
-<cdparam x="372" y="429" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1592" >
+<cdparam x="349" y="181" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="1686" />
-<TGConnectingPoint num="1" id="1687" />
-<TGConnectingPoint num="2" id="1688" />
-<TGConnectingPoint num="3" id="1689" />
-<TGConnectingPoint num="4" id="1690" />
-<TGConnectingPoint num="5" id="1691" />
-<TGConnectingPoint num="6" id="1692" />
-<TGConnectingPoint num="7" id="1693" />
-<TGConnectingPoint num="8" id="1694" />
-<TGConnectingPoint num="9" id="1695" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chin(m)" />
+<TGConnectingPoint num="0" id="1582" />
+<TGConnectingPoint num="1" id="1583" />
+<TGConnectingPoint num="2" id="1584" />
+<TGConnectingPoint num="3" id="1585" />
+<TGConnectingPoint num="4" id="1586" />
+<TGConnectingPoint num="5" id="1587" />
+<TGConnectingPoint num="6" id="1588" />
+<TGConnectingPoint num="7" id="1589" />
+<TGConnectingPoint num="8" id="1590" />
+<TGConnectingPoint num="9" id="1591" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1737" >
-<cdparam x="342" y="354" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1633" >
+<cdparam x="399" y="108" />
+<sizeparam width="100" height="39" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="1697" />
-<TGConnectingPoint num="1" id="1698" />
-<TGConnectingPoint num="2" id="1699" />
-<TGConnectingPoint num="3" id="1700" />
-<TGConnectingPoint num="4" id="1701" />
-<TGConnectingPoint num="5" id="1702" />
-<TGConnectingPoint num="6" id="1703" />
-<TGConnectingPoint num="7" id="1704" />
-<TGConnectingPoint num="8" id="1705" />
-<TGConnectingPoint num="9" id="1706" />
-<TGConnectingPoint num="10" id="1707" />
-<TGConnectingPoint num="11" id="1708" />
-<TGConnectingPoint num="12" id="1709" />
-<TGConnectingPoint num="13" id="1710" />
-<TGConnectingPoint num="14" id="1711" />
-<TGConnectingPoint num="15" id="1712" />
-<TGConnectingPoint num="16" id="1713" />
-<TGConnectingPoint num="17" id="1714" />
-<TGConnectingPoint num="18" id="1715" />
-<TGConnectingPoint num="19" id="1716" />
-<TGConnectingPoint num="20" id="1717" />
-<TGConnectingPoint num="21" id="1718" />
-<TGConnectingPoint num="22" id="1719" />
-<TGConnectingPoint num="23" id="1720" />
-<TGConnectingPoint num="24" id="1721" />
-<TGConnectingPoint num="25" id="1722" />
-<TGConnectingPoint num="26" id="1723" />
-<TGConnectingPoint num="27" id="1724" />
-<TGConnectingPoint num="28" id="1725" />
-<TGConnectingPoint num="29" id="1726" />
-<TGConnectingPoint num="30" id="1727" />
-<TGConnectingPoint num="31" id="1728" />
-<TGConnectingPoint num="32" id="1729" />
-<TGConnectingPoint num="33" id="1730" />
-<TGConnectingPoint num="34" id="1731" />
-<TGConnectingPoint num="35" id="1732" />
-<TGConnectingPoint num="36" id="1733" />
-<TGConnectingPoint num="37" id="1734" />
-<TGConnectingPoint num="38" id="1735" />
-<TGConnectingPoint num="39" id="1736" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="waiting" />
+<TGConnectingPoint num="0" id="1593" />
+<TGConnectingPoint num="1" id="1594" />
+<TGConnectingPoint num="2" id="1595" />
+<TGConnectingPoint num="3" id="1596" />
+<TGConnectingPoint num="4" id="1597" />
+<TGConnectingPoint num="5" id="1598" />
+<TGConnectingPoint num="6" id="1599" />
+<TGConnectingPoint num="7" id="1600" />
+<TGConnectingPoint num="8" id="1601" />
+<TGConnectingPoint num="9" id="1602" />
+<TGConnectingPoint num="10" id="1603" />
+<TGConnectingPoint num="11" id="1604" />
+<TGConnectingPoint num="12" id="1605" />
+<TGConnectingPoint num="13" id="1606" />
+<TGConnectingPoint num="14" id="1607" />
+<TGConnectingPoint num="15" id="1608" />
+<TGConnectingPoint num="16" id="1609" />
+<TGConnectingPoint num="17" id="1610" />
+<TGConnectingPoint num="18" id="1611" />
+<TGConnectingPoint num="19" id="1612" />
+<TGConnectingPoint num="20" id="1613" />
+<TGConnectingPoint num="21" id="1614" />
+<TGConnectingPoint num="22" id="1615" />
+<TGConnectingPoint num="23" id="1616" />
+<TGConnectingPoint num="24" id="1617" />
+<TGConnectingPoint num="25" id="1618" />
+<TGConnectingPoint num="26" id="1619" />
+<TGConnectingPoint num="27" id="1620" />
+<TGConnectingPoint num="28" id="1621" />
+<TGConnectingPoint num="29" id="1622" />
+<TGConnectingPoint num="30" id="1623" />
+<TGConnectingPoint num="31" id="1624" />
+<TGConnectingPoint num="32" id="1625" />
+<TGConnectingPoint num="33" id="1626" />
+<TGConnectingPoint num="34" id="1627" />
+<TGConnectingPoint num="35" id="1628" />
+<TGConnectingPoint num="36" id="1629" />
+<TGConnectingPoint num="37" id="1630" />
+<TGConnectingPoint num="38" id="1631" />
+<TGConnectingPoint num="39" id="1632" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1739" >
-<cdparam x="400" y="50" />
+<COMPONENT type="5100" id="1635" >
+<cdparam x="404" y="51" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1738" />
+<TGConnectingPoint num="0" id="1634" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1746" >
+<CONNECTOR type="5102" id="2298" >
+<cdparam x="608" y="388" />
+<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="2300" />
+<P1  x="404" y="406" id="2257" />
+<P2  x="383" y="493" id="1881" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2302" >
+<father id="2298" num="0" />
+<cdparam x="408" y="443" />
+<sizeparam width="150" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2303" />
+<TGConnectingPoint num="1" id="2304" />
+<TGConnectingPoint num="2" id="2305" />
+<TGConnectingPoint num="3" id="2306" />
+<extraparam>
+<guard value="[ m2.data == bobID ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="bobPubK.data = m.data" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="2250" >
+<cdparam x="354" y="356" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="state0" />
+<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" />
+<TGConnectingPoint num="10" id="2261" />
+<TGConnectingPoint num="11" id="2262" />
+<TGConnectingPoint num="12" id="2263" />
+<TGConnectingPoint num="13" id="2264" />
+<TGConnectingPoint num="14" id="2265" />
+<TGConnectingPoint num="15" id="2266" />
+<TGConnectingPoint num="16" id="2267" />
+<TGConnectingPoint num="17" id="2268" />
+<TGConnectingPoint num="18" id="2269" />
+<TGConnectingPoint num="19" id="2270" />
+<TGConnectingPoint num="20" id="2271" />
+<TGConnectingPoint num="21" id="2272" />
+<TGConnectingPoint num="22" id="2273" />
+<TGConnectingPoint num="23" id="2274" />
+<TGConnectingPoint num="24" id="2275" />
+<TGConnectingPoint num="25" id="2276" />
+<TGConnectingPoint num="26" id="2277" />
+<TGConnectingPoint num="27" id="2278" />
+<TGConnectingPoint num="28" id="2279" />
+<TGConnectingPoint num="29" id="2280" />
+<TGConnectingPoint num="30" id="2281" />
+<TGConnectingPoint num="31" id="2282" />
+<TGConnectingPoint num="32" id="2283" />
+<TGConnectingPoint num="33" id="2284" />
+<TGConnectingPoint num="34" id="2285" />
+<TGConnectingPoint num="35" id="2286" />
+<TGConnectingPoint num="36" id="2287" />
+<TGConnectingPoint num="37" id="2288" />
+<TGConnectingPoint num="38" id="2289" />
+<TGConnectingPoint num="39" id="2290" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5102" id="1642" >
 <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="1745" />
-<P1  x="407" y="70" id="2025" />
-<P2  x="412" y="100" id="1849" />
+<TGConnectingPoint num="0" id="1641" />
+<P1  x="407" y="70" id="1921" />
+<P2  x="412" y="100" id="1745" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1744" >
-<father id="1746" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1640" >
+<father id="1642" num="0" />
 <cdparam x="409" y="85" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1740" />
-<TGConnectingPoint num="1" id="1741" />
-<TGConnectingPoint num="2" id="1742" />
-<TGConnectingPoint num="3" id="1743" />
+<TGConnectingPoint num="0" id="1636" />
+<TGConnectingPoint num="1" id="1637" />
+<TGConnectingPoint num="2" id="1638" />
+<TGConnectingPoint num="3" id="1639" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3507,25 +3607,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1753" >
-<cdparam x="411" y="567" />
+<CONNECTOR type="5102" id="1649" >
+<cdparam x="390" y="707" />
 <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="1752" />
-<P1  x="411" y="567" id="1931" />
-<P2  x="420" y="613" id="1890" />
+<TGConnectingPoint num="0" id="1648" />
+<P1  x="390" y="707" id="1827" />
+<P2  x="399" y="753" id="1786" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1751" >
-<father id="1753" num="0" />
-<cdparam x="453" y="610" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1647" >
+<father id="1649" num="0" />
+<cdparam x="432" y="750" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1747" />
-<TGConnectingPoint num="1" id="1748" />
-<TGConnectingPoint num="2" id="1749" />
-<TGConnectingPoint num="3" id="1750" />
+<TGConnectingPoint num="0" id="1643" />
+<TGConnectingPoint num="1" id="1644" />
+<TGConnectingPoint num="2" id="1645" />
+<TGConnectingPoint num="3" id="1646" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3535,25 +3635,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1760" >
-<cdparam x="496" y="703" />
+<CONNECTOR type="5102" id="1656" >
+<cdparam x="475" y="843" />
 <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="1759" />
-<P1  x="420" y="663" id="1895" />
-<P2  x="438" y="703" id="1941" />
+<TGConnectingPoint num="0" id="1655" />
+<P1  x="399" y="803" id="1791" />
+<P2  x="417" y="843" id="1837" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1758" >
-<father id="1760" num="0" />
-<cdparam x="453" y="697" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1654" >
+<father id="1656" num="0" />
+<cdparam x="432" y="837" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1754" />
-<TGConnectingPoint num="1" id="1755" />
-<TGConnectingPoint num="2" id="1756" />
-<TGConnectingPoint num="3" id="1757" />
+<TGConnectingPoint num="0" id="1650" />
+<TGConnectingPoint num="1" id="1651" />
+<TGConnectingPoint num="2" id="1652" />
+<TGConnectingPoint num="3" id="1653" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3563,25 +3663,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1767" >
-<cdparam x="411" y="508" />
+<CONNECTOR type="5102" id="1663" >
+<cdparam x="390" y="648" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="1766" />
-<P1  x="411" y="508" id="1949" />
-<P2  x="411" y="537" id="1930" />
+<TGConnectingPoint num="0" id="1662" />
+<P1  x="390" y="648" id="1845" />
+<P2  x="390" y="677" id="1826" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1765" >
-<father id="1767" num="0" />
-<cdparam x="411" y="548" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1661" >
+<father id="1663" num="0" />
+<cdparam x="390" y="688" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1761" />
-<TGConnectingPoint num="1" id="1762" />
-<TGConnectingPoint num="2" id="1763" />
-<TGConnectingPoint num="3" id="1764" />
+<TGConnectingPoint num="0" id="1657" />
+<TGConnectingPoint num="1" id="1658" />
+<TGConnectingPoint num="2" id="1659" />
+<TGConnectingPoint num="3" id="1660" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3591,25 +3691,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1774" >
+<CONNECTOR type="5102" id="1670" >
 <cdparam x="411" y="389" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1773" />
-<P1  x="411" y="389" id="1990" />
-<P2  x="411" y="468" id="1944" />
+<TGConnectingPoint num="0" id="1669" />
+<P1  x="383" y="533" id="1886" />
+<P2  x="390" y="608" id="1840" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1772" >
-<father id="1774" num="0" />
-<cdparam x="439" y="414" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1668" >
+<father id="1670" num="0" />
+<cdparam x="421" y="563" />
 <sizeparam width="152" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1768" />
-<TGConnectingPoint num="1" id="1769" />
-<TGConnectingPoint num="2" id="1770" />
-<TGConnectingPoint num="3" id="1771" />
+<TGConnectingPoint num="0" id="1664" />
+<TGConnectingPoint num="1" id="1665" />
+<TGConnectingPoint num="2" id="1666" />
+<TGConnectingPoint num="3" id="1667" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3622,25 +3722,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1781" >
+<CONNECTOR type="5102" id="1677" >
 <cdparam x="380" y="258" />
 <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="1780" />
-<P1  x="393" y="134" id="1877" />
-<P2  x="394" y="160" id="1837" />
+<TGConnectingPoint num="0" id="1676" />
+<P1  x="393" y="134" id="1773" />
+<P2  x="394" y="160" id="1733" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1779" >
-<father id="1781" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1675" >
+<father id="1677" num="0" />
 <cdparam x="377" y="267" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1775" />
-<TGConnectingPoint num="1" id="1776" />
-<TGConnectingPoint num="2" id="1777" />
-<TGConnectingPoint num="3" id="1778" />
+<TGConnectingPoint num="0" id="1671" />
+<TGConnectingPoint num="1" id="1672" />
+<TGConnectingPoint num="2" id="1673" />
+<TGConnectingPoint num="3" id="1674" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3650,25 +3750,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1788" >
+<CONNECTOR type="5102" id="1684" >
 <cdparam x="412" y="134" />
 <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="1787" />
-<P1  x="394" y="190" id="1838" />
-<P2  x="396" y="253" id="1797" />
+<TGConnectingPoint num="0" id="1683" />
+<P1  x="394" y="190" id="1734" />
+<P2  x="396" y="253" id="1693" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1786" >
-<father id="1788" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1682" >
+<father id="1684" num="0" />
 <cdparam x="462" y="185" />
-<sizeparam width="228" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="228" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1782" />
-<TGConnectingPoint num="1" id="1783" />
-<TGConnectingPoint num="2" id="1784" />
-<TGConnectingPoint num="3" id="1785" />
+<TGConnectingPoint num="0" id="1678" />
+<TGConnectingPoint num="1" id="1679" />
+<TGConnectingPoint num="2" id="1680" />
+<TGConnectingPoint num="3" id="1681" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3676,505 +3776,418 @@
 <computeMin value="" />
 <computeMax value="" />
 <actions value="get2(m, m1, sig)" />
-<actions value="get2(m1, m, m2)" />
-<actions value="m2.data = bobID" />
-<actions value="m1 = concat2(m, m2)" />
 <actions value="certOK = verifySign(m1, sig, CAPubK)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1795" >
+<CONNECTOR type="5102" id="1691" >
 <cdparam x="408" y="272" />
 <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="1794" />
-<P1  x="396" y="283" id="1802" />
-<P2  x="411" y="349" id="1985" />
+<TGConnectingPoint num="0" id="1690" />
+<P1  x="421" y="283" id="1707" />
+<P2  x="404" y="356" id="2252" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1793" >
-<father id="1795" num="0" />
-<cdparam x="427" y="308" />
-<sizeparam width="150" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1689" >
+<father id="1691" num="0" />
+<cdparam x="462" y="301" />
+<sizeparam width="104" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1789" />
-<TGConnectingPoint num="1" id="1790" />
-<TGConnectingPoint num="2" id="1791" />
-<TGConnectingPoint num="3" id="1792" />
+<TGConnectingPoint num="0" id="1685" />
+<TGConnectingPoint num="1" id="1686" />
+<TGConnectingPoint num="2" id="1687" />
+<TGConnectingPoint num="3" id="1688" />
 <extraparam>
 <guard value="[ certOK ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="bobPubK.data = m.data" />
+<actions value="get2(m1, m, m2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1836" >
+<COMPONENT type="5106" id="1732" >
 <cdparam x="346" y="253" />
 <sizeparam width="100" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="verifyCert" />
-<TGConnectingPoint num="0" id="1796" />
-<TGConnectingPoint num="1" id="1797" />
-<TGConnectingPoint num="2" id="1798" />
-<TGConnectingPoint num="3" id="1799" />
-<TGConnectingPoint num="4" id="1800" />
-<TGConnectingPoint num="5" id="1801" />
-<TGConnectingPoint num="6" id="1802" />
-<TGConnectingPoint num="7" id="1803" />
-<TGConnectingPoint num="8" id="1804" />
-<TGConnectingPoint num="9" id="1805" />
-<TGConnectingPoint num="10" id="1806" />
-<TGConnectingPoint num="11" id="1807" />
-<TGConnectingPoint num="12" id="1808" />
-<TGConnectingPoint num="13" id="1809" />
-<TGConnectingPoint num="14" id="1810" />
-<TGConnectingPoint num="15" id="1811" />
-<TGConnectingPoint num="16" id="1812" />
-<TGConnectingPoint num="17" id="1813" />
-<TGConnectingPoint num="18" id="1814" />
-<TGConnectingPoint num="19" id="1815" />
-<TGConnectingPoint num="20" id="1816" />
-<TGConnectingPoint num="21" id="1817" />
-<TGConnectingPoint num="22" id="1818" />
-<TGConnectingPoint num="23" id="1819" />
-<TGConnectingPoint num="24" id="1820" />
-<TGConnectingPoint num="25" id="1821" />
-<TGConnectingPoint num="26" id="1822" />
-<TGConnectingPoint num="27" id="1823" />
-<TGConnectingPoint num="28" id="1824" />
-<TGConnectingPoint num="29" id="1825" />
-<TGConnectingPoint num="30" id="1826" />
-<TGConnectingPoint num="31" id="1827" />
-<TGConnectingPoint num="32" id="1828" />
-<TGConnectingPoint num="33" id="1829" />
-<TGConnectingPoint num="34" id="1830" />
-<TGConnectingPoint num="35" id="1831" />
-<TGConnectingPoint num="36" id="1832" />
-<TGConnectingPoint num="37" id="1833" />
-<TGConnectingPoint num="38" id="1834" />
-<TGConnectingPoint num="39" id="1835" />
+<TGConnectingPoint num="0" id="1692" />
+<TGConnectingPoint num="1" id="1693" />
+<TGConnectingPoint num="2" id="1694" />
+<TGConnectingPoint num="3" id="1695" />
+<TGConnectingPoint num="4" id="1696" />
+<TGConnectingPoint num="5" id="1697" />
+<TGConnectingPoint num="6" id="1698" />
+<TGConnectingPoint num="7" id="1699" />
+<TGConnectingPoint num="8" id="1700" />
+<TGConnectingPoint num="9" id="1701" />
+<TGConnectingPoint num="10" id="1702" />
+<TGConnectingPoint num="11" id="1703" />
+<TGConnectingPoint num="12" id="1704" />
+<TGConnectingPoint num="13" id="1705" />
+<TGConnectingPoint num="14" id="1706" />
+<TGConnectingPoint num="15" id="1707" />
+<TGConnectingPoint num="16" id="1708" />
+<TGConnectingPoint num="17" id="1709" />
+<TGConnectingPoint num="18" id="1710" />
+<TGConnectingPoint num="19" id="1711" />
+<TGConnectingPoint num="20" id="1712" />
+<TGConnectingPoint num="21" id="1713" />
+<TGConnectingPoint num="22" id="1714" />
+<TGConnectingPoint num="23" id="1715" />
+<TGConnectingPoint num="24" id="1716" />
+<TGConnectingPoint num="25" id="1717" />
+<TGConnectingPoint num="26" id="1718" />
+<TGConnectingPoint num="27" id="1719" />
+<TGConnectingPoint num="28" id="1720" />
+<TGConnectingPoint num="29" id="1721" />
+<TGConnectingPoint num="30" id="1722" />
+<TGConnectingPoint num="31" id="1723" />
+<TGConnectingPoint num="32" id="1724" />
+<TGConnectingPoint num="33" id="1725" />
+<TGConnectingPoint num="34" id="1726" />
+<TGConnectingPoint num="35" id="1727" />
+<TGConnectingPoint num="36" id="1728" />
+<TGConnectingPoint num="37" id="1729" />
+<TGConnectingPoint num="38" id="1730" />
+<TGConnectingPoint num="39" id="1731" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1847" >
+<COMPONENT type="5104" id="1743" >
 <cdparam x="362" y="165" />
 <sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="chin(m)" />
-<TGConnectingPoint num="0" id="1837" />
-<TGConnectingPoint num="1" id="1838" />
-<TGConnectingPoint num="2" id="1839" />
-<TGConnectingPoint num="3" id="1840" />
-<TGConnectingPoint num="4" id="1841" />
-<TGConnectingPoint num="5" id="1842" />
-<TGConnectingPoint num="6" id="1843" />
-<TGConnectingPoint num="7" id="1844" />
-<TGConnectingPoint num="8" id="1845" />
-<TGConnectingPoint num="9" id="1846" />
+<TGConnectingPoint num="0" id="1733" />
+<TGConnectingPoint num="1" id="1734" />
+<TGConnectingPoint num="2" id="1735" />
+<TGConnectingPoint num="3" id="1736" />
+<TGConnectingPoint num="4" id="1737" />
+<TGConnectingPoint num="5" id="1738" />
+<TGConnectingPoint num="6" id="1739" />
+<TGConnectingPoint num="7" id="1740" />
+<TGConnectingPoint num="8" id="1741" />
+<TGConnectingPoint num="9" id="1742" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1888" >
+<COMPONENT type="5106" id="1784" >
 <cdparam x="339" y="100" />
 <sizeparam width="147" height="34" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="receivingBobCert" />
-<TGConnectingPoint num="0" id="1848" />
-<TGConnectingPoint num="1" id="1849" />
-<TGConnectingPoint num="2" id="1850" />
-<TGConnectingPoint num="3" id="1851" />
-<TGConnectingPoint num="4" id="1852" />
-<TGConnectingPoint num="5" id="1853" />
-<TGConnectingPoint num="6" id="1854" />
-<TGConnectingPoint num="7" id="1855" />
-<TGConnectingPoint num="8" id="1856" />
-<TGConnectingPoint num="9" id="1857" />
-<TGConnectingPoint num="10" id="1858" />
-<TGConnectingPoint num="11" id="1859" />
-<TGConnectingPoint num="12" id="1860" />
-<TGConnectingPoint num="13" id="1861" />
-<TGConnectingPoint num="14" id="1862" />
-<TGConnectingPoint num="15" id="1863" />
-<TGConnectingPoint num="16" id="1864" />
-<TGConnectingPoint num="17" id="1865" />
-<TGConnectingPoint num="18" id="1866" />
-<TGConnectingPoint num="19" id="1867" />
-<TGConnectingPoint num="20" id="1868" />
-<TGConnectingPoint num="21" id="1869" />
-<TGConnectingPoint num="22" id="1870" />
-<TGConnectingPoint num="23" id="1871" />
-<TGConnectingPoint num="24" id="1872" />
-<TGConnectingPoint num="25" id="1873" />
-<TGConnectingPoint num="26" id="1874" />
-<TGConnectingPoint num="27" id="1875" />
-<TGConnectingPoint num="28" id="1876" />
-<TGConnectingPoint num="29" id="1877" />
-<TGConnectingPoint num="30" id="1878" />
-<TGConnectingPoint num="31" id="1879" />
-<TGConnectingPoint num="32" id="1880" />
-<TGConnectingPoint num="33" id="1881" />
-<TGConnectingPoint num="34" id="1882" />
-<TGConnectingPoint num="35" id="1883" />
-<TGConnectingPoint num="36" id="1884" />
-<TGConnectingPoint num="37" id="1885" />
-<TGConnectingPoint num="38" id="1886" />
-<TGConnectingPoint num="39" id="1887" />
+<TGConnectingPoint num="0" id="1744" />
+<TGConnectingPoint num="1" id="1745" />
+<TGConnectingPoint num="2" id="1746" />
+<TGConnectingPoint num="3" id="1747" />
+<TGConnectingPoint num="4" id="1748" />
+<TGConnectingPoint num="5" id="1749" />
+<TGConnectingPoint num="6" id="1750" />
+<TGConnectingPoint num="7" id="1751" />
+<TGConnectingPoint num="8" id="1752" />
+<TGConnectingPoint num="9" id="1753" />
+<TGConnectingPoint num="10" id="1754" />
+<TGConnectingPoint num="11" id="1755" />
+<TGConnectingPoint num="12" id="1756" />
+<TGConnectingPoint num="13" id="1757" />
+<TGConnectingPoint num="14" id="1758" />
+<TGConnectingPoint num="15" id="1759" />
+<TGConnectingPoint num="16" id="1760" />
+<TGConnectingPoint num="17" id="1761" />
+<TGConnectingPoint num="18" id="1762" />
+<TGConnectingPoint num="19" id="1763" />
+<TGConnectingPoint num="20" id="1764" />
+<TGConnectingPoint num="21" id="1765" />
+<TGConnectingPoint num="22" id="1766" />
+<TGConnectingPoint num="23" id="1767" />
+<TGConnectingPoint num="24" id="1768" />
+<TGConnectingPoint num="25" id="1769" />
+<TGConnectingPoint num="26" id="1770" />
+<TGConnectingPoint num="27" id="1771" />
+<TGConnectingPoint num="28" id="1772" />
+<TGConnectingPoint num="29" id="1773" />
+<TGConnectingPoint num="30" id="1774" />
+<TGConnectingPoint num="31" id="1775" />
+<TGConnectingPoint num="32" id="1776" />
+<TGConnectingPoint num="33" id="1777" />
+<TGConnectingPoint num="34" id="1778" />
+<TGConnectingPoint num="35" id="1779" />
+<TGConnectingPoint num="36" id="1780" />
+<TGConnectingPoint num="37" id="1781" />
+<TGConnectingPoint num="38" id="1782" />
+<TGConnectingPoint num="39" id="1783" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1929" >
-<cdparam x="370" y="613" />
+<COMPONENT type="5106" id="1825" >
+<cdparam x="349" y="753" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="beforeFinish" />
-<TGConnectingPoint num="0" id="1889" />
-<TGConnectingPoint num="1" id="1890" />
-<TGConnectingPoint num="2" id="1891" />
-<TGConnectingPoint num="3" id="1892" />
-<TGConnectingPoint num="4" id="1893" />
-<TGConnectingPoint num="5" id="1894" />
-<TGConnectingPoint num="6" id="1895" />
-<TGConnectingPoint num="7" id="1896" />
-<TGConnectingPoint num="8" id="1897" />
-<TGConnectingPoint num="9" id="1898" />
-<TGConnectingPoint num="10" id="1899" />
-<TGConnectingPoint num="11" id="1900" />
-<TGConnectingPoint num="12" id="1901" />
-<TGConnectingPoint num="13" id="1902" />
-<TGConnectingPoint num="14" id="1903" />
-<TGConnectingPoint num="15" id="1904" />
-<TGConnectingPoint num="16" id="1905" />
-<TGConnectingPoint num="17" id="1906" />
-<TGConnectingPoint num="18" id="1907" />
-<TGConnectingPoint num="19" id="1908" />
-<TGConnectingPoint num="20" id="1909" />
-<TGConnectingPoint num="21" id="1910" />
-<TGConnectingPoint num="22" id="1911" />
-<TGConnectingPoint num="23" id="1912" />
-<TGConnectingPoint num="24" id="1913" />
-<TGConnectingPoint num="25" id="1914" />
-<TGConnectingPoint num="26" id="1915" />
-<TGConnectingPoint num="27" id="1916" />
-<TGConnectingPoint num="28" id="1917" />
-<TGConnectingPoint num="29" id="1918" />
-<TGConnectingPoint num="30" id="1919" />
-<TGConnectingPoint num="31" id="1920" />
-<TGConnectingPoint num="32" id="1921" />
-<TGConnectingPoint num="33" id="1922" />
-<TGConnectingPoint num="34" id="1923" />
-<TGConnectingPoint num="35" id="1924" />
-<TGConnectingPoint num="36" id="1925" />
-<TGConnectingPoint num="37" id="1926" />
-<TGConnectingPoint num="38" id="1927" />
-<TGConnectingPoint num="39" id="1928" />
+<TGConnectingPoint num="0" id="1785" />
+<TGConnectingPoint num="1" id="1786" />
+<TGConnectingPoint num="2" id="1787" />
+<TGConnectingPoint num="3" id="1788" />
+<TGConnectingPoint num="4" id="1789" />
+<TGConnectingPoint num="5" id="1790" />
+<TGConnectingPoint num="6" id="1791" />
+<TGConnectingPoint num="7" id="1792" />
+<TGConnectingPoint num="8" id="1793" />
+<TGConnectingPoint num="9" id="1794" />
+<TGConnectingPoint num="10" id="1795" />
+<TGConnectingPoint num="11" id="1796" />
+<TGConnectingPoint num="12" id="1797" />
+<TGConnectingPoint num="13" id="1798" />
+<TGConnectingPoint num="14" id="1799" />
+<TGConnectingPoint num="15" id="1800" />
+<TGConnectingPoint num="16" id="1801" />
+<TGConnectingPoint num="17" id="1802" />
+<TGConnectingPoint num="18" id="1803" />
+<TGConnectingPoint num="19" id="1804" />
+<TGConnectingPoint num="20" id="1805" />
+<TGConnectingPoint num="21" id="1806" />
+<TGConnectingPoint num="22" id="1807" />
+<TGConnectingPoint num="23" id="1808" />
+<TGConnectingPoint num="24" id="1809" />
+<TGConnectingPoint num="25" id="1810" />
+<TGConnectingPoint num="26" id="1811" />
+<TGConnectingPoint num="27" id="1812" />
+<TGConnectingPoint num="28" id="1813" />
+<TGConnectingPoint num="29" id="1814" />
+<TGConnectingPoint num="30" id="1815" />
+<TGConnectingPoint num="31" id="1816" />
+<TGConnectingPoint num="32" id="1817" />
+<TGConnectingPoint num="33" id="1818" />
+<TGConnectingPoint num="34" id="1819" />
+<TGConnectingPoint num="35" id="1820" />
+<TGConnectingPoint num="36" id="1821" />
+<TGConnectingPoint num="37" id="1822" />
+<TGConnectingPoint num="38" id="1823" />
+<TGConnectingPoint num="39" id="1824" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1940" >
-<cdparam x="374" y="542" />
+<COMPONENT type="5103" id="1836" >
+<cdparam x="353" y="682" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="1930" />
-<TGConnectingPoint num="1" id="1931" />
-<TGConnectingPoint num="2" id="1932" />
-<TGConnectingPoint num="3" id="1933" />
-<TGConnectingPoint num="4" id="1934" />
-<TGConnectingPoint num="5" id="1935" />
-<TGConnectingPoint num="6" id="1936" />
-<TGConnectingPoint num="7" id="1937" />
-<TGConnectingPoint num="8" id="1938" />
-<TGConnectingPoint num="9" id="1939" />
+<TGConnectingPoint num="0" id="1826" />
+<TGConnectingPoint num="1" id="1827" />
+<TGConnectingPoint num="2" id="1828" />
+<TGConnectingPoint num="3" id="1829" />
+<TGConnectingPoint num="4" id="1830" />
+<TGConnectingPoint num="5" id="1831" />
+<TGConnectingPoint num="6" id="1832" />
+<TGConnectingPoint num="7" id="1833" />
+<TGConnectingPoint num="8" id="1834" />
+<TGConnectingPoint num="9" id="1835" />
 </COMPONENT>
 
-<COMPONENT type="5101" id="1942" >
-<cdparam x="428" y="708" />
+<COMPONENT type="5101" id="1838" >
+<cdparam x="407" y="848" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1941" />
+<TGConnectingPoint num="0" id="1837" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1983" >
-<cdparam x="340" y="468" />
+<COMPONENT type="5106" id="1879" >
+<cdparam x="319" y="608" />
 <sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="1943" />
-<TGConnectingPoint num="1" id="1944" />
-<TGConnectingPoint num="2" id="1945" />
-<TGConnectingPoint num="3" id="1946" />
-<TGConnectingPoint num="4" id="1947" />
-<TGConnectingPoint num="5" id="1948" />
-<TGConnectingPoint num="6" id="1949" />
-<TGConnectingPoint num="7" id="1950" />
-<TGConnectingPoint num="8" id="1951" />
-<TGConnectingPoint num="9" id="1952" />
-<TGConnectingPoint num="10" id="1953" />
-<TGConnectingPoint num="11" id="1954" />
-<TGConnectingPoint num="12" id="1955" />
-<TGConnectingPoint num="13" id="1956" />
-<TGConnectingPoint num="14" id="1957" />
-<TGConnectingPoint num="15" id="1958" />
-<TGConnectingPoint num="16" id="1959" />
-<TGConnectingPoint num="17" id="1960" />
-<TGConnectingPoint num="18" id="1961" />
-<TGConnectingPoint num="19" id="1962" />
-<TGConnectingPoint num="20" id="1963" />
-<TGConnectingPoint num="21" id="1964" />
-<TGConnectingPoint num="22" id="1965" />
-<TGConnectingPoint num="23" id="1966" />
-<TGConnectingPoint num="24" id="1967" />
-<TGConnectingPoint num="25" id="1968" />
-<TGConnectingPoint num="26" id="1969" />
-<TGConnectingPoint num="27" id="1970" />
-<TGConnectingPoint num="28" id="1971" />
-<TGConnectingPoint num="29" id="1972" />
-<TGConnectingPoint num="30" id="1973" />
-<TGConnectingPoint num="31" id="1974" />
-<TGConnectingPoint num="32" id="1975" />
-<TGConnectingPoint num="33" id="1976" />
-<TGConnectingPoint num="34" id="1977" />
-<TGConnectingPoint num="35" id="1978" />
-<TGConnectingPoint num="36" id="1979" />
-<TGConnectingPoint num="37" id="1980" />
-<TGConnectingPoint num="38" id="1981" />
-<TGConnectingPoint num="39" id="1982" />
+<TGConnectingPoint num="0" id="1839" />
+<TGConnectingPoint num="1" id="1840" />
+<TGConnectingPoint num="2" id="1841" />
+<TGConnectingPoint num="3" id="1842" />
+<TGConnectingPoint num="4" id="1843" />
+<TGConnectingPoint num="5" id="1844" />
+<TGConnectingPoint num="6" id="1845" />
+<TGConnectingPoint num="7" id="1846" />
+<TGConnectingPoint num="8" id="1847" />
+<TGConnectingPoint num="9" id="1848" />
+<TGConnectingPoint num="10" id="1849" />
+<TGConnectingPoint num="11" id="1850" />
+<TGConnectingPoint num="12" id="1851" />
+<TGConnectingPoint num="13" id="1852" />
+<TGConnectingPoint num="14" id="1853" />
+<TGConnectingPoint num="15" id="1854" />
+<TGConnectingPoint num="16" id="1855" />
+<TGConnectingPoint num="17" id="1856" />
+<TGConnectingPoint num="18" id="1857" />
+<TGConnectingPoint num="19" id="1858" />
+<TGConnectingPoint num="20" id="1859" />
+<TGConnectingPoint num="21" id="1860" />
+<TGConnectingPoint num="22" id="1861" />
+<TGConnectingPoint num="23" id="1862" />
+<TGConnectingPoint num="24" id="1863" />
+<TGConnectingPoint num="25" id="1864" />
+<TGConnectingPoint num="26" id="1865" />
+<TGConnectingPoint num="27" id="1866" />
+<TGConnectingPoint num="28" id="1867" />
+<TGConnectingPoint num="29" id="1868" />
+<TGConnectingPoint num="30" id="1869" />
+<TGConnectingPoint num="31" id="1870" />
+<TGConnectingPoint num="32" id="1871" />
+<TGConnectingPoint num="33" id="1872" />
+<TGConnectingPoint num="34" id="1873" />
+<TGConnectingPoint num="35" id="1874" />
+<TGConnectingPoint num="36" id="1875" />
+<TGConnectingPoint num="37" id="1876" />
+<TGConnectingPoint num="38" id="1877" />
+<TGConnectingPoint num="39" id="1878" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2024" >
-<cdparam x="344" y="349" />
+<COMPONENT type="5106" id="1920" >
+<cdparam x="316" y="493" />
 <sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="1984" />
-<TGConnectingPoint num="1" id="1985" />
-<TGConnectingPoint num="2" id="1986" />
-<TGConnectingPoint num="3" id="1987" />
-<TGConnectingPoint num="4" id="1988" />
-<TGConnectingPoint num="5" id="1989" />
-<TGConnectingPoint num="6" id="1990" />
-<TGConnectingPoint num="7" id="1991" />
-<TGConnectingPoint num="8" id="1992" />
-<TGConnectingPoint num="9" id="1993" />
-<TGConnectingPoint num="10" id="1994" />
-<TGConnectingPoint num="11" id="1995" />
-<TGConnectingPoint num="12" id="1996" />
-<TGConnectingPoint num="13" id="1997" />
-<TGConnectingPoint num="14" id="1998" />
-<TGConnectingPoint num="15" id="1999" />
-<TGConnectingPoint num="16" id="2000" />
-<TGConnectingPoint num="17" id="2001" />
-<TGConnectingPoint num="18" id="2002" />
-<TGConnectingPoint num="19" id="2003" />
-<TGConnectingPoint num="20" id="2004" />
-<TGConnectingPoint num="21" id="2005" />
-<TGConnectingPoint num="22" id="2006" />
-<TGConnectingPoint num="23" id="2007" />
-<TGConnectingPoint num="24" id="2008" />
-<TGConnectingPoint num="25" id="2009" />
-<TGConnectingPoint num="26" id="2010" />
-<TGConnectingPoint num="27" id="2011" />
-<TGConnectingPoint num="28" id="2012" />
-<TGConnectingPoint num="29" id="2013" />
-<TGConnectingPoint num="30" id="2014" />
-<TGConnectingPoint num="31" id="2015" />
-<TGConnectingPoint num="32" id="2016" />
-<TGConnectingPoint num="33" id="2017" />
-<TGConnectingPoint num="34" id="2018" />
-<TGConnectingPoint num="35" id="2019" />
-<TGConnectingPoint num="36" id="2020" />
-<TGConnectingPoint num="37" id="2021" />
-<TGConnectingPoint num="38" id="2022" />
-<TGConnectingPoint num="39" id="2023" />
+<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>
 </COMPONENT>
 
-<COMPONENT type="5100" id="2026" >
+<COMPONENT type="5100" id="1922" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2025" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="CA" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="2037" >
-<cdparam x="331" y="296" />
-<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="2034" />
-<TGConnectingPoint num="1" id="2035" />
-<TGConnectingPoint num="2" id="2036" />
-<P1  x="338" y="295" id="2135" />
-<P2  x="399" y="127" id="2209" />
-<Point x="90" y="296" />
-<Point x="90" y="127" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2027" >
-<father id="2037" num="0" />
-<cdparam x="90" y="296" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2028" >
-<father id="2037" num="1" />
-<cdparam x="90" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2033" >
-<father id="2037" num="2" />
-<cdparam x="101" y="203" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2029" />
-<TGConnectingPoint num="1" id="2030" />
-<TGConnectingPoint num="2" id="2031" />
-<TGConnectingPoint num="3" id="2032" />
-<extraparam>
-<guard value="[ else ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="2050" >
-<cdparam x="799" y="260" />
-<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="2046" />
-<TGConnectingPoint num="1" id="2047" />
-<TGConnectingPoint num="2" id="2048" />
-<TGConnectingPoint num="3" id="2049" />
-<P1  x="799" y="260" id="2122" />
-<P2  x="499" y="127" id="2210" />
-<Point x="799" y="295" />
-<Point x="1095" y="295" />
-<Point x="1095" y="127" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2038" >
-<father id="2050" num="0" />
-<cdparam x="799" y="295" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2039" >
-<father id="2050" num="1" />
-<cdparam x="1095" y="295" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2040" >
-<father id="2050" num="2" />
-<cdparam x="1095" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2045" >
-<father id="2050" num="3" />
-<cdparam x="649" y="193" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1921" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5106" id="2307" >
+<cdparam x="353" y="353" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2041" />
-<TGConnectingPoint num="1" id="2042" />
-<TGConnectingPoint num="2" id="2043" />
-<TGConnectingPoint num="3" id="2044" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="state0" />
+<TGConnectingPoint num="0" id="2308" />
+<TGConnectingPoint num="1" id="2309" />
+<TGConnectingPoint num="2" id="2310" />
+<TGConnectingPoint num="3" id="2311" />
+<TGConnectingPoint num="4" id="2312" />
+<TGConnectingPoint num="5" id="2313" />
+<TGConnectingPoint num="6" id="2314" />
+<TGConnectingPoint num="7" id="2315" />
+<TGConnectingPoint num="8" id="2316" />
+<TGConnectingPoint num="9" id="2317" />
+<TGConnectingPoint num="10" id="2318" />
+<TGConnectingPoint num="11" id="2319" />
+<TGConnectingPoint num="12" id="2320" />
+<TGConnectingPoint num="13" id="2321" />
+<TGConnectingPoint num="14" id="2322" />
+<TGConnectingPoint num="15" id="2323" />
+<TGConnectingPoint num="16" id="2324" />
+<TGConnectingPoint num="17" id="2325" />
+<TGConnectingPoint num="18" id="2326" />
+<TGConnectingPoint num="19" id="2327" />
+<TGConnectingPoint num="20" id="2328" />
+<TGConnectingPoint num="21" id="2329" />
+<TGConnectingPoint num="22" id="2330" />
+<TGConnectingPoint num="23" id="2331" />
+<TGConnectingPoint num="24" id="2332" />
+<TGConnectingPoint num="25" id="2333" />
+<TGConnectingPoint num="26" id="2334" />
+<TGConnectingPoint num="27" id="2335" />
+<TGConnectingPoint num="28" id="2336" />
+<TGConnectingPoint num="29" id="2337" />
+<TGConnectingPoint num="30" id="2338" />
+<TGConnectingPoint num="31" id="2339" />
+<TGConnectingPoint num="32" id="2340" />
+<TGConnectingPoint num="33" id="2341" />
+<TGConnectingPoint num="34" id="2342" />
+<TGConnectingPoint num="35" id="2343" />
+<TGConnectingPoint num="36" id="2344" />
+<TGConnectingPoint num="37" id="2345" />
+<TGConnectingPoint num="38" id="2346" />
+<TGConnectingPoint num="39" id="2347" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2063" >
-<cdparam x="474" y="253" />
+<CONNECTOR type="5102" id="1929" >
+<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="2059" />
-<TGConnectingPoint num="1" id="2060" />
-<TGConnectingPoint num="2" id="2061" />
-<TGConnectingPoint num="3" id="2062" />
-<P1  x="474" y="253" id="2174" />
-<P2  x="499" y="112" id="2228" />
-<Point x="474" y="351" />
-<Point x="1122" y="352" />
-<Point x="1122" y="112" />
+<TGConnectingPoint num="0" id="1928" />
+<P1  x="407" y="70" id="2247" />
+<P2  x="413" y="90" id="2032" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2051" >
-<father id="2063" num="0" />
-<cdparam x="474" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2052" >
-<father id="2063" num="1" />
-<cdparam x="1122" y="352" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2053" >
-<father id="2063" num="2" />
-<cdparam x="1122" y="112" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2058" >
-<father id="2063" num="3" />
-<cdparam x="486" y="182" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1927" >
+<father id="1929" num="0" />
+<cdparam x="404" y="80" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2054" />
-<TGConnectingPoint num="1" id="2055" />
-<TGConnectingPoint num="2" id="2056" />
-<TGConnectingPoint num="3" id="2057" />
+<TGConnectingPoint num="0" id="1923" />
+<TGConnectingPoint num="1" id="1924" />
+<TGConnectingPoint num="2" id="1925" />
+<TGConnectingPoint num="3" id="1926" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4184,133 +4197,84 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2072" >
-<cdparam x="499" y="137" />
-<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="2070" />
-<TGConnectingPoint num="1" id="2071" />
-<P1  x="499" y="137" id="2219" />
-<P2  x="799" y="230" id="2121" />
-<Point x="799" y="137" />
+<CONNECTOR type="5102" id="1936" >
+<cdparam x="395" y="745" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1935" />
+<P1  x="395" y="745" id="2078" />
+<P2  x="399" y="790" id="2114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2064" >
-<father id="2072" num="0" />
-<cdparam x="799" y="137" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2069" >
-<father id="2072" num="1" />
-<cdparam x="816" y="160" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1934" >
+<father id="1936" num="0" />
+<cdparam x="410" y="769" />
+<sizeparam width="145" 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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2065" />
-<TGConnectingPoint num="1" id="2066" />
-<TGConnectingPoint num="2" id="2067" />
-<TGConnectingPoint num="3" id="2068" />
+<TGConnectingPoint num="0" id="1930" />
+<TGConnectingPoint num="1" id="1931" />
+<TGConnectingPoint num="2" id="1932" />
+<TGConnectingPoint num="3" id="1933" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m1.data = bobPubK.data" />
-<actions value="m2.data = bobID" />
-<actions value="m = concat2(m1, m2)" />
-<actions value="m1 = sign(m, privK)" />
-<actions value="newCert = concat2(m, m1)" />
+<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2079" >
-<cdparam x="391" y="326" />
-<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="2078" />
-<P1  x="388" y="320" id="2138" />
-<P2  x="381" y="428" id="2184" />
+<CONNECTOR type="5102" id="1943" >
+<cdparam x="386" y="639" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1942" />
+<P1  x="386" y="639" id="2160" />
+<P2  x="395" y="705" id="2073" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2077" >
-<father id="2079" num="0" />
-<cdparam x="126" y="354" />
-<sizeparam width="267" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1941" >
+<father id="1943" num="0" />
+<cdparam x="408" y="664" />
+<sizeparam width="157" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2073" />
-<TGConnectingPoint num="1" id="2074" />
-<TGConnectingPoint num="2" id="2075" />
-<TGConnectingPoint num="3" id="2076" />
+<TGConnectingPoint num="0" id="1937" />
+<TGConnectingPoint num="1" id="1938" />
+<TGConnectingPoint num="2" id="1939" />
+<TGConnectingPoint num="3" id="1940" />
 <extraparam>
-<guard value="[ (newID != aliceID) and (newID != bobID) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m1.data = newK.data" />
-<actions value="m2.data = newID" />
-<actions value="m = concat2(m1, m2)" />
-<actions value="m1 = sign(m, privK)" />
-<actions value="newCert = concat2(m, m1)" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
+<actions value="sk = DH(alicePubK, privK)" />
+<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2092" >
-<cdparam x="381" y="290" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2088" />
-<TGConnectingPoint num="1" id="2089" />
-<TGConnectingPoint num="2" id="2090" />
-<TGConnectingPoint num="3" id="2091" />
-<P1  x="381" y="458" id="2185" />
-<P2  x="399" y="117" id="2216" />
-<Point x="381" y="519" />
-<Point x="44" y="519" />
-<Point x="44" y="117" />
+<CONNECTOR type="5102" id="1950" >
+<cdparam x="385" y="567" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1949" />
+<P1  x="385" y="567" id="2196" />
+<P2  x="386" y="599" id="2155" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2080" >
-<father id="2092" num="0" />
-<cdparam x="381" y="519" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2081" >
-<father id="2092" num="1" />
-<cdparam x="44" y="519" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2082" >
-<father id="2092" num="2" />
-<cdparam x="44" y="117" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2087" >
-<father id="2092" num="3" />
-<cdparam x="390" y="203" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1948" >
+<father id="1950" num="0" />
+<cdparam x="385" y="607" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2083" />
-<TGConnectingPoint num="1" id="2084" />
-<TGConnectingPoint num="2" id="2085" />
-<TGConnectingPoint num="3" id="2086" />
+<TGConnectingPoint num="0" id="1944" />
+<TGConnectingPoint num="1" id="1945" />
+<TGConnectingPoint num="2" id="1946" />
+<TGConnectingPoint num="3" id="1947" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4320,25 +4284,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2099" >
-<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="2098" />
-<P1  x="411" y="71" id="2247" />
-<P2  x="411" y="108" id="2222" />
+<CONNECTOR type="5102" id="1957" >
+<cdparam x="385" y="507" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1956" />
+<P1  x="385" y="507" id="2212" />
+<P2  x="385" y="537" id="2195" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2097" >
-<father id="2099" num="0" />
-<cdparam x="409" y="89" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1955" >
+<father id="1957" num="0" />
+<cdparam x="385" y="547" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2093" />
-<TGConnectingPoint num="1" id="2094" />
-<TGConnectingPoint num="2" id="2095" />
-<TGConnectingPoint num="3" id="2096" />
+<TGConnectingPoint num="0" id="1951" />
+<TGConnectingPoint num="1" id="1952" />
+<TGConnectingPoint num="2" id="1953" />
+<TGConnectingPoint num="3" id="1954" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4348,25 +4312,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2106" >
-<cdparam x="399" y="147" />
+<CONNECTOR type="5102" id="1964" >
+<cdparam x="409" 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="2105" />
-<P1  x="399" y="147" id="2211" />
-<P2  x="381" y="176" id="2195" />
+<TGConnectingPoint num="0" id="1963" />
+<P1  x="413" y="128" id="2037" />
+<P2  x="412" y="159" id="2020" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2104" >
-<father id="2106" num="0" />
-<cdparam x="390" y="161" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1962" >
+<father id="1964" num="0" />
+<cdparam x="409" y="281" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2100" />
-<TGConnectingPoint num="1" id="2101" />
-<TGConnectingPoint num="2" id="2102" />
-<TGConnectingPoint num="3" id="2103" />
+<TGConnectingPoint num="0" id="1958" />
+<TGConnectingPoint num="1" id="1959" />
+<TGConnectingPoint num="2" id="1960" />
+<TGConnectingPoint num="3" id="1961" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4376,180 +4340,343 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2113" >
-<cdparam x="381" y="206" />
+<CONNECTOR type="5102" id="1971" >
+<cdparam x="410" y="327" />
 <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="2112" />
-<P1  x="381" y="206" id="2196" />
-<P2  x="388" y="270" id="2133" />
+<TGConnectingPoint num="0" id="1970" />
+<P1  x="412" y="189" id="2021" />
+<P2  x="410" y="267" id="1980" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2111" >
-<father id="2113" num="0" />
-<cdparam x="216" y="224" />
-<sizeparam width="135" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1969" >
+<father id="1971" num="0" />
+<cdparam x="456" y="193" />
+<sizeparam width="228" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2107" />
-<TGConnectingPoint num="1" id="2108" />
-<TGConnectingPoint num="2" id="2109" />
-<TGConnectingPoint num="3" id="2110" />
+<TGConnectingPoint num="0" id="1965" />
+<TGConnectingPoint num="1" id="1966" />
+<TGConnectingPoint num="2" id="1967" />
+<TGConnectingPoint num="3" id="1968" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m, m1, m2)" />
-<actions value="newK.data = m1.data" />
-<actions value="newID = m2.data" />
+<actions value="get2(m, m1, sig)" />
+<actions value="certOK = verifySign(m1, sig, CAPubK)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2120" >
-<cdparam x="499" y="147" />
+<CONNECTOR type="5102" id="1978" >
+<cdparam x="423" y="345" />
 <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="2119" />
-<P1  x="474" y="147" id="2221" />
-<P2  x="474" y="223" id="2173" />
+<TGConnectingPoint num="0" id="1977" />
+<P1  x="435" y="297" id="1994" />
+<P2  x="428" y="353" id="2317" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2118" >
-<father id="2120" num="0" />
-<cdparam x="496" y="166" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1976" >
+<father id="1978" num="0" />
+<cdparam x="450" y="315" />
+<sizeparam width="104" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2114" />
-<TGConnectingPoint num="1" id="2115" />
-<TGConnectingPoint num="2" id="2116" />
-<TGConnectingPoint num="3" id="2117" />
+<TGConnectingPoint num="0" id="1972" />
+<TGConnectingPoint num="1" id="1973" />
+<TGConnectingPoint num="2" id="1974" />
+<TGConnectingPoint num="3" id="1975" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ certOK ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m1.data = alicePubK.data" />
-<actions value="m2.data = aliceID" />
-<actions value="m = concat2(m1, m2)" />
-<actions value="m1 = sign(m, privK)" />
-<actions value="newCert = concat2(m, m1)" />
+<actions value="get2(m1, m, m2)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="2131" >
-<cdparam x="746" y="235" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2019" >
+<cdparam x="360" y="267" />
+<sizeparam width="100" 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="1500" />
-<infoparam name="Send signal" value="chout(newCert)" />
-<TGConnectingPoint num="0" id="2121" />
-<TGConnectingPoint num="1" id="2122" />
-<TGConnectingPoint num="2" id="2123" />
-<TGConnectingPoint num="3" id="2124" />
-<TGConnectingPoint num="4" id="2125" />
-<TGConnectingPoint num="5" id="2126" />
-<TGConnectingPoint num="6" id="2127" />
-<TGConnectingPoint num="7" id="2128" />
-<TGConnectingPoint num="8" id="2129" />
-<TGConnectingPoint num="9" id="2130" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="verifyCert" />
+<TGConnectingPoint num="0" id="1979" />
+<TGConnectingPoint num="1" id="1980" />
+<TGConnectingPoint num="2" id="1981" />
+<TGConnectingPoint num="3" id="1982" />
+<TGConnectingPoint num="4" id="1983" />
+<TGConnectingPoint num="5" id="1984" />
+<TGConnectingPoint num="6" id="1985" />
+<TGConnectingPoint num="7" id="1986" />
+<TGConnectingPoint num="8" id="1987" />
+<TGConnectingPoint num="9" id="1988" />
+<TGConnectingPoint num="10" id="1989" />
+<TGConnectingPoint num="11" id="1990" />
+<TGConnectingPoint num="12" id="1991" />
+<TGConnectingPoint num="13" id="1992" />
+<TGConnectingPoint num="14" id="1993" />
+<TGConnectingPoint num="15" id="1994" />
+<TGConnectingPoint num="16" id="1995" />
+<TGConnectingPoint num="17" id="1996" />
+<TGConnectingPoint num="18" id="1997" />
+<TGConnectingPoint num="19" id="1998" />
+<TGConnectingPoint num="20" id="1999" />
+<TGConnectingPoint num="21" id="2000" />
+<TGConnectingPoint num="22" id="2001" />
+<TGConnectingPoint num="23" id="2002" />
+<TGConnectingPoint num="24" id="2003" />
+<TGConnectingPoint num="25" id="2004" />
+<TGConnectingPoint num="26" id="2005" />
+<TGConnectingPoint num="27" id="2006" />
+<TGConnectingPoint num="28" id="2007" />
+<TGConnectingPoint num="29" id="2008" />
+<TGConnectingPoint num="30" id="2009" />
+<TGConnectingPoint num="31" id="2010" />
+<TGConnectingPoint num="32" id="2011" />
+<TGConnectingPoint num="33" id="2012" />
+<TGConnectingPoint num="34" id="2013" />
+<TGConnectingPoint num="35" id="2014" />
+<TGConnectingPoint num="36" id="2015" />
+<TGConnectingPoint num="37" id="2016" />
+<TGConnectingPoint num="38" id="2017" />
+<TGConnectingPoint num="39" id="2018" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2172" >
-<cdparam x="338" y="270" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2030" >
+<cdparam x="380" y="164" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verifyID" />
-<TGConnectingPoint num="0" id="2132" />
-<TGConnectingPoint num="1" id="2133" />
-<TGConnectingPoint num="2" id="2134" />
-<TGConnectingPoint num="3" id="2135" />
-<TGConnectingPoint num="4" id="2136" />
-<TGConnectingPoint num="5" id="2137" />
-<TGConnectingPoint num="6" id="2138" />
-<TGConnectingPoint num="7" id="2139" />
-<TGConnectingPoint num="8" id="2140" />
-<TGConnectingPoint num="9" id="2141" />
-<TGConnectingPoint num="10" id="2142" />
-<TGConnectingPoint num="11" id="2143" />
-<TGConnectingPoint num="12" id="2144" />
-<TGConnectingPoint num="13" id="2145" />
-<TGConnectingPoint num="14" id="2146" />
-<TGConnectingPoint num="15" id="2147" />
-<TGConnectingPoint num="16" id="2148" />
-<TGConnectingPoint num="17" id="2149" />
-<TGConnectingPoint num="18" id="2150" />
-<TGConnectingPoint num="19" id="2151" />
-<TGConnectingPoint num="20" id="2152" />
-<TGConnectingPoint num="21" id="2153" />
-<TGConnectingPoint num="22" id="2154" />
-<TGConnectingPoint num="23" id="2155" />
-<TGConnectingPoint num="24" id="2156" />
-<TGConnectingPoint num="25" id="2157" />
-<TGConnectingPoint num="26" id="2158" />
-<TGConnectingPoint num="27" id="2159" />
-<TGConnectingPoint num="28" id="2160" />
-<TGConnectingPoint num="29" id="2161" />
-<TGConnectingPoint num="30" id="2162" />
-<TGConnectingPoint num="31" id="2163" />
-<TGConnectingPoint num="32" id="2164" />
-<TGConnectingPoint num="33" id="2165" />
-<TGConnectingPoint num="34" id="2166" />
-<TGConnectingPoint num="35" id="2167" />
-<TGConnectingPoint num="36" id="2168" />
-<TGConnectingPoint num="37" id="2169" />
-<TGConnectingPoint num="38" id="2170" />
-<TGConnectingPoint num="39" id="2171" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="chin(m)" />
+<TGConnectingPoint num="0" id="2020" />
+<TGConnectingPoint num="1" id="2021" />
+<TGConnectingPoint num="2" id="2022" />
+<TGConnectingPoint num="3" id="2023" />
+<TGConnectingPoint num="4" id="2024" />
+<TGConnectingPoint num="5" id="2025" />
+<TGConnectingPoint num="6" id="2026" />
+<TGConnectingPoint num="7" id="2027" />
+<TGConnectingPoint num="8" id="2028" />
+<TGConnectingPoint num="9" id="2029" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2071" >
+<cdparam x="341" y="90" />
+<sizeparam width="144" height="38" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="State" value="receivingAliceCert" />
+<TGConnectingPoint num="0" id="2031" />
+<TGConnectingPoint num="1" id="2032" />
+<TGConnectingPoint num="2" id="2033" />
+<TGConnectingPoint num="3" id="2034" />
+<TGConnectingPoint num="4" id="2035" />
+<TGConnectingPoint num="5" id="2036" />
+<TGConnectingPoint num="6" id="2037" />
+<TGConnectingPoint num="7" id="2038" />
+<TGConnectingPoint num="8" id="2039" />
+<TGConnectingPoint num="9" id="2040" />
+<TGConnectingPoint num="10" id="2041" />
+<TGConnectingPoint num="11" id="2042" />
+<TGConnectingPoint num="12" id="2043" />
+<TGConnectingPoint num="13" id="2044" />
+<TGConnectingPoint num="14" id="2045" />
+<TGConnectingPoint num="15" id="2046" />
+<TGConnectingPoint num="16" id="2047" />
+<TGConnectingPoint num="17" id="2048" />
+<TGConnectingPoint num="18" id="2049" />
+<TGConnectingPoint num="19" id="2050" />
+<TGConnectingPoint num="20" id="2051" />
+<TGConnectingPoint num="21" id="2052" />
+<TGConnectingPoint num="22" id="2053" />
+<TGConnectingPoint num="23" id="2054" />
+<TGConnectingPoint num="24" id="2055" />
+<TGConnectingPoint num="25" id="2056" />
+<TGConnectingPoint num="26" id="2057" />
+<TGConnectingPoint num="27" id="2058" />
+<TGConnectingPoint num="28" id="2059" />
+<TGConnectingPoint num="29" id="2060" />
+<TGConnectingPoint num="30" id="2061" />
+<TGConnectingPoint num="31" id="2062" />
+<TGConnectingPoint num="32" id="2063" />
+<TGConnectingPoint num="33" id="2064" />
+<TGConnectingPoint num="34" id="2065" />
+<TGConnectingPoint num="35" id="2066" />
+<TGConnectingPoint num="36" id="2067" />
+<TGConnectingPoint num="37" id="2068" />
+<TGConnectingPoint num="38" id="2069" />
+<TGConnectingPoint num="39" id="2070" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2183" >
-<cdparam x="421" y="228" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2112" >
+<cdparam x="306" y="705" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chout(newCert)" />
-<TGConnectingPoint num="0" id="2173" />
-<TGConnectingPoint num="1" id="2174" />
-<TGConnectingPoint num="2" id="2175" />
-<TGConnectingPoint num="3" id="2176" />
-<TGConnectingPoint num="4" id="2177" />
-<TGConnectingPoint num="5" id="2178" />
-<TGConnectingPoint num="6" id="2179" />
-<TGConnectingPoint num="7" id="2180" />
-<TGConnectingPoint num="8" id="2181" />
-<TGConnectingPoint num="9" id="2182" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="2072" />
+<TGConnectingPoint num="1" id="2073" />
+<TGConnectingPoint num="2" id="2074" />
+<TGConnectingPoint num="3" id="2075" />
+<TGConnectingPoint num="4" id="2076" />
+<TGConnectingPoint num="5" id="2077" />
+<TGConnectingPoint num="6" id="2078" />
+<TGConnectingPoint num="7" id="2079" />
+<TGConnectingPoint num="8" id="2080" />
+<TGConnectingPoint num="9" id="2081" />
+<TGConnectingPoint num="10" id="2082" />
+<TGConnectingPoint num="11" id="2083" />
+<TGConnectingPoint num="12" id="2084" />
+<TGConnectingPoint num="13" id="2085" />
+<TGConnectingPoint num="14" id="2086" />
+<TGConnectingPoint num="15" id="2087" />
+<TGConnectingPoint num="16" id="2088" />
+<TGConnectingPoint num="17" id="2089" />
+<TGConnectingPoint num="18" id="2090" />
+<TGConnectingPoint num="19" id="2091" />
+<TGConnectingPoint num="20" id="2092" />
+<TGConnectingPoint num="21" id="2093" />
+<TGConnectingPoint num="22" id="2094" />
+<TGConnectingPoint num="23" id="2095" />
+<TGConnectingPoint num="24" id="2096" />
+<TGConnectingPoint num="25" id="2097" />
+<TGConnectingPoint num="26" id="2098" />
+<TGConnectingPoint num="27" id="2099" />
+<TGConnectingPoint num="28" id="2100" />
+<TGConnectingPoint num="29" id="2101" />
+<TGConnectingPoint num="30" id="2102" />
+<TGConnectingPoint num="31" id="2103" />
+<TGConnectingPoint num="32" id="2104" />
+<TGConnectingPoint num="33" id="2105" />
+<TGConnectingPoint num="34" id="2106" />
+<TGConnectingPoint num="35" id="2107" />
+<TGConnectingPoint num="36" id="2108" />
+<TGConnectingPoint num="37" id="2109" />
+<TGConnectingPoint num="38" id="2110" />
+<TGConnectingPoint num="39" id="2111" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2194" >
-<cdparam x="328" y="433" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2153" >
+<cdparam x="329" y="790" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chout(newCert)" />
-<TGConnectingPoint num="0" id="2184" />
-<TGConnectingPoint num="1" id="2185" />
-<TGConnectingPoint num="2" id="2186" />
-<TGConnectingPoint num="3" id="2187" />
-<TGConnectingPoint num="4" id="2188" />
-<TGConnectingPoint num="5" id="2189" />
-<TGConnectingPoint num="6" id="2190" />
-<TGConnectingPoint num="7" id="2191" />
-<TGConnectingPoint num="8" id="2192" />
-<TGConnectingPoint num="9" id="2193" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="2113" />
+<TGConnectingPoint num="1" id="2114" />
+<TGConnectingPoint num="2" id="2115" />
+<TGConnectingPoint num="3" id="2116" />
+<TGConnectingPoint num="4" id="2117" />
+<TGConnectingPoint num="5" id="2118" />
+<TGConnectingPoint num="6" id="2119" />
+<TGConnectingPoint num="7" id="2120" />
+<TGConnectingPoint num="8" id="2121" />
+<TGConnectingPoint num="9" id="2122" />
+<TGConnectingPoint num="10" id="2123" />
+<TGConnectingPoint num="11" id="2124" />
+<TGConnectingPoint num="12" id="2125" />
+<TGConnectingPoint num="13" id="2126" />
+<TGConnectingPoint num="14" id="2127" />
+<TGConnectingPoint num="15" id="2128" />
+<TGConnectingPoint num="16" id="2129" />
+<TGConnectingPoint num="17" id="2130" />
+<TGConnectingPoint num="18" id="2131" />
+<TGConnectingPoint num="19" id="2132" />
+<TGConnectingPoint num="20" id="2133" />
+<TGConnectingPoint num="21" id="2134" />
+<TGConnectingPoint num="22" id="2135" />
+<TGConnectingPoint num="23" id="2136" />
+<TGConnectingPoint num="24" id="2137" />
+<TGConnectingPoint num="25" id="2138" />
+<TGConnectingPoint num="26" id="2139" />
+<TGConnectingPoint num="27" id="2140" />
+<TGConnectingPoint num="28" id="2141" />
+<TGConnectingPoint num="29" id="2142" />
+<TGConnectingPoint num="30" id="2143" />
+<TGConnectingPoint num="31" id="2144" />
+<TGConnectingPoint num="32" id="2145" />
+<TGConnectingPoint num="33" id="2146" />
+<TGConnectingPoint num="34" id="2147" />
+<TGConnectingPoint num="35" id="2148" />
+<TGConnectingPoint num="36" id="2149" />
+<TGConnectingPoint num="37" id="2150" />
+<TGConnectingPoint num="38" id="2151" />
+<TGConnectingPoint num="39" id="2152" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2194" >
+<cdparam x="315" y="599" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="2154" />
+<TGConnectingPoint num="1" id="2155" />
+<TGConnectingPoint num="2" id="2156" />
+<TGConnectingPoint num="3" id="2157" />
+<TGConnectingPoint num="4" id="2158" />
+<TGConnectingPoint num="5" id="2159" />
+<TGConnectingPoint num="6" id="2160" />
+<TGConnectingPoint num="7" id="2161" />
+<TGConnectingPoint num="8" id="2162" />
+<TGConnectingPoint num="9" id="2163" />
+<TGConnectingPoint num="10" id="2164" />
+<TGConnectingPoint num="11" id="2165" />
+<TGConnectingPoint num="12" id="2166" />
+<TGConnectingPoint num="13" id="2167" />
+<TGConnectingPoint num="14" id="2168" />
+<TGConnectingPoint num="15" id="2169" />
+<TGConnectingPoint num="16" id="2170" />
+<TGConnectingPoint num="17" id="2171" />
+<TGConnectingPoint num="18" id="2172" />
+<TGConnectingPoint num="19" id="2173" />
+<TGConnectingPoint num="20" id="2174" />
+<TGConnectingPoint num="21" id="2175" />
+<TGConnectingPoint num="22" id="2176" />
+<TGConnectingPoint num="23" id="2177" />
+<TGConnectingPoint num="24" id="2178" />
+<TGConnectingPoint num="25" id="2179" />
+<TGConnectingPoint num="26" id="2180" />
+<TGConnectingPoint num="27" id="2181" />
+<TGConnectingPoint num="28" id="2182" />
+<TGConnectingPoint num="29" id="2183" />
+<TGConnectingPoint num="30" id="2184" />
+<TGConnectingPoint num="31" id="2185" />
+<TGConnectingPoint num="32" id="2186" />
+<TGConnectingPoint num="33" id="2187" />
+<TGConnectingPoint num="34" id="2188" />
+<TGConnectingPoint num="35" id="2189" />
+<TGConnectingPoint num="36" id="2190" />
+<TGConnectingPoint num="37" id="2191" />
+<TGConnectingPoint num="38" id="2192" />
+<TGConnectingPoint num="39" id="2193" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5104" id="2205" >
-<cdparam x="349" y="181" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="349" y="542" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chin(m)" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chin(m2)" />
 <TGConnectingPoint num="0" id="2195" />
 <TGConnectingPoint num="1" id="2196" />
 <TGConnectingPoint num="2" id="2197" />
@@ -4563,11 +4690,11 @@
 </COMPONENT>
 
 <COMPONENT type="5106" id="2246" >
-<cdparam x="399" y="108" />
-<sizeparam width="100" height="39" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="319" y="467" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="waiting" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="waitingForMessage" />
 <TGConnectingPoint num="0" id="2206" />
 <TGConnectingPoint num="1" id="2207" />
 <TGConnectingPoint num="2" id="2208" />
@@ -4613,14 +4740,45 @@
 </COMPONENT>
 
 <COMPONENT type="5100" id="2248" >
-<cdparam x="404" y="51" />
+<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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
 <TGConnectingPoint num="0" id="2247" />
 </COMPONENT>
 
+<CONNECTOR type="5102" id="2355" >
+<cdparam x="473" y="352" />
+<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="2356" />
+<P1  x="428" y="403" id="2323" />
+<P2  x="451" y="467" id="2208" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2357" >
+<father id="2355" num="0" />
+<cdparam x="463" y="424" />
+<sizeparam width="155" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2358" />
+<TGConnectingPoint num="1" id="2359" />
+<TGConnectingPoint num="2" id="2360" />
+<TGConnectingPoint num="3" id="2361" />
+<extraparam>
+<guard value="[ m2.data == aliceID ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="alicePubK.data = m.data" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
+</extraparam>
+</SUBCOMPONENT>
+
 
 </AVATARStateMachineDiagramPanel>
 
diff --git a/modeling/SysMLSec/EVITA_KeyingProtocol.xml b/modeling/SysMLSec/EVITA_KeyingProtocol.xml
index c2188fd498e40ade306991f9ff4cdcc0c9072899..092578a8a455e4dff4f34044c4f5de44294ca2fe 100644
--- a/modeling/SysMLSec/EVITA_KeyingProtocol.xml
+++ b/modeling/SysMLSec/EVITA_KeyingProtocol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.98-beta3">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="Analysis" nameTab="Analysis" >
 <InteractionOverviewDiagramPanel name="Interaction Overview Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
@@ -59,539 +59,9 @@
 
 </InteractionOverviewDiagramPanel>
 
-<SequenceDiagramPanel name="SesK distribution" minX="10" maxX="2400" minY="10" maxY="900" >
-<COMPONENT type="301" id="473" >
-<cdparam x="387" y="502" />
-<sizeparam width="328" height="65" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM sends an aknowledgement message to ECU1.
-It includes information about partial or total session
-key distribution in the group (SesKDistCode).
-" />
-<TGConnectingPoint num="0" id="465" />
-<TGConnectingPoint num="1" id="466" />
-<TGConnectingPoint num="2" id="467" />
-<TGConnectingPoint num="3" id="468" />
-<TGConnectingPoint num="4" id="469" />
-<TGConnectingPoint num="5" id="470" />
-<TGConnectingPoint num="6" id="471" />
-<TGConnectingPoint num="7" id="472" />
-<extraparam>
-<Line value="ECUKM sends an aknowledgement message to ECU1." />
-<Line value="It includes information about partial or total session" />
-<Line value="key distribution in the group (SesKDistCode)." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="482" >
-<cdparam x="881" y="228" />
-<sizeparam width="310" height="50" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM verifies message integrity, authenticity and
-freshness and then stores the new session key.
-" />
-<TGConnectingPoint num="0" id="474" />
-<TGConnectingPoint num="1" id="475" />
-<TGConnectingPoint num="2" id="476" />
-<TGConnectingPoint num="3" id="477" />
-<TGConnectingPoint num="4" id="478" />
-<TGConnectingPoint num="5" id="479" />
-<TGConnectingPoint num="6" id="480" />
-<TGConnectingPoint num="7" id="481" />
-<extraparam>
-<Line value="ECUKM verifies message integrity, authenticity and" />
-<Line value="freshness and then stores the new session key." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="491" >
-<cdparam x="367" y="226" />
-<sizeparam width="297" height="50" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECU1 sends the new session key to distribute it 
-among the members of the group.
-" />
-<TGConnectingPoint num="0" id="483" />
-<TGConnectingPoint num="1" id="484" />
-<TGConnectingPoint num="2" id="485" />
-<TGConnectingPoint num="3" id="486" />
-<TGConnectingPoint num="4" id="487" />
-<TGConnectingPoint num="5" id="488" />
-<TGConnectingPoint num="6" id="489" />
-<TGConnectingPoint num="7" id="490" />
-<extraparam>
-<Line value="ECU1 sends the new session key to distribute it " />
-<Line value="among the members of the group." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="541" >
-<cdparam x="1477" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECUN" />
-<TGConnectingPoint num="0" id="492" />
-<TGConnectingPoint num="1" id="493" />
-<TGConnectingPoint num="2" id="494" />
-<TGConnectingPoint num="3" id="495" />
-<TGConnectingPoint num="4" id="496" />
-<TGConnectingPoint num="5" id="497" />
-<TGConnectingPoint num="6" id="498" />
-<TGConnectingPoint num="7" id="499" />
-<TGConnectingPoint num="8" id="500" />
-<TGConnectingPoint num="9" id="501" />
-<TGConnectingPoint num="10" id="502" />
-<TGConnectingPoint num="11" id="503" />
-<TGConnectingPoint num="12" id="504" />
-<TGConnectingPoint num="13" id="505" />
-<TGConnectingPoint num="14" id="506" />
-<TGConnectingPoint num="15" id="507" />
-<TGConnectingPoint num="16" id="508" />
-<TGConnectingPoint num="17" id="509" />
-<TGConnectingPoint num="18" id="510" />
-<TGConnectingPoint num="19" id="511" />
-<TGConnectingPoint num="20" id="512" />
-<TGConnectingPoint num="21" id="513" />
-<TGConnectingPoint num="22" id="514" />
-<TGConnectingPoint num="23" id="515" />
-<TGConnectingPoint num="24" id="516" />
-<TGConnectingPoint num="25" id="517" />
-<TGConnectingPoint num="26" id="518" />
-<TGConnectingPoint num="27" id="519" />
-<TGConnectingPoint num="28" id="520" />
-<TGConnectingPoint num="29" id="521" />
-<TGConnectingPoint num="30" id="522" />
-<TGConnectingPoint num="31" id="523" />
-<TGConnectingPoint num="32" id="524" />
-<TGConnectingPoint num="33" id="525" />
-<TGConnectingPoint num="34" id="526" />
-<TGConnectingPoint num="35" id="527" />
-<TGConnectingPoint num="36" id="528" />
-<TGConnectingPoint num="37" id="529" />
-<TGConnectingPoint num="38" id="530" />
-<TGConnectingPoint num="39" id="531" />
-<TGConnectingPoint num="40" id="532" />
-<TGConnectingPoint num="41" id="533" />
-<TGConnectingPoint num="42" id="534" />
-<TGConnectingPoint num="43" id="535" />
-<TGConnectingPoint num="44" id="536" />
-<TGConnectingPoint num="45" id="537" />
-<TGConnectingPoint num="46" id="538" />
-<TGConnectingPoint num="47" id="539" />
-<TGConnectingPoint num="48" id="540" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="609" >
-<cdparam x="870" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECUKM" />
-<TGConnectingPoint num="0" id="560" />
-<TGConnectingPoint num="1" id="561" />
-<TGConnectingPoint num="2" id="562" />
-<TGConnectingPoint num="3" id="563" />
-<TGConnectingPoint num="4" id="564" />
-<TGConnectingPoint num="5" id="565" />
-<TGConnectingPoint num="6" id="566" />
-<TGConnectingPoint num="7" id="567" />
-<TGConnectingPoint num="8" id="568" />
-<TGConnectingPoint num="9" id="569" />
-<TGConnectingPoint num="10" id="570" />
-<TGConnectingPoint num="11" id="571" />
-<TGConnectingPoint num="12" id="572" />
-<TGConnectingPoint num="13" id="573" />
-<TGConnectingPoint num="14" id="574" />
-<TGConnectingPoint num="15" id="575" />
-<TGConnectingPoint num="16" id="576" />
-<TGConnectingPoint num="17" id="577" />
-<TGConnectingPoint num="18" id="578" />
-<TGConnectingPoint num="19" id="579" />
-<TGConnectingPoint num="20" id="580" />
-<TGConnectingPoint num="21" id="581" />
-<TGConnectingPoint num="22" id="582" />
-<TGConnectingPoint num="23" id="583" />
-<TGConnectingPoint num="24" id="584" />
-<TGConnectingPoint num="25" id="585" />
-<TGConnectingPoint num="26" id="586" />
-<TGConnectingPoint num="27" id="587" />
-<TGConnectingPoint num="28" id="588" />
-<TGConnectingPoint num="29" id="589" />
-<TGConnectingPoint num="30" id="590" />
-<TGConnectingPoint num="31" id="591" />
-<TGConnectingPoint num="32" id="592" />
-<TGConnectingPoint num="33" id="593" />
-<TGConnectingPoint num="34" id="594" />
-<TGConnectingPoint num="35" id="595" />
-<TGConnectingPoint num="36" id="596" />
-<TGConnectingPoint num="37" id="597" />
-<TGConnectingPoint num="38" id="598" />
-<TGConnectingPoint num="39" id="599" />
-<TGConnectingPoint num="40" id="600" />
-<TGConnectingPoint num="41" id="601" />
-<TGConnectingPoint num="42" id="602" />
-<TGConnectingPoint num="43" id="603" />
-<TGConnectingPoint num="44" id="604" />
-<TGConnectingPoint num="45" id="605" />
-<TGConnectingPoint num="46" id="606" />
-<TGConnectingPoint num="47" id="607" />
-<TGConnectingPoint num="48" id="608" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="604" id="550" >
-<father id="609" num="0" />
-<cdparam x="888" y="537" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer cancellation" value="{timer=timer2}" />
-<TGConnectingPoint num="0" id="542" />
-<TGConnectingPoint num="1" id="543" />
-<TGConnectingPoint num="2" id="544" />
-<TGConnectingPoint num="3" id="545" />
-<TGConnectingPoint num="4" id="546" />
-<TGConnectingPoint num="5" id="547" />
-<TGConnectingPoint num="6" id="548" />
-<TGConnectingPoint num="7" id="549" />
-<extraparam>
-<Interval timer="timer2" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="603" id="559" >
-<father id="609" num="1" />
-<cdparam x="888" y="421" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timer2, duration=22}" />
-<TGConnectingPoint num="0" id="551" />
-<TGConnectingPoint num="1" id="552" />
-<TGConnectingPoint num="2" id="553" />
-<TGConnectingPoint num="3" id="554" />
-<TGConnectingPoint num="4" id="555" />
-<TGConnectingPoint num="5" id="556" />
-<TGConnectingPoint num="6" id="557" />
-<TGConnectingPoint num="7" id="558" />
-<extraparam>
-<Interval timer="timer2" duration="22" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="606" id="677" >
-<cdparam x="221" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECU1" />
-<TGConnectingPoint num="0" id="628" />
-<TGConnectingPoint num="1" id="629" />
-<TGConnectingPoint num="2" id="630" />
-<TGConnectingPoint num="3" id="631" />
-<TGConnectingPoint num="4" id="632" />
-<TGConnectingPoint num="5" id="633" />
-<TGConnectingPoint num="6" id="634" />
-<TGConnectingPoint num="7" id="635" />
-<TGConnectingPoint num="8" id="636" />
-<TGConnectingPoint num="9" id="637" />
-<TGConnectingPoint num="10" id="638" />
-<TGConnectingPoint num="11" id="639" />
-<TGConnectingPoint num="12" id="640" />
-<TGConnectingPoint num="13" id="641" />
-<TGConnectingPoint num="14" id="642" />
-<TGConnectingPoint num="15" id="643" />
-<TGConnectingPoint num="16" id="644" />
-<TGConnectingPoint num="17" id="645" />
-<TGConnectingPoint num="18" id="646" />
-<TGConnectingPoint num="19" id="647" />
-<TGConnectingPoint num="20" id="648" />
-<TGConnectingPoint num="21" id="649" />
-<TGConnectingPoint num="22" id="650" />
-<TGConnectingPoint num="23" id="651" />
-<TGConnectingPoint num="24" id="652" />
-<TGConnectingPoint num="25" id="653" />
-<TGConnectingPoint num="26" id="654" />
-<TGConnectingPoint num="27" id="655" />
-<TGConnectingPoint num="28" id="656" />
-<TGConnectingPoint num="29" id="657" />
-<TGConnectingPoint num="30" id="658" />
-<TGConnectingPoint num="31" id="659" />
-<TGConnectingPoint num="32" id="660" />
-<TGConnectingPoint num="33" id="661" />
-<TGConnectingPoint num="34" id="662" />
-<TGConnectingPoint num="35" id="663" />
-<TGConnectingPoint num="36" id="664" />
-<TGConnectingPoint num="37" id="665" />
-<TGConnectingPoint num="38" id="666" />
-<TGConnectingPoint num="39" id="667" />
-<TGConnectingPoint num="40" id="668" />
-<TGConnectingPoint num="41" id="669" />
-<TGConnectingPoint num="42" id="670" />
-<TGConnectingPoint num="43" id="671" />
-<TGConnectingPoint num="44" id="672" />
-<TGConnectingPoint num="45" id="673" />
-<TGConnectingPoint num="46" id="674" />
-<TGConnectingPoint num="47" id="675" />
-<TGConnectingPoint num="48" id="676" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="603" id="618" >
-<father id="677" num="0" />
-<cdparam x="239" y="322" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timer1, duration=64}" />
-<TGConnectingPoint num="0" id="610" />
-<TGConnectingPoint num="1" id="611" />
-<TGConnectingPoint num="2" id="612" />
-<TGConnectingPoint num="3" id="613" />
-<TGConnectingPoint num="4" id="614" />
-<TGConnectingPoint num="5" id="615" />
-<TGConnectingPoint num="6" id="616" />
-<TGConnectingPoint num="7" id="617" />
-<extraparam>
-<Interval timer="timer1" duration="64" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="604" id="627" >
-<father id="677" num="1" />
-<cdparam x="239" y="611" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer cancellation" value="{timer=timer1}" />
-<TGConnectingPoint num="0" id="619" />
-<TGConnectingPoint num="1" id="620" />
-<TGConnectingPoint num="2" id="621" />
-<TGConnectingPoint num="3" id="622" />
-<TGConnectingPoint num="4" id="623" />
-<TGConnectingPoint num="5" id="624" />
-<TGConnectingPoint num="6" id="625" />
-<TGConnectingPoint num="7" id="626" />
-<extraparam>
-<Interval timer="timer1" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="301" id="686" >
-<cdparam x="765" y="64" />
-<sizeparam width="235" height="80" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECUKM:
-PSK-1: Private symmetric key ECU1.
-PSK-N: Private symmetric key ECUN..
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="678" />
-<TGConnectingPoint num="1" id="679" />
-<TGConnectingPoint num="2" id="680" />
-<TGConnectingPoint num="3" id="681" />
-<TGConnectingPoint num="4" id="682" />
-<TGConnectingPoint num="5" id="683" />
-<TGConnectingPoint num="6" id="684" />
-<TGConnectingPoint num="7" id="685" />
-<extraparam>
-<Line value="Initial Knowledge ECUKM:" />
-<Line value="PSK-1: Private symmetric key ECU1." />
-<Line value="PSK-N: Private symmetric key ECUN.." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="695" >
-<cdparam x="914" y="580" />
-<sizeparam width="325" height="65" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM verifies integrity, authenticity and freshness
-in the acknowledgement message. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="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" />
-<extraparam>
-<Line value="ECUKM verifies integrity, authenticity and freshness" />
-<Line value="in the acknowledgement message. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="704" >
-<cdparam x="1067" y="429" />
-<sizeparam width="311" height="65" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUN informs ECUKM that the session key has
-been accepted and thus stored. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
-<TGConnectingPoint num="2" id="698" />
-<TGConnectingPoint num="3" id="699" />
-<TGConnectingPoint num="4" id="700" />
-<TGConnectingPoint num="5" id="701" />
-<TGConnectingPoint num="6" id="702" />
-<TGConnectingPoint num="7" id="703" />
-<extraparam>
-<Line value="ECUN informs ECUKM that the session key has" />
-<Line value="been accepted and thus stored. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="713" >
-<cdparam x="1054" y="300" />
-<sizeparam width="334" height="80" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM distributes the new sesssion key among 
-the members of the group. The message interchanges
-between ECUKM and ECUN should be repeated 
-with each member of the group.
-" />
-<TGConnectingPoint num="0" id="705" />
-<TGConnectingPoint num="1" id="706" />
-<TGConnectingPoint num="2" id="707" />
-<TGConnectingPoint num="3" id="708" />
-<TGConnectingPoint num="4" id="709" />
-<TGConnectingPoint num="5" id="710" />
-<TGConnectingPoint num="6" id="711" />
-<TGConnectingPoint num="7" id="712" />
-<extraparam>
-<Line value="ECUKM distributes the new sesssion key among " />
-<Line value="the members of the group. The message interchanges" />
-<Line value="between ECUKM and ECUN should be repeated " />
-<Line value="with each member of the group." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="722" >
-<cdparam x="1303" y="62" />
-<sizeparam width="235" height="65" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECUN:
-PSK-N: Private symmetric key ECUN..
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="714" />
-<TGConnectingPoint num="1" id="715" />
-<TGConnectingPoint num="2" id="716" />
-<TGConnectingPoint num="3" id="717" />
-<TGConnectingPoint num="4" id="718" />
-<TGConnectingPoint num="5" id="719" />
-<TGConnectingPoint num="6" id="720" />
-<TGConnectingPoint num="7" id="721" />
-<extraparam>
-<Line value="Initial Knowledge ECUN:" />
-<Line value="PSK-N: Private symmetric key ECUN.." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="731" >
-<cdparam x="91" y="54" />
-<sizeparam width="240" height="80" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECU1:
-PSK-1: Private symmetric key ECU1.
-SesK: Random generated session key.
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="723" />
-<TGConnectingPoint num="1" id="724" />
-<TGConnectingPoint num="2" id="725" />
-<TGConnectingPoint num="3" id="726" />
-<TGConnectingPoint num="4" id="727" />
-<TGConnectingPoint num="5" id="728" />
-<TGConnectingPoint num="6" id="729" />
-<TGConnectingPoint num="7" id="730" />
-<extraparam>
-<Line value="Initial Knowledge ECU1:" />
-<Line value="PSK-1: Private symmetric key ECU1." />
-<Line value="SesK: Random generated session key." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="740" >
-<cdparam x="250" y="644" />
-<sizeparam width="325" height="65" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECU1 verifies integrity, authenticity and freshness
-in the acknowledgement message. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="732" />
-<TGConnectingPoint num="1" id="733" />
-<TGConnectingPoint num="2" id="734" />
-<TGConnectingPoint num="3" id="735" />
-<TGConnectingPoint num="4" id="736" />
-<TGConnectingPoint num="5" id="737" />
-<TGConnectingPoint num="6" id="738" />
-<TGConnectingPoint num="7" id="739" />
-<extraparam>
-<Line value="ECU1 verifies integrity, authenticity and freshness" />
-<Line value="in the acknowledgement message. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="106" id="741" >
-<cdparam x="833" y="536" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M4:={ACKcode, timeStamp4}, MAC(M4, PSK-1)]" />
-<P1  x="875" y="596" id="600" />
-<P2  x="226" y="596" id="668" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="742" >
-<cdparam x="1338" y="466" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M3:={ACKcode, timeStamp3}, MAC(M3, PSK-N)]" />
-<P1  x="1482" y="526" id="525" />
-<P2  x="875" y="526" id="593" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="107" id="743" >
-<cdparam x="793" y="396" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M2:={{SesK}_{PSK-N}, GroupNo, timeStamp2}, MAC(M2,PSK-N)]" />
-<P1  x="875" y="406" id="581" />
-<P2  x="1482" y="406" id="513" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="107" id="744" >
-<cdparam x="323" y="286" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value=" [M1:={{SesK}_{SesK}, GroupNo, timeStamp1}, MAC(M1,PSK-1)]" />
-<P1  x="226" y="306" id="639" />
-<P2  x="875" y="306" id="571" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
+<SequenceDiagramPanelZV name="SesK distribution" minX="10" maxX="2500" minY="10" maxY="1500" >
 
-</SequenceDiagramPanel>
+</SequenceDiagramPanelZV>
 
 </Modeling>
 
@@ -599,18 +69,59 @@ key is deleted in case there is one.
 
 
 <Modeling type="AVATAR Design" nameTab="KeyMasterProtocol" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="1400" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="1400" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="SecuredSystem;KM;TimerKM;ECU1;ECUN;" />
 <Ignored value="" />
 
+<COMPONENT type="302" id="106434" >
+<cdparam x="16" y="12" />
+<sizeparam width="487" height="149" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Proverif Pragma" value="#InitialSystemKnowledge ECU1.PSK1 KM.PSK1
+#InitialSystemKnowledge ECUN.PSKN KM.PSKN
+#InitialSystemKnowledge ECUN.ACK ECU1.ACK KM.ACK
+#InitialSystemKnowledge KM.timerexpire TimerKM.timerexpire
+#Confidentiality ECU1.SesK
+#Confidentiality ECU1.confData
+
+#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth" />
+<TGConnectingPoint num="0" id="106435" />
+<TGConnectingPoint num="1" id="106436" />
+<TGConnectingPoint num="2" id="106437" />
+<TGConnectingPoint num="3" id="106438" />
+<TGConnectingPoint num="4" id="106439" />
+<TGConnectingPoint num="5" id="106440" />
+<TGConnectingPoint num="6" id="106441" />
+<TGConnectingPoint num="7" id="106442" />
+<TGConnectingPoint num="8" id="106443" />
+<TGConnectingPoint num="9" id="106444" />
+<TGConnectingPoint num="10" id="106445" />
+<TGConnectingPoint num="11" id="106446" />
+<TGConnectingPoint num="12" id="106447" />
+<TGConnectingPoint num="13" id="106448" />
+<TGConnectingPoint num="14" id="106449" />
+<TGConnectingPoint num="15" id="106450" />
+<extraparam>
+<Line value="#InitialSystemKnowledge ECU1.PSK1 KM.PSK1" />
+<Line value="#InitialSystemKnowledge ECUN.PSKN KM.PSKN" />
+<Line value="#InitialSystemKnowledge ECUN.ACK ECU1.ACK KM.ACK" />
+<Line value="#InitialSystemKnowledge KM.timerexpire TimerKM.timerexpire" />
+<Line value="#Confidentiality ECU1.SesK" />
+<Line value="#Confidentiality ECU1.confData" />
+<Line value="" />
+<Line value="#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth" />
+</extraparam>
+</COMPONENT>
+
 <CONNECTOR type="118" id="745" >
 <cdparam x="954" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to point " value="null" />
-<P1  x="729" y="145" id="758" />
+<P1  x="738" y="125" id="758" />
 <P2  x="729" y="164" id="749" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
@@ -652,7 +163,7 @@ key is deleted in case there is one.
 
 <COMPONENT type="301" id="760" >
 <cdparam x="623" y="110" />
-<sizeparam width="213" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="230" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="Channel common to all subblocks
@@ -665,50 +176,22 @@ key is deleted in case there is one.
 <TGConnectingPoint num="5" id="757" />
 <TGConnectingPoint num="6" id="758" />
 <TGConnectingPoint num="7" id="759" />
+<TGConnectingPoint num="8" id="100038" />
+<TGConnectingPoint num="9" id="100039" />
+<TGConnectingPoint num="10" id="100040" />
+<TGConnectingPoint num="11" id="100041" />
+<TGConnectingPoint num="12" id="100042" />
+<TGConnectingPoint num="13" id="100043" />
+<TGConnectingPoint num="14" id="100044" />
+<TGConnectingPoint num="15" id="100045" />
 <extraparam>
 <Line value="Channel common to all subblocks" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="769" >
-<cdparam x="50" y="19" />
-<sizeparam width="427" height="155" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="UML Note" value="#Confidentiality ECU1.SesK
-#Confidentiality ECU1.confData
-
-#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth
-
-#InitialSystemKnowledge ECU1.PSK1 KM.PSK1
-#InitialSystemKnowledge ECUN.PSKN KM.PSKN
-#InitialSystemKnowledge ECUN.ACK ECU1.ACK KM.ACK
-#InitialSystemKnowledge KM.timerexpire TimerKM.timerexpire
-" />
-<TGConnectingPoint num="0" id="761" />
-<TGConnectingPoint num="1" id="762" />
-<TGConnectingPoint num="2" id="763" />
-<TGConnectingPoint num="3" id="764" />
-<TGConnectingPoint num="4" id="765" />
-<TGConnectingPoint num="5" id="766" />
-<TGConnectingPoint num="6" id="767" />
-<TGConnectingPoint num="7" id="768" />
-<extraparam>
-<Line value="#Confidentiality ECU1.SesK" />
-<Line value="#Confidentiality ECU1.confData" />
-<Line value="" />
-<Line value="#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth" />
-<Line value="" />
-<Line value="#InitialSystemKnowledge ECU1.PSK1 KM.PSK1" />
-<Line value="#InitialSystemKnowledge ECUN.PSKN KM.PSKN" />
-<Line value="#InitialSystemKnowledge ECUN.ACK ECU1.ACK KM.ACK" />
-<Line value="#InitialSystemKnowledge KM.timerexpire TimerKM.timerexpire" />
-</extraparam>
-</COMPONENT>
-
 <COMPONENT type="5003" id="778" >
-<cdparam x="500" y="28" />
-<sizeparam width="102" height="54" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="518" y="30" />
+<sizeparam width="128" height="56" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="DataType0" value="Message" />
@@ -726,7 +209,7 @@ key is deleted in case there is one.
 </COMPONENT>
 
 <COMPONENT type="5003" id="787" >
-<cdparam x="622" y="27" />
+<cdparam x="655" y="29" />
 <sizeparam width="110" height="56" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
@@ -776,133 +259,12 @@ key is deleted in case there is one.
 <TGConnectingPoint num="23" id="911" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="812" >
-<father id="912" num="0" />
-<cdparam x="54" y="283" />
-<sizeparam width="215" height="278" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="568" minY="0" maxY="109" />
-<infoparam name="Block0" value="ECUN" />
-<TGConnectingPoint num="0" id="788" />
-<TGConnectingPoint num="1" id="789" />
-<TGConnectingPoint num="2" id="790" />
-<TGConnectingPoint num="3" id="791" />
-<TGConnectingPoint num="4" id="792" />
-<TGConnectingPoint num="5" id="793" />
-<TGConnectingPoint num="6" id="794" />
-<TGConnectingPoint num="7" id="795" />
-<TGConnectingPoint num="8" id="796" />
-<TGConnectingPoint num="9" id="797" />
-<TGConnectingPoint num="10" id="798" />
-<TGConnectingPoint num="11" id="799" />
-<TGConnectingPoint num="12" id="800" />
-<TGConnectingPoint num="13" id="801" />
-<TGConnectingPoint num="14" id="802" />
-<TGConnectingPoint num="15" id="803" />
-<TGConnectingPoint num="16" id="804" />
-<TGConnectingPoint num="17" id="805" />
-<TGConnectingPoint num="18" id="806" />
-<TGConnectingPoint num="19" id="807" />
-<TGConnectingPoint num="20" id="808" />
-<TGConnectingPoint num="21" id="809" />
-<TGConnectingPoint num="22" id="810" />
-<TGConnectingPoint num="23" id="811" />
-<extraparam>
-<CryptoBlock value="false" />
-<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
-<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
-<Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="837" >
-<father id="912" num="1" />
-<cdparam x="277" y="282" />
-<sizeparam width="206" height="279" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="577" minY="0" maxY="108" />
-<infoparam name="Block0" value="ECU1" />
-<TGConnectingPoint num="0" id="813" />
-<TGConnectingPoint num="1" id="814" />
-<TGConnectingPoint num="2" id="815" />
-<TGConnectingPoint num="3" id="816" />
-<TGConnectingPoint num="4" id="817" />
-<TGConnectingPoint num="5" id="818" />
-<TGConnectingPoint num="6" id="819" />
-<TGConnectingPoint num="7" id="820" />
-<TGConnectingPoint num="8" id="821" />
-<TGConnectingPoint num="9" id="822" />
-<TGConnectingPoint num="10" id="823" />
-<TGConnectingPoint num="11" id="824" />
-<TGConnectingPoint num="12" id="825" />
-<TGConnectingPoint num="13" id="826" />
-<TGConnectingPoint num="14" id="827" />
-<TGConnectingPoint num="15" id="828" />
-<TGConnectingPoint num="16" id="829" />
-<TGConnectingPoint num="17" id="830" />
-<TGConnectingPoint num="18" id="831" />
-<TGConnectingPoint num="19" id="832" />
-<TGConnectingPoint num="20" id="833" />
-<TGConnectingPoint num="21" id="834" />
-<TGConnectingPoint num="22" id="835" />
-<TGConnectingPoint num="23" id="836" />
-<extraparam>
-<CryptoBlock value="false" />
-<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="groupid" value="" type="8" typeOther="" />
-<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
-<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
-<Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="confData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="887" >
-<father id="912" num="2" />
+<father id="912" num="0" />
 <cdparam x="495" y="281" />
 <sizeparam width="315" height="281" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -933,7 +295,7 @@ key is deleted in case there is one.
 <TGConnectingPoint num="22" id="885" />
 <TGConnectingPoint num="23" id="886" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
@@ -964,6 +326,16 @@ key is deleted in case there is one.
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="862" >
@@ -998,7 +370,7 @@ key is deleted in case there is one.
 <TGConnectingPoint num="22" id="860" />
 <TGConnectingPoint num="23" id="861" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
 <Method value="Message encrypt(Message msg, Key k)" />
@@ -1013,105 +385,228 @@ key is deleted in case there is one.
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
-
-
-</AVATARBlockDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="SecuredSystem" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="914" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="837" >
+<father id="912" num="1" />
+<cdparam x="277" y="282" />
+<sizeparam width="206" height="279" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="913" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
-<CONNECTOR type="5102" id="921" >
-<cdparam x="621" y="895" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="920" />
-<P1  x="458" y="749" id="1048" />
-<P2  x="425" y="798" id="1076" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="919" >
-<father id="921" num="0" />
-<cdparam x="270" y="771" />
-<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="0" maxX="577" minY="0" maxY="108" />
+<infoparam name="Block0" value="ECU1" />
+<TGConnectingPoint num="0" id="813" />
+<TGConnectingPoint num="1" id="814" />
+<TGConnectingPoint num="2" id="815" />
+<TGConnectingPoint num="3" id="816" />
+<TGConnectingPoint num="4" id="817" />
+<TGConnectingPoint num="5" id="818" />
+<TGConnectingPoint num="6" id="819" />
+<TGConnectingPoint num="7" id="820" />
+<TGConnectingPoint num="8" id="821" />
+<TGConnectingPoint num="9" id="822" />
+<TGConnectingPoint num="10" id="823" />
+<TGConnectingPoint num="11" id="824" />
+<TGConnectingPoint num="12" id="825" />
+<TGConnectingPoint num="13" id="826" />
+<TGConnectingPoint num="14" id="827" />
+<TGConnectingPoint num="15" id="828" />
+<TGConnectingPoint num="16" id="829" />
+<TGConnectingPoint num="17" id="830" />
+<TGConnectingPoint num="18" id="831" />
+<TGConnectingPoint num="19" id="832" />
+<TGConnectingPoint num="20" id="833" />
+<TGConnectingPoint num="21" id="834" />
+<TGConnectingPoint num="22" id="835" />
+<TGConnectingPoint num="23" id="836" />
+<extraparam>
+<CryptoBlock value="true" />
+<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="groupid" value="" type="8" typeOther="" />
+<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
+<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
+<Attribute access="0" id="b" value="" type="4" typeOther="" />
+<Attribute access="0" id="confData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="812" >
+<father id="912" num="2" />
+<cdparam x="54" y="283" />
+<sizeparam width="215" height="278" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
-<TGConnectingPoint num="3" id="918" />
+<cdrectangleparam minX="0" maxX="568" minY="0" maxY="109" />
+<infoparam name="Block0" value="ECUN" />
+<TGConnectingPoint num="0" id="788" />
+<TGConnectingPoint num="1" id="789" />
+<TGConnectingPoint num="2" id="790" />
+<TGConnectingPoint num="3" id="791" />
+<TGConnectingPoint num="4" id="792" />
+<TGConnectingPoint num="5" id="793" />
+<TGConnectingPoint num="6" id="794" />
+<TGConnectingPoint num="7" id="795" />
+<TGConnectingPoint num="8" id="796" />
+<TGConnectingPoint num="9" id="797" />
+<TGConnectingPoint num="10" id="798" />
+<TGConnectingPoint num="11" id="799" />
+<TGConnectingPoint num="12" id="800" />
+<TGConnectingPoint num="13" id="801" />
+<TGConnectingPoint num="14" id="802" />
+<TGConnectingPoint num="15" id="803" />
+<TGConnectingPoint num="16" id="804" />
+<TGConnectingPoint num="17" id="805" />
+<TGConnectingPoint num="18" id="806" />
+<TGConnectingPoint num="19" id="807" />
+<TGConnectingPoint num="20" id="808" />
+<TGConnectingPoint num="21" id="809" />
+<TGConnectingPoint num="22" id="810" />
+<TGConnectingPoint num="23" id="811" />
 <extraparam>
-<guard value="[msg.data == timerexpire.data ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<CryptoBlock value="true" />
+<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
+<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
+<Attribute access="0" id="b" value="" type="4" typeOther="" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="928" >
-<cdparam x="654" y="890" />
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="SecuredSystem" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="914" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="913" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="5102" id="2163" >
+<cdparam x="638" y="1030" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="927" />
-<P1  x="488" y="749" id="1040" />
-<P2  x="611" y="797" id="1262" />
+<TGConnectingPoint num="0" id="2162" />
+<P1  x="638" y="1030" id="2338" />
+<P2  x="656" y="1133" id="2251" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="926" >
-<father id="928" num="0" />
-<cdparam x="581" y="749" />
-<sizeparam width="217" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2161" >
+<father id="2163" num="0" />
+<cdparam x="654" y="1057" />
+<sizeparam width="223" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="922" />
-<TGConnectingPoint num="1" id="923" />
-<TGConnectingPoint num="2" id="924" />
-<TGConnectingPoint num="3" id="925" />
+<TGConnectingPoint num="0" id="2157" />
+<TGConnectingPoint num="1" id="2158" />
+<TGConnectingPoint num="2" id="2159" />
+<TGConnectingPoint num="3" id="2160" />
 <extraparam>
-<guard value="[not(msg.data == timerexpire.data) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg5, msg4)" />
-<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
+<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
+<actions value="secretData = msg3.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="935" >
-<cdparam x="524" y="710" />
+<CONNECTOR type="5102" id="2170" >
+<cdparam x="514" y="919" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="934" />
-<P1  x="489" y="594" id="1117" />
-<P2  x="488" y="613" id="1437" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2169" />
+<P1  x="514" y="919" id="2387" />
+<P2  x="417" y="985" id="2292" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="933" >
-<father id="935" num="0" />
-<cdparam x="524" y="750" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2168" >
+<father id="2170" num="0" />
+<cdparam x="413" y="957" />
+<sizeparam width="46" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="929" />
-<TGConnectingPoint num="1" id="930" />
-<TGConnectingPoint num="2" id="931" />
-<TGConnectingPoint num="3" id="932" />
+<TGConnectingPoint num="0" id="2164" />
+<TGConnectingPoint num="1" id="2165" />
+<TGConnectingPoint num="2" id="2166" />
+<TGConnectingPoint num="3" id="2167" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b)]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1119,58 +614,53 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="942" >
-<cdparam x="988" y="1206" />
+<CONNECTOR type="5102" id="2177" >
+<cdparam x="570" y="919" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="941" />
-<P1  x="611" y="980" id="1185" />
-<P2  x="611" y="1068" id="1127" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2176" />
+<P1  x="570" y="919" id="2388" />
+<P2  x="638" y="990" id="2333" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="940" >
-<father id="942" num="0" />
-<cdparam x="625" y="998" />
-<sizeparam width="315" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2175" >
+<father id="2177" num="0" />
+<cdparam x="570" y="959" />
+<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="936" />
-<TGConnectingPoint num="1" id="937" />
-<TGConnectingPoint num="2" id="938" />
-<TGConnectingPoint num="3" id="939" />
+<TGConnectingPoint num="0" id="2171" />
+<TGConnectingPoint num="1" id="2172" />
+<TGConnectingPoint num="2" id="2173" />
+<TGConnectingPoint num="3" id="2174" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp2" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSK1)" />
-<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="949" >
-<cdparam x="427" y="156" />
+<CONNECTOR type="5102" id="2184" >
+<cdparam x="342" y="72" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="948" />
-<P1  x="398" y="124" id="1581" />
-<P2  x="398" y="137" id="1570" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2183" />
+<P1  x="342" y="72" id="2578" />
+<P2  x="342" y="100" id="2538" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="947" >
-<father id="949" num="0" />
-<cdparam x="427" y="196" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2182" >
+<father id="2184" num="0" />
+<cdparam x="342" y="112" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="943" />
-<TGConnectingPoint num="1" id="944" />
-<TGConnectingPoint num="2" id="945" />
-<TGConnectingPoint num="3" id="946" />
+<TGConnectingPoint num="0" id="2178" />
+<TGConnectingPoint num="1" id="2179" />
+<TGConnectingPoint num="2" id="2180" />
+<TGConnectingPoint num="3" id="2181" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1180,57 +670,57 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="956" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="2191" >
+<cdparam x="548" y="792" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="955" />
-<P1  x="489" y="376" id="1308" />
-<P2  x="489" y="426" id="1344" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="2190" />
+<P1  x="548" y="792" id="2592" />
+<P2  x="542" y="879" id="2374" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="954" >
-<father id="956" num="0" />
-<cdparam x="513" y="397" />
-<sizeparam width="307" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2189" >
+<father id="2191" num="0" />
+<cdparam x="548" y="832" />
+<sizeparam width="240" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="950" />
-<TGConnectingPoint num="1" id="951" />
-<TGConnectingPoint num="2" id="952" />
-<TGConnectingPoint num="3" id="953" />
+<TGConnectingPoint num="0" id="2185" />
+<TGConnectingPoint num="1" id="2186" />
+<TGConnectingPoint num="2" id="2187" />
+<TGConnectingPoint num="3" id="2188" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get3(msg1, msg5, msg2, msg3)" />
-<actions value="msgauth= sdecrypt(msg5, PSK1)" />
+<actions value="get2(msg, msg1, msg2)" />
+<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="963" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="2198" >
+<cdparam x="434" y="475" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="962" />
-<P1  x="373" y="292" id="1543" />
-<P2  x="316" y="334" id="1489" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="2197" />
+<P1  x="479" y="445" id="2669" />
+<P2  x="530" y="495" id="2497" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="961" >
-<father id="963" num="0" />
-<cdparam x="208" y="317" />
-<sizeparam width="190" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2196" >
+<father id="2198" num="0" />
+<cdparam x="529" y="457" />
+<sizeparam width="291" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="957" />
-<TGConnectingPoint num="1" id="958" />
-<TGConnectingPoint num="2" id="959" />
-<TGConnectingPoint num="3" id="960" />
+<TGConnectingPoint num="0" id="2192" />
+<TGConnectingPoint num="1" id="2193" />
+<TGConnectingPoint num="2" id="2194" />
+<TGConnectingPoint num="3" id="2195" />
 <extraparam>
-<guard value="[not(msg8.data == msg4.data) ]" />
+<guard value="[  ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1238,25 +728,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="970" >
-<cdparam x="517" y="650" />
+<CONNECTOR type="5102" id="2205" >
+<cdparam x="486" y="696" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="969" />
-<P1  x="489" y="563" id="1478" />
-<P2  x="489" y="564" id="1116" />
+<TGConnectingPoint num="0" id="2204" />
+<P1  x="543" y="653" id="2644" />
+<P2  x="548" y="688" id="2603" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="968" >
-<father id="970" num="0" />
-<cdparam x="517" y="690" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2203" >
+<father id="2205" num="0" />
+<cdparam x="486" y="736" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="964" />
-<TGConnectingPoint num="1" id="965" />
-<TGConnectingPoint num="2" id="966" />
-<TGConnectingPoint num="3" id="967" />
+<TGConnectingPoint num="0" id="2199" />
+<TGConnectingPoint num="1" id="2200" />
+<TGConnectingPoint num="2" id="2201" />
+<TGConnectingPoint num="3" id="2202" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1266,25 +756,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="977" >
-<cdparam x="710" y="775" />
+<CONNECTOR type="5102" id="2212" >
+<cdparam x="548" y="728" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="976" />
-<P1  x="488" y="689" id="1426" />
-<P2  x="488" y="709" id="1035" />
+<TGConnectingPoint num="0" id="2211" />
+<P1  x="548" y="728" id="2608" />
+<P2  x="548" y="762" id="2591" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="975" >
-<father id="977" num="0" />
-<cdparam x="685" y="829" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2210" >
+<father id="2212" num="0" />
+<cdparam x="548" y="768" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="971" />
-<TGConnectingPoint num="1" id="972" />
-<TGConnectingPoint num="2" id="973" />
-<TGConnectingPoint num="3" id="974" />
+<TGConnectingPoint num="0" id="2206" />
+<TGConnectingPoint num="1" id="2207" />
+<TGConnectingPoint num="2" id="2208" />
+<TGConnectingPoint num="3" id="2209" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1294,960 +784,751 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="984" >
-<cdparam x="413" y="171" />
+<CONNECTOR type="5102" id="2219" >
+<cdparam x="304" y="307" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="983" />
-<P1  x="398" y="167" id="1571" />
-<P2  x="398" y="177" id="1385" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="2218" />
+<P1  x="429" y="362" id="2420" />
+<P2  x="454" y="405" id="2655" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="982" >
-<father id="984" num="0" />
-<cdparam x="413" y="211" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2217" >
+<father id="2219" num="0" />
+<cdparam x="440" y="381" />
+<sizeparam width="201" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="978" />
-<TGConnectingPoint num="1" id="979" />
-<TGConnectingPoint num="2" id="980" />
-<TGConnectingPoint num="3" id="981" />
+<TGConnectingPoint num="0" id="2213" />
+<TGConnectingPoint num="1" id="2214" />
+<TGConnectingPoint num="2" id="2215" />
+<TGConnectingPoint num="3" id="2216" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="991" >
-<cdparam x="820" y="859" />
+<CONNECTOR type="5102" id="2226" >
+<cdparam x="342" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="990" />
-<P1  x="611" y="837" id="1267" />
-<P2  x="611" y="874" id="1221" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2225" />
+<P1  x="342" y="140" id="2543" />
+<P2  x="350" y="173" id="2580" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="989" >
-<father id="991" num="0" />
-<cdparam x="626" y="851" />
-<sizeparam width="186" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2224" >
+<father id="2226" num="0" />
+<cdparam x="342" y="180" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="985" />
-<TGConnectingPoint num="1" id="986" />
-<TGConnectingPoint num="2" id="987" />
-<TGConnectingPoint num="3" id="988" />
+<TGConnectingPoint num="0" id="2220" />
+<TGConnectingPoint num="1" id="2221" />
+<TGConnectingPoint num="2" id="2222" />
+<TGConnectingPoint num="3" id="2223" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get3(msg5, msg1, msg2, msg3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="998" >
-<cdparam x="420" y="415" />
+<CONNECTOR type="5102" id="2233" >
+<cdparam x="518" y="526" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="997" />
-<P1  x="398" y="217" id="1390" />
-<P2  x="398" y="252" id="1530" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2232" />
+<P1  x="530" y="535" id="2502" />
+<P2  x="543" y="623" id="2643" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="996" >
-<father id="998" num="0" />
-<cdparam x="418" y="233" />
-<sizeparam width="218" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2231" >
+<father id="2233" num="0" />
+<cdparam x="565" y="553" />
+<sizeparam width="323" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="992" />
-<TGConnectingPoint num="1" id="993" />
-<TGConnectingPoint num="2" id="994" />
-<TGConnectingPoint num="3" id="995" />
+<TGConnectingPoint num="0" id="2227" />
+<TGConnectingPoint num="1" id="2228" />
+<TGConnectingPoint num="2" id="2229" />
+<TGConnectingPoint num="3" id="2230" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg8, msg1, msg4)" />
-<actions value="msg8 = MAC(msg1, PSK1)" />
+<actions value="keyOfGroup.data = msg1.data" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSKN)" />
+<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1005" >
-<cdparam x="967" y="524" />
+<CONNECTOR type="5102" id="2240" >
+<cdparam x="350" y="203" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1004" />
-<P1  x="489" y="466" id="1349" />
-<P2  x="489" y="533" id="1477" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2239" />
+<P1  x="350" y="203" id="2581" />
+<P2  x="406" y="238" id="2456" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1003" >
-<father id="1005" num="0" />
-<cdparam x="532" y="480" />
-<sizeparam width="307" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="999" />
-<TGConnectingPoint num="1" id="1000" />
-<TGConnectingPoint num="2" id="1001" />
-<TGConnectingPoint num="3" id="1002" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2238" >
+<father id="2240" num="0" />
+<cdparam x="350" y="243" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2234" />
+<TGConnectingPoint num="1" id="2235" />
+<TGConnectingPoint num="2" id="2236" />
+<TGConnectingPoint num="3" id="2237" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg7 = sencrypt(msgauth, PSKN)" />
-<actions value="msg3.data = timestamp1" />
-<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
-<actions value="msg4 = MAC(msg1, PSKN)" />
-<actions value="msg=concat2(msg1, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1012" >
-<cdparam x="433" y="416" />
+<CONNECTOR type="5102" id="2249" >
+<cdparam x="406" y="268" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1011" />
-<P1  x="398" y="292" id="1535" />
-<P2  x="489" y="336" id="1303" />
+<TGConnectingPoint num="0" id="2247" />
+<TGConnectingPoint num="1" id="2248" />
+<P1  x="406" y="268" id="2461" />
+<P2  x="429" y="322" id="2415" />
+<Point x="414" y="282" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1010" >
-<father id="1012" num="0" />
-<cdparam x="465" y="314" />
-<sizeparam width="160" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2241" >
+<father id="2249" num="0" />
+<cdparam x="414" y="282" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1006" />
-<TGConnectingPoint num="1" id="1007" />
-<TGConnectingPoint num="2" id="1008" />
-<TGConnectingPoint num="3" id="1009" />
-<extraparam>
-<guard value="[msg8.data == msg4.data]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1019" >
-<cdparam x="604" y="757" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1018" />
-<P1  x="488" y="653" id="1442" />
-<P2  x="488" y="659" id="1425" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1017" >
-<father id="1019" num="0" />
-<cdparam x="604" y="797" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="2246" >
+<father id="2249" num="1" />
+<cdparam x="446" y="292" />
+<sizeparam width="226" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1013" />
-<TGConnectingPoint num="1" id="1014" />
-<TGConnectingPoint num="2" id="1015" />
-<TGConnectingPoint num="3" id="1016" />
+<TGConnectingPoint num="0" id="2242" />
+<TGConnectingPoint num="1" id="2243" />
+<TGConnectingPoint num="2" id="2244" />
+<TGConnectingPoint num="3" id="2245" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg, msg5, msg6)" />
+<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1026" >
-<cdparam x="983" y="1157" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1025" />
-<P1  x="611" y="914" id="1226" />
-<P2  x="611" y="940" id="1180" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1024" >
-<father id="1026" num="0" />
-<cdparam x="629" y="930" />
-<sizeparam width="130" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2290" >
+<cdparam x="595" y="1133" />
+<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1020" />
-<TGConnectingPoint num="1" id="1021" />
-<TGConnectingPoint num="2" id="1022" />
-<TGConnectingPoint num="3" id="1023" />
+<infoparam name="state0" value="gotData" />
+<TGConnectingPoint num="0" id="2250" />
+<TGConnectingPoint num="1" id="2251" />
+<TGConnectingPoint num="2" id="2252" />
+<TGConnectingPoint num="3" id="2253" />
+<TGConnectingPoint num="4" id="2254" />
+<TGConnectingPoint num="5" id="2255" />
+<TGConnectingPoint num="6" id="2256" />
+<TGConnectingPoint num="7" id="2257" />
+<TGConnectingPoint num="8" id="2258" />
+<TGConnectingPoint num="9" id="2259" />
+<TGConnectingPoint num="10" id="2260" />
+<TGConnectingPoint num="11" id="2261" />
+<TGConnectingPoint num="12" id="2262" />
+<TGConnectingPoint num="13" id="2263" />
+<TGConnectingPoint num="14" id="2264" />
+<TGConnectingPoint num="15" id="2265" />
+<TGConnectingPoint num="16" id="2266" />
+<TGConnectingPoint num="17" id="2267" />
+<TGConnectingPoint num="18" id="2268" />
+<TGConnectingPoint num="19" id="2269" />
+<TGConnectingPoint num="20" id="2270" />
+<TGConnectingPoint num="21" id="2271" />
+<TGConnectingPoint num="22" id="2272" />
+<TGConnectingPoint num="23" id="2273" />
+<TGConnectingPoint num="24" id="2274" />
+<TGConnectingPoint num="25" id="2275" />
+<TGConnectingPoint num="26" id="2276" />
+<TGConnectingPoint num="27" id="2277" />
+<TGConnectingPoint num="28" id="2278" />
+<TGConnectingPoint num="29" id="2279" />
+<TGConnectingPoint num="30" id="2280" />
+<TGConnectingPoint num="31" id="2281" />
+<TGConnectingPoint num="32" id="2282" />
+<TGConnectingPoint num="33" id="2283" />
+<TGConnectingPoint num="34" id="2284" />
+<TGConnectingPoint num="35" id="2285" />
+<TGConnectingPoint num="36" id="2286" />
+<TGConnectingPoint num="37" id="2287" />
+<TGConnectingPoint num="38" id="2288" />
+<TGConnectingPoint num="39" id="2289" />
 <extraparam>
-<guard value="[msg1.data == ACK  ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1033" >
-<cdparam x="732" y="1157" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1032" />
-<P1  x="611" y="1098" id="1128" />
-<P2  x="610" y="1117" id="1139" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1031" >
-<father id="1033" num="0" />
-<cdparam x="732" y="1197" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2331" >
+<cdparam x="366" y="985" />
+<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1027" />
-<TGConnectingPoint num="1" id="1028" />
-<TGConnectingPoint num="2" id="1029" />
-<TGConnectingPoint num="3" id="1030" />
+<infoparam name="state0" value="MacDataFailed" />
+<TGConnectingPoint num="0" id="2291" />
+<TGConnectingPoint num="1" id="2292" />
+<TGConnectingPoint num="2" id="2293" />
+<TGConnectingPoint num="3" id="2294" />
+<TGConnectingPoint num="4" id="2295" />
+<TGConnectingPoint num="5" id="2296" />
+<TGConnectingPoint num="6" id="2297" />
+<TGConnectingPoint num="7" id="2298" />
+<TGConnectingPoint num="8" id="2299" />
+<TGConnectingPoint num="9" id="2300" />
+<TGConnectingPoint num="10" id="2301" />
+<TGConnectingPoint num="11" id="2302" />
+<TGConnectingPoint num="12" id="2303" />
+<TGConnectingPoint num="13" id="2304" />
+<TGConnectingPoint num="14" id="2305" />
+<TGConnectingPoint num="15" id="2306" />
+<TGConnectingPoint num="16" id="2307" />
+<TGConnectingPoint num="17" id="2308" />
+<TGConnectingPoint num="18" id="2309" />
+<TGConnectingPoint num="19" id="2310" />
+<TGConnectingPoint num="20" id="2311" />
+<TGConnectingPoint num="21" id="2312" />
+<TGConnectingPoint num="22" id="2313" />
+<TGConnectingPoint num="23" id="2314" />
+<TGConnectingPoint num="24" id="2315" />
+<TGConnectingPoint num="25" id="2316" />
+<TGConnectingPoint num="26" id="2317" />
+<TGConnectingPoint num="27" id="2318" />
+<TGConnectingPoint num="28" id="2319" />
+<TGConnectingPoint num="29" id="2320" />
+<TGConnectingPoint num="30" id="2321" />
+<TGConnectingPoint num="31" id="2322" />
+<TGConnectingPoint num="32" id="2323" />
+<TGConnectingPoint num="33" id="2324" />
+<TGConnectingPoint num="34" id="2325" />
+<TGConnectingPoint num="35" id="2326" />
+<TGConnectingPoint num="36" id="2327" />
+<TGConnectingPoint num="37" id="2328" />
+<TGConnectingPoint num="38" id="2329" />
+<TGConnectingPoint num="39" id="2330" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<COMPONENT type="5106" id="1074" >
-<cdparam x="429" y="709" />
-<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2372" >
+<cdparam x="580" y="990" />
+<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1034" />
-<TGConnectingPoint num="1" id="1035" />
-<TGConnectingPoint num="2" id="1036" />
-<TGConnectingPoint num="3" id="1037" />
-<TGConnectingPoint num="4" id="1038" />
-<TGConnectingPoint num="5" id="1039" />
-<TGConnectingPoint num="6" id="1040" />
-<TGConnectingPoint num="7" id="1041" />
-<TGConnectingPoint num="8" id="1042" />
-<TGConnectingPoint num="9" id="1043" />
-<TGConnectingPoint num="10" id="1044" />
-<TGConnectingPoint num="11" id="1045" />
-<TGConnectingPoint num="12" id="1046" />
-<TGConnectingPoint num="13" id="1047" />
-<TGConnectingPoint num="14" id="1048" />
-<TGConnectingPoint num="15" id="1049" />
-<TGConnectingPoint num="16" id="1050" />
-<TGConnectingPoint num="17" id="1051" />
-<TGConnectingPoint num="18" id="1052" />
-<TGConnectingPoint num="19" id="1053" />
-<TGConnectingPoint num="20" id="1054" />
-<TGConnectingPoint num="21" id="1055" />
-<TGConnectingPoint num="22" id="1056" />
-<TGConnectingPoint num="23" id="1057" />
-<TGConnectingPoint num="24" id="1058" />
-<TGConnectingPoint num="25" id="1059" />
-<TGConnectingPoint num="26" id="1060" />
-<TGConnectingPoint num="27" id="1061" />
-<TGConnectingPoint num="28" id="1062" />
-<TGConnectingPoint num="29" id="1063" />
-<TGConnectingPoint num="30" id="1064" />
-<TGConnectingPoint num="31" id="1065" />
-<TGConnectingPoint num="32" id="1066" />
-<TGConnectingPoint num="33" id="1067" />
-<TGConnectingPoint num="34" id="1068" />
-<TGConnectingPoint num="35" id="1069" />
-<TGConnectingPoint num="36" id="1070" />
-<TGConnectingPoint num="37" id="1071" />
-<TGConnectingPoint num="38" id="1072" />
-<TGConnectingPoint num="39" id="1073" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="MACDataOK" />
+<TGConnectingPoint num="0" id="2332" />
+<TGConnectingPoint num="1" id="2333" />
+<TGConnectingPoint num="2" id="2334" />
+<TGConnectingPoint num="3" id="2335" />
+<TGConnectingPoint num="4" id="2336" />
+<TGConnectingPoint num="5" id="2337" />
+<TGConnectingPoint num="6" id="2338" />
+<TGConnectingPoint num="7" id="2339" />
+<TGConnectingPoint num="8" id="2340" />
+<TGConnectingPoint num="9" id="2341" />
+<TGConnectingPoint num="10" id="2342" />
+<TGConnectingPoint num="11" id="2343" />
+<TGConnectingPoint num="12" id="2344" />
+<TGConnectingPoint num="13" id="2345" />
+<TGConnectingPoint num="14" id="2346" />
+<TGConnectingPoint num="15" id="2347" />
+<TGConnectingPoint num="16" id="2348" />
+<TGConnectingPoint num="17" id="2349" />
+<TGConnectingPoint num="18" id="2350" />
+<TGConnectingPoint num="19" id="2351" />
+<TGConnectingPoint num="20" id="2352" />
+<TGConnectingPoint num="21" id="2353" />
+<TGConnectingPoint num="22" id="2354" />
+<TGConnectingPoint num="23" id="2355" />
+<TGConnectingPoint num="24" id="2356" />
+<TGConnectingPoint num="25" id="2357" />
+<TGConnectingPoint num="26" id="2358" />
+<TGConnectingPoint num="27" id="2359" />
+<TGConnectingPoint num="28" id="2360" />
+<TGConnectingPoint num="29" id="2361" />
+<TGConnectingPoint num="30" id="2362" />
+<TGConnectingPoint num="31" id="2363" />
+<TGConnectingPoint num="32" id="2364" />
+<TGConnectingPoint num="33" id="2365" />
+<TGConnectingPoint num="34" id="2366" />
+<TGConnectingPoint num="35" id="2367" />
+<TGConnectingPoint num="36" id="2368" />
+<TGConnectingPoint num="37" id="2369" />
+<TGConnectingPoint num="38" id="2370" />
+<TGConnectingPoint num="39" id="2371" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1115" >
-<cdparam x="335" y="798" />
-<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2413" >
+<cdparam x="486" y="879" />
+<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="timerExpired" />
-<TGConnectingPoint num="0" id="1075" />
-<TGConnectingPoint num="1" id="1076" />
-<TGConnectingPoint num="2" id="1077" />
-<TGConnectingPoint num="3" id="1078" />
-<TGConnectingPoint num="4" id="1079" />
-<TGConnectingPoint num="5" id="1080" />
-<TGConnectingPoint num="6" id="1081" />
-<TGConnectingPoint num="7" id="1082" />
-<TGConnectingPoint num="8" id="1083" />
-<TGConnectingPoint num="9" id="1084" />
-<TGConnectingPoint num="10" id="1085" />
-<TGConnectingPoint num="11" id="1086" />
-<TGConnectingPoint num="12" id="1087" />
-<TGConnectingPoint num="13" id="1088" />
-<TGConnectingPoint num="14" id="1089" />
-<TGConnectingPoint num="15" id="1090" />
-<TGConnectingPoint num="16" id="1091" />
-<TGConnectingPoint num="17" id="1092" />
-<TGConnectingPoint num="18" id="1093" />
-<TGConnectingPoint num="19" id="1094" />
-<TGConnectingPoint num="20" id="1095" />
-<TGConnectingPoint num="21" id="1096" />
-<TGConnectingPoint num="22" id="1097" />
-<TGConnectingPoint num="23" id="1098" />
-<TGConnectingPoint num="24" id="1099" />
-<TGConnectingPoint num="25" id="1100" />
-<TGConnectingPoint num="26" id="1101" />
-<TGConnectingPoint num="27" id="1102" />
-<TGConnectingPoint num="28" id="1103" />
-<TGConnectingPoint num="29" id="1104" />
-<TGConnectingPoint num="30" id="1105" />
-<TGConnectingPoint num="31" id="1106" />
-<TGConnectingPoint num="32" id="1107" />
-<TGConnectingPoint num="33" id="1108" />
-<TGConnectingPoint num="34" id="1109" />
-<TGConnectingPoint num="35" id="1110" />
-<TGConnectingPoint num="36" id="1111" />
-<TGConnectingPoint num="37" id="1112" />
-<TGConnectingPoint num="38" id="1113" />
-<TGConnectingPoint num="39" id="1114" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testingMAC" />
+<TGConnectingPoint num="0" id="2373" />
+<TGConnectingPoint num="1" id="2374" />
+<TGConnectingPoint num="2" id="2375" />
+<TGConnectingPoint num="3" id="2376" />
+<TGConnectingPoint num="4" id="2377" />
+<TGConnectingPoint num="5" id="2378" />
+<TGConnectingPoint num="6" id="2379" />
+<TGConnectingPoint num="7" id="2380" />
+<TGConnectingPoint num="8" id="2381" />
+<TGConnectingPoint num="9" id="2382" />
+<TGConnectingPoint num="10" id="2383" />
+<TGConnectingPoint num="11" id="2384" />
+<TGConnectingPoint num="12" id="2385" />
+<TGConnectingPoint num="13" id="2386" />
+<TGConnectingPoint num="14" id="2387" />
+<TGConnectingPoint num="15" id="2388" />
+<TGConnectingPoint num="16" id="2389" />
+<TGConnectingPoint num="17" id="2390" />
+<TGConnectingPoint num="18" id="2391" />
+<TGConnectingPoint num="19" id="2392" />
+<TGConnectingPoint num="20" id="2393" />
+<TGConnectingPoint num="21" id="2394" />
+<TGConnectingPoint num="22" id="2395" />
+<TGConnectingPoint num="23" id="2396" />
+<TGConnectingPoint num="24" id="2397" />
+<TGConnectingPoint num="25" id="2398" />
+<TGConnectingPoint num="26" id="2399" />
+<TGConnectingPoint num="27" id="2400" />
+<TGConnectingPoint num="28" id="2401" />
+<TGConnectingPoint num="29" id="2402" />
+<TGConnectingPoint num="30" id="2403" />
+<TGConnectingPoint num="31" id="2404" />
+<TGConnectingPoint num="32" id="2405" />
+<TGConnectingPoint num="33" id="2406" />
+<TGConnectingPoint num="34" id="2407" />
+<TGConnectingPoint num="35" id="2408" />
+<TGConnectingPoint num="36" id="2409" />
+<TGConnectingPoint num="37" id="2410" />
+<TGConnectingPoint num="38" id="2411" />
+<TGConnectingPoint num="39" id="2412" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1126" >
-<cdparam x="441" y="569" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chout(settimer)" />
-<TGConnectingPoint num="0" id="1116" />
-<TGConnectingPoint num="1" id="1117" />
-<TGConnectingPoint num="2" id="1118" />
-<TGConnectingPoint num="3" id="1119" />
-<TGConnectingPoint num="4" id="1120" />
-<TGConnectingPoint num="5" id="1121" />
-<TGConnectingPoint num="6" id="1122" />
-<TGConnectingPoint num="7" id="1123" />
-<TGConnectingPoint num="8" id="1124" />
-<TGConnectingPoint num="9" id="1125" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1137" >
-<cdparam x="575" y="1073" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2454" >
+<cdparam x="353" y="322" />
+<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="1127" />
-<TGConnectingPoint num="1" id="1128" />
-<TGConnectingPoint num="2" id="1129" />
-<TGConnectingPoint num="3" id="1130" />
-<TGConnectingPoint num="4" id="1131" />
-<TGConnectingPoint num="5" id="1132" />
-<TGConnectingPoint num="6" id="1133" />
-<TGConnectingPoint num="7" id="1134" />
-<TGConnectingPoint num="8" id="1135" />
-<TGConnectingPoint num="9" id="1136" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC0" />
+<TGConnectingPoint num="0" id="2414" />
+<TGConnectingPoint num="1" id="2415" />
+<TGConnectingPoint num="2" id="2416" />
+<TGConnectingPoint num="3" id="2417" />
+<TGConnectingPoint num="4" id="2418" />
+<TGConnectingPoint num="5" id="2419" />
+<TGConnectingPoint num="6" id="2420" />
+<TGConnectingPoint num="7" id="2421" />
+<TGConnectingPoint num="8" id="2422" />
+<TGConnectingPoint num="9" id="2423" />
+<TGConnectingPoint num="10" id="2424" />
+<TGConnectingPoint num="11" id="2425" />
+<TGConnectingPoint num="12" id="2426" />
+<TGConnectingPoint num="13" id="2427" />
+<TGConnectingPoint num="14" id="2428" />
+<TGConnectingPoint num="15" id="2429" />
+<TGConnectingPoint num="16" id="2430" />
+<TGConnectingPoint num="17" id="2431" />
+<TGConnectingPoint num="18" id="2432" />
+<TGConnectingPoint num="19" id="2433" />
+<TGConnectingPoint num="20" id="2434" />
+<TGConnectingPoint num="21" id="2435" />
+<TGConnectingPoint num="22" id="2436" />
+<TGConnectingPoint num="23" id="2437" />
+<TGConnectingPoint num="24" id="2438" />
+<TGConnectingPoint num="25" id="2439" />
+<TGConnectingPoint num="26" id="2440" />
+<TGConnectingPoint num="27" id="2441" />
+<TGConnectingPoint num="28" id="2442" />
+<TGConnectingPoint num="29" id="2443" />
+<TGConnectingPoint num="30" id="2444" />
+<TGConnectingPoint num="31" id="2445" />
+<TGConnectingPoint num="32" id="2446" />
+<TGConnectingPoint num="33" id="2447" />
+<TGConnectingPoint num="34" id="2448" />
+<TGConnectingPoint num="35" id="2449" />
+<TGConnectingPoint num="36" id="2450" />
+<TGConnectingPoint num="37" id="2451" />
+<TGConnectingPoint num="38" id="2452" />
+<TGConnectingPoint num="39" id="2453" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1178" >
-<cdparam x="513" y="1117" />
-<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2495" >
+<cdparam x="311" y="238" />
+<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_FORWARDED" />
-<TGConnectingPoint num="0" id="1138" />
-<TGConnectingPoint num="1" id="1139" />
-<TGConnectingPoint num="2" id="1140" />
-<TGConnectingPoint num="3" id="1141" />
-<TGConnectingPoint num="4" id="1142" />
-<TGConnectingPoint num="5" id="1143" />
-<TGConnectingPoint num="6" id="1144" />
-<TGConnectingPoint num="7" id="1145" />
-<TGConnectingPoint num="8" id="1146" />
-<TGConnectingPoint num="9" id="1147" />
-<TGConnectingPoint num="10" id="1148" />
-<TGConnectingPoint num="11" id="1149" />
-<TGConnectingPoint num="12" id="1150" />
-<TGConnectingPoint num="13" id="1151" />
-<TGConnectingPoint num="14" id="1152" />
-<TGConnectingPoint num="15" id="1153" />
-<TGConnectingPoint num="16" id="1154" />
-<TGConnectingPoint num="17" id="1155" />
-<TGConnectingPoint num="18" id="1156" />
-<TGConnectingPoint num="19" id="1157" />
-<TGConnectingPoint num="20" id="1158" />
-<TGConnectingPoint num="21" id="1159" />
-<TGConnectingPoint num="22" id="1160" />
-<TGConnectingPoint num="23" id="1161" />
-<TGConnectingPoint num="24" id="1162" />
-<TGConnectingPoint num="25" id="1163" />
-<TGConnectingPoint num="26" id="1164" />
-<TGConnectingPoint num="27" id="1165" />
-<TGConnectingPoint num="28" id="1166" />
-<TGConnectingPoint num="29" id="1167" />
-<TGConnectingPoint num="30" id="1168" />
-<TGConnectingPoint num="31" id="1169" />
-<TGConnectingPoint num="32" id="1170" />
-<TGConnectingPoint num="33" id="1171" />
-<TGConnectingPoint num="34" id="1172" />
-<TGConnectingPoint num="35" id="1173" />
-<TGConnectingPoint num="36" id="1174" />
-<TGConnectingPoint num="37" id="1175" />
-<TGConnectingPoint num="38" id="1176" />
-<TGConnectingPoint num="39" id="1177" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="GotMessage" />
+<TGConnectingPoint num="0" id="2455" />
+<TGConnectingPoint num="1" id="2456" />
+<TGConnectingPoint num="2" id="2457" />
+<TGConnectingPoint num="3" id="2458" />
+<TGConnectingPoint num="4" id="2459" />
+<TGConnectingPoint num="5" id="2460" />
+<TGConnectingPoint num="6" id="2461" />
+<TGConnectingPoint num="7" id="2462" />
+<TGConnectingPoint num="8" id="2463" />
+<TGConnectingPoint num="9" id="2464" />
+<TGConnectingPoint num="10" id="2465" />
+<TGConnectingPoint num="11" id="2466" />
+<TGConnectingPoint num="12" id="2467" />
+<TGConnectingPoint num="13" id="2468" />
+<TGConnectingPoint num="14" id="2469" />
+<TGConnectingPoint num="15" id="2470" />
+<TGConnectingPoint num="16" id="2471" />
+<TGConnectingPoint num="17" id="2472" />
+<TGConnectingPoint num="18" id="2473" />
+<TGConnectingPoint num="19" id="2474" />
+<TGConnectingPoint num="20" id="2475" />
+<TGConnectingPoint num="21" id="2476" />
+<TGConnectingPoint num="22" id="2477" />
+<TGConnectingPoint num="23" id="2478" />
+<TGConnectingPoint num="24" id="2479" />
+<TGConnectingPoint num="25" id="2480" />
+<TGConnectingPoint num="26" id="2481" />
+<TGConnectingPoint num="27" id="2482" />
+<TGConnectingPoint num="28" id="2483" />
+<TGConnectingPoint num="29" id="2484" />
+<TGConnectingPoint num="30" id="2485" />
+<TGConnectingPoint num="31" id="2486" />
+<TGConnectingPoint num="32" id="2487" />
+<TGConnectingPoint num="33" id="2488" />
+<TGConnectingPoint num="34" id="2489" />
+<TGConnectingPoint num="35" id="2490" />
+<TGConnectingPoint num="36" id="2491" />
+<TGConnectingPoint num="37" id="2492" />
+<TGConnectingPoint num="38" id="2493" />
+<TGConnectingPoint num="39" id="2494" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1219" >
-<cdparam x="539" y="940" />
-<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2536" >
+<cdparam x="454" y="495" />
+<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_OK" />
-<TGConnectingPoint num="0" id="1179" />
-<TGConnectingPoint num="1" id="1180" />
-<TGConnectingPoint num="2" id="1181" />
-<TGConnectingPoint num="3" id="1182" />
-<TGConnectingPoint num="4" id="1183" />
-<TGConnectingPoint num="5" id="1184" />
-<TGConnectingPoint num="6" id="1185" />
-<TGConnectingPoint num="7" id="1186" />
-<TGConnectingPoint num="8" id="1187" />
-<TGConnectingPoint num="9" id="1188" />
-<TGConnectingPoint num="10" id="1189" />
-<TGConnectingPoint num="11" id="1190" />
-<TGConnectingPoint num="12" id="1191" />
-<TGConnectingPoint num="13" id="1192" />
-<TGConnectingPoint num="14" id="1193" />
-<TGConnectingPoint num="15" id="1194" />
-<TGConnectingPoint num="16" id="1195" />
-<TGConnectingPoint num="17" id="1196" />
-<TGConnectingPoint num="18" id="1197" />
-<TGConnectingPoint num="19" id="1198" />
-<TGConnectingPoint num="20" id="1199" />
-<TGConnectingPoint num="21" id="1200" />
-<TGConnectingPoint num="22" id="1201" />
-<TGConnectingPoint num="23" id="1202" />
-<TGConnectingPoint num="24" id="1203" />
-<TGConnectingPoint num="25" id="1204" />
-<TGConnectingPoint num="26" id="1205" />
-<TGConnectingPoint num="27" id="1206" />
-<TGConnectingPoint num="28" id="1207" />
-<TGConnectingPoint num="29" id="1208" />
-<TGConnectingPoint num="30" id="1209" />
-<TGConnectingPoint num="31" id="1210" />
-<TGConnectingPoint num="32" id="1211" />
-<TGConnectingPoint num="33" id="1212" />
-<TGConnectingPoint num="34" id="1213" />
-<TGConnectingPoint num="35" id="1214" />
-<TGConnectingPoint num="36" id="1215" />
-<TGConnectingPoint num="37" id="1216" />
-<TGConnectingPoint num="38" id="1217" />
-<TGConnectingPoint num="39" id="1218" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC_OK" />
+<TGConnectingPoint num="0" id="2496" />
+<TGConnectingPoint num="1" id="2497" />
+<TGConnectingPoint num="2" id="2498" />
+<TGConnectingPoint num="3" id="2499" />
+<TGConnectingPoint num="4" id="2500" />
+<TGConnectingPoint num="5" id="2501" />
+<TGConnectingPoint num="6" id="2502" />
+<TGConnectingPoint num="7" id="2503" />
+<TGConnectingPoint num="8" id="2504" />
+<TGConnectingPoint num="9" id="2505" />
+<TGConnectingPoint num="10" id="2506" />
+<TGConnectingPoint num="11" id="2507" />
+<TGConnectingPoint num="12" id="2508" />
+<TGConnectingPoint num="13" id="2509" />
+<TGConnectingPoint num="14" id="2510" />
+<TGConnectingPoint num="15" id="2511" />
+<TGConnectingPoint num="16" id="2512" />
+<TGConnectingPoint num="17" id="2513" />
+<TGConnectingPoint num="18" id="2514" />
+<TGConnectingPoint num="19" id="2515" />
+<TGConnectingPoint num="20" id="2516" />
+<TGConnectingPoint num="21" id="2517" />
+<TGConnectingPoint num="22" id="2518" />
+<TGConnectingPoint num="23" id="2519" />
+<TGConnectingPoint num="24" id="2520" />
+<TGConnectingPoint num="25" id="2521" />
+<TGConnectingPoint num="26" id="2522" />
+<TGConnectingPoint num="27" id="2523" />
+<TGConnectingPoint num="28" id="2524" />
+<TGConnectingPoint num="29" id="2525" />
+<TGConnectingPoint num="30" id="2526" />
+<TGConnectingPoint num="31" id="2527" />
+<TGConnectingPoint num="32" id="2528" />
+<TGConnectingPoint num="33" id="2529" />
+<TGConnectingPoint num="34" id="2530" />
+<TGConnectingPoint num="35" id="2531" />
+<TGConnectingPoint num="36" id="2532" />
+<TGConnectingPoint num="37" id="2533" />
+<TGConnectingPoint num="38" id="2534" />
+<TGConnectingPoint num="39" id="2535" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1260" >
-<cdparam x="552" y="874" />
-<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2577" >
+<cdparam x="259" y="100" />
+<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACK" />
-<TGConnectingPoint num="0" id="1220" />
-<TGConnectingPoint num="1" id="1221" />
-<TGConnectingPoint num="2" id="1222" />
-<TGConnectingPoint num="3" id="1223" />
-<TGConnectingPoint num="4" id="1224" />
-<TGConnectingPoint num="5" id="1225" />
-<TGConnectingPoint num="6" id="1226" />
-<TGConnectingPoint num="7" id="1227" />
-<TGConnectingPoint num="8" id="1228" />
-<TGConnectingPoint num="9" id="1229" />
-<TGConnectingPoint num="10" id="1230" />
-<TGConnectingPoint num="11" id="1231" />
-<TGConnectingPoint num="12" id="1232" />
-<TGConnectingPoint num="13" id="1233" />
-<TGConnectingPoint num="14" id="1234" />
-<TGConnectingPoint num="15" id="1235" />
-<TGConnectingPoint num="16" id="1236" />
-<TGConnectingPoint num="17" id="1237" />
-<TGConnectingPoint num="18" id="1238" />
-<TGConnectingPoint num="19" id="1239" />
-<TGConnectingPoint num="20" id="1240" />
-<TGConnectingPoint num="21" id="1241" />
-<TGConnectingPoint num="22" id="1242" />
-<TGConnectingPoint num="23" id="1243" />
-<TGConnectingPoint num="24" id="1244" />
-<TGConnectingPoint num="25" id="1245" />
-<TGConnectingPoint num="26" id="1246" />
-<TGConnectingPoint num="27" id="1247" />
-<TGConnectingPoint num="28" id="1248" />
-<TGConnectingPoint num="29" id="1249" />
-<TGConnectingPoint num="30" id="1250" />
-<TGConnectingPoint num="31" id="1251" />
-<TGConnectingPoint num="32" id="1252" />
-<TGConnectingPoint num="33" id="1253" />
-<TGConnectingPoint num="34" id="1254" />
-<TGConnectingPoint num="35" id="1255" />
-<TGConnectingPoint num="36" id="1256" />
-<TGConnectingPoint num="37" id="1257" />
-<TGConnectingPoint num="38" id="1258" />
-<TGConnectingPoint num="39" id="1259" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="waitForKeyGroup" />
+<TGConnectingPoint num="0" id="2537" />
+<TGConnectingPoint num="1" id="2538" />
+<TGConnectingPoint num="2" id="2539" />
+<TGConnectingPoint num="3" id="2540" />
+<TGConnectingPoint num="4" id="2541" />
+<TGConnectingPoint num="5" id="2542" />
+<TGConnectingPoint num="6" id="2543" />
+<TGConnectingPoint num="7" id="2544" />
+<TGConnectingPoint num="8" id="2545" />
+<TGConnectingPoint num="9" id="2546" />
+<TGConnectingPoint num="10" id="2547" />
+<TGConnectingPoint num="11" id="2548" />
+<TGConnectingPoint num="12" id="2549" />
+<TGConnectingPoint num="13" id="2550" />
+<TGConnectingPoint num="14" id="2551" />
+<TGConnectingPoint num="15" id="2552" />
+<TGConnectingPoint num="16" id="2553" />
+<TGConnectingPoint num="17" id="2554" />
+<TGConnectingPoint num="18" id="2555" />
+<TGConnectingPoint num="19" id="2556" />
+<TGConnectingPoint num="20" id="2557" />
+<TGConnectingPoint num="21" id="2558" />
+<TGConnectingPoint num="22" id="2559" />
+<TGConnectingPoint num="23" id="2560" />
+<TGConnectingPoint num="24" id="2561" />
+<TGConnectingPoint num="25" id="2562" />
+<TGConnectingPoint num="26" id="2563" />
+<TGConnectingPoint num="27" id="2564" />
+<TGConnectingPoint num="28" id="2565" />
+<TGConnectingPoint num="29" id="2566" />
+<TGConnectingPoint num="30" id="2567" />
+<TGConnectingPoint num="31" id="2568" />
+<TGConnectingPoint num="32" id="2569" />
+<TGConnectingPoint num="33" id="2570" />
+<TGConnectingPoint num="34" id="2571" />
+<TGConnectingPoint num="35" id="2572" />
+<TGConnectingPoint num="36" id="2573" />
+<TGConnectingPoint num="37" id="2574" />
+<TGConnectingPoint num="38" id="2575" />
+<TGConnectingPoint num="39" id="2576" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1301" >
-<cdparam x="532" y="797" />
-<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="2579" >
+<cdparam x="335" y="52" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACKMAC" />
-<TGConnectingPoint num="0" id="1261" />
-<TGConnectingPoint num="1" id="1262" />
-<TGConnectingPoint num="2" id="1263" />
-<TGConnectingPoint num="3" id="1264" />
-<TGConnectingPoint num="4" id="1265" />
-<TGConnectingPoint num="5" id="1266" />
-<TGConnectingPoint num="6" id="1267" />
-<TGConnectingPoint num="7" id="1268" />
-<TGConnectingPoint num="8" id="1269" />
-<TGConnectingPoint num="9" id="1270" />
-<TGConnectingPoint num="10" id="1271" />
-<TGConnectingPoint num="11" id="1272" />
-<TGConnectingPoint num="12" id="1273" />
-<TGConnectingPoint num="13" id="1274" />
-<TGConnectingPoint num="14" id="1275" />
-<TGConnectingPoint num="15" id="1276" />
-<TGConnectingPoint num="16" id="1277" />
-<TGConnectingPoint num="17" id="1278" />
-<TGConnectingPoint num="18" id="1279" />
-<TGConnectingPoint num="19" id="1280" />
-<TGConnectingPoint num="20" id="1281" />
-<TGConnectingPoint num="21" id="1282" />
-<TGConnectingPoint num="22" id="1283" />
-<TGConnectingPoint num="23" id="1284" />
-<TGConnectingPoint num="24" id="1285" />
-<TGConnectingPoint num="25" id="1286" />
-<TGConnectingPoint num="26" id="1287" />
-<TGConnectingPoint num="27" id="1288" />
-<TGConnectingPoint num="28" id="1289" />
-<TGConnectingPoint num="29" id="1290" />
-<TGConnectingPoint num="30" id="1291" />
-<TGConnectingPoint num="31" id="1292" />
-<TGConnectingPoint num="32" id="1293" />
-<TGConnectingPoint num="33" id="1294" />
-<TGConnectingPoint num="34" id="1295" />
-<TGConnectingPoint num="35" id="1296" />
-<TGConnectingPoint num="36" id="1297" />
-<TGConnectingPoint num="37" id="1298" />
-<TGConnectingPoint num="38" id="1299" />
-<TGConnectingPoint num="39" id="1300" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2578" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1342" >
-<cdparam x="394" y="336" />
-<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2590" >
+<cdparam x="314" y="178" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="1302" />
-<TGConnectingPoint num="1" id="1303" />
-<TGConnectingPoint num="2" id="1304" />
-<TGConnectingPoint num="3" id="1305" />
-<TGConnectingPoint num="4" id="1306" />
-<TGConnectingPoint num="5" id="1307" />
-<TGConnectingPoint num="6" id="1308" />
-<TGConnectingPoint num="7" id="1309" />
-<TGConnectingPoint num="8" id="1310" />
-<TGConnectingPoint num="9" id="1311" />
-<TGConnectingPoint num="10" id="1312" />
-<TGConnectingPoint num="11" id="1313" />
-<TGConnectingPoint num="12" id="1314" />
-<TGConnectingPoint num="13" id="1315" />
-<TGConnectingPoint num="14" id="1316" />
-<TGConnectingPoint num="15" id="1317" />
-<TGConnectingPoint num="16" id="1318" />
-<TGConnectingPoint num="17" id="1319" />
-<TGConnectingPoint num="18" id="1320" />
-<TGConnectingPoint num="19" id="1321" />
-<TGConnectingPoint num="20" id="1322" />
-<TGConnectingPoint num="21" id="1323" />
-<TGConnectingPoint num="22" id="1324" />
-<TGConnectingPoint num="23" id="1325" />
-<TGConnectingPoint num="24" id="1326" />
-<TGConnectingPoint num="25" id="1327" />
-<TGConnectingPoint num="26" id="1328" />
-<TGConnectingPoint num="27" id="1329" />
-<TGConnectingPoint num="28" id="1330" />
-<TGConnectingPoint num="29" id="1331" />
-<TGConnectingPoint num="30" id="1332" />
-<TGConnectingPoint num="31" id="1333" />
-<TGConnectingPoint num="32" id="1334" />
-<TGConnectingPoint num="33" id="1335" />
-<TGConnectingPoint num="34" id="1336" />
-<TGConnectingPoint num="35" id="1337" />
-<TGConnectingPoint num="36" id="1338" />
-<TGConnectingPoint num="37" id="1339" />
-<TGConnectingPoint num="38" id="1340" />
-<TGConnectingPoint num="39" id="1341" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="2580" />
+<TGConnectingPoint num="1" id="2581" />
+<TGConnectingPoint num="2" id="2582" />
+<TGConnectingPoint num="3" id="2583" />
+<TGConnectingPoint num="4" id="2584" />
+<TGConnectingPoint num="5" id="2585" />
+<TGConnectingPoint num="6" id="2586" />
+<TGConnectingPoint num="7" id="2587" />
+<TGConnectingPoint num="8" id="2588" />
+<TGConnectingPoint num="9" id="2589" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1383" >
-<cdparam x="411" y="426" />
-<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2601" >
+<cdparam x="512" y="767" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="decipherOK" />
-<TGConnectingPoint num="0" id="1343" />
-<TGConnectingPoint num="1" id="1344" />
-<TGConnectingPoint num="2" id="1345" />
-<TGConnectingPoint num="3" id="1346" />
-<TGConnectingPoint num="4" id="1347" />
-<TGConnectingPoint num="5" id="1348" />
-<TGConnectingPoint num="6" id="1349" />
-<TGConnectingPoint num="7" id="1350" />
-<TGConnectingPoint num="8" id="1351" />
-<TGConnectingPoint num="9" id="1352" />
-<TGConnectingPoint num="10" id="1353" />
-<TGConnectingPoint num="11" id="1354" />
-<TGConnectingPoint num="12" id="1355" />
-<TGConnectingPoint num="13" id="1356" />
-<TGConnectingPoint num="14" id="1357" />
-<TGConnectingPoint num="15" id="1358" />
-<TGConnectingPoint num="16" id="1359" />
-<TGConnectingPoint num="17" id="1360" />
-<TGConnectingPoint num="18" id="1361" />
-<TGConnectingPoint num="19" id="1362" />
-<TGConnectingPoint num="20" id="1363" />
-<TGConnectingPoint num="21" id="1364" />
-<TGConnectingPoint num="22" id="1365" />
-<TGConnectingPoint num="23" id="1366" />
-<TGConnectingPoint num="24" id="1367" />
-<TGConnectingPoint num="25" id="1368" />
-<TGConnectingPoint num="26" id="1369" />
-<TGConnectingPoint num="27" id="1370" />
-<TGConnectingPoint num="28" id="1371" />
-<TGConnectingPoint num="29" id="1372" />
-<TGConnectingPoint num="30" id="1373" />
-<TGConnectingPoint num="31" id="1374" />
-<TGConnectingPoint num="32" id="1375" />
-<TGConnectingPoint num="33" id="1376" />
-<TGConnectingPoint num="34" id="1377" />
-<TGConnectingPoint num="35" id="1378" />
-<TGConnectingPoint num="36" id="1379" />
-<TGConnectingPoint num="37" id="1380" />
-<TGConnectingPoint num="38" id="1381" />
-<TGConnectingPoint num="39" id="1382" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="2591" />
+<TGConnectingPoint num="1" id="2592" />
+<TGConnectingPoint num="2" id="2593" />
+<TGConnectingPoint num="3" id="2594" />
+<TGConnectingPoint num="4" id="2595" />
+<TGConnectingPoint num="5" id="2596" />
+<TGConnectingPoint num="6" id="2597" />
+<TGConnectingPoint num="7" id="2598" />
+<TGConnectingPoint num="8" id="2599" />
+<TGConnectingPoint num="9" id="2600" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1424" >
-<cdparam x="314" y="177" />
-<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2642" >
+<cdparam x="451" y="688" />
+<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="gotFirstMessage" />
-<TGConnectingPoint num="0" id="1384" />
-<TGConnectingPoint num="1" id="1385" />
-<TGConnectingPoint num="2" id="1386" />
-<TGConnectingPoint num="3" id="1387" />
-<TGConnectingPoint num="4" id="1388" />
-<TGConnectingPoint num="5" id="1389" />
-<TGConnectingPoint num="6" id="1390" />
-<TGConnectingPoint num="7" id="1391" />
-<TGConnectingPoint num="8" id="1392" />
-<TGConnectingPoint num="9" id="1393" />
-<TGConnectingPoint num="10" id="1394" />
-<TGConnectingPoint num="11" id="1395" />
-<TGConnectingPoint num="12" id="1396" />
-<TGConnectingPoint num="13" id="1397" />
-<TGConnectingPoint num="14" id="1398" />
-<TGConnectingPoint num="15" id="1399" />
-<TGConnectingPoint num="16" id="1400" />
-<TGConnectingPoint num="17" id="1401" />
-<TGConnectingPoint num="18" id="1402" />
-<TGConnectingPoint num="19" id="1403" />
-<TGConnectingPoint num="20" id="1404" />
-<TGConnectingPoint num="21" id="1405" />
-<TGConnectingPoint num="22" id="1406" />
-<TGConnectingPoint num="23" id="1407" />
-<TGConnectingPoint num="24" id="1408" />
-<TGConnectingPoint num="25" id="1409" />
-<TGConnectingPoint num="26" id="1410" />
-<TGConnectingPoint num="27" id="1411" />
-<TGConnectingPoint num="28" id="1412" />
-<TGConnectingPoint num="29" id="1413" />
-<TGConnectingPoint num="30" id="1414" />
-<TGConnectingPoint num="31" id="1415" />
-<TGConnectingPoint num="32" id="1416" />
-<TGConnectingPoint num="33" id="1417" />
-<TGConnectingPoint num="34" id="1418" />
-<TGConnectingPoint num="35" id="1419" />
-<TGConnectingPoint num="36" id="1420" />
-<TGConnectingPoint num="37" id="1421" />
-<TGConnectingPoint num="38" id="1422" />
-<TGConnectingPoint num="39" id="1423" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitForData" />
+<TGConnectingPoint num="0" id="2602" />
+<TGConnectingPoint num="1" id="2603" />
+<TGConnectingPoint num="2" id="2604" />
+<TGConnectingPoint num="3" id="2605" />
+<TGConnectingPoint num="4" id="2606" />
+<TGConnectingPoint num="5" id="2607" />
+<TGConnectingPoint num="6" id="2608" />
+<TGConnectingPoint num="7" id="2609" />
+<TGConnectingPoint num="8" id="2610" />
+<TGConnectingPoint num="9" id="2611" />
+<TGConnectingPoint num="10" id="2612" />
+<TGConnectingPoint num="11" id="2613" />
+<TGConnectingPoint num="12" id="2614" />
+<TGConnectingPoint num="13" id="2615" />
+<TGConnectingPoint num="14" id="2616" />
+<TGConnectingPoint num="15" id="2617" />
+<TGConnectingPoint num="16" id="2618" />
+<TGConnectingPoint num="17" id="2619" />
+<TGConnectingPoint num="18" id="2620" />
+<TGConnectingPoint num="19" id="2621" />
+<TGConnectingPoint num="20" id="2622" />
+<TGConnectingPoint num="21" id="2623" />
+<TGConnectingPoint num="22" id="2624" />
+<TGConnectingPoint num="23" id="2625" />
+<TGConnectingPoint num="24" id="2626" />
+<TGConnectingPoint num="25" id="2627" />
+<TGConnectingPoint num="26" id="2628" />
+<TGConnectingPoint num="27" id="2629" />
+<TGConnectingPoint num="28" id="2630" />
+<TGConnectingPoint num="29" id="2631" />
+<TGConnectingPoint num="30" id="2632" />
+<TGConnectingPoint num="31" id="2633" />
+<TGConnectingPoint num="32" id="2634" />
+<TGConnectingPoint num="33" id="2635" />
+<TGConnectingPoint num="34" id="2636" />
+<TGConnectingPoint num="35" id="2637" />
+<TGConnectingPoint num="36" id="2638" />
+<TGConnectingPoint num="37" id="2639" />
+<TGConnectingPoint num="38" id="2640" />
+<TGConnectingPoint num="39" id="2641" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1435" >
-<cdparam x="452" y="664" />
+<COMPONENT type="5103" id="2653" >
+<cdparam x="507" y="628" />
 <sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="1425" />
-<TGConnectingPoint num="1" id="1426" />
-<TGConnectingPoint num="2" id="1427" />
-<TGConnectingPoint num="3" id="1428" />
-<TGConnectingPoint num="4" id="1429" />
-<TGConnectingPoint num="5" id="1430" />
-<TGConnectingPoint num="6" id="1431" />
-<TGConnectingPoint num="7" id="1432" />
-<TGConnectingPoint num="8" id="1433" />
-<TGConnectingPoint num="9" id="1434" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1476" >
-<cdparam x="391" y="613" />
-<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="WaitForACK" />
-<TGConnectingPoint num="0" id="1436" />
-<TGConnectingPoint num="1" id="1437" />
-<TGConnectingPoint num="2" id="1438" />
-<TGConnectingPoint num="3" id="1439" />
-<TGConnectingPoint num="4" id="1440" />
-<TGConnectingPoint num="5" id="1441" />
-<TGConnectingPoint num="6" id="1442" />
-<TGConnectingPoint num="7" id="1443" />
-<TGConnectingPoint num="8" id="1444" />
-<TGConnectingPoint num="9" id="1445" />
-<TGConnectingPoint num="10" id="1446" />
-<TGConnectingPoint num="11" id="1447" />
-<TGConnectingPoint num="12" id="1448" />
-<TGConnectingPoint num="13" id="1449" />
-<TGConnectingPoint num="14" id="1450" />
-<TGConnectingPoint num="15" id="1451" />
-<TGConnectingPoint num="16" id="1452" />
-<TGConnectingPoint num="17" id="1453" />
-<TGConnectingPoint num="18" id="1454" />
-<TGConnectingPoint num="19" id="1455" />
-<TGConnectingPoint num="20" id="1456" />
-<TGConnectingPoint num="21" id="1457" />
-<TGConnectingPoint num="22" id="1458" />
-<TGConnectingPoint num="23" id="1459" />
-<TGConnectingPoint num="24" id="1460" />
-<TGConnectingPoint num="25" id="1461" />
-<TGConnectingPoint num="26" id="1462" />
-<TGConnectingPoint num="27" id="1463" />
-<TGConnectingPoint num="28" id="1464" />
-<TGConnectingPoint num="29" id="1465" />
-<TGConnectingPoint num="30" id="1466" />
-<TGConnectingPoint num="31" id="1467" />
-<TGConnectingPoint num="32" id="1468" />
-<TGConnectingPoint num="33" id="1469" />
-<TGConnectingPoint num="34" id="1470" />
-<TGConnectingPoint num="35" id="1471" />
-<TGConnectingPoint num="36" id="1472" />
-<TGConnectingPoint num="37" id="1473" />
-<TGConnectingPoint num="38" id="1474" />
-<TGConnectingPoint num="39" id="1475" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1487" >
-<cdparam x="453" y="538" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="1477" />
-<TGConnectingPoint num="1" id="1478" />
-<TGConnectingPoint num="2" id="1479" />
-<TGConnectingPoint num="3" id="1480" />
-<TGConnectingPoint num="4" id="1481" />
-<TGConnectingPoint num="5" id="1482" />
-<TGConnectingPoint num="6" id="1483" />
-<TGConnectingPoint num="7" id="1484" />
-<TGConnectingPoint num="8" id="1485" />
-<TGConnectingPoint num="9" id="1486" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1528" >
-<cdparam x="250" y="334" />
-<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="TestMACFailed" />
-<TGConnectingPoint num="0" id="1488" />
-<TGConnectingPoint num="1" id="1489" />
-<TGConnectingPoint num="2" id="1490" />
-<TGConnectingPoint num="3" id="1491" />
-<TGConnectingPoint num="4" id="1492" />
-<TGConnectingPoint num="5" id="1493" />
-<TGConnectingPoint num="6" id="1494" />
-<TGConnectingPoint num="7" id="1495" />
-<TGConnectingPoint num="8" id="1496" />
-<TGConnectingPoint num="9" id="1497" />
-<TGConnectingPoint num="10" id="1498" />
-<TGConnectingPoint num="11" id="1499" />
-<TGConnectingPoint num="12" id="1500" />
-<TGConnectingPoint num="13" id="1501" />
-<TGConnectingPoint num="14" id="1502" />
-<TGConnectingPoint num="15" id="1503" />
-<TGConnectingPoint num="16" id="1504" />
-<TGConnectingPoint num="17" id="1505" />
-<TGConnectingPoint num="18" id="1506" />
-<TGConnectingPoint num="19" id="1507" />
-<TGConnectingPoint num="20" id="1508" />
-<TGConnectingPoint num="21" id="1509" />
-<TGConnectingPoint num="22" id="1510" />
-<TGConnectingPoint num="23" id="1511" />
-<TGConnectingPoint num="24" id="1512" />
-<TGConnectingPoint num="25" id="1513" />
-<TGConnectingPoint num="26" id="1514" />
-<TGConnectingPoint num="27" id="1515" />
-<TGConnectingPoint num="28" id="1516" />
-<TGConnectingPoint num="29" id="1517" />
-<TGConnectingPoint num="30" id="1518" />
-<TGConnectingPoint num="31" id="1519" />
-<TGConnectingPoint num="32" id="1520" />
-<TGConnectingPoint num="33" id="1521" />
-<TGConnectingPoint num="34" id="1522" />
-<TGConnectingPoint num="35" id="1523" />
-<TGConnectingPoint num="36" id="1524" />
-<TGConnectingPoint num="37" id="1525" />
-<TGConnectingPoint num="38" id="1526" />
-<TGConnectingPoint num="39" id="1527" />
-<extraparam>
-</extraparam>
+<TGConnectingPoint num="0" id="2643" />
+<TGConnectingPoint num="1" id="2644" />
+<TGConnectingPoint num="2" id="2645" />
+<TGConnectingPoint num="3" id="2646" />
+<TGConnectingPoint num="4" id="2647" />
+<TGConnectingPoint num="5" id="2648" />
+<TGConnectingPoint num="6" id="2649" />
+<TGConnectingPoint num="7" id="2650" />
+<TGConnectingPoint num="8" id="2651" />
+<TGConnectingPoint num="9" id="2652" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1569" >
-<cdparam x="349" y="252" />
+<COMPONENT type="5106" id="2694" >
+<cdparam x="405" y="405" />
 <sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="1529" />
-<TGConnectingPoint num="1" id="1530" />
-<TGConnectingPoint num="2" id="1531" />
-<TGConnectingPoint num="3" id="1532" />
-<TGConnectingPoint num="4" id="1533" />
-<TGConnectingPoint num="5" id="1534" />
-<TGConnectingPoint num="6" id="1535" />
-<TGConnectingPoint num="7" id="1536" />
-<TGConnectingPoint num="8" id="1537" />
-<TGConnectingPoint num="9" id="1538" />
-<TGConnectingPoint num="10" id="1539" />
-<TGConnectingPoint num="11" id="1540" />
-<TGConnectingPoint num="12" id="1541" />
-<TGConnectingPoint num="13" id="1542" />
-<TGConnectingPoint num="14" id="1543" />
-<TGConnectingPoint num="15" id="1544" />
-<TGConnectingPoint num="16" id="1545" />
-<TGConnectingPoint num="17" id="1546" />
-<TGConnectingPoint num="18" id="1547" />
-<TGConnectingPoint num="19" id="1548" />
-<TGConnectingPoint num="20" id="1549" />
-<TGConnectingPoint num="21" id="1550" />
-<TGConnectingPoint num="22" id="1551" />
-<TGConnectingPoint num="23" id="1552" />
-<TGConnectingPoint num="24" id="1553" />
-<TGConnectingPoint num="25" id="1554" />
-<TGConnectingPoint num="26" id="1555" />
-<TGConnectingPoint num="27" id="1556" />
-<TGConnectingPoint num="28" id="1557" />
-<TGConnectingPoint num="29" id="1558" />
-<TGConnectingPoint num="30" id="1559" />
-<TGConnectingPoint num="31" id="1560" />
-<TGConnectingPoint num="32" id="1561" />
-<TGConnectingPoint num="33" id="1562" />
-<TGConnectingPoint num="34" id="1563" />
-<TGConnectingPoint num="35" id="1564" />
-<TGConnectingPoint num="36" id="1565" />
-<TGConnectingPoint num="37" id="1566" />
-<TGConnectingPoint num="38" id="1567" />
-<TGConnectingPoint num="39" id="1568" />
+<TGConnectingPoint num="0" id="2654" />
+<TGConnectingPoint num="1" id="2655" />
+<TGConnectingPoint num="2" id="2656" />
+<TGConnectingPoint num="3" id="2657" />
+<TGConnectingPoint num="4" id="2658" />
+<TGConnectingPoint num="5" id="2659" />
+<TGConnectingPoint num="6" id="2660" />
+<TGConnectingPoint num="7" id="2661" />
+<TGConnectingPoint num="8" id="2662" />
+<TGConnectingPoint num="9" id="2663" />
+<TGConnectingPoint num="10" id="2664" />
+<TGConnectingPoint num="11" id="2665" />
+<TGConnectingPoint num="12" id="2666" />
+<TGConnectingPoint num="13" id="2667" />
+<TGConnectingPoint num="14" id="2668" />
+<TGConnectingPoint num="15" id="2669" />
+<TGConnectingPoint num="16" id="2670" />
+<TGConnectingPoint num="17" id="2671" />
+<TGConnectingPoint num="18" id="2672" />
+<TGConnectingPoint num="19" id="2673" />
+<TGConnectingPoint num="20" id="2674" />
+<TGConnectingPoint num="21" id="2675" />
+<TGConnectingPoint num="22" id="2676" />
+<TGConnectingPoint num="23" id="2677" />
+<TGConnectingPoint num="24" id="2678" />
+<TGConnectingPoint num="25" id="2679" />
+<TGConnectingPoint num="26" id="2680" />
+<TGConnectingPoint num="27" id="2681" />
+<TGConnectingPoint num="28" id="2682" />
+<TGConnectingPoint num="29" id="2683" />
+<TGConnectingPoint num="30" id="2684" />
+<TGConnectingPoint num="31" id="2685" />
+<TGConnectingPoint num="32" id="2686" />
+<TGConnectingPoint num="33" id="2687" />
+<TGConnectingPoint num="34" id="2688" />
+<TGConnectingPoint num="35" id="2689" />
+<TGConnectingPoint num="36" id="2690" />
+<TGConnectingPoint num="37" id="2691" />
+<TGConnectingPoint num="38" id="2692" />
+<TGConnectingPoint num="39" id="2693" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1580" >
-<cdparam x="358" y="142" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chin(msg8)" />
-<TGConnectingPoint num="0" id="1570" />
-<TGConnectingPoint num="1" id="1571" />
-<TGConnectingPoint num="2" id="1572" />
-<TGConnectingPoint num="3" id="1573" />
-<TGConnectingPoint num="4" id="1574" />
-<TGConnectingPoint num="5" id="1575" />
-<TGConnectingPoint num="6" id="1576" />
-<TGConnectingPoint num="7" id="1577" />
-<TGConnectingPoint num="8" id="1578" />
-<TGConnectingPoint num="9" id="1579" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1582" >
-<cdparam x="391" y="104" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1581" />
-</COMPONENT>
-
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="TimerKM" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1589" >
-<cdparam x="405" y="289" />
+<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="5102" id="1723" >
+<cdparam x="225" y="74" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1588" />
-<P1  x="405" y="289" id="1653" />
-<P2  x="408" y="331" id="1612" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1722" />
+<P1  x="173" y="59" id="2155" />
+<P2  x="177" y="90" id="1795" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1587" >
-<father id="1589" num="0" />
-<cdparam x="405" y="329" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1721" >
+<father id="1723" num="0" />
+<cdparam x="225" y="114" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1583" />
-<TGConnectingPoint num="1" id="1584" />
-<TGConnectingPoint num="2" id="1585" />
-<TGConnectingPoint num="3" id="1586" />
+<TGConnectingPoint num="0" id="1717" />
+<TGConnectingPoint num="1" id="1718" />
+<TGConnectingPoint num="2" id="1719" />
+<TGConnectingPoint num="3" id="1720" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2257,53 +1538,60 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1596" >
-<cdparam x="404" y="216" />
+<CONNECTOR type="5102" id="1730" >
+<cdparam x="192" y="159" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1595" />
-<P1  x="404" y="216" id="1669" />
-<P2  x="405" y="259" id="1652" />
+<TGConnectingPoint num="0" id="1729" />
+<P1  x="211" y="152" id="1809" />
+<P2  x="228" y="199" id="2144" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1594" >
-<father id="1596" num="0" />
-<cdparam x="404" y="256" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1728" >
+<father id="1730" num="0" />
+<cdparam x="274" y="118" />
+<sizeparam width="215" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1590" />
-<TGConnectingPoint num="1" id="1591" />
-<TGConnectingPoint num="2" id="1592" />
-<TGConnectingPoint num="3" id="1593" />
+<TGConnectingPoint num="0" id="1724" />
+<TGConnectingPoint num="1" id="1725" />
+<TGConnectingPoint num="2" id="1726" />
+<TGConnectingPoint num="3" id="1727" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg.data = SesK.data" />
+<actions value="msg1 = sencrypt(msg, PSK1)" />
+<actions value="msg2.data = groupid" />
+<actions value="msg3.data = timestamp" />
+<actions value="msg4 = concat3(msg1, msg2, msg3)" />
+<actions value="msg5 = MAC(msg4, PSK1)" />
+<actions value="msg6=concat2(msg4, msg5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1603" >
-<cdparam x="404" y="135" />
+<CONNECTOR type="5102" id="1737" >
+<cdparam x="512" y="848" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1602" />
-<P1  x="404" y="135" id="1705" />
-<P2  x="404" y="176" id="1664" />
+<TGConnectingPoint num="0" id="1736" />
+<P1  x="530" y="917" id="1836" />
+<P2  x="530" y="985" id="1888" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1601" >
-<father id="1603" num="0" />
-<cdparam x="404" y="175" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1735" >
+<father id="1737" num="0" />
+<cdparam x="512" y="888" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1597" />
-<TGConnectingPoint num="1" id="1598" />
-<TGConnectingPoint num="2" id="1599" />
-<TGConnectingPoint num="3" id="1600" />
+<TGConnectingPoint num="0" id="1731" />
+<TGConnectingPoint num="1" id="1732" />
+<TGConnectingPoint num="2" id="1733" />
+<TGConnectingPoint num="3" id="1734" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2313,374 +1601,106 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1610" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="1744" >
+<cdparam x="512" y="778" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1609" />
-<P1  x="407" y="70" id="1715" />
-<P2  x="404" y="105" id="1704" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1743" />
+<P1  x="523" y="778" id="1934" />
+<P2  x="530" y="887" id="1835" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1608" >
-<father id="1610" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1742" >
+<father id="1744" num="0" />
+<cdparam x="512" y="818" />
+<sizeparam width="174" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1604" />
-<TGConnectingPoint num="1" id="1605" />
-<TGConnectingPoint num="2" id="1606" />
-<TGConnectingPoint num="3" id="1607" />
+<TGConnectingPoint num="0" id="1738" />
+<TGConnectingPoint num="1" id="1739" />
+<TGConnectingPoint num="2" id="1740" />
+<TGConnectingPoint num="3" id="1741" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg4.data = confData" />
+<actions value="msg1 = sencrypt(msg4, SesK)" />
+<actions value="msg2 = MAC(msg1, SesK)" />
+<actions value="msg = concat2(msg1, msg2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1651" >
-<cdparam x="315" y="331" />
-<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1751" >
+<cdparam x="363" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1750" />
+<P1  x="363" y="654" id="2024" />
+<P2  x="238" y="734" id="1847" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1749" >
+<father id="1751" num="0" />
+<cdparam x="254" y="699" />
+<sizeparam width="152" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="timerExpired" />
-<TGConnectingPoint num="0" id="1611" />
-<TGConnectingPoint num="1" id="1612" />
-<TGConnectingPoint num="2" id="1613" />
-<TGConnectingPoint num="3" id="1614" />
-<TGConnectingPoint num="4" id="1615" />
-<TGConnectingPoint num="5" id="1616" />
-<TGConnectingPoint num="6" id="1617" />
-<TGConnectingPoint num="7" id="1618" />
-<TGConnectingPoint num="8" id="1619" />
-<TGConnectingPoint num="9" id="1620" />
-<TGConnectingPoint num="10" id="1621" />
-<TGConnectingPoint num="11" id="1622" />
-<TGConnectingPoint num="12" id="1623" />
-<TGConnectingPoint num="13" id="1624" />
-<TGConnectingPoint num="14" id="1625" />
-<TGConnectingPoint num="15" id="1626" />
-<TGConnectingPoint num="16" id="1627" />
-<TGConnectingPoint num="17" id="1628" />
-<TGConnectingPoint num="18" id="1629" />
-<TGConnectingPoint num="19" id="1630" />
-<TGConnectingPoint num="20" id="1631" />
-<TGConnectingPoint num="21" id="1632" />
-<TGConnectingPoint num="22" id="1633" />
-<TGConnectingPoint num="23" id="1634" />
-<TGConnectingPoint num="24" id="1635" />
-<TGConnectingPoint num="25" id="1636" />
-<TGConnectingPoint num="26" id="1637" />
-<TGConnectingPoint num="27" id="1638" />
-<TGConnectingPoint num="28" id="1639" />
-<TGConnectingPoint num="29" id="1640" />
-<TGConnectingPoint num="30" id="1641" />
-<TGConnectingPoint num="31" id="1642" />
-<TGConnectingPoint num="32" id="1643" />
-<TGConnectingPoint num="33" id="1644" />
-<TGConnectingPoint num="34" id="1645" />
-<TGConnectingPoint num="35" id="1646" />
-<TGConnectingPoint num="36" id="1647" />
-<TGConnectingPoint num="37" id="1648" />
-<TGConnectingPoint num="38" id="1649" />
-<TGConnectingPoint num="39" id="1650" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1745" />
+<TGConnectingPoint num="1" id="1746" />
+<TGConnectingPoint num="2" id="1747" />
+<TGConnectingPoint num="3" id="1748" />
 <extraparam>
+<guard value="[not(msg1.data == ACK) ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1662" >
-<cdparam x="347" y="264" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1758" >
+<cdparam x="436" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1757" />
+<P1  x="436" y="654" id="2025" />
+<P2  x="523" y="738" id="1929" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1756" >
+<father id="1758" num="0" />
+<cdparam x="446" y="694" />
+<sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(timerexpire)" />
-<TGConnectingPoint num="0" id="1652" />
-<TGConnectingPoint num="1" id="1653" />
-<TGConnectingPoint num="2" id="1654" />
-<TGConnectingPoint num="3" id="1655" />
-<TGConnectingPoint num="4" id="1656" />
-<TGConnectingPoint num="5" id="1657" />
-<TGConnectingPoint num="6" id="1658" />
-<TGConnectingPoint num="7" id="1659" />
-<TGConnectingPoint num="8" id="1660" />
-<TGConnectingPoint num="9" id="1661" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1752" />
+<TGConnectingPoint num="1" id="1753" />
+<TGConnectingPoint num="2" id="1754" />
+<TGConnectingPoint num="3" id="1755" />
+<extraparam>
+<guard value="[msg1.data == ACK ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1703" >
-<cdparam x="311" y="176" />
-<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="timerSet" />
-<TGConnectingPoint num="0" id="1663" />
-<TGConnectingPoint num="1" id="1664" />
-<TGConnectingPoint num="2" id="1665" />
-<TGConnectingPoint num="3" id="1666" />
-<TGConnectingPoint num="4" id="1667" />
-<TGConnectingPoint num="5" id="1668" />
-<TGConnectingPoint num="6" id="1669" />
-<TGConnectingPoint num="7" id="1670" />
-<TGConnectingPoint num="8" id="1671" />
-<TGConnectingPoint num="9" id="1672" />
-<TGConnectingPoint num="10" id="1673" />
-<TGConnectingPoint num="11" id="1674" />
-<TGConnectingPoint num="12" id="1675" />
-<TGConnectingPoint num="13" id="1676" />
-<TGConnectingPoint num="14" id="1677" />
-<TGConnectingPoint num="15" id="1678" />
-<TGConnectingPoint num="16" id="1679" />
-<TGConnectingPoint num="17" id="1680" />
-<TGConnectingPoint num="18" id="1681" />
-<TGConnectingPoint num="19" id="1682" />
-<TGConnectingPoint num="20" id="1683" />
-<TGConnectingPoint num="21" id="1684" />
-<TGConnectingPoint num="22" id="1685" />
-<TGConnectingPoint num="23" id="1686" />
-<TGConnectingPoint num="24" id="1687" />
-<TGConnectingPoint num="25" id="1688" />
-<TGConnectingPoint num="26" id="1689" />
-<TGConnectingPoint num="27" id="1690" />
-<TGConnectingPoint num="28" id="1691" />
-<TGConnectingPoint num="29" id="1692" />
-<TGConnectingPoint num="30" id="1693" />
-<TGConnectingPoint num="31" id="1694" />
-<TGConnectingPoint num="32" id="1695" />
-<TGConnectingPoint num="33" id="1696" />
-<TGConnectingPoint num="34" id="1697" />
-<TGConnectingPoint num="35" id="1698" />
-<TGConnectingPoint num="36" id="1699" />
-<TGConnectingPoint num="37" id="1700" />
-<TGConnectingPoint num="38" id="1701" />
-<TGConnectingPoint num="39" id="1702" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1714" >
-<cdparam x="356" y="110" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(settimer)" />
-<TGConnectingPoint num="0" id="1704" />
-<TGConnectingPoint num="1" id="1705" />
-<TGConnectingPoint num="2" id="1706" />
-<TGConnectingPoint num="3" id="1707" />
-<TGConnectingPoint num="4" id="1708" />
-<TGConnectingPoint num="5" id="1709" />
-<TGConnectingPoint num="6" id="1710" />
-<TGConnectingPoint num="7" id="1711" />
-<TGConnectingPoint num="8" id="1712" />
-<TGConnectingPoint num="9" id="1713" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1716" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1715" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="1723" >
-<cdparam x="225" y="74" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1722" />
-<P1  x="173" y="59" id="2155" />
-<P2  x="177" y="90" id="1795" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1721" >
-<father id="1723" num="0" />
-<cdparam x="225" y="114" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1717" />
-<TGConnectingPoint num="1" id="1718" />
-<TGConnectingPoint num="2" id="1719" />
-<TGConnectingPoint num="3" id="1720" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1730" >
-<cdparam x="192" y="159" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1729" />
-<P1  x="211" y="152" id="1809" />
-<P2  x="228" y="199" id="2144" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1728" >
-<father id="1730" num="0" />
-<cdparam x="274" y="118" />
-<sizeparam width="215" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1724" />
-<TGConnectingPoint num="1" id="1725" />
-<TGConnectingPoint num="2" id="1726" />
-<TGConnectingPoint num="3" id="1727" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="msg.data = SesK.data" />
-<actions value="msg1 = sencrypt(msg, PSK1)" />
-<actions value="msg2.data = groupid" />
-<actions value="msg3.data = timestamp" />
-<actions value="msg4 = concat3(msg1, msg2, msg3)" />
-<actions value="msg5 = MAC(msg4, PSK1)" />
-<actions value="msg6=concat2(msg4, msg5)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1737" >
-<cdparam x="512" y="848" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1736" />
-<P1  x="530" y="917" id="1836" />
-<P2  x="530" y="985" id="1888" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1735" >
-<father id="1737" num="0" />
-<cdparam x="512" y="888" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1731" />
-<TGConnectingPoint num="1" id="1732" />
-<TGConnectingPoint num="2" id="1733" />
-<TGConnectingPoint num="3" id="1734" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1744" >
-<cdparam x="512" y="778" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1743" />
-<P1  x="523" y="778" id="1934" />
-<P2  x="530" y="887" id="1835" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1742" >
-<father id="1744" num="0" />
-<cdparam x="512" y="818" />
-<sizeparam width="174" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1738" />
-<TGConnectingPoint num="1" id="1739" />
-<TGConnectingPoint num="2" id="1740" />
-<TGConnectingPoint num="3" id="1741" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="msg4.data = confData" />
-<actions value="msg1 = sencrypt(msg4, SesK)" />
-<actions value="msg2 = MAC(msg1, SesK)" />
-<actions value="msg = concat2(msg1, msg2)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1751" >
-<cdparam x="363" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1750" />
-<P1  x="363" y="654" id="2024" />
-<P2  x="238" y="734" id="1847" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1749" >
-<father id="1751" num="0" />
-<cdparam x="254" y="699" />
-<sizeparam width="152" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1745" />
-<TGConnectingPoint num="1" id="1746" />
-<TGConnectingPoint num="2" id="1747" />
-<TGConnectingPoint num="3" id="1748" />
-<extraparam>
-<guard value="[not(msg1.data == ACK) ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1758" >
-<cdparam x="436" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1757" />
-<P1  x="436" y="654" id="2025" />
-<P2  x="523" y="738" id="1929" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1756" >
-<father id="1758" num="0" />
-<cdparam x="446" y="694" />
-<sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1752" />
-<TGConnectingPoint num="1" id="1753" />
-<TGConnectingPoint num="2" id="1754" />
-<TGConnectingPoint num="3" id="1755" />
-<extraparam>
-<guard value="[msg1.data == ACK ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1765" >
-<cdparam x="249" y="524" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1764" />
-<P1  x="249" y="524" id="2065" />
-<P2  x="171" y="604" id="1970" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1763" >
-<father id="1765" num="0" />
-<cdparam x="160" y="553" />
-<sizeparam width="42" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1765" >
+<cdparam x="249" y="524" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1764" />
+<P1  x="249" y="524" id="2065" />
+<P2  x="171" y="604" id="1970" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1763" >
+<father id="1765" num="0" />
+<cdparam x="160" y="553" />
+<sizeparam width="42" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3278,86 +2298,86 @@ key is deleted in case there is one.
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="2163" >
-<cdparam x="638" y="1030" />
+<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
+<CONNECTOR type="5102" id="921" >
+<cdparam x="621" y="895" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2162" />
-<P1  x="638" y="1030" id="2338" />
-<P2  x="656" y="1133" id="2251" />
+<TGConnectingPoint num="0" id="920" />
+<P1  x="458" y="749" id="1048" />
+<P2  x="425" y="798" id="1076" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2161" >
-<father id="2163" num="0" />
-<cdparam x="654" y="1057" />
-<sizeparam width="223" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="919" >
+<father id="921" num="0" />
+<cdparam x="270" y="771" />
+<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2157" />
-<TGConnectingPoint num="1" id="2158" />
-<TGConnectingPoint num="2" id="2159" />
-<TGConnectingPoint num="3" id="2160" />
+<TGConnectingPoint num="0" id="915" />
+<TGConnectingPoint num="1" id="916" />
+<TGConnectingPoint num="2" id="917" />
+<TGConnectingPoint num="3" id="918" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[msg.data == timerexpire.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
-<actions value="secretData = msg3.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2170" >
-<cdparam x="514" y="919" />
+<CONNECTOR type="5102" id="928" >
+<cdparam x="654" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2169" />
-<P1  x="514" y="919" id="2387" />
-<P2  x="417" y="985" id="2292" />
+<TGConnectingPoint num="0" id="927" />
+<P1  x="488" y="749" id="1040" />
+<P2  x="611" y="797" id="1262" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2168" >
-<father id="2170" num="0" />
-<cdparam x="413" y="957" />
-<sizeparam width="46" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="926" >
+<father id="928" num="0" />
+<cdparam x="581" y="749" />
+<sizeparam width="217" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2164" />
-<TGConnectingPoint num="1" id="2165" />
-<TGConnectingPoint num="2" id="2166" />
-<TGConnectingPoint num="3" id="2167" />
+<TGConnectingPoint num="0" id="922" />
+<TGConnectingPoint num="1" id="923" />
+<TGConnectingPoint num="2" id="924" />
+<TGConnectingPoint num="3" id="925" />
 <extraparam>
-<guard value="[ not(b)]" />
+<guard value="[not(msg.data == timerexpire.data) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg, msg5, msg4)" />
+<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2177" >
-<cdparam x="570" y="919" />
+<CONNECTOR type="5102" id="935" >
+<cdparam x="524" y="710" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2176" />
-<P1  x="570" y="919" id="2388" />
-<P2  x="638" y="990" id="2333" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="934" />
+<P1  x="489" y="594" id="1117" />
+<P2  x="488" y="613" id="1437" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2175" >
-<father id="2177" num="0" />
-<cdparam x="570" y="959" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="933" >
+<father id="935" num="0" />
+<cdparam x="524" y="750" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2171" />
-<TGConnectingPoint num="1" id="2172" />
-<TGConnectingPoint num="2" id="2173" />
-<TGConnectingPoint num="3" id="2174" />
+<TGConnectingPoint num="0" id="929" />
+<TGConnectingPoint num="1" id="930" />
+<TGConnectingPoint num="2" id="931" />
+<TGConnectingPoint num="3" id="932" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -3365,113 +2385,118 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2184" >
-<cdparam x="342" y="72" />
+<CONNECTOR type="5102" id="942" >
+<cdparam x="988" y="1206" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2183" />
-<P1  x="342" y="72" id="2578" />
-<P2  x="342" y="100" id="2538" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="941" />
+<P1  x="611" y="980" id="1185" />
+<P2  x="611" y="1068" id="1127" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2182" >
-<father id="2184" num="0" />
-<cdparam x="342" y="112" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="940" >
+<father id="942" num="0" />
+<cdparam x="625" y="998" />
+<sizeparam width="315" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2178" />
-<TGConnectingPoint num="1" id="2179" />
-<TGConnectingPoint num="2" id="2180" />
-<TGConnectingPoint num="3" id="2181" />
+<TGConnectingPoint num="0" id="936" />
+<TGConnectingPoint num="1" id="937" />
+<TGConnectingPoint num="2" id="938" />
+<TGConnectingPoint num="3" id="939" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp2" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSK1)" />
+<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2191" >
-<cdparam x="548" y="792" />
+<CONNECTOR type="5102" id="949" >
+<cdparam x="427" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="2190" />
-<P1  x="548" y="792" id="2592" />
-<P2  x="542" y="879" id="2374" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="948" />
+<P1  x="398" y="124" id="1581" />
+<P2  x="398" y="137" id="1570" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2189" >
-<father id="2191" num="0" />
-<cdparam x="548" y="832" />
-<sizeparam width="240" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="947" >
+<father id="949" num="0" />
+<cdparam x="427" y="196" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2185" />
-<TGConnectingPoint num="1" id="2186" />
-<TGConnectingPoint num="2" id="2187" />
-<TGConnectingPoint num="3" id="2188" />
+<TGConnectingPoint num="0" id="943" />
+<TGConnectingPoint num="1" id="944" />
+<TGConnectingPoint num="2" id="945" />
+<TGConnectingPoint num="3" id="946" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg1, msg2)" />
-<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2198" >
-<cdparam x="434" y="475" />
+<CONNECTOR type="5102" id="956" >
+<cdparam x="472" y="500" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2197" />
-<P1  x="479" y="445" id="2669" />
-<P2  x="530" y="495" id="2497" />
+<TGConnectingPoint num="0" id="955" />
+<P1  x="489" y="376" id="1308" />
+<P2  x="489" y="426" id="1344" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2196" >
-<father id="2198" num="0" />
-<cdparam x="529" y="457" />
-<sizeparam width="291" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="954" >
+<father id="956" num="0" />
+<cdparam x="513" y="397" />
+<sizeparam width="307" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2192" />
-<TGConnectingPoint num="1" id="2193" />
-<TGConnectingPoint num="2" id="2194" />
-<TGConnectingPoint num="3" id="2195" />
+<TGConnectingPoint num="0" id="950" />
+<TGConnectingPoint num="1" id="951" />
+<TGConnectingPoint num="2" id="952" />
+<TGConnectingPoint num="3" id="953" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get3(msg1, msg5, msg2, msg3)" />
+<actions value="msgauth= sdecrypt(msg5, PSK1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2205" >
-<cdparam x="486" y="696" />
+<CONNECTOR type="5102" id="963" >
+<cdparam x="472" y="500" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2204" />
-<P1  x="543" y="653" id="2644" />
-<P2  x="548" y="688" id="2603" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="962" />
+<P1  x="373" y="292" id="1543" />
+<P2  x="316" y="334" id="1489" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2203" >
-<father id="2205" num="0" />
-<cdparam x="486" y="736" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="961" >
+<father id="963" num="0" />
+<cdparam x="208" y="317" />
+<sizeparam width="190" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2199" />
-<TGConnectingPoint num="1" id="2200" />
-<TGConnectingPoint num="2" id="2201" />
-<TGConnectingPoint num="3" id="2202" />
+<TGConnectingPoint num="0" id="957" />
+<TGConnectingPoint num="1" id="958" />
+<TGConnectingPoint num="2" id="959" />
+<TGConnectingPoint num="3" id="960" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[not(msg8.data == msg4.data) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -3479,25 +2504,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2212" >
-<cdparam x="548" y="728" />
+<CONNECTOR type="5102" id="970" >
+<cdparam x="517" y="650" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2211" />
-<P1  x="548" y="728" id="2608" />
-<P2  x="548" y="762" id="2591" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="969" />
+<P1  x="489" y="563" id="1478" />
+<P2  x="489" y="564" id="1116" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2210" >
-<father id="2212" num="0" />
-<cdparam x="548" y="768" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="968" >
+<father id="970" num="0" />
+<cdparam x="517" y="690" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2206" />
-<TGConnectingPoint num="1" id="2207" />
-<TGConnectingPoint num="2" id="2208" />
-<TGConnectingPoint num="3" id="2209" />
+<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="2" id="966" />
+<TGConnectingPoint num="3" id="967" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3507,54 +2532,53 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2219" >
-<cdparam x="304" y="307" />
+<CONNECTOR type="5102" id="977" >
+<cdparam x="710" y="775" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="2218" />
-<P1  x="429" y="362" id="2420" />
-<P2  x="454" y="405" id="2655" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="976" />
+<P1  x="488" y="689" id="1426" />
+<P2  x="488" y="709" id="1035" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2217" >
-<father id="2219" num="0" />
-<cdparam x="440" y="381" />
-<sizeparam width="201" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="975" >
+<father id="977" num="0" />
+<cdparam x="685" y="829" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2213" />
-<TGConnectingPoint num="1" id="2214" />
-<TGConnectingPoint num="2" id="2215" />
-<TGConnectingPoint num="3" id="2216" />
+<TGConnectingPoint num="0" id="971" />
+<TGConnectingPoint num="1" id="972" />
+<TGConnectingPoint num="2" id="973" />
+<TGConnectingPoint num="3" id="974" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2226" >
-<cdparam x="342" y="140" />
+<CONNECTOR type="5102" id="984" >
+<cdparam x="413" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2225" />
-<P1  x="342" y="140" id="2543" />
-<P2  x="350" y="173" id="2580" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="983" />
+<P1  x="398" y="167" id="1571" />
+<P2  x="398" y="177" id="1385" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2224" >
-<father id="2226" num="0" />
-<cdparam x="342" y="180" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="982" >
+<father id="984" num="0" />
+<cdparam x="413" y="211" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2220" />
-<TGConnectingPoint num="1" id="2221" />
-<TGConnectingPoint num="2" id="2222" />
-<TGConnectingPoint num="3" id="2223" />
+<TGConnectingPoint num="0" id="978" />
+<TGConnectingPoint num="1" id="979" />
+<TGConnectingPoint num="2" id="980" />
+<TGConnectingPoint num="3" id="981" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3564,687 +2588,1268 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2233" >
-<cdparam x="518" y="526" />
+<CONNECTOR type="5102" id="991" >
+<cdparam x="820" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2232" />
-<P1  x="530" y="535" id="2502" />
-<P2  x="543" y="623" id="2643" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="990" />
+<P1  x="611" y="837" id="1267" />
+<P2  x="611" y="874" id="1221" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2231" >
-<father id="2233" num="0" />
-<cdparam x="565" y="553" />
-<sizeparam width="323" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="989" >
+<father id="991" num="0" />
+<cdparam x="626" y="851" />
+<sizeparam width="186" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2227" />
-<TGConnectingPoint num="1" id="2228" />
-<TGConnectingPoint num="2" id="2229" />
-<TGConnectingPoint num="3" id="2230" />
+<TGConnectingPoint num="0" id="985" />
+<TGConnectingPoint num="1" id="986" />
+<TGConnectingPoint num="2" id="987" />
+<TGConnectingPoint num="3" id="988" />
+<extraparam>
+<guard value="[  ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get3(msg5, msg1, msg2, msg3)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="998" >
+<cdparam x="420" y="415" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="997" />
+<P1  x="398" y="217" id="1390" />
+<P2  x="398" y="252" id="1530" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="996" >
+<father id="998" num="0" />
+<cdparam x="418" y="233" />
+<sizeparam width="218" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="992" />
+<TGConnectingPoint num="1" id="993" />
+<TGConnectingPoint num="2" id="994" />
+<TGConnectingPoint num="3" id="995" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="keyOfGroup.data = msg1.data" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSKN)" />
-<actions value="msg = concat2(msg3, msg4)" />
+<actions value="get2(msg8, msg1, msg4)" />
+<actions value="msg8 = MAC(msg1, PSK1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2240" >
-<cdparam x="350" y="203" />
+<CONNECTOR type="5102" id="1005" >
+<cdparam x="967" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2239" />
-<P1  x="350" y="203" id="2581" />
-<P2  x="406" y="238" id="2456" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1004" />
+<P1  x="489" y="466" id="1349" />
+<P2  x="489" y="533" id="1477" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2238" >
-<father id="2240" num="0" />
-<cdparam x="350" y="243" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1003" >
+<father id="1005" num="0" />
+<cdparam x="532" y="480" />
+<sizeparam width="307" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2234" />
-<TGConnectingPoint num="1" id="2235" />
-<TGConnectingPoint num="2" id="2236" />
-<TGConnectingPoint num="3" id="2237" />
+<TGConnectingPoint num="0" id="999" />
+<TGConnectingPoint num="1" id="1000" />
+<TGConnectingPoint num="2" id="1001" />
+<TGConnectingPoint num="3" id="1002" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg7 = sencrypt(msgauth, PSKN)" />
+<actions value="msg3.data = timestamp1" />
+<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
+<actions value="msg4 = MAC(msg1, PSKN)" />
+<actions value="msg=concat2(msg1, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2249" >
-<cdparam x="406" y="268" />
+<CONNECTOR type="5102" id="1012" >
+<cdparam x="433" y="416" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2247" />
-<TGConnectingPoint num="1" id="2248" />
-<P1  x="406" y="268" id="2461" />
-<P2  x="429" y="322" id="2415" />
-<Point x="414" y="282" />
+<TGConnectingPoint num="0" id="1011" />
+<P1  x="398" y="292" id="1535" />
+<P2  x="489" y="336" id="1303" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2241" >
-<father id="2249" num="0" />
-<cdparam x="414" y="282" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1010" >
+<father id="1012" num="0" />
+<cdparam x="465" y="314" />
+<sizeparam width="160" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1006" />
+<TGConnectingPoint num="1" id="1007" />
+<TGConnectingPoint num="2" id="1008" />
+<TGConnectingPoint num="3" id="1009" />
+<extraparam>
+<guard value="[msg8.data == msg4.data]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2246" >
-<father id="2249" num="1" />
-<cdparam x="446" y="292" />
-<sizeparam width="226" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<CONNECTOR type="5102" id="1019" >
+<cdparam x="604" y="757" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1018" />
+<P1  x="488" y="653" id="1442" />
+<P2  x="488" y="659" id="1425" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1017" >
+<father id="1019" num="0" />
+<cdparam x="604" y="797" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2242" />
-<TGConnectingPoint num="1" id="2243" />
-<TGConnectingPoint num="2" id="2244" />
-<TGConnectingPoint num="3" id="2245" />
+<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="1" id="1014" />
+<TGConnectingPoint num="2" id="1015" />
+<TGConnectingPoint num="3" id="1016" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg5, msg6)" />
-<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2290" >
-<cdparam x="595" y="1133" />
-<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1026" >
+<cdparam x="983" y="1157" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1025" />
+<P1  x="611" y="914" id="1226" />
+<P2  x="611" y="940" id="1180" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1024" >
+<father id="1026" num="0" />
+<cdparam x="629" y="930" />
+<sizeparam width="130" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="gotData" />
-<TGConnectingPoint num="0" id="2250" />
-<TGConnectingPoint num="1" id="2251" />
-<TGConnectingPoint num="2" id="2252" />
-<TGConnectingPoint num="3" id="2253" />
-<TGConnectingPoint num="4" id="2254" />
-<TGConnectingPoint num="5" id="2255" />
-<TGConnectingPoint num="6" id="2256" />
-<TGConnectingPoint num="7" id="2257" />
-<TGConnectingPoint num="8" id="2258" />
-<TGConnectingPoint num="9" id="2259" />
-<TGConnectingPoint num="10" id="2260" />
-<TGConnectingPoint num="11" id="2261" />
-<TGConnectingPoint num="12" id="2262" />
-<TGConnectingPoint num="13" id="2263" />
-<TGConnectingPoint num="14" id="2264" />
-<TGConnectingPoint num="15" id="2265" />
-<TGConnectingPoint num="16" id="2266" />
-<TGConnectingPoint num="17" id="2267" />
-<TGConnectingPoint num="18" id="2268" />
-<TGConnectingPoint num="19" id="2269" />
-<TGConnectingPoint num="20" id="2270" />
-<TGConnectingPoint num="21" id="2271" />
-<TGConnectingPoint num="22" id="2272" />
-<TGConnectingPoint num="23" id="2273" />
-<TGConnectingPoint num="24" id="2274" />
-<TGConnectingPoint num="25" id="2275" />
-<TGConnectingPoint num="26" id="2276" />
-<TGConnectingPoint num="27" id="2277" />
-<TGConnectingPoint num="28" id="2278" />
-<TGConnectingPoint num="29" id="2279" />
-<TGConnectingPoint num="30" id="2280" />
-<TGConnectingPoint num="31" id="2281" />
-<TGConnectingPoint num="32" id="2282" />
-<TGConnectingPoint num="33" id="2283" />
-<TGConnectingPoint num="34" id="2284" />
-<TGConnectingPoint num="35" id="2285" />
-<TGConnectingPoint num="36" id="2286" />
-<TGConnectingPoint num="37" id="2287" />
-<TGConnectingPoint num="38" id="2288" />
-<TGConnectingPoint num="39" id="2289" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2331" >
-<cdparam x="366" y="985" />
-<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="MacDataFailed" />
-<TGConnectingPoint num="0" id="2291" />
-<TGConnectingPoint num="1" id="2292" />
-<TGConnectingPoint num="2" id="2293" />
-<TGConnectingPoint num="3" id="2294" />
-<TGConnectingPoint num="4" id="2295" />
-<TGConnectingPoint num="5" id="2296" />
-<TGConnectingPoint num="6" id="2297" />
-<TGConnectingPoint num="7" id="2298" />
-<TGConnectingPoint num="8" id="2299" />
-<TGConnectingPoint num="9" id="2300" />
-<TGConnectingPoint num="10" id="2301" />
-<TGConnectingPoint num="11" id="2302" />
-<TGConnectingPoint num="12" id="2303" />
-<TGConnectingPoint num="13" id="2304" />
-<TGConnectingPoint num="14" id="2305" />
-<TGConnectingPoint num="15" id="2306" />
-<TGConnectingPoint num="16" id="2307" />
-<TGConnectingPoint num="17" id="2308" />
-<TGConnectingPoint num="18" id="2309" />
-<TGConnectingPoint num="19" id="2310" />
-<TGConnectingPoint num="20" id="2311" />
-<TGConnectingPoint num="21" id="2312" />
-<TGConnectingPoint num="22" id="2313" />
-<TGConnectingPoint num="23" id="2314" />
-<TGConnectingPoint num="24" id="2315" />
-<TGConnectingPoint num="25" id="2316" />
-<TGConnectingPoint num="26" id="2317" />
-<TGConnectingPoint num="27" id="2318" />
-<TGConnectingPoint num="28" id="2319" />
-<TGConnectingPoint num="29" id="2320" />
-<TGConnectingPoint num="30" id="2321" />
-<TGConnectingPoint num="31" id="2322" />
-<TGConnectingPoint num="32" id="2323" />
-<TGConnectingPoint num="33" id="2324" />
-<TGConnectingPoint num="34" id="2325" />
-<TGConnectingPoint num="35" id="2326" />
-<TGConnectingPoint num="36" id="2327" />
-<TGConnectingPoint num="37" id="2328" />
-<TGConnectingPoint num="38" id="2329" />
-<TGConnectingPoint num="39" id="2330" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1020" />
+<TGConnectingPoint num="1" id="1021" />
+<TGConnectingPoint num="2" id="1022" />
+<TGConnectingPoint num="3" id="1023" />
 <extraparam>
+<guard value="[msg1.data == ACK  ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2372" >
-<cdparam x="580" y="990" />
-<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1033" >
+<cdparam x="732" y="1157" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1032" />
+<P1  x="611" y="1098" id="1128" />
+<P2  x="610" y="1117" id="1139" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1031" >
+<father id="1033" num="0" />
+<cdparam x="732" y="1197" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="MACDataOK" />
-<TGConnectingPoint num="0" id="2332" />
-<TGConnectingPoint num="1" id="2333" />
-<TGConnectingPoint num="2" id="2334" />
-<TGConnectingPoint num="3" id="2335" />
-<TGConnectingPoint num="4" id="2336" />
-<TGConnectingPoint num="5" id="2337" />
-<TGConnectingPoint num="6" id="2338" />
-<TGConnectingPoint num="7" id="2339" />
-<TGConnectingPoint num="8" id="2340" />
-<TGConnectingPoint num="9" id="2341" />
-<TGConnectingPoint num="10" id="2342" />
-<TGConnectingPoint num="11" id="2343" />
-<TGConnectingPoint num="12" id="2344" />
-<TGConnectingPoint num="13" id="2345" />
-<TGConnectingPoint num="14" id="2346" />
-<TGConnectingPoint num="15" id="2347" />
-<TGConnectingPoint num="16" id="2348" />
-<TGConnectingPoint num="17" id="2349" />
-<TGConnectingPoint num="18" id="2350" />
-<TGConnectingPoint num="19" id="2351" />
-<TGConnectingPoint num="20" id="2352" />
-<TGConnectingPoint num="21" id="2353" />
-<TGConnectingPoint num="22" id="2354" />
-<TGConnectingPoint num="23" id="2355" />
-<TGConnectingPoint num="24" id="2356" />
-<TGConnectingPoint num="25" id="2357" />
-<TGConnectingPoint num="26" id="2358" />
-<TGConnectingPoint num="27" id="2359" />
-<TGConnectingPoint num="28" id="2360" />
-<TGConnectingPoint num="29" id="2361" />
-<TGConnectingPoint num="30" id="2362" />
-<TGConnectingPoint num="31" id="2363" />
-<TGConnectingPoint num="32" id="2364" />
-<TGConnectingPoint num="33" id="2365" />
-<TGConnectingPoint num="34" id="2366" />
-<TGConnectingPoint num="35" id="2367" />
-<TGConnectingPoint num="36" id="2368" />
-<TGConnectingPoint num="37" id="2369" />
-<TGConnectingPoint num="38" id="2370" />
-<TGConnectingPoint num="39" id="2371" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1027" />
+<TGConnectingPoint num="1" id="1028" />
+<TGConnectingPoint num="2" id="1029" />
+<TGConnectingPoint num="3" id="1030" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2413" >
-<cdparam x="486" y="879" />
-<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1074" >
+<cdparam x="429" y="709" />
+<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testingMAC" />
-<TGConnectingPoint num="0" id="2373" />
-<TGConnectingPoint num="1" id="2374" />
-<TGConnectingPoint num="2" id="2375" />
-<TGConnectingPoint num="3" id="2376" />
-<TGConnectingPoint num="4" id="2377" />
-<TGConnectingPoint num="5" id="2378" />
-<TGConnectingPoint num="6" id="2379" />
-<TGConnectingPoint num="7" id="2380" />
-<TGConnectingPoint num="8" id="2381" />
-<TGConnectingPoint num="9" id="2382" />
-<TGConnectingPoint num="10" id="2383" />
-<TGConnectingPoint num="11" id="2384" />
-<TGConnectingPoint num="12" id="2385" />
-<TGConnectingPoint num="13" id="2386" />
-<TGConnectingPoint num="14" id="2387" />
-<TGConnectingPoint num="15" id="2388" />
-<TGConnectingPoint num="16" id="2389" />
-<TGConnectingPoint num="17" id="2390" />
-<TGConnectingPoint num="18" id="2391" />
-<TGConnectingPoint num="19" id="2392" />
-<TGConnectingPoint num="20" id="2393" />
-<TGConnectingPoint num="21" id="2394" />
-<TGConnectingPoint num="22" id="2395" />
-<TGConnectingPoint num="23" id="2396" />
-<TGConnectingPoint num="24" id="2397" />
-<TGConnectingPoint num="25" id="2398" />
-<TGConnectingPoint num="26" id="2399" />
-<TGConnectingPoint num="27" id="2400" />
-<TGConnectingPoint num="28" id="2401" />
-<TGConnectingPoint num="29" id="2402" />
-<TGConnectingPoint num="30" id="2403" />
-<TGConnectingPoint num="31" id="2404" />
-<TGConnectingPoint num="32" id="2405" />
-<TGConnectingPoint num="33" id="2406" />
-<TGConnectingPoint num="34" id="2407" />
-<TGConnectingPoint num="35" id="2408" />
-<TGConnectingPoint num="36" id="2409" />
-<TGConnectingPoint num="37" id="2410" />
-<TGConnectingPoint num="38" id="2411" />
-<TGConnectingPoint num="39" id="2412" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="1034" />
+<TGConnectingPoint num="1" id="1035" />
+<TGConnectingPoint num="2" id="1036" />
+<TGConnectingPoint num="3" id="1037" />
+<TGConnectingPoint num="4" id="1038" />
+<TGConnectingPoint num="5" id="1039" />
+<TGConnectingPoint num="6" id="1040" />
+<TGConnectingPoint num="7" id="1041" />
+<TGConnectingPoint num="8" id="1042" />
+<TGConnectingPoint num="9" id="1043" />
+<TGConnectingPoint num="10" id="1044" />
+<TGConnectingPoint num="11" id="1045" />
+<TGConnectingPoint num="12" id="1046" />
+<TGConnectingPoint num="13" id="1047" />
+<TGConnectingPoint num="14" id="1048" />
+<TGConnectingPoint num="15" id="1049" />
+<TGConnectingPoint num="16" id="1050" />
+<TGConnectingPoint num="17" id="1051" />
+<TGConnectingPoint num="18" id="1052" />
+<TGConnectingPoint num="19" id="1053" />
+<TGConnectingPoint num="20" id="1054" />
+<TGConnectingPoint num="21" id="1055" />
+<TGConnectingPoint num="22" id="1056" />
+<TGConnectingPoint num="23" id="1057" />
+<TGConnectingPoint num="24" id="1058" />
+<TGConnectingPoint num="25" id="1059" />
+<TGConnectingPoint num="26" id="1060" />
+<TGConnectingPoint num="27" id="1061" />
+<TGConnectingPoint num="28" id="1062" />
+<TGConnectingPoint num="29" id="1063" />
+<TGConnectingPoint num="30" id="1064" />
+<TGConnectingPoint num="31" id="1065" />
+<TGConnectingPoint num="32" id="1066" />
+<TGConnectingPoint num="33" id="1067" />
+<TGConnectingPoint num="34" id="1068" />
+<TGConnectingPoint num="35" id="1069" />
+<TGConnectingPoint num="36" id="1070" />
+<TGConnectingPoint num="37" id="1071" />
+<TGConnectingPoint num="38" id="1072" />
+<TGConnectingPoint num="39" id="1073" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2454" >
-<cdparam x="353" y="322" />
-<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1115" >
+<cdparam x="335" y="798" />
+<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC0" />
-<TGConnectingPoint num="0" id="2414" />
-<TGConnectingPoint num="1" id="2415" />
-<TGConnectingPoint num="2" id="2416" />
-<TGConnectingPoint num="3" id="2417" />
-<TGConnectingPoint num="4" id="2418" />
-<TGConnectingPoint num="5" id="2419" />
-<TGConnectingPoint num="6" id="2420" />
-<TGConnectingPoint num="7" id="2421" />
-<TGConnectingPoint num="8" id="2422" />
-<TGConnectingPoint num="9" id="2423" />
-<TGConnectingPoint num="10" id="2424" />
-<TGConnectingPoint num="11" id="2425" />
-<TGConnectingPoint num="12" id="2426" />
-<TGConnectingPoint num="13" id="2427" />
-<TGConnectingPoint num="14" id="2428" />
-<TGConnectingPoint num="15" id="2429" />
-<TGConnectingPoint num="16" id="2430" />
-<TGConnectingPoint num="17" id="2431" />
-<TGConnectingPoint num="18" id="2432" />
-<TGConnectingPoint num="19" id="2433" />
-<TGConnectingPoint num="20" id="2434" />
-<TGConnectingPoint num="21" id="2435" />
-<TGConnectingPoint num="22" id="2436" />
-<TGConnectingPoint num="23" id="2437" />
-<TGConnectingPoint num="24" id="2438" />
-<TGConnectingPoint num="25" id="2439" />
-<TGConnectingPoint num="26" id="2440" />
-<TGConnectingPoint num="27" id="2441" />
-<TGConnectingPoint num="28" id="2442" />
-<TGConnectingPoint num="29" id="2443" />
-<TGConnectingPoint num="30" id="2444" />
-<TGConnectingPoint num="31" id="2445" />
-<TGConnectingPoint num="32" id="2446" />
-<TGConnectingPoint num="33" id="2447" />
-<TGConnectingPoint num="34" id="2448" />
-<TGConnectingPoint num="35" id="2449" />
-<TGConnectingPoint num="36" id="2450" />
-<TGConnectingPoint num="37" id="2451" />
-<TGConnectingPoint num="38" id="2452" />
-<TGConnectingPoint num="39" id="2453" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="timerExpired" />
+<TGConnectingPoint num="0" id="1075" />
+<TGConnectingPoint num="1" id="1076" />
+<TGConnectingPoint num="2" id="1077" />
+<TGConnectingPoint num="3" id="1078" />
+<TGConnectingPoint num="4" id="1079" />
+<TGConnectingPoint num="5" id="1080" />
+<TGConnectingPoint num="6" id="1081" />
+<TGConnectingPoint num="7" id="1082" />
+<TGConnectingPoint num="8" id="1083" />
+<TGConnectingPoint num="9" id="1084" />
+<TGConnectingPoint num="10" id="1085" />
+<TGConnectingPoint num="11" id="1086" />
+<TGConnectingPoint num="12" id="1087" />
+<TGConnectingPoint num="13" id="1088" />
+<TGConnectingPoint num="14" id="1089" />
+<TGConnectingPoint num="15" id="1090" />
+<TGConnectingPoint num="16" id="1091" />
+<TGConnectingPoint num="17" id="1092" />
+<TGConnectingPoint num="18" id="1093" />
+<TGConnectingPoint num="19" id="1094" />
+<TGConnectingPoint num="20" id="1095" />
+<TGConnectingPoint num="21" id="1096" />
+<TGConnectingPoint num="22" id="1097" />
+<TGConnectingPoint num="23" id="1098" />
+<TGConnectingPoint num="24" id="1099" />
+<TGConnectingPoint num="25" id="1100" />
+<TGConnectingPoint num="26" id="1101" />
+<TGConnectingPoint num="27" id="1102" />
+<TGConnectingPoint num="28" id="1103" />
+<TGConnectingPoint num="29" id="1104" />
+<TGConnectingPoint num="30" id="1105" />
+<TGConnectingPoint num="31" id="1106" />
+<TGConnectingPoint num="32" id="1107" />
+<TGConnectingPoint num="33" id="1108" />
+<TGConnectingPoint num="34" id="1109" />
+<TGConnectingPoint num="35" id="1110" />
+<TGConnectingPoint num="36" id="1111" />
+<TGConnectingPoint num="37" id="1112" />
+<TGConnectingPoint num="38" id="1113" />
+<TGConnectingPoint num="39" id="1114" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2495" >
-<cdparam x="311" y="238" />
-<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1126" >
+<cdparam x="441" y="569" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="GotMessage" />
-<TGConnectingPoint num="0" id="2455" />
-<TGConnectingPoint num="1" id="2456" />
-<TGConnectingPoint num="2" id="2457" />
-<TGConnectingPoint num="3" id="2458" />
-<TGConnectingPoint num="4" id="2459" />
-<TGConnectingPoint num="5" id="2460" />
-<TGConnectingPoint num="6" id="2461" />
-<TGConnectingPoint num="7" id="2462" />
-<TGConnectingPoint num="8" id="2463" />
-<TGConnectingPoint num="9" id="2464" />
-<TGConnectingPoint num="10" id="2465" />
-<TGConnectingPoint num="11" id="2466" />
-<TGConnectingPoint num="12" id="2467" />
-<TGConnectingPoint num="13" id="2468" />
-<TGConnectingPoint num="14" id="2469" />
-<TGConnectingPoint num="15" id="2470" />
-<TGConnectingPoint num="16" id="2471" />
-<TGConnectingPoint num="17" id="2472" />
-<TGConnectingPoint num="18" id="2473" />
-<TGConnectingPoint num="19" id="2474" />
-<TGConnectingPoint num="20" id="2475" />
-<TGConnectingPoint num="21" id="2476" />
-<TGConnectingPoint num="22" id="2477" />
-<TGConnectingPoint num="23" id="2478" />
-<TGConnectingPoint num="24" id="2479" />
-<TGConnectingPoint num="25" id="2480" />
-<TGConnectingPoint num="26" id="2481" />
-<TGConnectingPoint num="27" id="2482" />
-<TGConnectingPoint num="28" id="2483" />
-<TGConnectingPoint num="29" id="2484" />
-<TGConnectingPoint num="30" id="2485" />
-<TGConnectingPoint num="31" id="2486" />
-<TGConnectingPoint num="32" id="2487" />
-<TGConnectingPoint num="33" id="2488" />
-<TGConnectingPoint num="34" id="2489" />
-<TGConnectingPoint num="35" id="2490" />
-<TGConnectingPoint num="36" id="2491" />
-<TGConnectingPoint num="37" id="2492" />
-<TGConnectingPoint num="38" id="2493" />
-<TGConnectingPoint num="39" id="2494" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(settimer)" />
+<TGConnectingPoint num="0" id="1116" />
+<TGConnectingPoint num="1" id="1117" />
+<TGConnectingPoint num="2" id="1118" />
+<TGConnectingPoint num="3" id="1119" />
+<TGConnectingPoint num="4" id="1120" />
+<TGConnectingPoint num="5" id="1121" />
+<TGConnectingPoint num="6" id="1122" />
+<TGConnectingPoint num="7" id="1123" />
+<TGConnectingPoint num="8" id="1124" />
+<TGConnectingPoint num="9" id="1125" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1137" >
+<cdparam x="575" y="1073" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="1127" />
+<TGConnectingPoint num="1" id="1128" />
+<TGConnectingPoint num="2" id="1129" />
+<TGConnectingPoint num="3" id="1130" />
+<TGConnectingPoint num="4" id="1131" />
+<TGConnectingPoint num="5" id="1132" />
+<TGConnectingPoint num="6" id="1133" />
+<TGConnectingPoint num="7" id="1134" />
+<TGConnectingPoint num="8" id="1135" />
+<TGConnectingPoint num="9" id="1136" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1178" >
+<cdparam x="513" y="1117" />
+<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_FORWARDED" />
+<TGConnectingPoint num="0" id="1138" />
+<TGConnectingPoint num="1" id="1139" />
+<TGConnectingPoint num="2" id="1140" />
+<TGConnectingPoint num="3" id="1141" />
+<TGConnectingPoint num="4" id="1142" />
+<TGConnectingPoint num="5" id="1143" />
+<TGConnectingPoint num="6" id="1144" />
+<TGConnectingPoint num="7" id="1145" />
+<TGConnectingPoint num="8" id="1146" />
+<TGConnectingPoint num="9" id="1147" />
+<TGConnectingPoint num="10" id="1148" />
+<TGConnectingPoint num="11" id="1149" />
+<TGConnectingPoint num="12" id="1150" />
+<TGConnectingPoint num="13" id="1151" />
+<TGConnectingPoint num="14" id="1152" />
+<TGConnectingPoint num="15" id="1153" />
+<TGConnectingPoint num="16" id="1154" />
+<TGConnectingPoint num="17" id="1155" />
+<TGConnectingPoint num="18" id="1156" />
+<TGConnectingPoint num="19" id="1157" />
+<TGConnectingPoint num="20" id="1158" />
+<TGConnectingPoint num="21" id="1159" />
+<TGConnectingPoint num="22" id="1160" />
+<TGConnectingPoint num="23" id="1161" />
+<TGConnectingPoint num="24" id="1162" />
+<TGConnectingPoint num="25" id="1163" />
+<TGConnectingPoint num="26" id="1164" />
+<TGConnectingPoint num="27" id="1165" />
+<TGConnectingPoint num="28" id="1166" />
+<TGConnectingPoint num="29" id="1167" />
+<TGConnectingPoint num="30" id="1168" />
+<TGConnectingPoint num="31" id="1169" />
+<TGConnectingPoint num="32" id="1170" />
+<TGConnectingPoint num="33" id="1171" />
+<TGConnectingPoint num="34" id="1172" />
+<TGConnectingPoint num="35" id="1173" />
+<TGConnectingPoint num="36" id="1174" />
+<TGConnectingPoint num="37" id="1175" />
+<TGConnectingPoint num="38" id="1176" />
+<TGConnectingPoint num="39" id="1177" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2536" >
-<cdparam x="454" y="495" />
-<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1219" >
+<cdparam x="539" y="940" />
+<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="2496" />
-<TGConnectingPoint num="1" id="2497" />
-<TGConnectingPoint num="2" id="2498" />
-<TGConnectingPoint num="3" id="2499" />
-<TGConnectingPoint num="4" id="2500" />
-<TGConnectingPoint num="5" id="2501" />
-<TGConnectingPoint num="6" id="2502" />
-<TGConnectingPoint num="7" id="2503" />
-<TGConnectingPoint num="8" id="2504" />
-<TGConnectingPoint num="9" id="2505" />
-<TGConnectingPoint num="10" id="2506" />
-<TGConnectingPoint num="11" id="2507" />
-<TGConnectingPoint num="12" id="2508" />
-<TGConnectingPoint num="13" id="2509" />
-<TGConnectingPoint num="14" id="2510" />
-<TGConnectingPoint num="15" id="2511" />
-<TGConnectingPoint num="16" id="2512" />
-<TGConnectingPoint num="17" id="2513" />
-<TGConnectingPoint num="18" id="2514" />
-<TGConnectingPoint num="19" id="2515" />
-<TGConnectingPoint num="20" id="2516" />
-<TGConnectingPoint num="21" id="2517" />
-<TGConnectingPoint num="22" id="2518" />
-<TGConnectingPoint num="23" id="2519" />
-<TGConnectingPoint num="24" id="2520" />
-<TGConnectingPoint num="25" id="2521" />
-<TGConnectingPoint num="26" id="2522" />
-<TGConnectingPoint num="27" id="2523" />
-<TGConnectingPoint num="28" id="2524" />
-<TGConnectingPoint num="29" id="2525" />
-<TGConnectingPoint num="30" id="2526" />
-<TGConnectingPoint num="31" id="2527" />
-<TGConnectingPoint num="32" id="2528" />
-<TGConnectingPoint num="33" id="2529" />
-<TGConnectingPoint num="34" id="2530" />
-<TGConnectingPoint num="35" id="2531" />
-<TGConnectingPoint num="36" id="2532" />
-<TGConnectingPoint num="37" id="2533" />
-<TGConnectingPoint num="38" id="2534" />
-<TGConnectingPoint num="39" id="2535" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_OK" />
+<TGConnectingPoint num="0" id="1179" />
+<TGConnectingPoint num="1" id="1180" />
+<TGConnectingPoint num="2" id="1181" />
+<TGConnectingPoint num="3" id="1182" />
+<TGConnectingPoint num="4" id="1183" />
+<TGConnectingPoint num="5" id="1184" />
+<TGConnectingPoint num="6" id="1185" />
+<TGConnectingPoint num="7" id="1186" />
+<TGConnectingPoint num="8" id="1187" />
+<TGConnectingPoint num="9" id="1188" />
+<TGConnectingPoint num="10" id="1189" />
+<TGConnectingPoint num="11" id="1190" />
+<TGConnectingPoint num="12" id="1191" />
+<TGConnectingPoint num="13" id="1192" />
+<TGConnectingPoint num="14" id="1193" />
+<TGConnectingPoint num="15" id="1194" />
+<TGConnectingPoint num="16" id="1195" />
+<TGConnectingPoint num="17" id="1196" />
+<TGConnectingPoint num="18" id="1197" />
+<TGConnectingPoint num="19" id="1198" />
+<TGConnectingPoint num="20" id="1199" />
+<TGConnectingPoint num="21" id="1200" />
+<TGConnectingPoint num="22" id="1201" />
+<TGConnectingPoint num="23" id="1202" />
+<TGConnectingPoint num="24" id="1203" />
+<TGConnectingPoint num="25" id="1204" />
+<TGConnectingPoint num="26" id="1205" />
+<TGConnectingPoint num="27" id="1206" />
+<TGConnectingPoint num="28" id="1207" />
+<TGConnectingPoint num="29" id="1208" />
+<TGConnectingPoint num="30" id="1209" />
+<TGConnectingPoint num="31" id="1210" />
+<TGConnectingPoint num="32" id="1211" />
+<TGConnectingPoint num="33" id="1212" />
+<TGConnectingPoint num="34" id="1213" />
+<TGConnectingPoint num="35" id="1214" />
+<TGConnectingPoint num="36" id="1215" />
+<TGConnectingPoint num="37" id="1216" />
+<TGConnectingPoint num="38" id="1217" />
+<TGConnectingPoint num="39" id="1218" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1260" >
+<cdparam x="552" y="874" />
+<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACK" />
+<TGConnectingPoint num="0" id="1220" />
+<TGConnectingPoint num="1" id="1221" />
+<TGConnectingPoint num="2" id="1222" />
+<TGConnectingPoint num="3" id="1223" />
+<TGConnectingPoint num="4" id="1224" />
+<TGConnectingPoint num="5" id="1225" />
+<TGConnectingPoint num="6" id="1226" />
+<TGConnectingPoint num="7" id="1227" />
+<TGConnectingPoint num="8" id="1228" />
+<TGConnectingPoint num="9" id="1229" />
+<TGConnectingPoint num="10" id="1230" />
+<TGConnectingPoint num="11" id="1231" />
+<TGConnectingPoint num="12" id="1232" />
+<TGConnectingPoint num="13" id="1233" />
+<TGConnectingPoint num="14" id="1234" />
+<TGConnectingPoint num="15" id="1235" />
+<TGConnectingPoint num="16" id="1236" />
+<TGConnectingPoint num="17" id="1237" />
+<TGConnectingPoint num="18" id="1238" />
+<TGConnectingPoint num="19" id="1239" />
+<TGConnectingPoint num="20" id="1240" />
+<TGConnectingPoint num="21" id="1241" />
+<TGConnectingPoint num="22" id="1242" />
+<TGConnectingPoint num="23" id="1243" />
+<TGConnectingPoint num="24" id="1244" />
+<TGConnectingPoint num="25" id="1245" />
+<TGConnectingPoint num="26" id="1246" />
+<TGConnectingPoint num="27" id="1247" />
+<TGConnectingPoint num="28" id="1248" />
+<TGConnectingPoint num="29" id="1249" />
+<TGConnectingPoint num="30" id="1250" />
+<TGConnectingPoint num="31" id="1251" />
+<TGConnectingPoint num="32" id="1252" />
+<TGConnectingPoint num="33" id="1253" />
+<TGConnectingPoint num="34" id="1254" />
+<TGConnectingPoint num="35" id="1255" />
+<TGConnectingPoint num="36" id="1256" />
+<TGConnectingPoint num="37" id="1257" />
+<TGConnectingPoint num="38" id="1258" />
+<TGConnectingPoint num="39" id="1259" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1301" >
+<cdparam x="532" y="797" />
+<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACKMAC" />
+<TGConnectingPoint num="0" id="1261" />
+<TGConnectingPoint num="1" id="1262" />
+<TGConnectingPoint num="2" id="1263" />
+<TGConnectingPoint num="3" id="1264" />
+<TGConnectingPoint num="4" id="1265" />
+<TGConnectingPoint num="5" id="1266" />
+<TGConnectingPoint num="6" id="1267" />
+<TGConnectingPoint num="7" id="1268" />
+<TGConnectingPoint num="8" id="1269" />
+<TGConnectingPoint num="9" id="1270" />
+<TGConnectingPoint num="10" id="1271" />
+<TGConnectingPoint num="11" id="1272" />
+<TGConnectingPoint num="12" id="1273" />
+<TGConnectingPoint num="13" id="1274" />
+<TGConnectingPoint num="14" id="1275" />
+<TGConnectingPoint num="15" id="1276" />
+<TGConnectingPoint num="16" id="1277" />
+<TGConnectingPoint num="17" id="1278" />
+<TGConnectingPoint num="18" id="1279" />
+<TGConnectingPoint num="19" id="1280" />
+<TGConnectingPoint num="20" id="1281" />
+<TGConnectingPoint num="21" id="1282" />
+<TGConnectingPoint num="22" id="1283" />
+<TGConnectingPoint num="23" id="1284" />
+<TGConnectingPoint num="24" id="1285" />
+<TGConnectingPoint num="25" id="1286" />
+<TGConnectingPoint num="26" id="1287" />
+<TGConnectingPoint num="27" id="1288" />
+<TGConnectingPoint num="28" id="1289" />
+<TGConnectingPoint num="29" id="1290" />
+<TGConnectingPoint num="30" id="1291" />
+<TGConnectingPoint num="31" id="1292" />
+<TGConnectingPoint num="32" id="1293" />
+<TGConnectingPoint num="33" id="1294" />
+<TGConnectingPoint num="34" id="1295" />
+<TGConnectingPoint num="35" id="1296" />
+<TGConnectingPoint num="36" id="1297" />
+<TGConnectingPoint num="37" id="1298" />
+<TGConnectingPoint num="38" id="1299" />
+<TGConnectingPoint num="39" id="1300" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1342" >
+<cdparam x="394" y="336" />
+<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC_OK" />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<TGConnectingPoint num="2" id="1304" />
+<TGConnectingPoint num="3" id="1305" />
+<TGConnectingPoint num="4" id="1306" />
+<TGConnectingPoint num="5" id="1307" />
+<TGConnectingPoint num="6" id="1308" />
+<TGConnectingPoint num="7" id="1309" />
+<TGConnectingPoint num="8" id="1310" />
+<TGConnectingPoint num="9" id="1311" />
+<TGConnectingPoint num="10" id="1312" />
+<TGConnectingPoint num="11" id="1313" />
+<TGConnectingPoint num="12" id="1314" />
+<TGConnectingPoint num="13" id="1315" />
+<TGConnectingPoint num="14" id="1316" />
+<TGConnectingPoint num="15" id="1317" />
+<TGConnectingPoint num="16" id="1318" />
+<TGConnectingPoint num="17" id="1319" />
+<TGConnectingPoint num="18" id="1320" />
+<TGConnectingPoint num="19" id="1321" />
+<TGConnectingPoint num="20" id="1322" />
+<TGConnectingPoint num="21" id="1323" />
+<TGConnectingPoint num="22" id="1324" />
+<TGConnectingPoint num="23" id="1325" />
+<TGConnectingPoint num="24" id="1326" />
+<TGConnectingPoint num="25" id="1327" />
+<TGConnectingPoint num="26" id="1328" />
+<TGConnectingPoint num="27" id="1329" />
+<TGConnectingPoint num="28" id="1330" />
+<TGConnectingPoint num="29" id="1331" />
+<TGConnectingPoint num="30" id="1332" />
+<TGConnectingPoint num="31" id="1333" />
+<TGConnectingPoint num="32" id="1334" />
+<TGConnectingPoint num="33" id="1335" />
+<TGConnectingPoint num="34" id="1336" />
+<TGConnectingPoint num="35" id="1337" />
+<TGConnectingPoint num="36" id="1338" />
+<TGConnectingPoint num="37" id="1339" />
+<TGConnectingPoint num="38" id="1340" />
+<TGConnectingPoint num="39" id="1341" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1383" >
+<cdparam x="411" y="426" />
+<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="decipherOK" />
+<TGConnectingPoint num="0" id="1343" />
+<TGConnectingPoint num="1" id="1344" />
+<TGConnectingPoint num="2" id="1345" />
+<TGConnectingPoint num="3" id="1346" />
+<TGConnectingPoint num="4" id="1347" />
+<TGConnectingPoint num="5" id="1348" />
+<TGConnectingPoint num="6" id="1349" />
+<TGConnectingPoint num="7" id="1350" />
+<TGConnectingPoint num="8" id="1351" />
+<TGConnectingPoint num="9" id="1352" />
+<TGConnectingPoint num="10" id="1353" />
+<TGConnectingPoint num="11" id="1354" />
+<TGConnectingPoint num="12" id="1355" />
+<TGConnectingPoint num="13" id="1356" />
+<TGConnectingPoint num="14" id="1357" />
+<TGConnectingPoint num="15" id="1358" />
+<TGConnectingPoint num="16" id="1359" />
+<TGConnectingPoint num="17" id="1360" />
+<TGConnectingPoint num="18" id="1361" />
+<TGConnectingPoint num="19" id="1362" />
+<TGConnectingPoint num="20" id="1363" />
+<TGConnectingPoint num="21" id="1364" />
+<TGConnectingPoint num="22" id="1365" />
+<TGConnectingPoint num="23" id="1366" />
+<TGConnectingPoint num="24" id="1367" />
+<TGConnectingPoint num="25" id="1368" />
+<TGConnectingPoint num="26" id="1369" />
+<TGConnectingPoint num="27" id="1370" />
+<TGConnectingPoint num="28" id="1371" />
+<TGConnectingPoint num="29" id="1372" />
+<TGConnectingPoint num="30" id="1373" />
+<TGConnectingPoint num="31" id="1374" />
+<TGConnectingPoint num="32" id="1375" />
+<TGConnectingPoint num="33" id="1376" />
+<TGConnectingPoint num="34" id="1377" />
+<TGConnectingPoint num="35" id="1378" />
+<TGConnectingPoint num="36" id="1379" />
+<TGConnectingPoint num="37" id="1380" />
+<TGConnectingPoint num="38" id="1381" />
+<TGConnectingPoint num="39" id="1382" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1424" >
+<cdparam x="314" y="177" />
+<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="gotFirstMessage" />
+<TGConnectingPoint num="0" id="1384" />
+<TGConnectingPoint num="1" id="1385" />
+<TGConnectingPoint num="2" id="1386" />
+<TGConnectingPoint num="3" id="1387" />
+<TGConnectingPoint num="4" id="1388" />
+<TGConnectingPoint num="5" id="1389" />
+<TGConnectingPoint num="6" id="1390" />
+<TGConnectingPoint num="7" id="1391" />
+<TGConnectingPoint num="8" id="1392" />
+<TGConnectingPoint num="9" id="1393" />
+<TGConnectingPoint num="10" id="1394" />
+<TGConnectingPoint num="11" id="1395" />
+<TGConnectingPoint num="12" id="1396" />
+<TGConnectingPoint num="13" id="1397" />
+<TGConnectingPoint num="14" id="1398" />
+<TGConnectingPoint num="15" id="1399" />
+<TGConnectingPoint num="16" id="1400" />
+<TGConnectingPoint num="17" id="1401" />
+<TGConnectingPoint num="18" id="1402" />
+<TGConnectingPoint num="19" id="1403" />
+<TGConnectingPoint num="20" id="1404" />
+<TGConnectingPoint num="21" id="1405" />
+<TGConnectingPoint num="22" id="1406" />
+<TGConnectingPoint num="23" id="1407" />
+<TGConnectingPoint num="24" id="1408" />
+<TGConnectingPoint num="25" id="1409" />
+<TGConnectingPoint num="26" id="1410" />
+<TGConnectingPoint num="27" id="1411" />
+<TGConnectingPoint num="28" id="1412" />
+<TGConnectingPoint num="29" id="1413" />
+<TGConnectingPoint num="30" id="1414" />
+<TGConnectingPoint num="31" id="1415" />
+<TGConnectingPoint num="32" id="1416" />
+<TGConnectingPoint num="33" id="1417" />
+<TGConnectingPoint num="34" id="1418" />
+<TGConnectingPoint num="35" id="1419" />
+<TGConnectingPoint num="36" id="1420" />
+<TGConnectingPoint num="37" id="1421" />
+<TGConnectingPoint num="38" id="1422" />
+<TGConnectingPoint num="39" id="1423" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1435" >
+<cdparam x="452" y="664" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="1425" />
+<TGConnectingPoint num="1" id="1426" />
+<TGConnectingPoint num="2" id="1427" />
+<TGConnectingPoint num="3" id="1428" />
+<TGConnectingPoint num="4" id="1429" />
+<TGConnectingPoint num="5" id="1430" />
+<TGConnectingPoint num="6" id="1431" />
+<TGConnectingPoint num="7" id="1432" />
+<TGConnectingPoint num="8" id="1433" />
+<TGConnectingPoint num="9" id="1434" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1476" >
+<cdparam x="391" y="613" />
+<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="WaitForACK" />
+<TGConnectingPoint num="0" id="1436" />
+<TGConnectingPoint num="1" id="1437" />
+<TGConnectingPoint num="2" id="1438" />
+<TGConnectingPoint num="3" id="1439" />
+<TGConnectingPoint num="4" id="1440" />
+<TGConnectingPoint num="5" id="1441" />
+<TGConnectingPoint num="6" id="1442" />
+<TGConnectingPoint num="7" id="1443" />
+<TGConnectingPoint num="8" id="1444" />
+<TGConnectingPoint num="9" id="1445" />
+<TGConnectingPoint num="10" id="1446" />
+<TGConnectingPoint num="11" id="1447" />
+<TGConnectingPoint num="12" id="1448" />
+<TGConnectingPoint num="13" id="1449" />
+<TGConnectingPoint num="14" id="1450" />
+<TGConnectingPoint num="15" id="1451" />
+<TGConnectingPoint num="16" id="1452" />
+<TGConnectingPoint num="17" id="1453" />
+<TGConnectingPoint num="18" id="1454" />
+<TGConnectingPoint num="19" id="1455" />
+<TGConnectingPoint num="20" id="1456" />
+<TGConnectingPoint num="21" id="1457" />
+<TGConnectingPoint num="22" id="1458" />
+<TGConnectingPoint num="23" id="1459" />
+<TGConnectingPoint num="24" id="1460" />
+<TGConnectingPoint num="25" id="1461" />
+<TGConnectingPoint num="26" id="1462" />
+<TGConnectingPoint num="27" id="1463" />
+<TGConnectingPoint num="28" id="1464" />
+<TGConnectingPoint num="29" id="1465" />
+<TGConnectingPoint num="30" id="1466" />
+<TGConnectingPoint num="31" id="1467" />
+<TGConnectingPoint num="32" id="1468" />
+<TGConnectingPoint num="33" id="1469" />
+<TGConnectingPoint num="34" id="1470" />
+<TGConnectingPoint num="35" id="1471" />
+<TGConnectingPoint num="36" id="1472" />
+<TGConnectingPoint num="37" id="1473" />
+<TGConnectingPoint num="38" id="1474" />
+<TGConnectingPoint num="39" id="1475" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="1487" >
+<cdparam x="453" y="538" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="1477" />
+<TGConnectingPoint num="1" id="1478" />
+<TGConnectingPoint num="2" id="1479" />
+<TGConnectingPoint num="3" id="1480" />
+<TGConnectingPoint num="4" id="1481" />
+<TGConnectingPoint num="5" id="1482" />
+<TGConnectingPoint num="6" id="1483" />
+<TGConnectingPoint num="7" id="1484" />
+<TGConnectingPoint num="8" id="1485" />
+<TGConnectingPoint num="9" id="1486" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1528" >
+<cdparam x="250" y="334" />
+<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="TestMACFailed" />
+<TGConnectingPoint num="0" id="1488" />
+<TGConnectingPoint num="1" id="1489" />
+<TGConnectingPoint num="2" id="1490" />
+<TGConnectingPoint num="3" id="1491" />
+<TGConnectingPoint num="4" id="1492" />
+<TGConnectingPoint num="5" id="1493" />
+<TGConnectingPoint num="6" id="1494" />
+<TGConnectingPoint num="7" id="1495" />
+<TGConnectingPoint num="8" id="1496" />
+<TGConnectingPoint num="9" id="1497" />
+<TGConnectingPoint num="10" id="1498" />
+<TGConnectingPoint num="11" id="1499" />
+<TGConnectingPoint num="12" id="1500" />
+<TGConnectingPoint num="13" id="1501" />
+<TGConnectingPoint num="14" id="1502" />
+<TGConnectingPoint num="15" id="1503" />
+<TGConnectingPoint num="16" id="1504" />
+<TGConnectingPoint num="17" id="1505" />
+<TGConnectingPoint num="18" id="1506" />
+<TGConnectingPoint num="19" id="1507" />
+<TGConnectingPoint num="20" id="1508" />
+<TGConnectingPoint num="21" id="1509" />
+<TGConnectingPoint num="22" id="1510" />
+<TGConnectingPoint num="23" id="1511" />
+<TGConnectingPoint num="24" id="1512" />
+<TGConnectingPoint num="25" id="1513" />
+<TGConnectingPoint num="26" id="1514" />
+<TGConnectingPoint num="27" id="1515" />
+<TGConnectingPoint num="28" id="1516" />
+<TGConnectingPoint num="29" id="1517" />
+<TGConnectingPoint num="30" id="1518" />
+<TGConnectingPoint num="31" id="1519" />
+<TGConnectingPoint num="32" id="1520" />
+<TGConnectingPoint num="33" id="1521" />
+<TGConnectingPoint num="34" id="1522" />
+<TGConnectingPoint num="35" id="1523" />
+<TGConnectingPoint num="36" id="1524" />
+<TGConnectingPoint num="37" id="1525" />
+<TGConnectingPoint num="38" id="1526" />
+<TGConnectingPoint num="39" id="1527" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1569" >
+<cdparam x="349" y="252" />
+<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC1" />
+<TGConnectingPoint num="0" id="1529" />
+<TGConnectingPoint num="1" id="1530" />
+<TGConnectingPoint num="2" id="1531" />
+<TGConnectingPoint num="3" id="1532" />
+<TGConnectingPoint num="4" id="1533" />
+<TGConnectingPoint num="5" id="1534" />
+<TGConnectingPoint num="6" id="1535" />
+<TGConnectingPoint num="7" id="1536" />
+<TGConnectingPoint num="8" id="1537" />
+<TGConnectingPoint num="9" id="1538" />
+<TGConnectingPoint num="10" id="1539" />
+<TGConnectingPoint num="11" id="1540" />
+<TGConnectingPoint num="12" id="1541" />
+<TGConnectingPoint num="13" id="1542" />
+<TGConnectingPoint num="14" id="1543" />
+<TGConnectingPoint num="15" id="1544" />
+<TGConnectingPoint num="16" id="1545" />
+<TGConnectingPoint num="17" id="1546" />
+<TGConnectingPoint num="18" id="1547" />
+<TGConnectingPoint num="19" id="1548" />
+<TGConnectingPoint num="20" id="1549" />
+<TGConnectingPoint num="21" id="1550" />
+<TGConnectingPoint num="22" id="1551" />
+<TGConnectingPoint num="23" id="1552" />
+<TGConnectingPoint num="24" id="1553" />
+<TGConnectingPoint num="25" id="1554" />
+<TGConnectingPoint num="26" id="1555" />
+<TGConnectingPoint num="27" id="1556" />
+<TGConnectingPoint num="28" id="1557" />
+<TGConnectingPoint num="29" id="1558" />
+<TGConnectingPoint num="30" id="1559" />
+<TGConnectingPoint num="31" id="1560" />
+<TGConnectingPoint num="32" id="1561" />
+<TGConnectingPoint num="33" id="1562" />
+<TGConnectingPoint num="34" id="1563" />
+<TGConnectingPoint num="35" id="1564" />
+<TGConnectingPoint num="36" id="1565" />
+<TGConnectingPoint num="37" id="1566" />
+<TGConnectingPoint num="38" id="1567" />
+<TGConnectingPoint num="39" id="1568" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1580" >
+<cdparam x="358" y="142" />
+<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chin(msg8)" />
+<TGConnectingPoint num="0" id="1570" />
+<TGConnectingPoint num="1" id="1571" />
+<TGConnectingPoint num="2" id="1572" />
+<TGConnectingPoint num="3" id="1573" />
+<TGConnectingPoint num="4" id="1574" />
+<TGConnectingPoint num="5" id="1575" />
+<TGConnectingPoint num="6" id="1576" />
+<TGConnectingPoint num="7" id="1577" />
+<TGConnectingPoint num="8" id="1578" />
+<TGConnectingPoint num="9" id="1579" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1582" >
+<cdparam x="391" y="104" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1581" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="TimerKM" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1589" >
+<cdparam x="405" y="289" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1588" />
+<P1  x="405" y="289" id="1653" />
+<P2  x="408" y="331" id="1612" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1587" >
+<father id="1589" num="0" />
+<cdparam x="405" y="329" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1583" />
+<TGConnectingPoint num="1" id="1584" />
+<TGConnectingPoint num="2" id="1585" />
+<TGConnectingPoint num="3" id="1586" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1596" >
+<cdparam x="404" y="216" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1595" />
+<P1  x="404" y="216" id="1669" />
+<P2  x="405" y="259" id="1652" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1594" >
+<father id="1596" num="0" />
+<cdparam x="404" y="256" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1590" />
+<TGConnectingPoint num="1" id="1591" />
+<TGConnectingPoint num="2" id="1592" />
+<TGConnectingPoint num="3" id="1593" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1603" >
+<cdparam x="404" y="135" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1602" />
+<P1  x="404" y="135" id="1705" />
+<P2  x="404" y="176" id="1664" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1601" >
+<father id="1603" num="0" />
+<cdparam x="404" y="175" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1597" />
+<TGConnectingPoint num="1" id="1598" />
+<TGConnectingPoint num="2" id="1599" />
+<TGConnectingPoint num="3" id="1600" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1610" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1609" />
+<P1  x="407" y="70" id="1715" />
+<P2  x="404" y="105" id="1704" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1608" >
+<father id="1610" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1604" />
+<TGConnectingPoint num="1" id="1605" />
+<TGConnectingPoint num="2" id="1606" />
+<TGConnectingPoint num="3" id="1607" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="1651" >
+<cdparam x="315" y="331" />
+<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="timerExpired" />
+<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="1" id="1612" />
+<TGConnectingPoint num="2" id="1613" />
+<TGConnectingPoint num="3" id="1614" />
+<TGConnectingPoint num="4" id="1615" />
+<TGConnectingPoint num="5" id="1616" />
+<TGConnectingPoint num="6" id="1617" />
+<TGConnectingPoint num="7" id="1618" />
+<TGConnectingPoint num="8" id="1619" />
+<TGConnectingPoint num="9" id="1620" />
+<TGConnectingPoint num="10" id="1621" />
+<TGConnectingPoint num="11" id="1622" />
+<TGConnectingPoint num="12" id="1623" />
+<TGConnectingPoint num="13" id="1624" />
+<TGConnectingPoint num="14" id="1625" />
+<TGConnectingPoint num="15" id="1626" />
+<TGConnectingPoint num="16" id="1627" />
+<TGConnectingPoint num="17" id="1628" />
+<TGConnectingPoint num="18" id="1629" />
+<TGConnectingPoint num="19" id="1630" />
+<TGConnectingPoint num="20" id="1631" />
+<TGConnectingPoint num="21" id="1632" />
+<TGConnectingPoint num="22" id="1633" />
+<TGConnectingPoint num="23" id="1634" />
+<TGConnectingPoint num="24" id="1635" />
+<TGConnectingPoint num="25" id="1636" />
+<TGConnectingPoint num="26" id="1637" />
+<TGConnectingPoint num="27" id="1638" />
+<TGConnectingPoint num="28" id="1639" />
+<TGConnectingPoint num="29" id="1640" />
+<TGConnectingPoint num="30" id="1641" />
+<TGConnectingPoint num="31" id="1642" />
+<TGConnectingPoint num="32" id="1643" />
+<TGConnectingPoint num="33" id="1644" />
+<TGConnectingPoint num="34" id="1645" />
+<TGConnectingPoint num="35" id="1646" />
+<TGConnectingPoint num="36" id="1647" />
+<TGConnectingPoint num="37" id="1648" />
+<TGConnectingPoint num="38" id="1649" />
+<TGConnectingPoint num="39" id="1650" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="1662" >
+<cdparam x="347" y="264" />
+<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chout(timerexpire)" />
+<TGConnectingPoint num="0" id="1652" />
+<TGConnectingPoint num="1" id="1653" />
+<TGConnectingPoint num="2" id="1654" />
+<TGConnectingPoint num="3" id="1655" />
+<TGConnectingPoint num="4" id="1656" />
+<TGConnectingPoint num="5" id="1657" />
+<TGConnectingPoint num="6" id="1658" />
+<TGConnectingPoint num="7" id="1659" />
+<TGConnectingPoint num="8" id="1660" />
+<TGConnectingPoint num="9" id="1661" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1703" >
+<cdparam x="311" y="176" />
+<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="timerSet" />
+<TGConnectingPoint num="0" id="1663" />
+<TGConnectingPoint num="1" id="1664" />
+<TGConnectingPoint num="2" id="1665" />
+<TGConnectingPoint num="3" id="1666" />
+<TGConnectingPoint num="4" id="1667" />
+<TGConnectingPoint num="5" id="1668" />
+<TGConnectingPoint num="6" id="1669" />
+<TGConnectingPoint num="7" id="1670" />
+<TGConnectingPoint num="8" id="1671" />
+<TGConnectingPoint num="9" id="1672" />
+<TGConnectingPoint num="10" id="1673" />
+<TGConnectingPoint num="11" id="1674" />
+<TGConnectingPoint num="12" id="1675" />
+<TGConnectingPoint num="13" id="1676" />
+<TGConnectingPoint num="14" id="1677" />
+<TGConnectingPoint num="15" id="1678" />
+<TGConnectingPoint num="16" id="1679" />
+<TGConnectingPoint num="17" id="1680" />
+<TGConnectingPoint num="18" id="1681" />
+<TGConnectingPoint num="19" id="1682" />
+<TGConnectingPoint num="20" id="1683" />
+<TGConnectingPoint num="21" id="1684" />
+<TGConnectingPoint num="22" id="1685" />
+<TGConnectingPoint num="23" id="1686" />
+<TGConnectingPoint num="24" id="1687" />
+<TGConnectingPoint num="25" id="1688" />
+<TGConnectingPoint num="26" id="1689" />
+<TGConnectingPoint num="27" id="1690" />
+<TGConnectingPoint num="28" id="1691" />
+<TGConnectingPoint num="29" id="1692" />
+<TGConnectingPoint num="30" id="1693" />
+<TGConnectingPoint num="31" id="1694" />
+<TGConnectingPoint num="32" id="1695" />
+<TGConnectingPoint num="33" id="1696" />
+<TGConnectingPoint num="34" id="1697" />
+<TGConnectingPoint num="35" id="1698" />
+<TGConnectingPoint num="36" id="1699" />
+<TGConnectingPoint num="37" id="1700" />
+<TGConnectingPoint num="38" id="1701" />
+<TGConnectingPoint num="39" id="1702" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2577" >
-<cdparam x="259" y="100" />
-<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1714" >
+<cdparam x="356" y="110" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="waitForKeyGroup" />
-<TGConnectingPoint num="0" id="2537" />
-<TGConnectingPoint num="1" id="2538" />
-<TGConnectingPoint num="2" id="2539" />
-<TGConnectingPoint num="3" id="2540" />
-<TGConnectingPoint num="4" id="2541" />
-<TGConnectingPoint num="5" id="2542" />
-<TGConnectingPoint num="6" id="2543" />
-<TGConnectingPoint num="7" id="2544" />
-<TGConnectingPoint num="8" id="2545" />
-<TGConnectingPoint num="9" id="2546" />
-<TGConnectingPoint num="10" id="2547" />
-<TGConnectingPoint num="11" id="2548" />
-<TGConnectingPoint num="12" id="2549" />
-<TGConnectingPoint num="13" id="2550" />
-<TGConnectingPoint num="14" id="2551" />
-<TGConnectingPoint num="15" id="2552" />
-<TGConnectingPoint num="16" id="2553" />
-<TGConnectingPoint num="17" id="2554" />
-<TGConnectingPoint num="18" id="2555" />
-<TGConnectingPoint num="19" id="2556" />
-<TGConnectingPoint num="20" id="2557" />
-<TGConnectingPoint num="21" id="2558" />
-<TGConnectingPoint num="22" id="2559" />
-<TGConnectingPoint num="23" id="2560" />
-<TGConnectingPoint num="24" id="2561" />
-<TGConnectingPoint num="25" id="2562" />
-<TGConnectingPoint num="26" id="2563" />
-<TGConnectingPoint num="27" id="2564" />
-<TGConnectingPoint num="28" id="2565" />
-<TGConnectingPoint num="29" id="2566" />
-<TGConnectingPoint num="30" id="2567" />
-<TGConnectingPoint num="31" id="2568" />
-<TGConnectingPoint num="32" id="2569" />
-<TGConnectingPoint num="33" id="2570" />
-<TGConnectingPoint num="34" id="2571" />
-<TGConnectingPoint num="35" id="2572" />
-<TGConnectingPoint num="36" id="2573" />
-<TGConnectingPoint num="37" id="2574" />
-<TGConnectingPoint num="38" id="2575" />
-<TGConnectingPoint num="39" id="2576" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chin(settimer)" />
+<TGConnectingPoint num="0" id="1704" />
+<TGConnectingPoint num="1" id="1705" />
+<TGConnectingPoint num="2" id="1706" />
+<TGConnectingPoint num="3" id="1707" />
+<TGConnectingPoint num="4" id="1708" />
+<TGConnectingPoint num="5" id="1709" />
+<TGConnectingPoint num="6" id="1710" />
+<TGConnectingPoint num="7" id="1711" />
+<TGConnectingPoint num="8" id="1712" />
+<TGConnectingPoint num="9" id="1713" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="2579" >
-<cdparam x="335" y="52" />
+<COMPONENT type="5100" id="1716" >
+<cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2578" />
+<TGConnectingPoint num="0" id="1715" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="2590" >
-<cdparam x="314" y="178" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="2580" />
-<TGConnectingPoint num="1" id="2581" />
-<TGConnectingPoint num="2" id="2582" />
-<TGConnectingPoint num="3" id="2583" />
-<TGConnectingPoint num="4" id="2584" />
-<TGConnectingPoint num="5" id="2585" />
-<TGConnectingPoint num="6" id="2586" />
-<TGConnectingPoint num="7" id="2587" />
-<TGConnectingPoint num="8" id="2588" />
-<TGConnectingPoint num="9" id="2589" />
-</COMPONENT>
 
-<COMPONENT type="5104" id="2601" >
-<cdparam x="512" y="767" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="2591" />
-<TGConnectingPoint num="1" id="2592" />
-<TGConnectingPoint num="2" id="2593" />
-<TGConnectingPoint num="3" id="2594" />
-<TGConnectingPoint num="4" id="2595" />
-<TGConnectingPoint num="5" id="2596" />
-<TGConnectingPoint num="6" id="2597" />
-<TGConnectingPoint num="7" id="2598" />
-<TGConnectingPoint num="8" id="2599" />
-<TGConnectingPoint num="9" id="2600" />
-</COMPONENT>
+</AVATARStateMachineDiagramPanel>
 
-<COMPONENT type="5106" id="2642" >
-<cdparam x="451" y="688" />
-<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitForData" />
-<TGConnectingPoint num="0" id="2602" />
-<TGConnectingPoint num="1" id="2603" />
-<TGConnectingPoint num="2" id="2604" />
-<TGConnectingPoint num="3" id="2605" />
-<TGConnectingPoint num="4" id="2606" />
-<TGConnectingPoint num="5" id="2607" />
-<TGConnectingPoint num="6" id="2608" />
-<TGConnectingPoint num="7" id="2609" />
-<TGConnectingPoint num="8" id="2610" />
-<TGConnectingPoint num="9" id="2611" />
-<TGConnectingPoint num="10" id="2612" />
-<TGConnectingPoint num="11" id="2613" />
-<TGConnectingPoint num="12" id="2614" />
-<TGConnectingPoint num="13" id="2615" />
-<TGConnectingPoint num="14" id="2616" />
-<TGConnectingPoint num="15" id="2617" />
-<TGConnectingPoint num="16" id="2618" />
-<TGConnectingPoint num="17" id="2619" />
-<TGConnectingPoint num="18" id="2620" />
-<TGConnectingPoint num="19" id="2621" />
-<TGConnectingPoint num="20" id="2622" />
-<TGConnectingPoint num="21" id="2623" />
-<TGConnectingPoint num="22" id="2624" />
-<TGConnectingPoint num="23" id="2625" />
-<TGConnectingPoint num="24" id="2626" />
-<TGConnectingPoint num="25" id="2627" />
-<TGConnectingPoint num="26" id="2628" />
-<TGConnectingPoint num="27" id="2629" />
-<TGConnectingPoint num="28" id="2630" />
-<TGConnectingPoint num="29" id="2631" />
-<TGConnectingPoint num="30" id="2632" />
-<TGConnectingPoint num="31" id="2633" />
-<TGConnectingPoint num="32" id="2634" />
-<TGConnectingPoint num="33" id="2635" />
-<TGConnectingPoint num="34" id="2636" />
-<TGConnectingPoint num="35" id="2637" />
-<TGConnectingPoint num="36" id="2638" />
-<TGConnectingPoint num="37" id="2639" />
-<TGConnectingPoint num="38" id="2640" />
-<TGConnectingPoint num="39" id="2641" />
-<extraparam>
-</extraparam>
-</COMPONENT>
+</Modeling>
 
-<COMPONENT type="5103" id="2653" >
-<cdparam x="507" y="628" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="2643" />
-<TGConnectingPoint num="1" id="2644" />
-<TGConnectingPoint num="2" id="2645" />
-<TGConnectingPoint num="3" id="2646" />
-<TGConnectingPoint num="4" id="2647" />
-<TGConnectingPoint num="5" id="2648" />
-<TGConnectingPoint num="6" id="2649" />
-<TGConnectingPoint num="7" id="2650" />
-<TGConnectingPoint num="8" id="2651" />
-<TGConnectingPoint num="9" id="2652" />
-</COMPONENT>
 
-<COMPONENT type="5106" id="2694" >
-<cdparam x="405" y="405" />
-<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+
+<Modeling type="AVATAR Design" nameTab="AsymmetricKeyDistributionProtocol" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="1400" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="SecuredSystem;ECU1;ECU2;" />
+<Ignored value="" />
+
+<COMPONENT type="302" id="106462" >
+<cdparam x="845" y="165" />
+<sizeparam width="496" height="357" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="2654" />
-<TGConnectingPoint num="1" id="2655" />
-<TGConnectingPoint num="2" id="2656" />
-<TGConnectingPoint num="3" id="2657" />
-<TGConnectingPoint num="4" id="2658" />
-<TGConnectingPoint num="5" id="2659" />
-<TGConnectingPoint num="6" id="2660" />
-<TGConnectingPoint num="7" id="2661" />
-<TGConnectingPoint num="8" id="2662" />
-<TGConnectingPoint num="9" id="2663" />
-<TGConnectingPoint num="10" id="2664" />
-<TGConnectingPoint num="11" id="2665" />
-<TGConnectingPoint num="12" id="2666" />
-<TGConnectingPoint num="13" id="2667" />
-<TGConnectingPoint num="14" id="2668" />
-<TGConnectingPoint num="15" id="2669" />
-<TGConnectingPoint num="16" id="2670" />
-<TGConnectingPoint num="17" id="2671" />
-<TGConnectingPoint num="18" id="2672" />
-<TGConnectingPoint num="19" id="2673" />
-<TGConnectingPoint num="20" id="2674" />
-<TGConnectingPoint num="21" id="2675" />
-<TGConnectingPoint num="22" id="2676" />
-<TGConnectingPoint num="23" id="2677" />
-<TGConnectingPoint num="24" id="2678" />
-<TGConnectingPoint num="25" id="2679" />
-<TGConnectingPoint num="26" id="2680" />
-<TGConnectingPoint num="27" id="2681" />
-<TGConnectingPoint num="28" id="2682" />
-<TGConnectingPoint num="29" id="2683" />
-<TGConnectingPoint num="30" id="2684" />
-<TGConnectingPoint num="31" id="2685" />
-<TGConnectingPoint num="32" id="2686" />
-<TGConnectingPoint num="33" id="2687" />
-<TGConnectingPoint num="34" id="2688" />
-<TGConnectingPoint num="35" id="2689" />
-<TGConnectingPoint num="36" id="2690" />
-<TGConnectingPoint num="37" id="2691" />
-<TGConnectingPoint num="38" id="2692" />
-<TGConnectingPoint num="39" id="2693" />
+<infoparam name="Proverif Pragma" value="#PrivatePublicKeys ECU1 mvksk mvkpk
+#PrivatePublicKeys ECU1 idk1sk idk1pk
+#PrivatePublicKeys ECU2 idk2sk idk2pk
+
+#InitialSystemKnowledge ECU1.ack ECU2.ack
+#InitialSystemKnowledge ECU1.rpk ECU2.rpk
+#InitialSystemKnowledge ECU1.ecu1id ECU2.ecu1id
+#InitialSystemKnowledge ECU2.ecu2id ECU1.ecu2id
+
+#InitialSystemKnowledge ECU1.mvksk ECU2.mvksk
+#InitialSystemKnowledge ECU1.mvkpk ECU2.mvkpk
+
+#InitialSessionKnowledge ECU1.ts0 ECU2.ts0
+#InitialSessionKnowledge ECU1.ts1 ECU2.ts1
+#InitialSessionKnowledge ECU1.ts2 ECU2.ts2
+#InitialSessionKnowledge ECU1.ts3 ECU2.ts3
+#InitialSessionKnowledge ECU1.ts4 ECU2.ts4
+#InitialSessionKnowledge ECU1.ts5 ECU2.ts5
+#InitialSessionKnowledge ECU1.ts6 ECU2.ts6
+#SecrecyAssumption ECU1.idk1sk
+#SecrecyAssumption ECU2.idk2sk
+#SecrecyAssumption ECU1.mvksk
+
+#Confidentiality ECU1.SesK
+#Confidentiality ECU1.secretData
+
+#Authenticity ECU1.SendMsg3.SesK ECU2.AdoptSessionKey.sesk
+#Authenticity ECU1.SendMsg5.secretData ECU2.SecretDataReceived.sd
+" />
+<TGConnectingPoint num="0" id="106463" />
+<TGConnectingPoint num="1" id="106464" />
+<TGConnectingPoint num="2" id="106465" />
+<TGConnectingPoint num="3" id="106466" />
+<TGConnectingPoint num="4" id="106467" />
+<TGConnectingPoint num="5" id="106468" />
+<TGConnectingPoint num="6" id="106469" />
+<TGConnectingPoint num="7" id="106470" />
+<TGConnectingPoint num="8" id="106471" />
+<TGConnectingPoint num="9" id="106472" />
+<TGConnectingPoint num="10" id="106473" />
+<TGConnectingPoint num="11" id="106474" />
+<TGConnectingPoint num="12" id="106475" />
+<TGConnectingPoint num="13" id="106476" />
+<TGConnectingPoint num="14" id="106477" />
+<TGConnectingPoint num="15" id="106478" />
 <extraparam>
+<Line value="#PrivatePublicKeys ECU1 mvksk mvkpk" />
+<Line value="#PrivatePublicKeys ECU1 idk1sk idk1pk" />
+<Line value="#PrivatePublicKeys ECU2 idk2sk idk2pk" />
+<Line value="" />
+<Line value="#InitialSystemKnowledge ECU1.ack ECU2.ack" />
+<Line value="#InitialSystemKnowledge ECU1.rpk ECU2.rpk" />
+<Line value="#InitialSystemKnowledge ECU1.ecu1id ECU2.ecu1id" />
+<Line value="#InitialSystemKnowledge ECU2.ecu2id ECU1.ecu2id" />
+<Line value="" />
+<Line value="#InitialSystemKnowledge ECU1.mvksk ECU2.mvksk" />
+<Line value="#InitialSystemKnowledge ECU1.mvkpk ECU2.mvkpk" />
+<Line value="" />
+<Line value="#InitialSessionKnowledge ECU1.ts0 ECU2.ts0" />
+<Line value="#InitialSessionKnowledge ECU1.ts1 ECU2.ts1" />
+<Line value="#InitialSessionKnowledge ECU1.ts2 ECU2.ts2" />
+<Line value="#InitialSessionKnowledge ECU1.ts3 ECU2.ts3" />
+<Line value="#InitialSessionKnowledge ECU1.ts4 ECU2.ts4" />
+<Line value="#InitialSessionKnowledge ECU1.ts5 ECU2.ts5" />
+<Line value="#InitialSessionKnowledge ECU1.ts6 ECU2.ts6" />
+<Line value="#SecrecyAssumption ECU1.idk1sk" />
+<Line value="#SecrecyAssumption ECU2.idk2sk" />
+<Line value="#SecrecyAssumption ECU1.mvksk" />
+<Line value="" />
+<Line value="#Confidentiality ECU1.SesK" />
+<Line value="#Confidentiality ECU1.secretData" />
+<Line value="" />
+<Line value="#Authenticity ECU1.SendMsg3.SesK ECU2.AdoptSessionKey.sesk" />
+<Line value="#Authenticity ECU1.SendMsg5.secretData ECU2.SecretDataReceived.sd" />
 </extraparam>
 </COMPONENT>
 
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="AsymmetricKeyDistributionProtocol" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="1400" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="" />
-<Ignored value="" />
-
 <CONNECTOR type="5002" id="2700" >
 <cdparam x="810" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4285,13 +3890,13 @@ key is deleted in case there is one.
 <cdparam x="948" y="10" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to point " value="null" />
-<P1  x="691" y="268" id="2708" />
+<P1  x="700" y="268" id="2708" />
 <P2  x="692" y="314" id="2698" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
 <COMPONENT type="301" id="2710" >
 <cdparam x="585" y="253" />
-<sizeparam width="213" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="230" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="Channel common to all subblocks
@@ -4304,6 +3909,14 @@ key is deleted in case there is one.
 <TGConnectingPoint num="5" id="2707" />
 <TGConnectingPoint num="6" id="2708" />
 <TGConnectingPoint num="7" id="2709" />
+<TGConnectingPoint num="8" id="102296" />
+<TGConnectingPoint num="9" id="102297" />
+<TGConnectingPoint num="10" id="102298" />
+<TGConnectingPoint num="11" id="102299" />
+<TGConnectingPoint num="12" id="102300" />
+<TGConnectingPoint num="13" id="102301" />
+<TGConnectingPoint num="14" id="102302" />
+<TGConnectingPoint num="15" id="102303" />
 <extraparam>
 <Line value="Channel common to all subblocks" />
 </extraparam>
@@ -4379,51 +3992,53 @@ key is deleted in case there is one.
 <TGConnectingPoint num="23" id="2802" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="2753" >
+<SUBCOMPONENT type="5000" id="2778" >
 <father id="2803" num="0" />
-<cdparam x="443" y="422" />
-<sizeparam width="290" height="137" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="76" y="420" />
+<sizeparam width="338" height="139" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="478" minY="0" maxY="85" />
-<infoparam name="Block0" value="ECU2" />
-<TGConnectingPoint num="0" id="2729" />
-<TGConnectingPoint num="1" id="2730" />
-<TGConnectingPoint num="2" id="2731" />
-<TGConnectingPoint num="3" id="2732" />
-<TGConnectingPoint num="4" id="2733" />
-<TGConnectingPoint num="5" id="2734" />
-<TGConnectingPoint num="6" id="2735" />
-<TGConnectingPoint num="7" id="2736" />
-<TGConnectingPoint num="8" id="2737" />
-<TGConnectingPoint num="9" id="2738" />
-<TGConnectingPoint num="10" id="2739" />
-<TGConnectingPoint num="11" id="2740" />
-<TGConnectingPoint num="12" id="2741" />
-<TGConnectingPoint num="13" id="2742" />
-<TGConnectingPoint num="14" id="2743" />
-<TGConnectingPoint num="15" id="2744" />
-<TGConnectingPoint num="16" id="2745" />
-<TGConnectingPoint num="17" id="2746" />
-<TGConnectingPoint num="18" id="2747" />
-<TGConnectingPoint num="19" id="2748" />
-<TGConnectingPoint num="20" id="2749" />
-<TGConnectingPoint num="21" id="2750" />
-<TGConnectingPoint num="22" id="2751" />
-<TGConnectingPoint num="23" id="2752" />
+<cdrectangleparam minX="0" maxX="430" minY="0" maxY="83" />
+<infoparam name="Block0" value="ECU1" />
+<TGConnectingPoint num="0" id="2754" />
+<TGConnectingPoint num="1" id="2755" />
+<TGConnectingPoint num="2" id="2756" />
+<TGConnectingPoint num="3" id="2757" />
+<TGConnectingPoint num="4" id="2758" />
+<TGConnectingPoint num="5" id="2759" />
+<TGConnectingPoint num="6" id="2760" />
+<TGConnectingPoint num="7" id="2761" />
+<TGConnectingPoint num="8" id="2762" />
+<TGConnectingPoint num="9" id="2763" />
+<TGConnectingPoint num="10" id="2764" />
+<TGConnectingPoint num="11" id="2765" />
+<TGConnectingPoint num="12" id="2766" />
+<TGConnectingPoint num="13" id="2767" />
+<TGConnectingPoint num="14" id="2768" />
+<TGConnectingPoint num="15" id="2769" />
+<TGConnectingPoint num="16" id="2770" />
+<TGConnectingPoint num="17" id="2771" />
+<TGConnectingPoint num="18" id="2772" />
+<TGConnectingPoint num="19" id="2773" />
+<TGConnectingPoint num="20" id="2774" />
+<TGConnectingPoint num="21" id="2775" />
+<TGConnectingPoint num="22" id="2776" />
+<TGConnectingPoint num="23" id="2777" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="ack" value="1" type="8" typeOther="" />
 <Attribute access="0" id="rpk" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu1id" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu2id" value="" type="8" typeOther="" />
 <Attribute access="0" id="mvksk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="mvkpk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk2sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk2pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts0" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts1" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts2" value="" type="8" typeOther="" />
@@ -4431,9 +4046,7 @@ key is deleted in case there is one.
 <Attribute access="0" id="ts4" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts5" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts6" value="" type="8" typeOther="" />
-<Attribute access="0" id="idk1Pk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="sesk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="sd" value="" type="8" typeOther="" />
+<Attribute access="0" id="idk2Pk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="m0" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
@@ -4466,51 +4079,50 @@ key is deleted in case there is one.
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Key DH(Key pubK, Key privK)" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2778" >
+<SUBCOMPONENT type="5000" id="2753" >
 <father id="2803" num="1" />
-<cdparam x="76" y="420" />
-<sizeparam width="338" height="139" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="443" y="422" />
+<sizeparam width="290" height="137" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="83" />
-<infoparam name="Block0" value="ECU1" />
-<TGConnectingPoint num="0" id="2754" />
-<TGConnectingPoint num="1" id="2755" />
-<TGConnectingPoint num="2" id="2756" />
-<TGConnectingPoint num="3" id="2757" />
-<TGConnectingPoint num="4" id="2758" />
-<TGConnectingPoint num="5" id="2759" />
-<TGConnectingPoint num="6" id="2760" />
-<TGConnectingPoint num="7" id="2761" />
-<TGConnectingPoint num="8" id="2762" />
-<TGConnectingPoint num="9" id="2763" />
-<TGConnectingPoint num="10" id="2764" />
-<TGConnectingPoint num="11" id="2765" />
-<TGConnectingPoint num="12" id="2766" />
-<TGConnectingPoint num="13" id="2767" />
-<TGConnectingPoint num="14" id="2768" />
-<TGConnectingPoint num="15" id="2769" />
-<TGConnectingPoint num="16" id="2770" />
-<TGConnectingPoint num="17" id="2771" />
-<TGConnectingPoint num="18" id="2772" />
-<TGConnectingPoint num="19" id="2773" />
-<TGConnectingPoint num="20" id="2774" />
-<TGConnectingPoint num="21" id="2775" />
-<TGConnectingPoint num="22" id="2776" />
-<TGConnectingPoint num="23" id="2777" />
+<cdrectangleparam minX="0" maxX="478" minY="0" maxY="85" />
+<infoparam name="Block0" value="ECU2" />
+<TGConnectingPoint num="0" id="2729" />
+<TGConnectingPoint num="1" id="2730" />
+<TGConnectingPoint num="2" id="2731" />
+<TGConnectingPoint num="3" id="2732" />
+<TGConnectingPoint num="4" id="2733" />
+<TGConnectingPoint num="5" id="2734" />
+<TGConnectingPoint num="6" id="2735" />
+<TGConnectingPoint num="7" id="2736" />
+<TGConnectingPoint num="8" id="2737" />
+<TGConnectingPoint num="9" id="2738" />
+<TGConnectingPoint num="10" id="2739" />
+<TGConnectingPoint num="11" id="2740" />
+<TGConnectingPoint num="12" id="2741" />
+<TGConnectingPoint num="13" id="2742" />
+<TGConnectingPoint num="14" id="2743" />
+<TGConnectingPoint num="15" id="2744" />
+<TGConnectingPoint num="16" id="2745" />
+<TGConnectingPoint num="17" id="2746" />
+<TGConnectingPoint num="18" id="2747" />
+<TGConnectingPoint num="19" id="2748" />
+<TGConnectingPoint num="20" id="2749" />
+<TGConnectingPoint num="21" id="2750" />
+<TGConnectingPoint num="22" id="2751" />
+<TGConnectingPoint num="23" id="2752" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="ack" value="1" type="8" typeOther="" />
 <Attribute access="0" id="rpk" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu1id" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu2id" value="" type="8" typeOther="" />
 <Attribute access="0" id="mvksk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="mvkpk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk1sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk1pk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="idk2sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk2pk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="ts0" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts1" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts2" value="" type="8" typeOther="" />
@@ -4518,7 +4130,9 @@ key is deleted in case there is one.
 <Attribute access="0" id="ts4" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts5" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts6" value="" type="8" typeOther="" />
-<Attribute access="0" id="idk2Pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1Pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="sesk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="sd" value="" type="8" typeOther="" />
 <Attribute access="0" id="m0" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
@@ -4551,12 +4165,13 @@ key is deleted in case there is one.
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Key DH(Key pubK, Key privK)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="301" id="2812" >
-<cdparam x="351" y="37" />
-<sizeparam width="429" height="111" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="366" y="37" />
+<sizeparam width="471" height="111" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="#SecrecyAssumption ECU1.idk1sk
@@ -4577,6 +4192,14 @@ key is deleted in case there is one.
 <TGConnectingPoint num="5" id="2809" />
 <TGConnectingPoint num="6" id="2810" />
 <TGConnectingPoint num="7" id="2811" />
+<TGConnectingPoint num="8" id="102358" />
+<TGConnectingPoint num="9" id="102359" />
+<TGConnectingPoint num="10" id="102360" />
+<TGConnectingPoint num="11" id="102361" />
+<TGConnectingPoint num="12" id="102362" />
+<TGConnectingPoint num="13" id="102363" />
+<TGConnectingPoint num="14" id="102364" />
+<TGConnectingPoint num="15" id="102365" />
 <extraparam>
 <Line value="#SecrecyAssumption ECU1.idk1sk" />
 <Line value="#SecrecyAssumption ECU2.idk2sk" />
@@ -4592,7 +4215,7 @@ key is deleted in case there is one.
 
 <COMPONENT type="301" id="2821" >
 <cdparam x="22" y="36" />
-<sizeparam width="317" height="231" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="335" height="231" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="#PrivatePublicKeys ECU1 mvksk mvkpk
@@ -4623,6 +4246,14 @@ key is deleted in case there is one.
 <TGConnectingPoint num="5" id="2818" />
 <TGConnectingPoint num="6" id="2819" />
 <TGConnectingPoint num="7" id="2820" />
+<TGConnectingPoint num="8" id="102375" />
+<TGConnectingPoint num="9" id="102376" />
+<TGConnectingPoint num="10" id="102377" />
+<TGConnectingPoint num="11" id="102378" />
+<TGConnectingPoint num="12" id="102379" />
+<TGConnectingPoint num="13" id="102380" />
+<TGConnectingPoint num="14" id="102381" />
+<TGConnectingPoint num="15" id="102382" />
 <extraparam>
 <Line value="#PrivatePublicKeys ECU1 mvksk mvkpk" />
 <Line value="#PrivatePublicKeys ECU1 idk1sk idk1pk" />
@@ -4662,116 +4293,130 @@ key is deleted in case there is one.
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="2900" >
-<CONNECTOR type="118" id="2824" >
-<cdparam x="741" y="2090" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="741" y="2090" id="3391" />
-<P2  x="630" y="2102" id="3433" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="118" id="2825" >
-<cdparam x="729" y="1796" />
+<AVATARStateMachineDiagramPanel name="ECU2" minX="10" maxX="1400" minY="10" maxY="2900" >
+<CONNECTOR type="118" id="4462" >
+<cdparam x="692" y="1924" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="729" y="1796" id="3493" />
-<P2  x="643" y="1806" id="3535" />
+<P1  x="692" y="1914" id="5052" />
+<P2  x="590" y="1936" id="5094" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="2826" >
-<cdparam x="557" y="1335" />
+<CONNECTOR type="118" id="4463" >
+<cdparam x="556" y="1263" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="557" y="1335" id="3800" />
-<P2  x="449" y="1349" id="3842" />
+<P1  x="556" y="1253" id="5370" />
+<P2  x="475" y="1272" id="5412" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="2827" >
-<cdparam x="526" y="1036" />
+<CONNECTOR type="5102" id="4470" >
+<cdparam x="434" y="1028" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="526" y="1036" id="3902" />
-<P2  x="438" y="1044" id="3944" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="118" id="2828" >
-<cdparam x="266" y="570" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4469" />
+<P1  x="434" y="1028" id="5502" />
+<P2  x="429" y="1137" id="5429" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4468" >
+<father id="4470" num="0" />
+<cdparam x="436" y="1050" />
+<sizeparam width="179" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4464" />
+<TGConnectingPoint num="1" id="4465" />
+<TGConnectingPoint num="2" id="4466" />
+<TGConnectingPoint num="3" id="4467" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="tmp1 = sign(idk2pk,mvksk)" />
+<actions value="tmp2 = cert(idk2pk,tmp1)" />
+<actions value="tmp3.data = ts2" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk2sk)" />
+<actions value="m2 = concat2(tmp4,tmp5)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="118" id="4471" >
+<cdparam x="546" y="1000" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="266" y="570" id="4157" />
-<P2  x="127" y="575" id="4269" />
+<P1  x="546" y="990" id="5472" />
+<P2  x="484" y="1003" id="5532" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="2829" >
-<cdparam x="334" y="333" />
+<CONNECTOR type="118" id="4472" >
+<cdparam x="453" y="572" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="277" y="335" id="4166" />
-<P2  x="154" y="346" id="4373" />
+<infoparam name="connector from UML Note to state1" value="null" />
+<P1  x="453" y="562" id="5481" />
+<P2  x="360" y="584" id="5871" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="2830" >
-<cdparam x="175" y="86" />
+<CONNECTOR type="118" id="4473" >
+<cdparam x="231" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to UML Note" value="null" />
-<P1  x="137" y="90" id="4455" />
-<P2  x="278" y="76" id="4175" />
+<P1  x="231" y="83" id="6169" />
+<P2  x="272" y="73" id="5490" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="2837" >
-<cdparam x="428" y="180" />
+<CONNECTOR type="5102" id="4480" >
+<cdparam x="277" y="445" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2836" />
-<P1  x="88" y="115" id="4425" />
-<P2  x="103" y="205" id="4379" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4479" />
+<P1  x="302" y="434" id="5756" />
+<P2  x="302" y="479" id="5935" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2835" >
-<father id="2837" num="0" />
-<cdparam x="123" y="126" />
-<sizeparam width="213" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4478" >
+<father id="4480" num="0" />
+<cdparam x="314" y="453" />
+<sizeparam width="208" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2831" />
-<TGConnectingPoint num="1" id="2832" />
-<TGConnectingPoint num="2" id="2833" />
-<TGConnectingPoint num="3" id="2834" />
+<TGConnectingPoint num="0" id="4474" />
+<TGConnectingPoint num="1" id="4475" />
+<TGConnectingPoint num="2" id="4476" />
+<TGConnectingPoint num="3" id="4477" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1 = sign(idk1pk, mvksk)" />
-<actions value="tmp2 = cert(idk1pk, tmp1)" />
-<actions value="tmp3.data = ts0" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m0 = concat2(tmp4,tmp5)" />
+<actions value="idk1Pk = getpk(tmp2)" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2844" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="4487" >
+<cdparam x="447" y="71" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2843" />
-<P1  x="74" y="47" id="4460" />
-<P2  x="75" y="65" id="4436" />
+<TGConnectingPoint num="0" id="4486" />
+<P1  x="140" y="45" id="6174" />
+<P2  x="140" y="58" id="6134" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2842" >
-<father id="2844" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4485" >
+<father id="4487" num="0" />
+<cdparam x="447" y="111" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2838" />
-<TGConnectingPoint num="1" id="2839" />
-<TGConnectingPoint num="2" id="2840" />
-<TGConnectingPoint num="3" id="2841" />
+<TGConnectingPoint num="0" id="4481" />
+<TGConnectingPoint num="1" id="4482" />
+<TGConnectingPoint num="2" id="4483" />
+<TGConnectingPoint num="3" id="4484" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4781,25 +4426,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2851" >
-<cdparam x="451" y="341" />
+<CONNECTOR type="5102" id="4494" >
+<cdparam x="447" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2850" />
-<P1  x="116" y="255" id="4408" />
-<P2  x="137" y="272" id="4326" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="4493" />
+<P1  x="140" y="108" id="6139" />
+<P2  x="140" y="121" id="6122" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2849" >
-<father id="2851" num="0" />
-<cdparam x="451" y="381" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4492" >
+<father id="4494" num="0" />
+<cdparam x="447" y="198" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2845" />
-<TGConnectingPoint num="1" id="2846" />
-<TGConnectingPoint num="2" id="2847" />
-<TGConnectingPoint num="3" id="2848" />
+<TGConnectingPoint num="0" id="4488" />
+<TGConnectingPoint num="1" id="4489" />
+<TGConnectingPoint num="2" id="4490" />
+<TGConnectingPoint num="3" id="4491" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4809,117 +4454,114 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2858" >
-<cdparam x="445" y="417" />
+<CONNECTOR type="5102" id="4501" >
+<cdparam x="451" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2857" />
-<P1  x="137" y="302" id="4327" />
-<P2  x="119" y="321" id="4355" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4500" />
+<P1  x="140" y="151" id="6123" />
+<P2  x="140" y="183" id="6082" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2856" >
-<father id="2858" num="0" />
-<cdparam x="445" y="457" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4499" >
+<father id="4501" num="0" />
+<cdparam x="187" y="157" />
+<sizeparam width="151" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2852" />
-<TGConnectingPoint num="1" id="2853" />
-<TGConnectingPoint num="2" id="2854" />
-<TGConnectingPoint num="3" id="2855" />
+<TGConnectingPoint num="0" id="4495" />
+<TGConnectingPoint num="1" id="4496" />
+<TGConnectingPoint num="2" id="4497" />
+<TGConnectingPoint num="3" id="4498" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m0, tmp4, tmp5)" />
+<actions value="get2(tmp4, tmp2, tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2865" >
-<cdparam x="146" y="365" />
+<CONNECTOR type="5102" id="4508" >
+<cdparam x="95" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2864" />
-<P1  x="119" y="371" id="4367" />
-<P2  x="85" y="436" id="4286" />
+<TGConnectingPoint num="0" id="4507" />
+<P1  x="94" y="233" id="6095" />
+<P2  x="95" y="314" id="6058" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2863" >
-<father id="2865" num="0" />
-<cdparam x="141" y="390" />
-<sizeparam width="203" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4506" >
+<father id="4508" num="0" />
+<cdparam x="25" y="274" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2859" />
-<TGConnectingPoint num="1" id="2860" />
-<TGConnectingPoint num="2" id="2861" />
-<TGConnectingPoint num="3" id="2862" />
+<TGConnectingPoint num="0" id="4502" />
+<TGConnectingPoint num="1" id="4503" />
+<TGConnectingPoint num="2" id="4504" />
+<TGConnectingPoint num="3" id="4505" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp3.data == ts0) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = rpk" />
-<actions value="tmp2.data = ecu2id" />
-<actions value="tmp3.data = ts1" />
-<actions value="tmp4 = concat3(tmp1,tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m1 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2872" >
-<cdparam x="97" y="486" />
+<CONNECTOR type="5102" id="4515" >
+<cdparam x="232" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2871" />
-<P1  x="97" y="486" id="4315" />
-<P2  x="91" y="503" id="4274" />
+<infoparam name="connector from state0 to state1" value="null" />
+<TGConnectingPoint num="0" id="4514" />
+<P1  x="231" y="233" id="6088" />
+<P2  x="253" y="288" id="6007" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2870" >
-<father id="2872" num="0" />
-<cdparam x="97" y="526" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4513" >
+<father id="4515" num="0" />
+<cdparam x="246" y="255" />
+<sizeparam width="169" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2866" />
-<TGConnectingPoint num="1" id="2867" />
-<TGConnectingPoint num="2" id="2868" />
-<TGConnectingPoint num="3" id="2869" />
+<TGConnectingPoint num="0" id="4509" />
+<TGConnectingPoint num="1" id="4510" />
+<TGConnectingPoint num="2" id="4511" />
+<TGConnectingPoint num="3" id="4512" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp3.data == ts0 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2879" >
-<cdparam x="91" y="533" />
+<CONNECTOR type="5102" id="4522" >
+<cdparam x="231" y="423" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2878" />
-<P1  x="91" y="533" id="4275" />
-<P2  x="52" y="550" id="4241" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4521" />
+<P1  x="240" y="338" id="6027" />
+<P2  x="184" y="395" id="5976" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2877" >
-<father id="2879" num="0" />
-<cdparam x="91" y="573" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4520" >
+<father id="4522" num="0" />
+<cdparam x="146" y="380" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2873" />
-<TGConnectingPoint num="1" id="2874" />
-<TGConnectingPoint num="2" id="2875" />
-<TGConnectingPoint num="3" id="2876" />
+<TGConnectingPoint num="0" id="4516" />
+<TGConnectingPoint num="1" id="4517" />
+<TGConnectingPoint num="2" id="4518" />
+<TGConnectingPoint num="3" id="4519" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4927,27 +4569,27 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2886" >
-<cdparam x="89" y="600" />
+<CONNECTOR type="5102" id="4529" >
+<cdparam x="331" y="423" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2885" />
-<P1  x="89" y="600" id="4263" />
-<P2  x="83" y="616" id="4222" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4528" />
+<P1  x="290" y="338" id="6029" />
+<P2  x="302" y="384" id="5750" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2884" >
-<father id="2886" num="0" />
-<cdparam x="89" y="640" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4527" >
+<father id="4529" num="0" />
+<cdparam x="306" y="367" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2880" />
-<TGConnectingPoint num="1" id="2881" />
-<TGConnectingPoint num="2" id="2882" />
-<TGConnectingPoint num="3" id="2883" />
+<TGConnectingPoint num="0" id="4523" />
+<TGConnectingPoint num="1" id="4524" />
+<TGConnectingPoint num="2" id="4525" />
+<TGConnectingPoint num="3" id="4526" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4955,57 +4597,55 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2893" >
-<cdparam x="83" y="646" />
+<CONNECTOR type="5102" id="4536" >
+<cdparam x="243" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2892" />
-<P1  x="83" y="646" id="4223" />
-<P2  x="124" y="699" id="4197" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4535" />
+<P1  x="240" y="529" id="5922" />
+<P2  x="118" y="560" id="5878" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2891" >
-<father id="2893" num="0" />
-<cdparam x="114" y="662" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4534" >
+<father id="4536" num="0" />
+<cdparam x="96" y="536" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2887" />
-<TGConnectingPoint num="1" id="2888" />
-<TGConnectingPoint num="2" id="2889" />
-<TGConnectingPoint num="3" id="2890" />
+<TGConnectingPoint num="0" id="4530" />
+<TGConnectingPoint num="1" id="4531" />
+<TGConnectingPoint num="2" id="4532" />
+<TGConnectingPoint num="3" id="4533" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m2,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2900" >
-<cdparam x="112" y="749" />
+<CONNECTOR type="5102" id="4543" >
+<cdparam x="343" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2899" />
-<P1  x="112" y="749" id="4186" />
-<P2  x="89" y="809" id="4131" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4542" />
+<P1  x="315" y="529" id="5932" />
+<P2  x="271" y="559" id="5843" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2898" >
-<father id="2900" num="0" />
-<cdparam x="12" y="775" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4541" >
+<father id="4543" num="0" />
+<cdparam x="270" y="544" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2894" />
-<TGConnectingPoint num="1" id="2895" />
-<TGConnectingPoint num="2" id="2896" />
-<TGConnectingPoint num="3" id="2897" />
+<TGConnectingPoint num="0" id="4537" />
+<TGConnectingPoint num="1" id="4538" />
+<TGConnectingPoint num="2" id="4539" />
+<TGConnectingPoint num="3" id="4540" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts2)]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5013,142 +4653,142 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2907" >
-<cdparam x="212" y="749" />
+<CONNECTOR type="5102" id="4550" >
+<cdparam x="317" y="568" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2906" />
-<P1  x="212" y="749" id="4188" />
-<P2  x="198" y="809" id="4072" />
+<infoparam name="connector from state1 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="4549" />
+<P1  x="315" y="609" id="5865" />
+<P2  x="250" y="624" id="5824" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2905" >
-<father id="2907" num="0" />
-<cdparam x="212" y="777" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4548" >
+<father id="4550" num="0" />
+<cdparam x="303" y="638" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2901" />
-<TGConnectingPoint num="1" id="2902" />
-<TGConnectingPoint num="2" id="2903" />
-<TGConnectingPoint num="3" id="2904" />
+<TGConnectingPoint num="0" id="4544" />
+<TGConnectingPoint num="1" id="4545" />
+<TGConnectingPoint num="2" id="4546" />
+<TGConnectingPoint num="3" id="4547" />
 <extraparam>
-<guard value="[ tmp3.data == ts2 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2914" >
-<cdparam x="198" y="859" />
+<CONNECTOR type="5102" id="4557" >
+<cdparam x="313" y="621" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2913" />
-<P1  x="198" y="859" id="4077" />
-<P2  x="149" y="914" id="4032" />
+<infoparam name="connector from Receive signal to state1" value="null" />
+<TGConnectingPoint num="0" id="4556" />
+<P1  x="250" y="654" id="5825" />
+<P2  x="201" y="687" id="5799" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2912" >
-<father id="2914" num="0" />
-<cdparam x="111" y="886" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4555" >
+<father id="4557" num="0" />
+<cdparam x="271" y="666" />
+<sizeparam width="179" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2908" />
-<TGConnectingPoint num="1" id="2909" />
-<TGConnectingPoint num="2" id="2910" />
-<TGConnectingPoint num="3" id="2911" />
+<TGConnectingPoint num="0" id="4551" />
+<TGConnectingPoint num="1" id="4552" />
+<TGConnectingPoint num="2" id="4553" />
+<TGConnectingPoint num="3" id="4554" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m1,tmp4,tmp5)" />
+<actions value="get3(tmp4,tmp1,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2921" >
-<cdparam x="298" y="859" />
+<CONNECTOR type="5102" id="4564" >
+<cdparam x="189" y="737" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2920" />
-<P1  x="298" y="859" id="4079" />
-<P2  x="290" y="914" id="4006" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4563" />
+<P1  x="201" y="737" id="5811" />
+<P2  x="163" y="778" id="5703" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2919" >
-<father id="2921" num="0" />
-<cdparam x="303" y="873" />
-<sizeparam width="198" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4562" >
+<father id="4564" num="0" />
+<cdparam x="34" y="748" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2915" />
-<TGConnectingPoint num="1" id="2916" />
-<TGConnectingPoint num="2" id="2917" />
-<TGConnectingPoint num="3" id="2918" />
+<TGConnectingPoint num="0" id="4558" />
+<TGConnectingPoint num="1" id="4559" />
+<TGConnectingPoint num="2" id="4560" />
+<TGConnectingPoint num="3" id="4561" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(tmp3.data == ts1) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="idk2Pk = getpk(tmp2)" />
-<actions value="b = verifySign(tmp4,tmp5,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2928" >
-<cdparam x="199" y="964" />
+<CONNECTOR type="5102" id="4571" >
+<cdparam x="289" y="737" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2927" />
-<P1  x="278" y="964" id="3995" />
-<P2  x="185" y="1019" id="3957" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4570" />
+<P1  x="264" y="737" id="5798" />
+<P2  x="292" y="778" id="5668" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2926" >
-<father id="2928" num="0" />
-<cdparam x="169" y="993" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4569" >
+<father id="4571" num="0" />
+<cdparam x="288" y="752" />
+<sizeparam width="208" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2922" />
-<TGConnectingPoint num="1" id="2923" />
-<TGConnectingPoint num="2" id="2924" />
-<TGConnectingPoint num="3" id="2925" />
+<TGConnectingPoint num="0" id="4565" />
+<TGConnectingPoint num="1" id="4566" />
+<TGConnectingPoint num="2" id="4567" />
+<TGConnectingPoint num="3" id="4568" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ tmp3.data == ts1 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2935" >
-<cdparam x="378" y="964" />
+<CONNECTOR type="5102" id="4578" >
+<cdparam x="267" y="828" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2934" />
-<P1  x="378" y="964" id="3997" />
-<P2  x="388" y="1019" id="3909" />
+<TGConnectingPoint num="0" id="4577" />
+<P1  x="279" y="828" id="5688" />
+<P2  x="249" y="877" id="5621" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2933" >
-<father id="2935" num="0" />
-<cdparam x="388" y="985" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4576" >
+<father id="4578" num="0" />
+<cdparam x="187" y="850" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2929" />
-<TGConnectingPoint num="1" id="2930" />
-<TGConnectingPoint num="2" id="2931" />
-<TGConnectingPoint num="3" id="2932" />
+<TGConnectingPoint num="0" id="4572" />
+<TGConnectingPoint num="1" id="4573" />
+<TGConnectingPoint num="2" id="4574" />
+<TGConnectingPoint num="3" id="4575" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5156,61 +4796,55 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2942" >
-<cdparam x="425" y="1069" />
+<CONNECTOR type="5102" id="4585" >
+<cdparam x="367" y="828" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2941" />
-<P1  x="388" y="1069" id="3914" />
-<P2  x="385" y="1185" id="3859" />
+<TGConnectingPoint num="0" id="4584" />
+<P1  x="342" y="828" id="5675" />
+<P2  x="354" y="880" id="5586" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2940" >
-<father id="2942" num="0" />
-<cdparam x="402" y="1087" />
-<sizeparam width="199" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4583" >
+<father id="4585" num="0" />
+<cdparam x="368" y="850" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2936" />
-<TGConnectingPoint num="1" id="2937" />
-<TGConnectingPoint num="2" id="2938" />
-<TGConnectingPoint num="3" id="2939" />
+<TGConnectingPoint num="0" id="4579" />
+<TGConnectingPoint num="1" id="4580" />
+<TGConnectingPoint num="2" id="4581" />
+<TGConnectingPoint num="3" id="4582" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = SesK.data" />
-<actions value="tmp2 = aencrypt(tmp1,idk2Pk)" />
-<actions value="tmp3.data = ts3" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m3 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2949" >
-<cdparam x="397" y="1235" />
+<CONNECTOR type="5102" id="4592" >
+<cdparam x="329" y="930" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2948" />
-<P1  x="397" y="1235" id="3888" />
-<P2  x="392" y="1257" id="3847" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4591" />
+<P1  x="341" y="930" id="5606" />
+<P2  x="290" y="980" id="5556" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2947" >
-<father id="2949" num="0" />
-<cdparam x="397" y="1275" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4590" >
+<father id="4592" num="0" />
+<cdparam x="159" y="957" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2943" />
-<TGConnectingPoint num="1" id="2944" />
-<TGConnectingPoint num="2" id="2945" />
-<TGConnectingPoint num="3" id="2946" />
+<TGConnectingPoint num="0" id="4586" />
+<TGConnectingPoint num="1" id="4587" />
+<TGConnectingPoint num="2" id="4588" />
+<TGConnectingPoint num="3" id="4589" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp1.data == rpk) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5218,27 +4852,27 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2956" >
-<cdparam x="392" y="1287" />
+<CONNECTOR type="5102" id="4599" >
+<cdparam x="429" y="930" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2955" />
-<P1  x="392" y="1287" id="3848" />
-<P2  x="399" y="1324" id="3807" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4598" />
+<P1  x="404" y="930" id="5593" />
+<P2  x="434" y="978" id="5497" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2954" >
-<father id="2956" num="0" />
-<cdparam x="408" y="1300" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4597" >
+<father id="4599" num="0" />
+<cdparam x="443" y="958" />
+<sizeparam width="131" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2950" />
-<TGConnectingPoint num="1" id="2951" />
-<TGConnectingPoint num="2" id="2952" />
-<TGConnectingPoint num="3" id="2953" />
+<TGConnectingPoint num="0" id="4593" />
+<TGConnectingPoint num="1" id="4594" />
+<TGConnectingPoint num="2" id="4595" />
+<TGConnectingPoint num="3" id="4596" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp1.data == rpk ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5246,25 +4880,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2963" >
-<cdparam x="386" y="1374" />
+<CONNECTOR type="5102" id="4606" >
+<cdparam x="429" y="1187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2962" />
-<P1  x="386" y="1374" id="3835" />
-<P2  x="390" y="1405" id="3786" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="4605" />
+<P1  x="429" y="1187" id="5434" />
+<P2  x="434" y="1192" id="5417" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2961" >
-<father id="2963" num="0" />
-<cdparam x="386" y="1414" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4604" >
+<father id="4606" num="0" />
+<cdparam x="429" y="1227" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2957" />
-<TGConnectingPoint num="1" id="2958" />
-<TGConnectingPoint num="2" id="2959" />
-<TGConnectingPoint num="3" id="2960" />
+<TGConnectingPoint num="0" id="4600" />
+<TGConnectingPoint num="1" id="4601" />
+<TGConnectingPoint num="2" id="4602" />
+<TGConnectingPoint num="3" id="4603" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5274,57 +4908,55 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2970" >
-<cdparam x="390" y="1435" />
+<CONNECTOR type="5102" id="4613" >
+<cdparam x="434" y="1222" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2969" />
-<P1  x="390" y="1435" id="3787" />
-<P2  x="400" y="1491" id="3746" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4612" />
+<P1  x="434" y="1222" id="5418" />
+<P2  x="412" y="1247" id="5393" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2968" >
-<father id="2970" num="0" />
-<cdparam x="406" y="1456" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4611" >
+<father id="4613" num="0" />
+<cdparam x="434" y="1262" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2964" />
-<TGConnectingPoint num="1" id="2965" />
-<TGConnectingPoint num="2" id="2966" />
-<TGConnectingPoint num="3" id="2967" />
+<TGConnectingPoint num="0" id="4607" />
+<TGConnectingPoint num="1" id="4608" />
+<TGConnectingPoint num="2" id="4609" />
+<TGConnectingPoint num="3" id="4610" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m4,tmp3,tmp4)" />
-<actions value="get2(tmp3,tmp1,tmp2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2977" >
-<cdparam x="350" y="1541" />
+<CONNECTOR type="5102" id="4620" >
+<cdparam x="412" y="1297" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2976" />
-<P1  x="350" y="1541" id="3750" />
-<P2  x="327" y="1579" id="3706" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="4619" />
+<P1  x="412" y="1297" id="5405" />
+<P2  x="412" y="1311" id="5356" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2975" >
-<father id="2977" num="0" />
-<cdparam x="184" y="1554" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4618" >
+<father id="4620" num="0" />
+<cdparam x="412" y="1337" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2971" />
-<TGConnectingPoint num="1" id="2972" />
-<TGConnectingPoint num="2" id="2973" />
-<TGConnectingPoint num="3" id="2974" />
+<TGConnectingPoint num="0" id="4614" />
+<TGConnectingPoint num="1" id="4615" />
+<TGConnectingPoint num="2" id="4616" />
+<TGConnectingPoint num="3" id="4617" />
 <extraparam>
-<guard value="[ not(tmp2.data == ts4) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5332,56 +4964,57 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2984" >
-<cdparam x="450" y="1541" />
+<CONNECTOR type="5102" id="4627" >
+<cdparam x="412" y="1341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2983" />
-<P1  x="450" y="1541" id="3752" />
-<P2  x="454" y="1583" id="3671" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4626" />
+<P1  x="412" y="1341" id="5357" />
+<P2  x="406" y="1402" id="5316" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2982" >
-<father id="2984" num="0" />
-<cdparam x="459" y="1556" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4625" >
+<father id="4627" num="0" />
+<cdparam x="420" y="1366" />
+<sizeparam width="143" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2978" />
-<TGConnectingPoint num="1" id="2979" />
-<TGConnectingPoint num="2" id="2980" />
-<TGConnectingPoint num="3" id="2981" />
+<TGConnectingPoint num="0" id="4621" />
+<TGConnectingPoint num="1" id="4622" />
+<TGConnectingPoint num="2" id="4623" />
+<TGConnectingPoint num="3" id="4624" />
 <extraparam>
-<guard value="[ tmp2.data == ts4 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp3,tmp4,idk2Pk)" />
+<actions value="get2(m3,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2991" >
-<cdparam x="429" y="1633" />
+<CONNECTOR type="5102" id="4634" >
+<cdparam x="356" y="1452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2990" />
-<P1  x="429" y="1633" id="3668" />
-<P2  x="393" y="1673" id="3641" />
+<TGConnectingPoint num="0" id="4633" />
+<P1  x="368" y="1452" id="5343" />
+<P2  x="326" y="1507" id="5292" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2989" >
-<father id="2991" num="0" />
-<cdparam x="346" y="1656" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4632" >
+<father id="4634" num="0" />
+<cdparam x="188" y="1471" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2985" />
-<TGConnectingPoint num="1" id="2986" />
-<TGConnectingPoint num="2" id="2987" />
-<TGConnectingPoint num="3" id="2988" />
+<TGConnectingPoint num="0" id="4628" />
+<TGConnectingPoint num="1" id="4629" />
+<TGConnectingPoint num="2" id="4630" />
+<TGConnectingPoint num="3" id="4631" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ not(tmp3.data == ts3) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5389,55 +5022,56 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2998" >
-<cdparam x="529" y="1633" />
+<CONNECTOR type="5102" id="4641" >
+<cdparam x="456" y="1452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2997" />
-<P1  x="529" y="1633" id="3670" />
-<P2  x="509" y="1674" id="3589" />
+<TGConnectingPoint num="0" id="4640" />
+<P1  x="431" y="1452" id="5330" />
+<P2  x="446" y="1506" id="5241" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2996" >
-<father id="2998" num="0" />
-<cdparam x="532" y="1649" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4639" >
+<father id="4641" num="0" />
+<cdparam x="443" y="1474" />
+<sizeparam width="208" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2992" />
-<TGConnectingPoint num="1" id="2993" />
-<TGConnectingPoint num="2" id="2994" />
-<TGConnectingPoint num="3" id="2995" />
+<TGConnectingPoint num="0" id="4635" />
+<TGConnectingPoint num="1" id="4636" />
+<TGConnectingPoint num="2" id="4637" />
+<TGConnectingPoint num="3" id="4638" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ tmp3.data == ts3 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3005" >
-<cdparam x="406" y="1723" />
+<CONNECTOR type="5102" id="4648" >
+<cdparam x="421" y="1565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3004" />
-<P1  x="484" y="1724" id="3586" />
-<P2  x="415" y="1780" id="3557" />
+<TGConnectingPoint num="0" id="4647" />
+<P1  x="433" y="1556" id="5261" />
+<P2  x="388" y="1623" id="5210" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3003" >
-<father id="3005" num="0" />
-<cdparam x="285" y="1756" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4646" >
+<father id="4648" num="0" />
+<cdparam x="348" y="1589" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2999" />
-<TGConnectingPoint num="1" id="3000" />
-<TGConnectingPoint num="2" id="3001" />
-<TGConnectingPoint num="3" id="3002" />
+<TGConnectingPoint num="0" id="4642" />
+<TGConnectingPoint num="1" id="4643" />
+<TGConnectingPoint num="2" id="4644" />
+<TGConnectingPoint num="3" id="4645" />
 <extraparam>
-<guard value="[ not(tmp1.data == ack) ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5445,87 +5079,87 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3012" >
-<cdparam x="584" y="1724" />
+<CONNECTOR type="5102" id="4655" >
+<cdparam x="521" y="1565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3011" />
-<P1  x="584" y="1724" id="3588" />
-<P2  x="580" y="1781" id="3516" />
+<TGConnectingPoint num="0" id="4654" />
+<P1  x="496" y="1556" id="5248" />
+<P2  x="501" y="1625" id="5159" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3010" >
-<father id="3012" num="0" />
-<cdparam x="589" y="1756" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4653" >
+<father id="4655" num="0" />
+<cdparam x="508" y="1597" />
+<sizeparam width="188" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3006" />
-<TGConnectingPoint num="1" id="3007" />
-<TGConnectingPoint num="2" id="3008" />
-<TGConnectingPoint num="3" id="3009" />
+<TGConnectingPoint num="0" id="4649" />
+<TGConnectingPoint num="1" id="4650" />
+<TGConnectingPoint num="2" id="4651" />
+<TGConnectingPoint num="3" id="4652" />
 <extraparam>
-<guard value="[ tmp1.data == ack ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sesk = adecrypt(tmp2,idk2sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3019" >
-<cdparam x="593" y="1831" />
+<CONNECTOR type="5102" id="4662" >
+<cdparam x="549" y="1687" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3018" />
-<P1  x="593" y="1831" id="3505" />
-<P2  x="583" y="1944" id="3450" />
+<TGConnectingPoint num="0" id="4661" />
+<P1  x="532" y="1675" id="5157" />
+<P2  x="533" y="1783" id="5111" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3017" >
-<father id="3019" num="0" />
-<cdparam x="601" y="1856" />
-<sizeparam width="203" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4660" >
+<father id="4662" num="0" />
+<cdparam x="550" y="1707" />
+<sizeparam width="179" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3013" />
-<TGConnectingPoint num="1" id="3014" />
-<TGConnectingPoint num="2" id="3015" />
-<TGConnectingPoint num="3" id="3016" />
+<TGConnectingPoint num="0" id="4656" />
+<TGConnectingPoint num="1" id="4657" />
+<TGConnectingPoint num="2" id="4658" />
+<TGConnectingPoint num="3" id="4659" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = secretData" />
-<actions value="tmp2 = sencrypt(secretData, SesK)" />
-<actions value="tmp3.data = ts5" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = MAC(tmp4,SesK)" />
-<actions value="m5 = concat2(tmp4,tmp5)" />
+<actions value="tmp1.data = ack" />
+<actions value="tmp2.data = ts4" />
+<actions value="tmp3 = concat2(tmp1,tmp2)" />
+<actions value="tmp4 = sign(tmp3,idk2sk)" />
+<actions value="m4 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3026" >
-<cdparam x="595" y="1994" />
+<CONNECTOR type="5102" id="4669" >
+<cdparam x="520" y="1833" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3025" />
-<P1  x="583" y="1994" id="3455" />
-<P2  x="583" y="2015" id="3438" />
+<TGConnectingPoint num="0" id="4668" />
+<P1  x="520" y="1833" id="5139" />
+<P2  x="519" y="1853" id="5099" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3024" >
-<father id="3026" num="0" />
-<cdparam x="595" y="2034" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4667" >
+<father id="4669" num="0" />
+<cdparam x="520" y="1873" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3020" />
-<TGConnectingPoint num="1" id="3021" />
-<TGConnectingPoint num="2" id="3022" />
-<TGConnectingPoint num="3" id="3023" />
+<TGConnectingPoint num="0" id="4663" />
+<TGConnectingPoint num="1" id="4664" />
+<TGConnectingPoint num="2" id="4665" />
+<TGConnectingPoint num="3" id="4666" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5535,25 +5169,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3033" >
-<cdparam x="583" y="2045" />
+<CONNECTOR type="5102" id="4676" >
+<cdparam x="519" y="1883" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3032" />
-<P1  x="583" y="2045" id="3439" />
-<P2  x="580" y="2077" id="3398" />
+<TGConnectingPoint num="0" id="4675" />
+<P1  x="519" y="1883" id="5100" />
+<P2  x="515" y="1911" id="5066" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3031" >
-<father id="3033" num="0" />
-<cdparam x="583" y="2085" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4674" >
+<father id="4676" num="0" />
+<cdparam x="519" y="1923" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3027" />
-<TGConnectingPoint num="1" id="3028" />
-<TGConnectingPoint num="2" id="3029" />
-<TGConnectingPoint num="3" id="3030" />
+<TGConnectingPoint num="0" id="4670" />
+<TGConnectingPoint num="1" id="4671" />
+<TGConnectingPoint num="2" id="4672" />
+<TGConnectingPoint num="3" id="4673" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5563,25 +5197,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3040" >
-<cdparam x="567" y="2127" />
+<CONNECTOR type="5102" id="4683" >
+<cdparam x="527" y="1961" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3039" />
-<P1  x="567" y="2127" id="3426" />
-<P2  x="566" y="2151" id="3377" />
+<TGConnectingPoint num="0" id="4682" />
+<P1  x="527" y="1961" id="5087" />
+<P2  x="531" y="1989" id="5038" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3038" >
-<father id="3040" num="0" />
-<cdparam x="567" y="2167" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4681" >
+<father id="4683" num="0" />
+<cdparam x="527" y="2001" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3034" />
-<TGConnectingPoint num="1" id="3035" />
-<TGConnectingPoint num="2" id="3036" />
-<TGConnectingPoint num="3" id="3037" />
+<TGConnectingPoint num="0" id="4677" />
+<TGConnectingPoint num="1" id="4678" />
+<TGConnectingPoint num="2" id="4679" />
+<TGConnectingPoint num="3" id="4680" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5591,57 +5225,57 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3047" >
-<cdparam x="566" y="2181" />
+<CONNECTOR type="5102" id="4690" >
+<cdparam x="531" y="2019" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3046" />
-<P1  x="566" y="2181" id="3378" />
-<P2  x="544" y="2227" id="3344" />
+<TGConnectingPoint num="0" id="4689" />
+<P1  x="531" y="2019" id="5039" />
+<P2  x="532" y="2073" id="4998" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3045" >
-<father id="3047" num="0" />
-<cdparam x="569" y="2200" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4688" >
+<father id="4690" num="0" />
+<cdparam x="540" y="2041" />
+<sizeparam width="143" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3041" />
-<TGConnectingPoint num="1" id="3042" />
-<TGConnectingPoint num="2" id="3043" />
-<TGConnectingPoint num="3" id="3044" />
+<TGConnectingPoint num="0" id="4684" />
+<TGConnectingPoint num="1" id="4685" />
+<TGConnectingPoint num="2" id="4686" />
+<TGConnectingPoint num="3" id="4687" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m6,tmp3,tmp4)" />
-<actions value="get2(tmp3,tmp1,tmp2)" />
+<actions value="get2(m5,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3054" >
-<cdparam x="519" y="2277" />
+<CONNECTOR type="5102" id="4697" >
+<cdparam x="494" y="2123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3053" />
-<P1  x="531" y="2277" id="3364" />
-<P2  x="497" y="2323" id="3297" />
+<TGConnectingPoint num="0" id="4696" />
+<P1  x="494" y="2123" id="5025" />
+<P2  x="428" y="2165" id="4974" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3052" >
-<father id="3054" num="0" />
-<cdparam x="358" y="2298" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4695" >
+<father id="4697" num="0" />
+<cdparam x="313" y="2141" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3048" />
-<TGConnectingPoint num="1" id="3049" />
-<TGConnectingPoint num="2" id="3050" />
-<TGConnectingPoint num="3" id="3051" />
+<TGConnectingPoint num="0" id="4691" />
+<TGConnectingPoint num="1" id="4692" />
+<TGConnectingPoint num="2" id="4693" />
+<TGConnectingPoint num="3" id="4694" />
 <extraparam>
-<guard value="[ not(tmp2.data == ts6) ]" />
+<guard value="[ not(tmp3.data == ts5) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5649,54 +5283,54 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3061" >
-<cdparam x="619" y="2277" />
+<CONNECTOR type="5102" id="4704" >
+<cdparam x="582" y="2123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3060" />
-<P1  x="594" y="2277" id="3351" />
-<P2  x="618" y="2321" id="3271" />
+<TGConnectingPoint num="0" id="4703" />
+<P1  x="557" y="2123" id="5012" />
+<P2  x="578" y="2165" id="4932" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3059" >
-<father id="3061" num="0" />
-<cdparam x="616" y="2293" />
-<sizeparam width="188" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4702" >
+<father id="4704" num="0" />
+<cdparam x="590" y="2138" />
+<sizeparam width="195" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3055" />
-<TGConnectingPoint num="1" id="3056" />
-<TGConnectingPoint num="2" id="3057" />
-<TGConnectingPoint num="3" id="3058" />
+<TGConnectingPoint num="0" id="4698" />
+<TGConnectingPoint num="1" id="4699" />
+<TGConnectingPoint num="2" id="4700" />
+<TGConnectingPoint num="3" id="4701" />
 <extraparam>
-<guard value="[ tmp2.data == ts6 ]" />
+<guard value="[ tmp3.data == ts5 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(tmp3,tmp4,SesK)" />
+<actions value="b = verifyMAC(tmp4,tmp5,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3068" >
-<cdparam x="581" y="2371" />
+<CONNECTOR type="5102" id="4711" >
+<cdparam x="466" y="2215" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3067" />
-<P1  x="593" y="2371" id="3282" />
-<P2  x="540" y="2408" id="3214" />
+<TGConnectingPoint num="0" id="4710" />
+<P1  x="553" y="2215" id="4943" />
+<P2  x="469" y="2265" id="4891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3066" >
-<father id="3068" num="0" />
-<cdparam x="506" y="2388" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4709" >
+<father id="4711" num="0" />
+<cdparam x="460" y="2238" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3062" />
-<TGConnectingPoint num="1" id="3063" />
-<TGConnectingPoint num="2" id="3064" />
-<TGConnectingPoint num="3" id="3065" />
+<TGConnectingPoint num="0" id="4705" />
+<TGConnectingPoint num="1" id="4706" />
+<TGConnectingPoint num="2" id="4707" />
+<TGConnectingPoint num="3" id="4708" />
 <extraparam>
 <guard value="[ not(b) ]" />
 <afterMin value="" />
@@ -5706,2020 +5340,2112 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3075" >
-<cdparam x="681" y="2371" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3074" />
-<P1  x="656" y="2371" id="3269" />
-<P2  x="687" y="2408" id="3189" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3073" >
-<father id="3075" num="0" />
-<cdparam x="693" y="2391" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3069" />
-<TGConnectingPoint num="1" id="3070" />
-<TGConnectingPoint num="2" id="3071" />
-<TGConnectingPoint num="3" id="3072" />
-<extraparam>
-<guard value="[ b ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3082" >
-<cdparam x="650" y="2458" />
+<CONNECTOR type="5102" id="4718" >
+<cdparam x="641" y="2215" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3081" />
-<P1  x="662" y="2458" id="3200" />
-<P2  x="604" y="2519" id="3140" />
+<TGConnectingPoint num="0" id="4717" />
+<P1  x="616" y="2215" id="4930" />
+<P2  x="650" y="2265" id="4841" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3080" >
-<father id="3082" num="0" />
-<cdparam x="473" y="2491" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4716" >
+<father id="4718" num="0" />
+<cdparam x="638" y="2235" />
+<sizeparam width="162" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3076" />
-<TGConnectingPoint num="1" id="3077" />
-<TGConnectingPoint num="2" id="3078" />
-<TGConnectingPoint num="3" id="3079" />
+<TGConnectingPoint num="0" id="4712" />
+<TGConnectingPoint num="1" id="4713" />
+<TGConnectingPoint num="2" id="4714" />
+<TGConnectingPoint num="3" id="4715" />
 <extraparam>
-<guard value="[ not(tmp1.data == ack) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sd = sdecrypt(tmp2,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3089" >
-<cdparam x="750" y="2458" />
+<CONNECTOR type="5102" id="4725" >
+<cdparam x="695" y="2315" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3088" />
-<P1  x="712" y="2458" id="3202" />
-<P2  x="726" y="2522" id="3106" />
+<TGConnectingPoint num="0" id="4724" />
+<P1  x="681" y="2315" id="4839" />
+<P2  x="670" y="2407" id="4793" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3087" >
-<father id="3089" num="0" />
-<cdparam x="725" y="2486" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4723" >
+<father id="4725" num="0" />
+<cdparam x="677" y="2337" />
+<sizeparam width="179" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3083" />
-<TGConnectingPoint num="1" id="3084" />
-<TGConnectingPoint num="2" id="3085" />
-<TGConnectingPoint num="3" id="3086" />
+<TGConnectingPoint num="0" id="4719" />
+<TGConnectingPoint num="1" id="4720" />
+<TGConnectingPoint num="2" id="4721" />
+<TGConnectingPoint num="3" id="4722" />
 <extraparam>
-<guard value="[ tmp1.data == ack ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = ack" />
+<actions value="tmp2.data = ts6" />
+<actions value="tmp3 = concat2(tmp1,tmp2)" />
+<actions value="tmp4 = MAC(tmp3,sesk)" />
+<actions value="m6 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3130" >
-<cdparam x="711" y="2522" />
-<sizeparam width="131" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ProtocolRunEnded" />
-<TGConnectingPoint num="0" id="3090" />
-<TGConnectingPoint num="1" id="3091" />
-<TGConnectingPoint num="2" id="3092" />
-<TGConnectingPoint num="3" id="3093" />
-<TGConnectingPoint num="4" id="3094" />
-<TGConnectingPoint num="5" id="3095" />
-<TGConnectingPoint num="6" id="3096" />
-<TGConnectingPoint num="7" id="3097" />
-<TGConnectingPoint num="8" id="3098" />
-<TGConnectingPoint num="9" id="3099" />
-<TGConnectingPoint num="10" id="3100" />
-<TGConnectingPoint num="11" id="3101" />
-<TGConnectingPoint num="12" id="3102" />
-<TGConnectingPoint num="13" id="3103" />
-<TGConnectingPoint num="14" id="3104" />
-<TGConnectingPoint num="15" id="3105" />
-<TGConnectingPoint num="16" id="3106" />
-<TGConnectingPoint num="17" id="3107" />
-<TGConnectingPoint num="18" id="3108" />
-<TGConnectingPoint num="19" id="3109" />
-<TGConnectingPoint num="20" id="3110" />
-<TGConnectingPoint num="21" id="3111" />
-<TGConnectingPoint num="22" id="3112" />
-<TGConnectingPoint num="23" id="3113" />
-<TGConnectingPoint num="24" id="3114" />
-<TGConnectingPoint num="25" id="3115" />
-<TGConnectingPoint num="26" id="3116" />
-<TGConnectingPoint num="27" id="3117" />
-<TGConnectingPoint num="28" id="3118" />
-<TGConnectingPoint num="29" id="3119" />
-<TGConnectingPoint num="30" id="3120" />
-<TGConnectingPoint num="31" id="3121" />
-<TGConnectingPoint num="32" id="3122" />
-<TGConnectingPoint num="33" id="3123" />
-<TGConnectingPoint num="34" id="3124" />
-<TGConnectingPoint num="35" id="3125" />
-<TGConnectingPoint num="36" id="3126" />
-<TGConnectingPoint num="37" id="3127" />
-<TGConnectingPoint num="38" id="3128" />
-<TGConnectingPoint num="39" id="3129" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3171" >
-<cdparam x="514" y="2519" />
-<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="UnexpectedMsg6" />
-<TGConnectingPoint num="0" id="3131" />
-<TGConnectingPoint num="1" id="3132" />
-<TGConnectingPoint num="2" id="3133" />
-<TGConnectingPoint num="3" id="3134" />
-<TGConnectingPoint num="4" id="3135" />
-<TGConnectingPoint num="5" id="3136" />
-<TGConnectingPoint num="6" id="3137" />
-<TGConnectingPoint num="7" id="3138" />
-<TGConnectingPoint num="8" id="3139" />
-<TGConnectingPoint num="9" id="3140" />
-<TGConnectingPoint num="10" id="3141" />
-<TGConnectingPoint num="11" id="3142" />
-<TGConnectingPoint num="12" id="3143" />
-<TGConnectingPoint num="13" id="3144" />
-<TGConnectingPoint num="14" id="3145" />
-<TGConnectingPoint num="15" id="3146" />
-<TGConnectingPoint num="16" id="3147" />
-<TGConnectingPoint num="17" id="3148" />
-<TGConnectingPoint num="18" id="3149" />
-<TGConnectingPoint num="19" id="3150" />
-<TGConnectingPoint num="20" id="3151" />
-<TGConnectingPoint num="21" id="3152" />
-<TGConnectingPoint num="22" id="3153" />
-<TGConnectingPoint num="23" id="3154" />
-<TGConnectingPoint num="24" id="3155" />
-<TGConnectingPoint num="25" id="3156" />
-<TGConnectingPoint num="26" id="3157" />
-<TGConnectingPoint num="27" id="3158" />
-<TGConnectingPoint num="28" id="3159" />
-<TGConnectingPoint num="29" id="3160" />
-<TGConnectingPoint num="30" id="3161" />
-<TGConnectingPoint num="31" id="3162" />
-<TGConnectingPoint num="32" id="3163" />
-<TGConnectingPoint num="33" id="3164" />
-<TGConnectingPoint num="34" id="3165" />
-<TGConnectingPoint num="35" id="3166" />
-<TGConnectingPoint num="36" id="3167" />
-<TGConnectingPoint num="37" id="3168" />
-<TGConnectingPoint num="38" id="3169" />
-<TGConnectingPoint num="39" id="3170" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3212" >
-<cdparam x="650" y="2408" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyack6" />
-<TGConnectingPoint num="0" id="3172" />
-<TGConnectingPoint num="1" id="3173" />
-<TGConnectingPoint num="2" id="3174" />
-<TGConnectingPoint num="3" id="3175" />
-<TGConnectingPoint num="4" id="3176" />
-<TGConnectingPoint num="5" id="3177" />
-<TGConnectingPoint num="6" id="3178" />
-<TGConnectingPoint num="7" id="3179" />
-<TGConnectingPoint num="8" id="3180" />
-<TGConnectingPoint num="9" id="3181" />
-<TGConnectingPoint num="10" id="3182" />
-<TGConnectingPoint num="11" id="3183" />
-<TGConnectingPoint num="12" id="3184" />
-<TGConnectingPoint num="13" id="3185" />
-<TGConnectingPoint num="14" id="3186" />
-<TGConnectingPoint num="15" id="3187" />
-<TGConnectingPoint num="16" id="3188" />
-<TGConnectingPoint num="17" id="3189" />
-<TGConnectingPoint num="18" id="3190" />
-<TGConnectingPoint num="19" id="3191" />
-<TGConnectingPoint num="20" id="3192" />
-<TGConnectingPoint num="21" id="3193" />
-<TGConnectingPoint num="22" id="3194" />
-<TGConnectingPoint num="23" id="3195" />
-<TGConnectingPoint num="24" id="3196" />
-<TGConnectingPoint num="25" id="3197" />
-<TGConnectingPoint num="26" id="3198" />
-<TGConnectingPoint num="27" id="3199" />
-<TGConnectingPoint num="28" id="3200" />
-<TGConnectingPoint num="29" id="3201" />
-<TGConnectingPoint num="30" id="3202" />
-<TGConnectingPoint num="31" id="3203" />
-<TGConnectingPoint num="32" id="3204" />
-<TGConnectingPoint num="33" id="3205" />
-<TGConnectingPoint num="34" id="3206" />
-<TGConnectingPoint num="35" id="3207" />
-<TGConnectingPoint num="36" id="3208" />
-<TGConnectingPoint num="37" id="3209" />
-<TGConnectingPoint num="38" id="3210" />
-<TGConnectingPoint num="39" id="3211" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3253" >
-<cdparam x="490" y="2408" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="4732" >
+<cdparam x="657" y="2457" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="4731" />
+<P1  x="657" y="2457" id="4821" />
+<P2  x="660" y="2480" id="4781" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4730" >
+<father id="4732" num="0" />
+<cdparam x="657" y="2497" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidMAC6" />
-<TGConnectingPoint num="0" id="3213" />
-<TGConnectingPoint num="1" id="3214" />
-<TGConnectingPoint num="2" id="3215" />
-<TGConnectingPoint num="3" id="3216" />
-<TGConnectingPoint num="4" id="3217" />
-<TGConnectingPoint num="5" id="3218" />
-<TGConnectingPoint num="6" id="3219" />
-<TGConnectingPoint num="7" id="3220" />
-<TGConnectingPoint num="8" id="3221" />
-<TGConnectingPoint num="9" id="3222" />
-<TGConnectingPoint num="10" id="3223" />
-<TGConnectingPoint num="11" id="3224" />
-<TGConnectingPoint num="12" id="3225" />
-<TGConnectingPoint num="13" id="3226" />
-<TGConnectingPoint num="14" id="3227" />
-<TGConnectingPoint num="15" id="3228" />
-<TGConnectingPoint num="16" id="3229" />
-<TGConnectingPoint num="17" id="3230" />
-<TGConnectingPoint num="18" id="3231" />
-<TGConnectingPoint num="19" id="3232" />
-<TGConnectingPoint num="20" id="3233" />
-<TGConnectingPoint num="21" id="3234" />
-<TGConnectingPoint num="22" id="3235" />
-<TGConnectingPoint num="23" id="3236" />
-<TGConnectingPoint num="24" id="3237" />
-<TGConnectingPoint num="25" id="3238" />
-<TGConnectingPoint num="26" id="3239" />
-<TGConnectingPoint num="27" id="3240" />
-<TGConnectingPoint num="28" id="3241" />
-<TGConnectingPoint num="29" id="3242" />
-<TGConnectingPoint num="30" id="3243" />
-<TGConnectingPoint num="31" id="3244" />
-<TGConnectingPoint num="32" id="3245" />
-<TGConnectingPoint num="33" id="3246" />
-<TGConnectingPoint num="34" id="3247" />
-<TGConnectingPoint num="35" id="3248" />
-<TGConnectingPoint num="36" id="3249" />
-<TGConnectingPoint num="37" id="3250" />
-<TGConnectingPoint num="38" id="3251" />
-<TGConnectingPoint num="39" id="3252" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4726" />
+<TGConnectingPoint num="1" id="4727" />
+<TGConnectingPoint num="2" id="4728" />
+<TGConnectingPoint num="3" id="4729" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3294" >
-<cdparam x="581" y="2321" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="4739" >
+<cdparam x="660" y="2510" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4738" />
+<P1  x="660" y="2510" id="4782" />
+<P2  x="642" y="2537" id="4757" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4737" >
+<father id="4739" num="0" />
+<cdparam x="660" y="2550" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyMAC6" />
-<TGConnectingPoint num="0" id="3254" />
-<TGConnectingPoint num="1" id="3255" />
-<TGConnectingPoint num="2" id="3256" />
-<TGConnectingPoint num="3" id="3257" />
-<TGConnectingPoint num="4" id="3258" />
-<TGConnectingPoint num="5" id="3259" />
-<TGConnectingPoint num="6" id="3260" />
-<TGConnectingPoint num="7" id="3261" />
-<TGConnectingPoint num="8" id="3262" />
-<TGConnectingPoint num="9" id="3263" />
-<TGConnectingPoint num="10" id="3264" />
-<TGConnectingPoint num="11" id="3265" />
-<TGConnectingPoint num="12" id="3266" />
-<TGConnectingPoint num="13" id="3267" />
-<TGConnectingPoint num="14" id="3268" />
-<TGConnectingPoint num="15" id="3269" />
-<TGConnectingPoint num="16" id="3270" />
-<TGConnectingPoint num="17" id="3271" />
-<TGConnectingPoint num="18" id="3272" />
-<TGConnectingPoint num="19" id="3273" />
-<TGConnectingPoint num="20" id="3274" />
-<TGConnectingPoint num="21" id="3275" />
-<TGConnectingPoint num="22" id="3276" />
-<TGConnectingPoint num="23" id="3277" />
-<TGConnectingPoint num="24" id="3278" />
-<TGConnectingPoint num="25" id="3279" />
-<TGConnectingPoint num="26" id="3280" />
-<TGConnectingPoint num="27" id="3281" />
-<TGConnectingPoint num="28" id="3282" />
-<TGConnectingPoint num="29" id="3283" />
-<TGConnectingPoint num="30" id="3284" />
-<TGConnectingPoint num="31" id="3285" />
-<TGConnectingPoint num="32" id="3286" />
-<TGConnectingPoint num="33" id="3287" />
-<TGConnectingPoint num="34" id="3288" />
-<TGConnectingPoint num="35" id="3289" />
-<TGConnectingPoint num="36" id="3290" />
-<TGConnectingPoint num="37" id="3291" />
-<TGConnectingPoint num="38" id="3292" />
-<TGConnectingPoint num="39" id="3293" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4733" />
+<TGConnectingPoint num="1" id="4734" />
+<TGConnectingPoint num="2" id="4735" />
+<TGConnectingPoint num="3" id="4736" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3335" >
-<cdparam x="397" y="2323" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4780" >
+<cdparam x="595" y="2537" />
+<sizeparam width="128" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidt6" />
-<TGConnectingPoint num="0" id="3295" />
-<TGConnectingPoint num="1" id="3296" />
-<TGConnectingPoint num="2" id="3297" />
-<TGConnectingPoint num="3" id="3298" />
-<TGConnectingPoint num="4" id="3299" />
-<TGConnectingPoint num="5" id="3300" />
-<TGConnectingPoint num="6" id="3301" />
-<TGConnectingPoint num="7" id="3302" />
-<TGConnectingPoint num="8" id="3303" />
-<TGConnectingPoint num="9" id="3304" />
-<TGConnectingPoint num="10" id="3305" />
-<TGConnectingPoint num="11" id="3306" />
-<TGConnectingPoint num="12" id="3307" />
-<TGConnectingPoint num="13" id="3308" />
-<TGConnectingPoint num="14" id="3309" />
-<TGConnectingPoint num="15" id="3310" />
-<TGConnectingPoint num="16" id="3311" />
-<TGConnectingPoint num="17" id="3312" />
-<TGConnectingPoint num="18" id="3313" />
-<TGConnectingPoint num="19" id="3314" />
-<TGConnectingPoint num="20" id="3315" />
-<TGConnectingPoint num="21" id="3316" />
-<TGConnectingPoint num="22" id="3317" />
-<TGConnectingPoint num="23" id="3318" />
-<TGConnectingPoint num="24" id="3319" />
-<TGConnectingPoint num="25" id="3320" />
-<TGConnectingPoint num="26" id="3321" />
-<TGConnectingPoint num="27" id="3322" />
-<TGConnectingPoint num="28" id="3323" />
-<TGConnectingPoint num="29" id="3324" />
-<TGConnectingPoint num="30" id="3325" />
-<TGConnectingPoint num="31" id="3326" />
-<TGConnectingPoint num="32" id="3327" />
-<TGConnectingPoint num="33" id="3328" />
-<TGConnectingPoint num="34" id="3329" />
-<TGConnectingPoint num="35" id="3330" />
-<TGConnectingPoint num="36" id="3331" />
-<TGConnectingPoint num="37" id="3332" />
-<TGConnectingPoint num="38" id="3333" />
-<TGConnectingPoint num="39" id="3334" />
+<infoparam name="state0" value="ProtocolRunEnded" />
+<TGConnectingPoint num="0" id="4740" />
+<TGConnectingPoint num="1" id="4741" />
+<TGConnectingPoint num="2" id="4742" />
+<TGConnectingPoint num="3" id="4743" />
+<TGConnectingPoint num="4" id="4744" />
+<TGConnectingPoint num="5" id="4745" />
+<TGConnectingPoint num="6" id="4746" />
+<TGConnectingPoint num="7" id="4747" />
+<TGConnectingPoint num="8" id="4748" />
+<TGConnectingPoint num="9" id="4749" />
+<TGConnectingPoint num="10" id="4750" />
+<TGConnectingPoint num="11" id="4751" />
+<TGConnectingPoint num="12" id="4752" />
+<TGConnectingPoint num="13" id="4753" />
+<TGConnectingPoint num="14" id="4754" />
+<TGConnectingPoint num="15" id="4755" />
+<TGConnectingPoint num="16" id="4756" />
+<TGConnectingPoint num="17" id="4757" />
+<TGConnectingPoint num="18" id="4758" />
+<TGConnectingPoint num="19" id="4759" />
+<TGConnectingPoint num="20" id="4760" />
+<TGConnectingPoint num="21" id="4761" />
+<TGConnectingPoint num="22" id="4762" />
+<TGConnectingPoint num="23" id="4763" />
+<TGConnectingPoint num="24" id="4764" />
+<TGConnectingPoint num="25" id="4765" />
+<TGConnectingPoint num="26" id="4766" />
+<TGConnectingPoint num="27" id="4767" />
+<TGConnectingPoint num="28" id="4768" />
+<TGConnectingPoint num="29" id="4769" />
+<TGConnectingPoint num="30" id="4770" />
+<TGConnectingPoint num="31" id="4771" />
+<TGConnectingPoint num="32" id="4772" />
+<TGConnectingPoint num="33" id="4773" />
+<TGConnectingPoint num="34" id="4774" />
+<TGConnectingPoint num="35" id="4775" />
+<TGConnectingPoint num="36" id="4776" />
+<TGConnectingPoint num="37" id="4777" />
+<TGConnectingPoint num="38" id="4778" />
+<TGConnectingPoint num="39" id="4779" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3376" >
-<cdparam x="519" y="2227" />
+<COMPONENT type="5103" id="4791" >
+<cdparam x="623" y="2485" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="Send signal" value="chout(m6)" />
+<TGConnectingPoint num="0" id="4781" />
+<TGConnectingPoint num="1" id="4782" />
+<TGConnectingPoint num="2" id="4783" />
+<TGConnectingPoint num="3" id="4784" />
+<TGConnectingPoint num="4" id="4785" />
+<TGConnectingPoint num="5" id="4786" />
+<TGConnectingPoint num="6" id="4787" />
+<TGConnectingPoint num="7" id="4788" />
+<TGConnectingPoint num="8" id="4789" />
+<TGConnectingPoint num="9" id="4790" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4832" >
+<cdparam x="620" y="2407" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testt6" />
-<TGConnectingPoint num="0" id="3336" />
-<TGConnectingPoint num="1" id="3337" />
-<TGConnectingPoint num="2" id="3338" />
-<TGConnectingPoint num="3" id="3339" />
-<TGConnectingPoint num="4" id="3340" />
-<TGConnectingPoint num="5" id="3341" />
-<TGConnectingPoint num="6" id="3342" />
-<TGConnectingPoint num="7" id="3343" />
-<TGConnectingPoint num="8" id="3344" />
-<TGConnectingPoint num="9" id="3345" />
-<TGConnectingPoint num="10" id="3346" />
-<TGConnectingPoint num="11" id="3347" />
-<TGConnectingPoint num="12" id="3348" />
-<TGConnectingPoint num="13" id="3349" />
-<TGConnectingPoint num="14" id="3350" />
-<TGConnectingPoint num="15" id="3351" />
-<TGConnectingPoint num="16" id="3352" />
-<TGConnectingPoint num="17" id="3353" />
-<TGConnectingPoint num="18" id="3354" />
-<TGConnectingPoint num="19" id="3355" />
-<TGConnectingPoint num="20" id="3356" />
-<TGConnectingPoint num="21" id="3357" />
-<TGConnectingPoint num="22" id="3358" />
-<TGConnectingPoint num="23" id="3359" />
-<TGConnectingPoint num="24" id="3360" />
-<TGConnectingPoint num="25" id="3361" />
-<TGConnectingPoint num="26" id="3362" />
-<TGConnectingPoint num="27" id="3363" />
-<TGConnectingPoint num="28" id="3364" />
-<TGConnectingPoint num="29" id="3365" />
-<TGConnectingPoint num="30" id="3366" />
-<TGConnectingPoint num="31" id="3367" />
-<TGConnectingPoint num="32" id="3368" />
-<TGConnectingPoint num="33" id="3369" />
-<TGConnectingPoint num="34" id="3370" />
-<TGConnectingPoint num="35" id="3371" />
-<TGConnectingPoint num="36" id="3372" />
-<TGConnectingPoint num="37" id="3373" />
-<TGConnectingPoint num="38" id="3374" />
-<TGConnectingPoint num="39" id="3375" />
+<infoparam name="state0" value="SendMsg6" />
+<TGConnectingPoint num="0" id="4792" />
+<TGConnectingPoint num="1" id="4793" />
+<TGConnectingPoint num="2" id="4794" />
+<TGConnectingPoint num="3" id="4795" />
+<TGConnectingPoint num="4" id="4796" />
+<TGConnectingPoint num="5" id="4797" />
+<TGConnectingPoint num="6" id="4798" />
+<TGConnectingPoint num="7" id="4799" />
+<TGConnectingPoint num="8" id="4800" />
+<TGConnectingPoint num="9" id="4801" />
+<TGConnectingPoint num="10" id="4802" />
+<TGConnectingPoint num="11" id="4803" />
+<TGConnectingPoint num="12" id="4804" />
+<TGConnectingPoint num="13" id="4805" />
+<TGConnectingPoint num="14" id="4806" />
+<TGConnectingPoint num="15" id="4807" />
+<TGConnectingPoint num="16" id="4808" />
+<TGConnectingPoint num="17" id="4809" />
+<TGConnectingPoint num="18" id="4810" />
+<TGConnectingPoint num="19" id="4811" />
+<TGConnectingPoint num="20" id="4812" />
+<TGConnectingPoint num="21" id="4813" />
+<TGConnectingPoint num="22" id="4814" />
+<TGConnectingPoint num="23" id="4815" />
+<TGConnectingPoint num="24" id="4816" />
+<TGConnectingPoint num="25" id="4817" />
+<TGConnectingPoint num="26" id="4818" />
+<TGConnectingPoint num="27" id="4819" />
+<TGConnectingPoint num="28" id="4820" />
+<TGConnectingPoint num="29" id="4821" />
+<TGConnectingPoint num="30" id="4822" />
+<TGConnectingPoint num="31" id="4823" />
+<TGConnectingPoint num="32" id="4824" />
+<TGConnectingPoint num="33" id="4825" />
+<TGConnectingPoint num="34" id="4826" />
+<TGConnectingPoint num="35" id="4827" />
+<TGConnectingPoint num="36" id="4828" />
+<TGConnectingPoint num="37" id="4829" />
+<TGConnectingPoint num="38" id="4830" />
+<TGConnectingPoint num="39" id="4831" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3387" >
-<cdparam x="532" y="2156" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4873" >
+<cdparam x="620" y="2265" />
+<sizeparam width="123" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m6)" />
-<TGConnectingPoint num="0" id="3377" />
-<TGConnectingPoint num="1" id="3378" />
-<TGConnectingPoint num="2" id="3379" />
-<TGConnectingPoint num="3" id="3380" />
-<TGConnectingPoint num="4" id="3381" />
-<TGConnectingPoint num="5" id="3382" />
-<TGConnectingPoint num="6" id="3383" />
-<TGConnectingPoint num="7" id="3384" />
-<TGConnectingPoint num="8" id="3385" />
-<TGConnectingPoint num="9" id="3386" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="4833" />
+<TGConnectingPoint num="1" id="4834" />
+<TGConnectingPoint num="2" id="4835" />
+<TGConnectingPoint num="3" id="4836" />
+<TGConnectingPoint num="4" id="4837" />
+<TGConnectingPoint num="5" id="4838" />
+<TGConnectingPoint num="6" id="4839" />
+<TGConnectingPoint num="7" id="4840" />
+<TGConnectingPoint num="8" id="4841" />
+<TGConnectingPoint num="9" id="4842" />
+<TGConnectingPoint num="10" id="4843" />
+<TGConnectingPoint num="11" id="4844" />
+<TGConnectingPoint num="12" id="4845" />
+<TGConnectingPoint num="13" id="4846" />
+<TGConnectingPoint num="14" id="4847" />
+<TGConnectingPoint num="15" id="4848" />
+<TGConnectingPoint num="16" id="4849" />
+<TGConnectingPoint num="17" id="4850" />
+<TGConnectingPoint num="18" id="4851" />
+<TGConnectingPoint num="19" id="4852" />
+<TGConnectingPoint num="20" id="4853" />
+<TGConnectingPoint num="21" id="4854" />
+<TGConnectingPoint num="22" id="4855" />
+<TGConnectingPoint num="23" id="4856" />
+<TGConnectingPoint num="24" id="4857" />
+<TGConnectingPoint num="25" id="4858" />
+<TGConnectingPoint num="26" id="4859" />
+<TGConnectingPoint num="27" id="4860" />
+<TGConnectingPoint num="28" id="4861" />
+<TGConnectingPoint num="29" id="4862" />
+<TGConnectingPoint num="30" id="4863" />
+<TGConnectingPoint num="31" id="4864" />
+<TGConnectingPoint num="32" id="4865" />
+<TGConnectingPoint num="33" id="4866" />
+<TGConnectingPoint num="34" id="4867" />
+<TGConnectingPoint num="35" id="4868" />
+<TGConnectingPoint num="36" id="4869" />
+<TGConnectingPoint num="37" id="4870" />
+<TGConnectingPoint num="38" id="4871" />
+<TGConnectingPoint num="39" id="4872" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="3396" >
-<cdparam x="741" y="2073" />
-<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4914" >
+<cdparam x="432" y="2265" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify ack message from ECU2
-" />
-<TGConnectingPoint num="0" id="3388" />
-<TGConnectingPoint num="1" id="3389" />
-<TGConnectingPoint num="2" id="3390" />
-<TGConnectingPoint num="3" id="3391" />
-<TGConnectingPoint num="4" id="3392" />
-<TGConnectingPoint num="5" id="3393" />
-<TGConnectingPoint num="6" id="3394" />
-<TGConnectingPoint num="7" id="3395" />
+<infoparam name="state0" value="InvalidMAC5" />
+<TGConnectingPoint num="0" id="4874" />
+<TGConnectingPoint num="1" id="4875" />
+<TGConnectingPoint num="2" id="4876" />
+<TGConnectingPoint num="3" id="4877" />
+<TGConnectingPoint num="4" id="4878" />
+<TGConnectingPoint num="5" id="4879" />
+<TGConnectingPoint num="6" id="4880" />
+<TGConnectingPoint num="7" id="4881" />
+<TGConnectingPoint num="8" id="4882" />
+<TGConnectingPoint num="9" id="4883" />
+<TGConnectingPoint num="10" id="4884" />
+<TGConnectingPoint num="11" id="4885" />
+<TGConnectingPoint num="12" id="4886" />
+<TGConnectingPoint num="13" id="4887" />
+<TGConnectingPoint num="14" id="4888" />
+<TGConnectingPoint num="15" id="4889" />
+<TGConnectingPoint num="16" id="4890" />
+<TGConnectingPoint num="17" id="4891" />
+<TGConnectingPoint num="18" id="4892" />
+<TGConnectingPoint num="19" id="4893" />
+<TGConnectingPoint num="20" id="4894" />
+<TGConnectingPoint num="21" id="4895" />
+<TGConnectingPoint num="22" id="4896" />
+<TGConnectingPoint num="23" id="4897" />
+<TGConnectingPoint num="24" id="4898" />
+<TGConnectingPoint num="25" id="4899" />
+<TGConnectingPoint num="26" id="4900" />
+<TGConnectingPoint num="27" id="4901" />
+<TGConnectingPoint num="28" id="4902" />
+<TGConnectingPoint num="29" id="4903" />
+<TGConnectingPoint num="30" id="4904" />
+<TGConnectingPoint num="31" id="4905" />
+<TGConnectingPoint num="32" id="4906" />
+<TGConnectingPoint num="33" id="4907" />
+<TGConnectingPoint num="34" id="4908" />
+<TGConnectingPoint num="35" id="4909" />
+<TGConnectingPoint num="36" id="4910" />
+<TGConnectingPoint num="37" id="4911" />
+<TGConnectingPoint num="38" id="4912" />
+<TGConnectingPoint num="39" id="4913" />
 <extraparam>
-<Line value="Receive and verify ack message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3437" >
-<cdparam x="530" y="2077" />
+<COMPONENT type="5106" id="4955" >
+<cdparam x="541" y="2165" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg6" />
-<TGConnectingPoint num="0" id="3397" />
-<TGConnectingPoint num="1" id="3398" />
-<TGConnectingPoint num="2" id="3399" />
-<TGConnectingPoint num="3" id="3400" />
-<TGConnectingPoint num="4" id="3401" />
-<TGConnectingPoint num="5" id="3402" />
-<TGConnectingPoint num="6" id="3403" />
-<TGConnectingPoint num="7" id="3404" />
-<TGConnectingPoint num="8" id="3405" />
-<TGConnectingPoint num="9" id="3406" />
-<TGConnectingPoint num="10" id="3407" />
-<TGConnectingPoint num="11" id="3408" />
-<TGConnectingPoint num="12" id="3409" />
-<TGConnectingPoint num="13" id="3410" />
-<TGConnectingPoint num="14" id="3411" />
-<TGConnectingPoint num="15" id="3412" />
-<TGConnectingPoint num="16" id="3413" />
-<TGConnectingPoint num="17" id="3414" />
-<TGConnectingPoint num="18" id="3415" />
-<TGConnectingPoint num="19" id="3416" />
-<TGConnectingPoint num="20" id="3417" />
-<TGConnectingPoint num="21" id="3418" />
-<TGConnectingPoint num="22" id="3419" />
-<TGConnectingPoint num="23" id="3420" />
-<TGConnectingPoint num="24" id="3421" />
-<TGConnectingPoint num="25" id="3422" />
-<TGConnectingPoint num="26" id="3423" />
-<TGConnectingPoint num="27" id="3424" />
-<TGConnectingPoint num="28" id="3425" />
-<TGConnectingPoint num="29" id="3426" />
-<TGConnectingPoint num="30" id="3427" />
-<TGConnectingPoint num="31" id="3428" />
-<TGConnectingPoint num="32" id="3429" />
-<TGConnectingPoint num="33" id="3430" />
-<TGConnectingPoint num="34" id="3431" />
-<TGConnectingPoint num="35" id="3432" />
-<TGConnectingPoint num="36" id="3433" />
-<TGConnectingPoint num="37" id="3434" />
-<TGConnectingPoint num="38" id="3435" />
-<TGConnectingPoint num="39" id="3436" />
+<infoparam name="state0" value="VerifyMAC5" />
+<TGConnectingPoint num="0" id="4915" />
+<TGConnectingPoint num="1" id="4916" />
+<TGConnectingPoint num="2" id="4917" />
+<TGConnectingPoint num="3" id="4918" />
+<TGConnectingPoint num="4" id="4919" />
+<TGConnectingPoint num="5" id="4920" />
+<TGConnectingPoint num="6" id="4921" />
+<TGConnectingPoint num="7" id="4922" />
+<TGConnectingPoint num="8" id="4923" />
+<TGConnectingPoint num="9" id="4924" />
+<TGConnectingPoint num="10" id="4925" />
+<TGConnectingPoint num="11" id="4926" />
+<TGConnectingPoint num="12" id="4927" />
+<TGConnectingPoint num="13" id="4928" />
+<TGConnectingPoint num="14" id="4929" />
+<TGConnectingPoint num="15" id="4930" />
+<TGConnectingPoint num="16" id="4931" />
+<TGConnectingPoint num="17" id="4932" />
+<TGConnectingPoint num="18" id="4933" />
+<TGConnectingPoint num="19" id="4934" />
+<TGConnectingPoint num="20" id="4935" />
+<TGConnectingPoint num="21" id="4936" />
+<TGConnectingPoint num="22" id="4937" />
+<TGConnectingPoint num="23" id="4938" />
+<TGConnectingPoint num="24" id="4939" />
+<TGConnectingPoint num="25" id="4940" />
+<TGConnectingPoint num="26" id="4941" />
+<TGConnectingPoint num="27" id="4942" />
+<TGConnectingPoint num="28" id="4943" />
+<TGConnectingPoint num="29" id="4944" />
+<TGConnectingPoint num="30" id="4945" />
+<TGConnectingPoint num="31" id="4946" />
+<TGConnectingPoint num="32" id="4947" />
+<TGConnectingPoint num="33" id="4948" />
+<TGConnectingPoint num="34" id="4949" />
+<TGConnectingPoint num="35" id="4950" />
+<TGConnectingPoint num="36" id="4951" />
+<TGConnectingPoint num="37" id="4952" />
+<TGConnectingPoint num="38" id="4953" />
+<TGConnectingPoint num="39" id="4954" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3448" >
-<cdparam x="549" y="2020" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4996" >
+<cdparam x="366" y="2165" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m5)" />
-<TGConnectingPoint num="0" id="3438" />
-<TGConnectingPoint num="1" id="3439" />
-<TGConnectingPoint num="2" id="3440" />
-<TGConnectingPoint num="3" id="3441" />
-<TGConnectingPoint num="4" id="3442" />
-<TGConnectingPoint num="5" id="3443" />
-<TGConnectingPoint num="6" id="3444" />
-<TGConnectingPoint num="7" id="3445" />
-<TGConnectingPoint num="8" id="3446" />
-<TGConnectingPoint num="9" id="3447" />
+<infoparam name="state0" value="Invalidts5" />
+<TGConnectingPoint num="0" id="4956" />
+<TGConnectingPoint num="1" id="4957" />
+<TGConnectingPoint num="2" id="4958" />
+<TGConnectingPoint num="3" id="4959" />
+<TGConnectingPoint num="4" id="4960" />
+<TGConnectingPoint num="5" id="4961" />
+<TGConnectingPoint num="6" id="4962" />
+<TGConnectingPoint num="7" id="4963" />
+<TGConnectingPoint num="8" id="4964" />
+<TGConnectingPoint num="9" id="4965" />
+<TGConnectingPoint num="10" id="4966" />
+<TGConnectingPoint num="11" id="4967" />
+<TGConnectingPoint num="12" id="4968" />
+<TGConnectingPoint num="13" id="4969" />
+<TGConnectingPoint num="14" id="4970" />
+<TGConnectingPoint num="15" id="4971" />
+<TGConnectingPoint num="16" id="4972" />
+<TGConnectingPoint num="17" id="4973" />
+<TGConnectingPoint num="18" id="4974" />
+<TGConnectingPoint num="19" id="4975" />
+<TGConnectingPoint num="20" id="4976" />
+<TGConnectingPoint num="21" id="4977" />
+<TGConnectingPoint num="22" id="4978" />
+<TGConnectingPoint num="23" id="4979" />
+<TGConnectingPoint num="24" id="4980" />
+<TGConnectingPoint num="25" id="4981" />
+<TGConnectingPoint num="26" id="4982" />
+<TGConnectingPoint num="27" id="4983" />
+<TGConnectingPoint num="28" id="4984" />
+<TGConnectingPoint num="29" id="4985" />
+<TGConnectingPoint num="30" id="4986" />
+<TGConnectingPoint num="31" id="4987" />
+<TGConnectingPoint num="32" id="4988" />
+<TGConnectingPoint num="33" id="4989" />
+<TGConnectingPoint num="34" id="4990" />
+<TGConnectingPoint num="35" id="4991" />
+<TGConnectingPoint num="36" id="4992" />
+<TGConnectingPoint num="37" id="4993" />
+<TGConnectingPoint num="38" id="4994" />
+<TGConnectingPoint num="39" id="4995" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3489" >
-<cdparam x="533" y="1944" />
+<COMPONENT type="5106" id="5037" >
+<cdparam x="482" y="2073" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg5" />
-<TGConnectingPoint num="0" id="3449" />
-<TGConnectingPoint num="1" id="3450" />
-<TGConnectingPoint num="2" id="3451" />
-<TGConnectingPoint num="3" id="3452" />
-<TGConnectingPoint num="4" id="3453" />
-<TGConnectingPoint num="5" id="3454" />
-<TGConnectingPoint num="6" id="3455" />
-<TGConnectingPoint num="7" id="3456" />
-<TGConnectingPoint num="8" id="3457" />
-<TGConnectingPoint num="9" id="3458" />
-<TGConnectingPoint num="10" id="3459" />
-<TGConnectingPoint num="11" id="3460" />
-<TGConnectingPoint num="12" id="3461" />
-<TGConnectingPoint num="13" id="3462" />
-<TGConnectingPoint num="14" id="3463" />
-<TGConnectingPoint num="15" id="3464" />
-<TGConnectingPoint num="16" id="3465" />
-<TGConnectingPoint num="17" id="3466" />
-<TGConnectingPoint num="18" id="3467" />
-<TGConnectingPoint num="19" id="3468" />
-<TGConnectingPoint num="20" id="3469" />
-<TGConnectingPoint num="21" id="3470" />
-<TGConnectingPoint num="22" id="3471" />
-<TGConnectingPoint num="23" id="3472" />
-<TGConnectingPoint num="24" id="3473" />
-<TGConnectingPoint num="25" id="3474" />
-<TGConnectingPoint num="26" id="3475" />
-<TGConnectingPoint num="27" id="3476" />
-<TGConnectingPoint num="28" id="3477" />
-<TGConnectingPoint num="29" id="3478" />
-<TGConnectingPoint num="30" id="3479" />
-<TGConnectingPoint num="31" id="3480" />
-<TGConnectingPoint num="32" id="3481" />
-<TGConnectingPoint num="33" id="3482" />
-<TGConnectingPoint num="34" id="3483" />
-<TGConnectingPoint num="35" id="3484" />
-<TGConnectingPoint num="36" id="3485" />
-<TGConnectingPoint num="37" id="3486" />
-<TGConnectingPoint num="38" id="3487" />
-<TGConnectingPoint num="39" id="3488" />
+<infoparam name="state0" value="Testts5" />
+<TGConnectingPoint num="0" id="4997" />
+<TGConnectingPoint num="1" id="4998" />
+<TGConnectingPoint num="2" id="4999" />
+<TGConnectingPoint num="3" id="5000" />
+<TGConnectingPoint num="4" id="5001" />
+<TGConnectingPoint num="5" id="5002" />
+<TGConnectingPoint num="6" id="5003" />
+<TGConnectingPoint num="7" id="5004" />
+<TGConnectingPoint num="8" id="5005" />
+<TGConnectingPoint num="9" id="5006" />
+<TGConnectingPoint num="10" id="5007" />
+<TGConnectingPoint num="11" id="5008" />
+<TGConnectingPoint num="12" id="5009" />
+<TGConnectingPoint num="13" id="5010" />
+<TGConnectingPoint num="14" id="5011" />
+<TGConnectingPoint num="15" id="5012" />
+<TGConnectingPoint num="16" id="5013" />
+<TGConnectingPoint num="17" id="5014" />
+<TGConnectingPoint num="18" id="5015" />
+<TGConnectingPoint num="19" id="5016" />
+<TGConnectingPoint num="20" id="5017" />
+<TGConnectingPoint num="21" id="5018" />
+<TGConnectingPoint num="22" id="5019" />
+<TGConnectingPoint num="23" id="5020" />
+<TGConnectingPoint num="24" id="5021" />
+<TGConnectingPoint num="25" id="5022" />
+<TGConnectingPoint num="26" id="5023" />
+<TGConnectingPoint num="27" id="5024" />
+<TGConnectingPoint num="28" id="5025" />
+<TGConnectingPoint num="29" id="5026" />
+<TGConnectingPoint num="30" id="5027" />
+<TGConnectingPoint num="31" id="5028" />
+<TGConnectingPoint num="32" id="5029" />
+<TGConnectingPoint num="33" id="5030" />
+<TGConnectingPoint num="34" id="5031" />
+<TGConnectingPoint num="35" id="5032" />
+<TGConnectingPoint num="36" id="5033" />
+<TGConnectingPoint num="37" id="5034" />
+<TGConnectingPoint num="38" id="5035" />
+<TGConnectingPoint num="39" id="5036" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="3498" >
-<cdparam x="729" y="1779" />
-<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="5048" >
+<cdparam x="495" y="1994" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Encrypt secret data with new symmetric key
-" />
-<TGConnectingPoint num="0" id="3490" />
-<TGConnectingPoint num="1" id="3491" />
-<TGConnectingPoint num="2" id="3492" />
-<TGConnectingPoint num="3" id="3493" />
-<TGConnectingPoint num="4" id="3494" />
-<TGConnectingPoint num="5" id="3495" />
-<TGConnectingPoint num="6" id="3496" />
-<TGConnectingPoint num="7" id="3497" />
-<extraparam>
-<Line value="Encrypt secret data with new symmetric key" />
-</extraparam>
+<infoparam name="Receive signal" value="chin(m5)" />
+<TGConnectingPoint num="0" id="5038" />
+<TGConnectingPoint num="1" id="5039" />
+<TGConnectingPoint num="2" id="5040" />
+<TGConnectingPoint num="3" id="5041" />
+<TGConnectingPoint num="4" id="5042" />
+<TGConnectingPoint num="5" id="5043" />
+<TGConnectingPoint num="6" id="5044" />
+<TGConnectingPoint num="7" id="5045" />
+<TGConnectingPoint num="8" id="5046" />
+<TGConnectingPoint num="9" id="5047" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3539" >
-<cdparam x="543" y="1781" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5057" >
+<cdparam x="692" y="1907" />
+<sizeparam width="299" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg5" />
-<TGConnectingPoint num="0" id="3499" />
-<TGConnectingPoint num="1" id="3500" />
-<TGConnectingPoint num="2" id="3501" />
-<TGConnectingPoint num="3" id="3502" />
-<TGConnectingPoint num="4" id="3503" />
-<TGConnectingPoint num="5" id="3504" />
-<TGConnectingPoint num="6" id="3505" />
-<TGConnectingPoint num="7" id="3506" />
-<TGConnectingPoint num="8" id="3507" />
-<TGConnectingPoint num="9" id="3508" />
-<TGConnectingPoint num="10" id="3509" />
-<TGConnectingPoint num="11" id="3510" />
-<TGConnectingPoint num="12" id="3511" />
-<TGConnectingPoint num="13" id="3512" />
-<TGConnectingPoint num="14" id="3513" />
-<TGConnectingPoint num="15" id="3514" />
-<TGConnectingPoint num="16" id="3515" />
-<TGConnectingPoint num="17" id="3516" />
-<TGConnectingPoint num="18" id="3517" />
-<TGConnectingPoint num="19" id="3518" />
-<TGConnectingPoint num="20" id="3519" />
-<TGConnectingPoint num="21" id="3520" />
-<TGConnectingPoint num="22" id="3521" />
-<TGConnectingPoint num="23" id="3522" />
-<TGConnectingPoint num="24" id="3523" />
-<TGConnectingPoint num="25" id="3524" />
-<TGConnectingPoint num="26" id="3525" />
-<TGConnectingPoint num="27" id="3526" />
-<TGConnectingPoint num="28" id="3527" />
-<TGConnectingPoint num="29" id="3528" />
-<TGConnectingPoint num="30" id="3529" />
-<TGConnectingPoint num="31" id="3530" />
-<TGConnectingPoint num="32" id="3531" />
-<TGConnectingPoint num="33" id="3532" />
-<TGConnectingPoint num="34" id="3533" />
-<TGConnectingPoint num="35" id="3534" />
-<TGConnectingPoint num="36" id="3535" />
-<TGConnectingPoint num="37" id="3536" />
-<TGConnectingPoint num="38" id="3537" />
-<TGConnectingPoint num="39" id="3538" />
+<infoparam name="UML Note" value="Receive and verify message with secret data
+" />
+<TGConnectingPoint num="0" id="5049" />
+<TGConnectingPoint num="1" id="5050" />
+<TGConnectingPoint num="2" id="5051" />
+<TGConnectingPoint num="3" id="5052" />
+<TGConnectingPoint num="4" id="5053" />
+<TGConnectingPoint num="5" id="5054" />
+<TGConnectingPoint num="6" id="5055" />
+<TGConnectingPoint num="7" id="5056" />
+<TGConnectingPoint num="8" id="104734" />
+<TGConnectingPoint num="9" id="104735" />
+<TGConnectingPoint num="10" id="104736" />
+<TGConnectingPoint num="11" id="104737" />
+<TGConnectingPoint num="12" id="104738" />
+<TGConnectingPoint num="13" id="104739" />
+<TGConnectingPoint num="14" id="104740" />
+<TGConnectingPoint num="15" id="104741" />
 <extraparam>
+<Line value="Receive and verify message with secret data" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3580" >
-<cdparam x="371" y="1780" />
-<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5098" >
+<cdparam x="490" y="1911" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="UnexpectedMsg4" />
-<TGConnectingPoint num="0" id="3540" />
-<TGConnectingPoint num="1" id="3541" />
-<TGConnectingPoint num="2" id="3542" />
-<TGConnectingPoint num="3" id="3543" />
-<TGConnectingPoint num="4" id="3544" />
-<TGConnectingPoint num="5" id="3545" />
-<TGConnectingPoint num="6" id="3546" />
-<TGConnectingPoint num="7" id="3547" />
-<TGConnectingPoint num="8" id="3548" />
-<TGConnectingPoint num="9" id="3549" />
-<TGConnectingPoint num="10" id="3550" />
-<TGConnectingPoint num="11" id="3551" />
-<TGConnectingPoint num="12" id="3552" />
-<TGConnectingPoint num="13" id="3553" />
-<TGConnectingPoint num="14" id="3554" />
-<TGConnectingPoint num="15" id="3555" />
-<TGConnectingPoint num="16" id="3556" />
-<TGConnectingPoint num="17" id="3557" />
-<TGConnectingPoint num="18" id="3558" />
-<TGConnectingPoint num="19" id="3559" />
-<TGConnectingPoint num="20" id="3560" />
-<TGConnectingPoint num="21" id="3561" />
-<TGConnectingPoint num="22" id="3562" />
-<TGConnectingPoint num="23" id="3563" />
-<TGConnectingPoint num="24" id="3564" />
-<TGConnectingPoint num="25" id="3565" />
-<TGConnectingPoint num="26" id="3566" />
-<TGConnectingPoint num="27" id="3567" />
-<TGConnectingPoint num="28" id="3568" />
-<TGConnectingPoint num="29" id="3569" />
-<TGConnectingPoint num="30" id="3570" />
-<TGConnectingPoint num="31" id="3571" />
-<TGConnectingPoint num="32" id="3572" />
-<TGConnectingPoint num="33" id="3573" />
-<TGConnectingPoint num="34" id="3574" />
-<TGConnectingPoint num="35" id="3575" />
-<TGConnectingPoint num="36" id="3576" />
-<TGConnectingPoint num="37" id="3577" />
-<TGConnectingPoint num="38" id="3578" />
-<TGConnectingPoint num="39" id="3579" />
+<infoparam name="state0" value="WaitForMsg5" />
+<TGConnectingPoint num="0" id="5058" />
+<TGConnectingPoint num="1" id="5059" />
+<TGConnectingPoint num="2" id="5060" />
+<TGConnectingPoint num="3" id="5061" />
+<TGConnectingPoint num="4" id="5062" />
+<TGConnectingPoint num="5" id="5063" />
+<TGConnectingPoint num="6" id="5064" />
+<TGConnectingPoint num="7" id="5065" />
+<TGConnectingPoint num="8" id="5066" />
+<TGConnectingPoint num="9" id="5067" />
+<TGConnectingPoint num="10" id="5068" />
+<TGConnectingPoint num="11" id="5069" />
+<TGConnectingPoint num="12" id="5070" />
+<TGConnectingPoint num="13" id="5071" />
+<TGConnectingPoint num="14" id="5072" />
+<TGConnectingPoint num="15" id="5073" />
+<TGConnectingPoint num="16" id="5074" />
+<TGConnectingPoint num="17" id="5075" />
+<TGConnectingPoint num="18" id="5076" />
+<TGConnectingPoint num="19" id="5077" />
+<TGConnectingPoint num="20" id="5078" />
+<TGConnectingPoint num="21" id="5079" />
+<TGConnectingPoint num="22" id="5080" />
+<TGConnectingPoint num="23" id="5081" />
+<TGConnectingPoint num="24" id="5082" />
+<TGConnectingPoint num="25" id="5083" />
+<TGConnectingPoint num="26" id="5084" />
+<TGConnectingPoint num="27" id="5085" />
+<TGConnectingPoint num="28" id="5086" />
+<TGConnectingPoint num="29" id="5087" />
+<TGConnectingPoint num="30" id="5088" />
+<TGConnectingPoint num="31" id="5089" />
+<TGConnectingPoint num="32" id="5090" />
+<TGConnectingPoint num="33" id="5091" />
+<TGConnectingPoint num="34" id="5092" />
+<TGConnectingPoint num="35" id="5093" />
+<TGConnectingPoint num="36" id="5094" />
+<TGConnectingPoint num="37" id="5095" />
+<TGConnectingPoint num="38" id="5096" />
+<TGConnectingPoint num="39" id="5097" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3621" >
-<cdparam x="484" y="1674" />
+<COMPONENT type="5103" id="5109" >
+<cdparam x="482" y="1858" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="Send signal" value="chout(m4)" />
+<TGConnectingPoint num="0" id="5099" />
+<TGConnectingPoint num="1" id="5100" />
+<TGConnectingPoint num="2" id="5101" />
+<TGConnectingPoint num="3" id="5102" />
+<TGConnectingPoint num="4" id="5103" />
+<TGConnectingPoint num="5" id="5104" />
+<TGConnectingPoint num="6" id="5105" />
+<TGConnectingPoint num="7" id="5106" />
+<TGConnectingPoint num="8" id="5107" />
+<TGConnectingPoint num="9" id="5108" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5150" >
+<cdparam x="483" y="1783" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyack4" />
-<TGConnectingPoint num="0" id="3581" />
-<TGConnectingPoint num="1" id="3582" />
-<TGConnectingPoint num="2" id="3583" />
-<TGConnectingPoint num="3" id="3584" />
-<TGConnectingPoint num="4" id="3585" />
-<TGConnectingPoint num="5" id="3586" />
-<TGConnectingPoint num="6" id="3587" />
-<TGConnectingPoint num="7" id="3588" />
-<TGConnectingPoint num="8" id="3589" />
-<TGConnectingPoint num="9" id="3590" />
-<TGConnectingPoint num="10" id="3591" />
-<TGConnectingPoint num="11" id="3592" />
-<TGConnectingPoint num="12" id="3593" />
-<TGConnectingPoint num="13" id="3594" />
-<TGConnectingPoint num="14" id="3595" />
-<TGConnectingPoint num="15" id="3596" />
-<TGConnectingPoint num="16" id="3597" />
-<TGConnectingPoint num="17" id="3598" />
-<TGConnectingPoint num="18" id="3599" />
-<TGConnectingPoint num="19" id="3600" />
-<TGConnectingPoint num="20" id="3601" />
-<TGConnectingPoint num="21" id="3602" />
-<TGConnectingPoint num="22" id="3603" />
-<TGConnectingPoint num="23" id="3604" />
-<TGConnectingPoint num="24" id="3605" />
-<TGConnectingPoint num="25" id="3606" />
-<TGConnectingPoint num="26" id="3607" />
-<TGConnectingPoint num="27" id="3608" />
-<TGConnectingPoint num="28" id="3609" />
-<TGConnectingPoint num="29" id="3610" />
-<TGConnectingPoint num="30" id="3611" />
-<TGConnectingPoint num="31" id="3612" />
-<TGConnectingPoint num="32" id="3613" />
-<TGConnectingPoint num="33" id="3614" />
-<TGConnectingPoint num="34" id="3615" />
-<TGConnectingPoint num="35" id="3616" />
-<TGConnectingPoint num="36" id="3617" />
-<TGConnectingPoint num="37" id="3618" />
-<TGConnectingPoint num="38" id="3619" />
-<TGConnectingPoint num="39" id="3620" />
+<infoparam name="state0" value="SendMsg4" />
+<TGConnectingPoint num="0" id="5110" />
+<TGConnectingPoint num="1" id="5111" />
+<TGConnectingPoint num="2" id="5112" />
+<TGConnectingPoint num="3" id="5113" />
+<TGConnectingPoint num="4" id="5114" />
+<TGConnectingPoint num="5" id="5115" />
+<TGConnectingPoint num="6" id="5116" />
+<TGConnectingPoint num="7" id="5117" />
+<TGConnectingPoint num="8" id="5118" />
+<TGConnectingPoint num="9" id="5119" />
+<TGConnectingPoint num="10" id="5120" />
+<TGConnectingPoint num="11" id="5121" />
+<TGConnectingPoint num="12" id="5122" />
+<TGConnectingPoint num="13" id="5123" />
+<TGConnectingPoint num="14" id="5124" />
+<TGConnectingPoint num="15" id="5125" />
+<TGConnectingPoint num="16" id="5126" />
+<TGConnectingPoint num="17" id="5127" />
+<TGConnectingPoint num="18" id="5128" />
+<TGConnectingPoint num="19" id="5129" />
+<TGConnectingPoint num="20" id="5130" />
+<TGConnectingPoint num="21" id="5131" />
+<TGConnectingPoint num="22" id="5132" />
+<TGConnectingPoint num="23" id="5133" />
+<TGConnectingPoint num="24" id="5134" />
+<TGConnectingPoint num="25" id="5135" />
+<TGConnectingPoint num="26" id="5136" />
+<TGConnectingPoint num="27" id="5137" />
+<TGConnectingPoint num="28" id="5138" />
+<TGConnectingPoint num="29" id="5139" />
+<TGConnectingPoint num="30" id="5140" />
+<TGConnectingPoint num="31" id="5141" />
+<TGConnectingPoint num="32" id="5142" />
+<TGConnectingPoint num="33" id="5143" />
+<TGConnectingPoint num="34" id="5144" />
+<TGConnectingPoint num="35" id="5145" />
+<TGConnectingPoint num="36" id="5146" />
+<TGConnectingPoint num="37" id="5147" />
+<TGConnectingPoint num="38" id="5148" />
+<TGConnectingPoint num="39" id="5149" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3662" >
-<cdparam x="306" y="1673" />
+<COMPONENT type="5106" id="5191" >
+<cdparam x="470" y="1625" />
+<sizeparam width="124" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="AdoptSessionKey" />
+<TGConnectingPoint num="0" id="5151" />
+<TGConnectingPoint num="1" id="5152" />
+<TGConnectingPoint num="2" id="5153" />
+<TGConnectingPoint num="3" id="5154" />
+<TGConnectingPoint num="4" id="5155" />
+<TGConnectingPoint num="5" id="5156" />
+<TGConnectingPoint num="6" id="5157" />
+<TGConnectingPoint num="7" id="5158" />
+<TGConnectingPoint num="8" id="5159" />
+<TGConnectingPoint num="9" id="5160" />
+<TGConnectingPoint num="10" id="5161" />
+<TGConnectingPoint num="11" id="5162" />
+<TGConnectingPoint num="12" id="5163" />
+<TGConnectingPoint num="13" id="5164" />
+<TGConnectingPoint num="14" id="5165" />
+<TGConnectingPoint num="15" id="5166" />
+<TGConnectingPoint num="16" id="5167" />
+<TGConnectingPoint num="17" id="5168" />
+<TGConnectingPoint num="18" id="5169" />
+<TGConnectingPoint num="19" id="5170" />
+<TGConnectingPoint num="20" id="5171" />
+<TGConnectingPoint num="21" id="5172" />
+<TGConnectingPoint num="22" id="5173" />
+<TGConnectingPoint num="23" id="5174" />
+<TGConnectingPoint num="24" id="5175" />
+<TGConnectingPoint num="25" id="5176" />
+<TGConnectingPoint num="26" id="5177" />
+<TGConnectingPoint num="27" id="5178" />
+<TGConnectingPoint num="28" id="5179" />
+<TGConnectingPoint num="29" id="5180" />
+<TGConnectingPoint num="30" id="5181" />
+<TGConnectingPoint num="31" id="5182" />
+<TGConnectingPoint num="32" id="5183" />
+<TGConnectingPoint num="33" id="5184" />
+<TGConnectingPoint num="34" id="5185" />
+<TGConnectingPoint num="35" id="5186" />
+<TGConnectingPoint num="36" id="5187" />
+<TGConnectingPoint num="37" id="5188" />
+<TGConnectingPoint num="38" id="5189" />
+<TGConnectingPoint num="39" id="5190" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5232" >
+<cdparam x="326" y="1623" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig4" />
-<TGConnectingPoint num="0" id="3622" />
-<TGConnectingPoint num="1" id="3623" />
-<TGConnectingPoint num="2" id="3624" />
-<TGConnectingPoint num="3" id="3625" />
-<TGConnectingPoint num="4" id="3626" />
-<TGConnectingPoint num="5" id="3627" />
-<TGConnectingPoint num="6" id="3628" />
-<TGConnectingPoint num="7" id="3629" />
-<TGConnectingPoint num="8" id="3630" />
-<TGConnectingPoint num="9" id="3631" />
-<TGConnectingPoint num="10" id="3632" />
-<TGConnectingPoint num="11" id="3633" />
-<TGConnectingPoint num="12" id="3634" />
-<TGConnectingPoint num="13" id="3635" />
-<TGConnectingPoint num="14" id="3636" />
-<TGConnectingPoint num="15" id="3637" />
-<TGConnectingPoint num="16" id="3638" />
-<TGConnectingPoint num="17" id="3639" />
-<TGConnectingPoint num="18" id="3640" />
-<TGConnectingPoint num="19" id="3641" />
-<TGConnectingPoint num="20" id="3642" />
-<TGConnectingPoint num="21" id="3643" />
-<TGConnectingPoint num="22" id="3644" />
-<TGConnectingPoint num="23" id="3645" />
-<TGConnectingPoint num="24" id="3646" />
-<TGConnectingPoint num="25" id="3647" />
-<TGConnectingPoint num="26" id="3648" />
-<TGConnectingPoint num="27" id="3649" />
-<TGConnectingPoint num="28" id="3650" />
-<TGConnectingPoint num="29" id="3651" />
-<TGConnectingPoint num="30" id="3652" />
-<TGConnectingPoint num="31" id="3653" />
-<TGConnectingPoint num="32" id="3654" />
-<TGConnectingPoint num="33" id="3655" />
-<TGConnectingPoint num="34" id="3656" />
-<TGConnectingPoint num="35" id="3657" />
-<TGConnectingPoint num="36" id="3658" />
-<TGConnectingPoint num="37" id="3659" />
-<TGConnectingPoint num="38" id="3660" />
-<TGConnectingPoint num="39" id="3661" />
+<infoparam name="state0" value="InvalidSig3" />
+<TGConnectingPoint num="0" id="5192" />
+<TGConnectingPoint num="1" id="5193" />
+<TGConnectingPoint num="2" id="5194" />
+<TGConnectingPoint num="3" id="5195" />
+<TGConnectingPoint num="4" id="5196" />
+<TGConnectingPoint num="5" id="5197" />
+<TGConnectingPoint num="6" id="5198" />
+<TGConnectingPoint num="7" id="5199" />
+<TGConnectingPoint num="8" id="5200" />
+<TGConnectingPoint num="9" id="5201" />
+<TGConnectingPoint num="10" id="5202" />
+<TGConnectingPoint num="11" id="5203" />
+<TGConnectingPoint num="12" id="5204" />
+<TGConnectingPoint num="13" id="5205" />
+<TGConnectingPoint num="14" id="5206" />
+<TGConnectingPoint num="15" id="5207" />
+<TGConnectingPoint num="16" id="5208" />
+<TGConnectingPoint num="17" id="5209" />
+<TGConnectingPoint num="18" id="5210" />
+<TGConnectingPoint num="19" id="5211" />
+<TGConnectingPoint num="20" id="5212" />
+<TGConnectingPoint num="21" id="5213" />
+<TGConnectingPoint num="22" id="5214" />
+<TGConnectingPoint num="23" id="5215" />
+<TGConnectingPoint num="24" id="5216" />
+<TGConnectingPoint num="25" id="5217" />
+<TGConnectingPoint num="26" id="5218" />
+<TGConnectingPoint num="27" id="5219" />
+<TGConnectingPoint num="28" id="5220" />
+<TGConnectingPoint num="29" id="5221" />
+<TGConnectingPoint num="30" id="5222" />
+<TGConnectingPoint num="31" id="5223" />
+<TGConnectingPoint num="32" id="5224" />
+<TGConnectingPoint num="33" id="5225" />
+<TGConnectingPoint num="34" id="5226" />
+<TGConnectingPoint num="35" id="5227" />
+<TGConnectingPoint num="36" id="5228" />
+<TGConnectingPoint num="37" id="5229" />
+<TGConnectingPoint num="38" id="5230" />
+<TGConnectingPoint num="39" id="5231" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3703" >
-<cdparam x="429" y="1583" />
+<COMPONENT type="5106" id="5273" >
+<cdparam x="421" y="1506" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig4" />
-<TGConnectingPoint num="0" id="3663" />
-<TGConnectingPoint num="1" id="3664" />
-<TGConnectingPoint num="2" id="3665" />
-<TGConnectingPoint num="3" id="3666" />
-<TGConnectingPoint num="4" id="3667" />
-<TGConnectingPoint num="5" id="3668" />
-<TGConnectingPoint num="6" id="3669" />
-<TGConnectingPoint num="7" id="3670" />
-<TGConnectingPoint num="8" id="3671" />
-<TGConnectingPoint num="9" id="3672" />
-<TGConnectingPoint num="10" id="3673" />
-<TGConnectingPoint num="11" id="3674" />
-<TGConnectingPoint num="12" id="3675" />
-<TGConnectingPoint num="13" id="3676" />
-<TGConnectingPoint num="14" id="3677" />
-<TGConnectingPoint num="15" id="3678" />
-<TGConnectingPoint num="16" id="3679" />
-<TGConnectingPoint num="17" id="3680" />
-<TGConnectingPoint num="18" id="3681" />
-<TGConnectingPoint num="19" id="3682" />
-<TGConnectingPoint num="20" id="3683" />
-<TGConnectingPoint num="21" id="3684" />
-<TGConnectingPoint num="22" id="3685" />
-<TGConnectingPoint num="23" id="3686" />
-<TGConnectingPoint num="24" id="3687" />
-<TGConnectingPoint num="25" id="3688" />
-<TGConnectingPoint num="26" id="3689" />
-<TGConnectingPoint num="27" id="3690" />
-<TGConnectingPoint num="28" id="3691" />
-<TGConnectingPoint num="29" id="3692" />
-<TGConnectingPoint num="30" id="3693" />
-<TGConnectingPoint num="31" id="3694" />
-<TGConnectingPoint num="32" id="3695" />
-<TGConnectingPoint num="33" id="3696" />
-<TGConnectingPoint num="34" id="3697" />
-<TGConnectingPoint num="35" id="3698" />
-<TGConnectingPoint num="36" id="3699" />
-<TGConnectingPoint num="37" id="3700" />
-<TGConnectingPoint num="38" id="3701" />
-<TGConnectingPoint num="39" id="3702" />
+<infoparam name="state0" value="VerifySig3" />
+<TGConnectingPoint num="0" id="5233" />
+<TGConnectingPoint num="1" id="5234" />
+<TGConnectingPoint num="2" id="5235" />
+<TGConnectingPoint num="3" id="5236" />
+<TGConnectingPoint num="4" id="5237" />
+<TGConnectingPoint num="5" id="5238" />
+<TGConnectingPoint num="6" id="5239" />
+<TGConnectingPoint num="7" id="5240" />
+<TGConnectingPoint num="8" id="5241" />
+<TGConnectingPoint num="9" id="5242" />
+<TGConnectingPoint num="10" id="5243" />
+<TGConnectingPoint num="11" id="5244" />
+<TGConnectingPoint num="12" id="5245" />
+<TGConnectingPoint num="13" id="5246" />
+<TGConnectingPoint num="14" id="5247" />
+<TGConnectingPoint num="15" id="5248" />
+<TGConnectingPoint num="16" id="5249" />
+<TGConnectingPoint num="17" id="5250" />
+<TGConnectingPoint num="18" id="5251" />
+<TGConnectingPoint num="19" id="5252" />
+<TGConnectingPoint num="20" id="5253" />
+<TGConnectingPoint num="21" id="5254" />
+<TGConnectingPoint num="22" id="5255" />
+<TGConnectingPoint num="23" id="5256" />
+<TGConnectingPoint num="24" id="5257" />
+<TGConnectingPoint num="25" id="5258" />
+<TGConnectingPoint num="26" id="5259" />
+<TGConnectingPoint num="27" id="5260" />
+<TGConnectingPoint num="28" id="5261" />
+<TGConnectingPoint num="29" id="5262" />
+<TGConnectingPoint num="30" id="5263" />
+<TGConnectingPoint num="31" id="5264" />
+<TGConnectingPoint num="32" id="5265" />
+<TGConnectingPoint num="33" id="5266" />
+<TGConnectingPoint num="34" id="5267" />
+<TGConnectingPoint num="35" id="5268" />
+<TGConnectingPoint num="36" id="5269" />
+<TGConnectingPoint num="37" id="5270" />
+<TGConnectingPoint num="38" id="5271" />
+<TGConnectingPoint num="39" id="5272" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3744" >
-<cdparam x="227" y="1579" />
+<COMPONENT type="5106" id="5314" >
+<cdparam x="264" y="1507" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts4" />
-<TGConnectingPoint num="0" id="3704" />
-<TGConnectingPoint num="1" id="3705" />
-<TGConnectingPoint num="2" id="3706" />
-<TGConnectingPoint num="3" id="3707" />
-<TGConnectingPoint num="4" id="3708" />
-<TGConnectingPoint num="5" id="3709" />
-<TGConnectingPoint num="6" id="3710" />
-<TGConnectingPoint num="7" id="3711" />
-<TGConnectingPoint num="8" id="3712" />
-<TGConnectingPoint num="9" id="3713" />
-<TGConnectingPoint num="10" id="3714" />
-<TGConnectingPoint num="11" id="3715" />
-<TGConnectingPoint num="12" id="3716" />
-<TGConnectingPoint num="13" id="3717" />
-<TGConnectingPoint num="14" id="3718" />
-<TGConnectingPoint num="15" id="3719" />
-<TGConnectingPoint num="16" id="3720" />
-<TGConnectingPoint num="17" id="3721" />
-<TGConnectingPoint num="18" id="3722" />
-<TGConnectingPoint num="19" id="3723" />
-<TGConnectingPoint num="20" id="3724" />
-<TGConnectingPoint num="21" id="3725" />
-<TGConnectingPoint num="22" id="3726" />
-<TGConnectingPoint num="23" id="3727" />
-<TGConnectingPoint num="24" id="3728" />
-<TGConnectingPoint num="25" id="3729" />
-<TGConnectingPoint num="26" id="3730" />
-<TGConnectingPoint num="27" id="3731" />
-<TGConnectingPoint num="28" id="3732" />
-<TGConnectingPoint num="29" id="3733" />
-<TGConnectingPoint num="30" id="3734" />
-<TGConnectingPoint num="31" id="3735" />
-<TGConnectingPoint num="32" id="3736" />
-<TGConnectingPoint num="33" id="3737" />
-<TGConnectingPoint num="34" id="3738" />
-<TGConnectingPoint num="35" id="3739" />
-<TGConnectingPoint num="36" id="3740" />
-<TGConnectingPoint num="37" id="3741" />
-<TGConnectingPoint num="38" id="3742" />
-<TGConnectingPoint num="39" id="3743" />
+<infoparam name="state0" value="Invalidts3" />
+<TGConnectingPoint num="0" id="5274" />
+<TGConnectingPoint num="1" id="5275" />
+<TGConnectingPoint num="2" id="5276" />
+<TGConnectingPoint num="3" id="5277" />
+<TGConnectingPoint num="4" id="5278" />
+<TGConnectingPoint num="5" id="5279" />
+<TGConnectingPoint num="6" id="5280" />
+<TGConnectingPoint num="7" id="5281" />
+<TGConnectingPoint num="8" id="5282" />
+<TGConnectingPoint num="9" id="5283" />
+<TGConnectingPoint num="10" id="5284" />
+<TGConnectingPoint num="11" id="5285" />
+<TGConnectingPoint num="12" id="5286" />
+<TGConnectingPoint num="13" id="5287" />
+<TGConnectingPoint num="14" id="5288" />
+<TGConnectingPoint num="15" id="5289" />
+<TGConnectingPoint num="16" id="5290" />
+<TGConnectingPoint num="17" id="5291" />
+<TGConnectingPoint num="18" id="5292" />
+<TGConnectingPoint num="19" id="5293" />
+<TGConnectingPoint num="20" id="5294" />
+<TGConnectingPoint num="21" id="5295" />
+<TGConnectingPoint num="22" id="5296" />
+<TGConnectingPoint num="23" id="5297" />
+<TGConnectingPoint num="24" id="5298" />
+<TGConnectingPoint num="25" id="5299" />
+<TGConnectingPoint num="26" id="5300" />
+<TGConnectingPoint num="27" id="5301" />
+<TGConnectingPoint num="28" id="5302" />
+<TGConnectingPoint num="29" id="5303" />
+<TGConnectingPoint num="30" id="5304" />
+<TGConnectingPoint num="31" id="5305" />
+<TGConnectingPoint num="32" id="5306" />
+<TGConnectingPoint num="33" id="5307" />
+<TGConnectingPoint num="34" id="5308" />
+<TGConnectingPoint num="35" id="5309" />
+<TGConnectingPoint num="36" id="5310" />
+<TGConnectingPoint num="37" id="5311" />
+<TGConnectingPoint num="38" id="5312" />
+<TGConnectingPoint num="39" id="5313" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3785" >
-<cdparam x="350" y="1491" />
+<COMPONENT type="5106" id="5355" >
+<cdparam x="356" y="1402" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts4" />
-<TGConnectingPoint num="0" id="3745" />
-<TGConnectingPoint num="1" id="3746" />
-<TGConnectingPoint num="2" id="3747" />
-<TGConnectingPoint num="3" id="3748" />
-<TGConnectingPoint num="4" id="3749" />
-<TGConnectingPoint num="5" id="3750" />
-<TGConnectingPoint num="6" id="3751" />
-<TGConnectingPoint num="7" id="3752" />
-<TGConnectingPoint num="8" id="3753" />
-<TGConnectingPoint num="9" id="3754" />
-<TGConnectingPoint num="10" id="3755" />
-<TGConnectingPoint num="11" id="3756" />
-<TGConnectingPoint num="12" id="3757" />
-<TGConnectingPoint num="13" id="3758" />
-<TGConnectingPoint num="14" id="3759" />
-<TGConnectingPoint num="15" id="3760" />
-<TGConnectingPoint num="16" id="3761" />
-<TGConnectingPoint num="17" id="3762" />
-<TGConnectingPoint num="18" id="3763" />
-<TGConnectingPoint num="19" id="3764" />
-<TGConnectingPoint num="20" id="3765" />
-<TGConnectingPoint num="21" id="3766" />
-<TGConnectingPoint num="22" id="3767" />
-<TGConnectingPoint num="23" id="3768" />
-<TGConnectingPoint num="24" id="3769" />
-<TGConnectingPoint num="25" id="3770" />
-<TGConnectingPoint num="26" id="3771" />
-<TGConnectingPoint num="27" id="3772" />
-<TGConnectingPoint num="28" id="3773" />
-<TGConnectingPoint num="29" id="3774" />
-<TGConnectingPoint num="30" id="3775" />
-<TGConnectingPoint num="31" id="3776" />
-<TGConnectingPoint num="32" id="3777" />
-<TGConnectingPoint num="33" id="3778" />
-<TGConnectingPoint num="34" id="3779" />
-<TGConnectingPoint num="35" id="3780" />
-<TGConnectingPoint num="36" id="3781" />
-<TGConnectingPoint num="37" id="3782" />
-<TGConnectingPoint num="38" id="3783" />
-<TGConnectingPoint num="39" id="3784" />
+<infoparam name="state0" value="Testts3" />
+<TGConnectingPoint num="0" id="5315" />
+<TGConnectingPoint num="1" id="5316" />
+<TGConnectingPoint num="2" id="5317" />
+<TGConnectingPoint num="3" id="5318" />
+<TGConnectingPoint num="4" id="5319" />
+<TGConnectingPoint num="5" id="5320" />
+<TGConnectingPoint num="6" id="5321" />
+<TGConnectingPoint num="7" id="5322" />
+<TGConnectingPoint num="8" id="5323" />
+<TGConnectingPoint num="9" id="5324" />
+<TGConnectingPoint num="10" id="5325" />
+<TGConnectingPoint num="11" id="5326" />
+<TGConnectingPoint num="12" id="5327" />
+<TGConnectingPoint num="13" id="5328" />
+<TGConnectingPoint num="14" id="5329" />
+<TGConnectingPoint num="15" id="5330" />
+<TGConnectingPoint num="16" id="5331" />
+<TGConnectingPoint num="17" id="5332" />
+<TGConnectingPoint num="18" id="5333" />
+<TGConnectingPoint num="19" id="5334" />
+<TGConnectingPoint num="20" id="5335" />
+<TGConnectingPoint num="21" id="5336" />
+<TGConnectingPoint num="22" id="5337" />
+<TGConnectingPoint num="23" id="5338" />
+<TGConnectingPoint num="24" id="5339" />
+<TGConnectingPoint num="25" id="5340" />
+<TGConnectingPoint num="26" id="5341" />
+<TGConnectingPoint num="27" id="5342" />
+<TGConnectingPoint num="28" id="5343" />
+<TGConnectingPoint num="29" id="5344" />
+<TGConnectingPoint num="30" id="5345" />
+<TGConnectingPoint num="31" id="5346" />
+<TGConnectingPoint num="32" id="5347" />
+<TGConnectingPoint num="33" id="5348" />
+<TGConnectingPoint num="34" id="5349" />
+<TGConnectingPoint num="35" id="5350" />
+<TGConnectingPoint num="36" id="5351" />
+<TGConnectingPoint num="37" id="5352" />
+<TGConnectingPoint num="38" id="5353" />
+<TGConnectingPoint num="39" id="5354" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3796" >
-<cdparam x="356" y="1410" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="5366" >
+<cdparam x="376" y="1316" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m4)" />
-<TGConnectingPoint num="0" id="3786" />
-<TGConnectingPoint num="1" id="3787" />
-<TGConnectingPoint num="2" id="3788" />
-<TGConnectingPoint num="3" id="3789" />
-<TGConnectingPoint num="4" id="3790" />
-<TGConnectingPoint num="5" id="3791" />
-<TGConnectingPoint num="6" id="3792" />
-<TGConnectingPoint num="7" id="3793" />
-<TGConnectingPoint num="8" id="3794" />
-<TGConnectingPoint num="9" id="3795" />
+<infoparam name="Receive signal" value="chin(m3)" />
+<TGConnectingPoint num="0" id="5356" />
+<TGConnectingPoint num="1" id="5357" />
+<TGConnectingPoint num="2" id="5358" />
+<TGConnectingPoint num="3" id="5359" />
+<TGConnectingPoint num="4" id="5360" />
+<TGConnectingPoint num="5" id="5361" />
+<TGConnectingPoint num="6" id="5362" />
+<TGConnectingPoint num="7" id="5363" />
+<TGConnectingPoint num="8" id="5364" />
+<TGConnectingPoint num="9" id="5365" />
 </COMPONENT>
 
-<COMPONENT type="301" id="3805" >
-<cdparam x="557" y="1318" />
-<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5375" >
+<cdparam x="556" y="1246" />
+<sizeparam width="289" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify ack-message from ECU2
+<infoparam name="UML Note" value="Verify Message with session key from ECU1
 " />
-<TGConnectingPoint num="0" id="3797" />
-<TGConnectingPoint num="1" id="3798" />
-<TGConnectingPoint num="2" id="3799" />
-<TGConnectingPoint num="3" id="3800" />
-<TGConnectingPoint num="4" id="3801" />
-<TGConnectingPoint num="5" id="3802" />
-<TGConnectingPoint num="6" id="3803" />
-<TGConnectingPoint num="7" id="3804" />
+<TGConnectingPoint num="0" id="5367" />
+<TGConnectingPoint num="1" id="5368" />
+<TGConnectingPoint num="2" id="5369" />
+<TGConnectingPoint num="3" id="5370" />
+<TGConnectingPoint num="4" id="5371" />
+<TGConnectingPoint num="5" id="5372" />
+<TGConnectingPoint num="6" id="5373" />
+<TGConnectingPoint num="7" id="5374" />
+<TGConnectingPoint num="8" id="105060" />
+<TGConnectingPoint num="9" id="105061" />
+<TGConnectingPoint num="10" id="105062" />
+<TGConnectingPoint num="11" id="105063" />
+<TGConnectingPoint num="12" id="105064" />
+<TGConnectingPoint num="13" id="105065" />
+<TGConnectingPoint num="14" id="105066" />
+<TGConnectingPoint num="15" id="105067" />
 <extraparam>
-<Line value="Receive and verify ack-message from ECU2" />
+<Line value="Verify Message with session key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3846" >
-<cdparam x="349" y="1324" />
+<COMPONENT type="5106" id="5416" >
+<cdparam x="375" y="1247" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg4" />
-<TGConnectingPoint num="0" id="3806" />
-<TGConnectingPoint num="1" id="3807" />
-<TGConnectingPoint num="2" id="3808" />
-<TGConnectingPoint num="3" id="3809" />
-<TGConnectingPoint num="4" id="3810" />
-<TGConnectingPoint num="5" id="3811" />
-<TGConnectingPoint num="6" id="3812" />
-<TGConnectingPoint num="7" id="3813" />
-<TGConnectingPoint num="8" id="3814" />
-<TGConnectingPoint num="9" id="3815" />
-<TGConnectingPoint num="10" id="3816" />
-<TGConnectingPoint num="11" id="3817" />
-<TGConnectingPoint num="12" id="3818" />
-<TGConnectingPoint num="13" id="3819" />
-<TGConnectingPoint num="14" id="3820" />
-<TGConnectingPoint num="15" id="3821" />
-<TGConnectingPoint num="16" id="3822" />
-<TGConnectingPoint num="17" id="3823" />
-<TGConnectingPoint num="18" id="3824" />
-<TGConnectingPoint num="19" id="3825" />
-<TGConnectingPoint num="20" id="3826" />
-<TGConnectingPoint num="21" id="3827" />
-<TGConnectingPoint num="22" id="3828" />
-<TGConnectingPoint num="23" id="3829" />
-<TGConnectingPoint num="24" id="3830" />
-<TGConnectingPoint num="25" id="3831" />
-<TGConnectingPoint num="26" id="3832" />
-<TGConnectingPoint num="27" id="3833" />
-<TGConnectingPoint num="28" id="3834" />
-<TGConnectingPoint num="29" id="3835" />
-<TGConnectingPoint num="30" id="3836" />
-<TGConnectingPoint num="31" id="3837" />
-<TGConnectingPoint num="32" id="3838" />
-<TGConnectingPoint num="33" id="3839" />
-<TGConnectingPoint num="34" id="3840" />
-<TGConnectingPoint num="35" id="3841" />
-<TGConnectingPoint num="36" id="3842" />
-<TGConnectingPoint num="37" id="3843" />
-<TGConnectingPoint num="38" id="3844" />
-<TGConnectingPoint num="39" id="3845" />
+<infoparam name="state0" value="WaitForMsg3" />
+<TGConnectingPoint num="0" id="5376" />
+<TGConnectingPoint num="1" id="5377" />
+<TGConnectingPoint num="2" id="5378" />
+<TGConnectingPoint num="3" id="5379" />
+<TGConnectingPoint num="4" id="5380" />
+<TGConnectingPoint num="5" id="5381" />
+<TGConnectingPoint num="6" id="5382" />
+<TGConnectingPoint num="7" id="5383" />
+<TGConnectingPoint num="8" id="5384" />
+<TGConnectingPoint num="9" id="5385" />
+<TGConnectingPoint num="10" id="5386" />
+<TGConnectingPoint num="11" id="5387" />
+<TGConnectingPoint num="12" id="5388" />
+<TGConnectingPoint num="13" id="5389" />
+<TGConnectingPoint num="14" id="5390" />
+<TGConnectingPoint num="15" id="5391" />
+<TGConnectingPoint num="16" id="5392" />
+<TGConnectingPoint num="17" id="5393" />
+<TGConnectingPoint num="18" id="5394" />
+<TGConnectingPoint num="19" id="5395" />
+<TGConnectingPoint num="20" id="5396" />
+<TGConnectingPoint num="21" id="5397" />
+<TGConnectingPoint num="22" id="5398" />
+<TGConnectingPoint num="23" id="5399" />
+<TGConnectingPoint num="24" id="5400" />
+<TGConnectingPoint num="25" id="5401" />
+<TGConnectingPoint num="26" id="5402" />
+<TGConnectingPoint num="27" id="5403" />
+<TGConnectingPoint num="28" id="5404" />
+<TGConnectingPoint num="29" id="5405" />
+<TGConnectingPoint num="30" id="5406" />
+<TGConnectingPoint num="31" id="5407" />
+<TGConnectingPoint num="32" id="5408" />
+<TGConnectingPoint num="33" id="5409" />
+<TGConnectingPoint num="34" id="5410" />
+<TGConnectingPoint num="35" id="5411" />
+<TGConnectingPoint num="36" id="5412" />
+<TGConnectingPoint num="37" id="5413" />
+<TGConnectingPoint num="38" id="5414" />
+<TGConnectingPoint num="39" id="5415" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3857" >
-<cdparam x="358" y="1262" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="5427" >
+<cdparam x="397" y="1197" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m3)" />
-<TGConnectingPoint num="0" id="3847" />
-<TGConnectingPoint num="1" id="3848" />
-<TGConnectingPoint num="2" id="3849" />
-<TGConnectingPoint num="3" id="3850" />
-<TGConnectingPoint num="4" id="3851" />
-<TGConnectingPoint num="5" id="3852" />
-<TGConnectingPoint num="6" id="3853" />
-<TGConnectingPoint num="7" id="3854" />
-<TGConnectingPoint num="8" id="3855" />
-<TGConnectingPoint num="9" id="3856" />
+<infoparam name="Send signal" value="chout(m2)" />
+<TGConnectingPoint num="0" id="5417" />
+<TGConnectingPoint num="1" id="5418" />
+<TGConnectingPoint num="2" id="5419" />
+<TGConnectingPoint num="3" id="5420" />
+<TGConnectingPoint num="4" id="5421" />
+<TGConnectingPoint num="5" id="5422" />
+<TGConnectingPoint num="6" id="5423" />
+<TGConnectingPoint num="7" id="5424" />
+<TGConnectingPoint num="8" id="5425" />
+<TGConnectingPoint num="9" id="5426" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3898" >
-<cdparam x="335" y="1185" />
+<COMPONENT type="5106" id="5468" >
+<cdparam x="379" y="1137" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg3" />
-<TGConnectingPoint num="0" id="3858" />
-<TGConnectingPoint num="1" id="3859" />
-<TGConnectingPoint num="2" id="3860" />
-<TGConnectingPoint num="3" id="3861" />
-<TGConnectingPoint num="4" id="3862" />
-<TGConnectingPoint num="5" id="3863" />
-<TGConnectingPoint num="6" id="3864" />
-<TGConnectingPoint num="7" id="3865" />
-<TGConnectingPoint num="8" id="3866" />
-<TGConnectingPoint num="9" id="3867" />
-<TGConnectingPoint num="10" id="3868" />
-<TGConnectingPoint num="11" id="3869" />
-<TGConnectingPoint num="12" id="3870" />
-<TGConnectingPoint num="13" id="3871" />
-<TGConnectingPoint num="14" id="3872" />
-<TGConnectingPoint num="15" id="3873" />
-<TGConnectingPoint num="16" id="3874" />
-<TGConnectingPoint num="17" id="3875" />
-<TGConnectingPoint num="18" id="3876" />
-<TGConnectingPoint num="19" id="3877" />
-<TGConnectingPoint num="20" id="3878" />
-<TGConnectingPoint num="21" id="3879" />
-<TGConnectingPoint num="22" id="3880" />
-<TGConnectingPoint num="23" id="3881" />
-<TGConnectingPoint num="24" id="3882" />
-<TGConnectingPoint num="25" id="3883" />
-<TGConnectingPoint num="26" id="3884" />
-<TGConnectingPoint num="27" id="3885" />
-<TGConnectingPoint num="28" id="3886" />
-<TGConnectingPoint num="29" id="3887" />
-<TGConnectingPoint num="30" id="3888" />
-<TGConnectingPoint num="31" id="3889" />
-<TGConnectingPoint num="32" id="3890" />
-<TGConnectingPoint num="33" id="3891" />
-<TGConnectingPoint num="34" id="3892" />
-<TGConnectingPoint num="35" id="3893" />
-<TGConnectingPoint num="36" id="3894" />
-<TGConnectingPoint num="37" id="3895" />
-<TGConnectingPoint num="38" id="3896" />
-<TGConnectingPoint num="39" id="3897" />
+<infoparam name="state0" value="SendMsg2" />
+<TGConnectingPoint num="0" id="5428" />
+<TGConnectingPoint num="1" id="5429" />
+<TGConnectingPoint num="2" id="5430" />
+<TGConnectingPoint num="3" id="5431" />
+<TGConnectingPoint num="4" id="5432" />
+<TGConnectingPoint num="5" id="5433" />
+<TGConnectingPoint num="6" id="5434" />
+<TGConnectingPoint num="7" id="5435" />
+<TGConnectingPoint num="8" id="5436" />
+<TGConnectingPoint num="9" id="5437" />
+<TGConnectingPoint num="10" id="5438" />
+<TGConnectingPoint num="11" id="5439" />
+<TGConnectingPoint num="12" id="5440" />
+<TGConnectingPoint num="13" id="5441" />
+<TGConnectingPoint num="14" id="5442" />
+<TGConnectingPoint num="15" id="5443" />
+<TGConnectingPoint num="16" id="5444" />
+<TGConnectingPoint num="17" id="5445" />
+<TGConnectingPoint num="18" id="5446" />
+<TGConnectingPoint num="19" id="5447" />
+<TGConnectingPoint num="20" id="5448" />
+<TGConnectingPoint num="21" id="5449" />
+<TGConnectingPoint num="22" id="5450" />
+<TGConnectingPoint num="23" id="5451" />
+<TGConnectingPoint num="24" id="5452" />
+<TGConnectingPoint num="25" id="5453" />
+<TGConnectingPoint num="26" id="5454" />
+<TGConnectingPoint num="27" id="5455" />
+<TGConnectingPoint num="28" id="5456" />
+<TGConnectingPoint num="29" id="5457" />
+<TGConnectingPoint num="30" id="5458" />
+<TGConnectingPoint num="31" id="5459" />
+<TGConnectingPoint num="32" id="5460" />
+<TGConnectingPoint num="33" id="5461" />
+<TGConnectingPoint num="34" id="5462" />
+<TGConnectingPoint num="35" id="5463" />
+<TGConnectingPoint num="36" id="5464" />
+<TGConnectingPoint num="37" id="5465" />
+<TGConnectingPoint num="38" id="5466" />
+<TGConnectingPoint num="39" id="5467" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="5477" >
+<cdparam x="546" y="983" />
+<sizeparam width="364" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="UML Note" value="Create and send answer for ECU1: Certified pk of ECU2
+" />
+<TGConnectingPoint num="0" id="5469" />
+<TGConnectingPoint num="1" id="5470" />
+<TGConnectingPoint num="2" id="5471" />
+<TGConnectingPoint num="3" id="5472" />
+<TGConnectingPoint num="4" id="5473" />
+<TGConnectingPoint num="5" id="5474" />
+<TGConnectingPoint num="6" id="5475" />
+<TGConnectingPoint num="7" id="5476" />
+<TGConnectingPoint num="8" id="105170" />
+<TGConnectingPoint num="9" id="105171" />
+<TGConnectingPoint num="10" id="105172" />
+<TGConnectingPoint num="11" id="105173" />
+<TGConnectingPoint num="12" id="105174" />
+<TGConnectingPoint num="13" id="105175" />
+<TGConnectingPoint num="14" id="105176" />
+<TGConnectingPoint num="15" id="105177" />
 <extraparam>
+<Line value="Create and send answer for ECU1: Certified pk of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="3907" >
-<cdparam x="526" y="1019" />
-<sizeparam width="414" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5486" >
+<cdparam x="453" y="555" />
+<sizeparam width="342" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create and send m3, message containing the encrypted session key
+<infoparam name="UML Note" value="Begin verifying m1: PK-Request message from ECU1
 " />
-<TGConnectingPoint num="0" id="3899" />
-<TGConnectingPoint num="1" id="3900" />
-<TGConnectingPoint num="2" id="3901" />
-<TGConnectingPoint num="3" id="3902" />
-<TGConnectingPoint num="4" id="3903" />
-<TGConnectingPoint num="5" id="3904" />
-<TGConnectingPoint num="6" id="3905" />
-<TGConnectingPoint num="7" id="3906" />
+<TGConnectingPoint num="0" id="5478" />
+<TGConnectingPoint num="1" id="5479" />
+<TGConnectingPoint num="2" id="5480" />
+<TGConnectingPoint num="3" id="5481" />
+<TGConnectingPoint num="4" id="5482" />
+<TGConnectingPoint num="5" id="5483" />
+<TGConnectingPoint num="6" id="5484" />
+<TGConnectingPoint num="7" id="5485" />
+<TGConnectingPoint num="8" id="105187" />
+<TGConnectingPoint num="9" id="105188" />
+<TGConnectingPoint num="10" id="105189" />
+<TGConnectingPoint num="11" id="105190" />
+<TGConnectingPoint num="12" id="105191" />
+<TGConnectingPoint num="13" id="105192" />
+<TGConnectingPoint num="14" id="105193" />
+<TGConnectingPoint num="15" id="105194" />
 <extraparam>
-<Line value="Create and send m3, message containing the encrypted session key" />
+<Line value="Begin verifying m1: PK-Request message from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3948" >
-<cdparam x="338" y="1019" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5495" >
+<cdparam x="272" y="66" />
+<sizeparam width="327" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg3" />
-<TGConnectingPoint num="0" id="3908" />
-<TGConnectingPoint num="1" id="3909" />
-<TGConnectingPoint num="2" id="3910" />
-<TGConnectingPoint num="3" id="3911" />
-<TGConnectingPoint num="4" id="3912" />
-<TGConnectingPoint num="5" id="3913" />
-<TGConnectingPoint num="6" id="3914" />
-<TGConnectingPoint num="7" id="3915" />
-<TGConnectingPoint num="8" id="3916" />
-<TGConnectingPoint num="9" id="3917" />
-<TGConnectingPoint num="10" id="3918" />
-<TGConnectingPoint num="11" id="3919" />
-<TGConnectingPoint num="12" id="3920" />
-<TGConnectingPoint num="13" id="3921" />
-<TGConnectingPoint num="14" id="3922" />
-<TGConnectingPoint num="15" id="3923" />
-<TGConnectingPoint num="16" id="3924" />
-<TGConnectingPoint num="17" id="3925" />
-<TGConnectingPoint num="18" id="3926" />
-<TGConnectingPoint num="19" id="3927" />
-<TGConnectingPoint num="20" id="3928" />
-<TGConnectingPoint num="21" id="3929" />
-<TGConnectingPoint num="22" id="3930" />
-<TGConnectingPoint num="23" id="3931" />
-<TGConnectingPoint num="24" id="3932" />
-<TGConnectingPoint num="25" id="3933" />
-<TGConnectingPoint num="26" id="3934" />
-<TGConnectingPoint num="27" id="3935" />
-<TGConnectingPoint num="28" id="3936" />
-<TGConnectingPoint num="29" id="3937" />
-<TGConnectingPoint num="30" id="3938" />
-<TGConnectingPoint num="31" id="3939" />
-<TGConnectingPoint num="32" id="3940" />
-<TGConnectingPoint num="33" id="3941" />
-<TGConnectingPoint num="34" id="3942" />
-<TGConnectingPoint num="35" id="3943" />
-<TGConnectingPoint num="36" id="3944" />
-<TGConnectingPoint num="37" id="3945" />
-<TGConnectingPoint num="38" id="3946" />
-<TGConnectingPoint num="39" id="3947" />
+<infoparam name="UML Note" value="Begin verifying m0: certified public key from ECU1
+" />
+<TGConnectingPoint num="0" id="5487" />
+<TGConnectingPoint num="1" id="5488" />
+<TGConnectingPoint num="2" id="5489" />
+<TGConnectingPoint num="3" id="5490" />
+<TGConnectingPoint num="4" id="5491" />
+<TGConnectingPoint num="5" id="5492" />
+<TGConnectingPoint num="6" id="5493" />
+<TGConnectingPoint num="7" id="5494" />
+<TGConnectingPoint num="8" id="105204" />
+<TGConnectingPoint num="9" id="105205" />
+<TGConnectingPoint num="10" id="105206" />
+<TGConnectingPoint num="11" id="105207" />
+<TGConnectingPoint num="12" id="105208" />
+<TGConnectingPoint num="13" id="105209" />
+<TGConnectingPoint num="14" id="105210" />
+<TGConnectingPoint num="15" id="105211" />
 <extraparam>
+<Line value="Begin verifying m0: certified public key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3989" >
-<cdparam x="160" y="1019" />
+<COMPONENT type="5106" id="5536" >
+<cdparam x="384" y="978" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig2" />
-<TGConnectingPoint num="0" id="3949" />
-<TGConnectingPoint num="1" id="3950" />
-<TGConnectingPoint num="2" id="3951" />
-<TGConnectingPoint num="3" id="3952" />
-<TGConnectingPoint num="4" id="3953" />
-<TGConnectingPoint num="5" id="3954" />
-<TGConnectingPoint num="6" id="3955" />
-<TGConnectingPoint num="7" id="3956" />
-<TGConnectingPoint num="8" id="3957" />
-<TGConnectingPoint num="9" id="3958" />
-<TGConnectingPoint num="10" id="3959" />
-<TGConnectingPoint num="11" id="3960" />
-<TGConnectingPoint num="12" id="3961" />
-<TGConnectingPoint num="13" id="3962" />
-<TGConnectingPoint num="14" id="3963" />
-<TGConnectingPoint num="15" id="3964" />
-<TGConnectingPoint num="16" id="3965" />
-<TGConnectingPoint num="17" id="3966" />
-<TGConnectingPoint num="18" id="3967" />
-<TGConnectingPoint num="19" id="3968" />
-<TGConnectingPoint num="20" id="3969" />
-<TGConnectingPoint num="21" id="3970" />
-<TGConnectingPoint num="22" id="3971" />
-<TGConnectingPoint num="23" id="3972" />
-<TGConnectingPoint num="24" id="3973" />
-<TGConnectingPoint num="25" id="3974" />
-<TGConnectingPoint num="26" id="3975" />
-<TGConnectingPoint num="27" id="3976" />
-<TGConnectingPoint num="28" id="3977" />
-<TGConnectingPoint num="29" id="3978" />
-<TGConnectingPoint num="30" id="3979" />
-<TGConnectingPoint num="31" id="3980" />
-<TGConnectingPoint num="32" id="3981" />
-<TGConnectingPoint num="33" id="3982" />
-<TGConnectingPoint num="34" id="3983" />
-<TGConnectingPoint num="35" id="3984" />
-<TGConnectingPoint num="36" id="3985" />
-<TGConnectingPoint num="37" id="3986" />
-<TGConnectingPoint num="38" id="3987" />
-<TGConnectingPoint num="39" id="3988" />
+<infoparam name="state0" value="ForgeMsg2" />
+<TGConnectingPoint num="0" id="5496" />
+<TGConnectingPoint num="1" id="5497" />
+<TGConnectingPoint num="2" id="5498" />
+<TGConnectingPoint num="3" id="5499" />
+<TGConnectingPoint num="4" id="5500" />
+<TGConnectingPoint num="5" id="5501" />
+<TGConnectingPoint num="6" id="5502" />
+<TGConnectingPoint num="7" id="5503" />
+<TGConnectingPoint num="8" id="5504" />
+<TGConnectingPoint num="9" id="5505" />
+<TGConnectingPoint num="10" id="5506" />
+<TGConnectingPoint num="11" id="5507" />
+<TGConnectingPoint num="12" id="5508" />
+<TGConnectingPoint num="13" id="5509" />
+<TGConnectingPoint num="14" id="5510" />
+<TGConnectingPoint num="15" id="5511" />
+<TGConnectingPoint num="16" id="5512" />
+<TGConnectingPoint num="17" id="5513" />
+<TGConnectingPoint num="18" id="5514" />
+<TGConnectingPoint num="19" id="5515" />
+<TGConnectingPoint num="20" id="5516" />
+<TGConnectingPoint num="21" id="5517" />
+<TGConnectingPoint num="22" id="5518" />
+<TGConnectingPoint num="23" id="5519" />
+<TGConnectingPoint num="24" id="5520" />
+<TGConnectingPoint num="25" id="5521" />
+<TGConnectingPoint num="26" id="5522" />
+<TGConnectingPoint num="27" id="5523" />
+<TGConnectingPoint num="28" id="5524" />
+<TGConnectingPoint num="29" id="5525" />
+<TGConnectingPoint num="30" id="5526" />
+<TGConnectingPoint num="31" id="5527" />
+<TGConnectingPoint num="32" id="5528" />
+<TGConnectingPoint num="33" id="5529" />
+<TGConnectingPoint num="34" id="5530" />
+<TGConnectingPoint num="35" id="5531" />
+<TGConnectingPoint num="36" id="5532" />
+<TGConnectingPoint num="37" id="5533" />
+<TGConnectingPoint num="38" id="5534" />
+<TGConnectingPoint num="39" id="5535" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4030" >
-<cdparam x="278" y="914" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5577" >
+<cdparam x="197" y="980" />
+<sizeparam width="107" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig2" />
-<TGConnectingPoint num="0" id="3990" />
-<TGConnectingPoint num="1" id="3991" />
-<TGConnectingPoint num="2" id="3992" />
-<TGConnectingPoint num="3" id="3993" />
-<TGConnectingPoint num="4" id="3994" />
-<TGConnectingPoint num="5" id="3995" />
-<TGConnectingPoint num="6" id="3996" />
-<TGConnectingPoint num="7" id="3997" />
-<TGConnectingPoint num="8" id="3998" />
-<TGConnectingPoint num="9" id="3999" />
-<TGConnectingPoint num="10" id="4000" />
-<TGConnectingPoint num="11" id="4001" />
-<TGConnectingPoint num="12" id="4002" />
-<TGConnectingPoint num="13" id="4003" />
-<TGConnectingPoint num="14" id="4004" />
-<TGConnectingPoint num="15" id="4005" />
-<TGConnectingPoint num="16" id="4006" />
-<TGConnectingPoint num="17" id="4007" />
-<TGConnectingPoint num="18" id="4008" />
-<TGConnectingPoint num="19" id="4009" />
-<TGConnectingPoint num="20" id="4010" />
-<TGConnectingPoint num="21" id="4011" />
-<TGConnectingPoint num="22" id="4012" />
-<TGConnectingPoint num="23" id="4013" />
-<TGConnectingPoint num="24" id="4014" />
-<TGConnectingPoint num="25" id="4015" />
-<TGConnectingPoint num="26" id="4016" />
-<TGConnectingPoint num="27" id="4017" />
-<TGConnectingPoint num="28" id="4018" />
-<TGConnectingPoint num="29" id="4019" />
-<TGConnectingPoint num="30" id="4020" />
-<TGConnectingPoint num="31" id="4021" />
-<TGConnectingPoint num="32" id="4022" />
-<TGConnectingPoint num="33" id="4023" />
-<TGConnectingPoint num="34" id="4024" />
-<TGConnectingPoint num="35" id="4025" />
-<TGConnectingPoint num="36" id="4026" />
-<TGConnectingPoint num="37" id="4027" />
-<TGConnectingPoint num="38" id="4028" />
-<TGConnectingPoint num="39" id="4029" />
+<infoparam name="state0" value="UnexpectedMsg" />
+<TGConnectingPoint num="0" id="5537" />
+<TGConnectingPoint num="1" id="5538" />
+<TGConnectingPoint num="2" id="5539" />
+<TGConnectingPoint num="3" id="5540" />
+<TGConnectingPoint num="4" id="5541" />
+<TGConnectingPoint num="5" id="5542" />
+<TGConnectingPoint num="6" id="5543" />
+<TGConnectingPoint num="7" id="5544" />
+<TGConnectingPoint num="8" id="5545" />
+<TGConnectingPoint num="9" id="5546" />
+<TGConnectingPoint num="10" id="5547" />
+<TGConnectingPoint num="11" id="5548" />
+<TGConnectingPoint num="12" id="5549" />
+<TGConnectingPoint num="13" id="5550" />
+<TGConnectingPoint num="14" id="5551" />
+<TGConnectingPoint num="15" id="5552" />
+<TGConnectingPoint num="16" id="5553" />
+<TGConnectingPoint num="17" id="5554" />
+<TGConnectingPoint num="18" id="5555" />
+<TGConnectingPoint num="19" id="5556" />
+<TGConnectingPoint num="20" id="5557" />
+<TGConnectingPoint num="21" id="5558" />
+<TGConnectingPoint num="22" id="5559" />
+<TGConnectingPoint num="23" id="5560" />
+<TGConnectingPoint num="24" id="5561" />
+<TGConnectingPoint num="25" id="5562" />
+<TGConnectingPoint num="26" id="5563" />
+<TGConnectingPoint num="27" id="5564" />
+<TGConnectingPoint num="28" id="5565" />
+<TGConnectingPoint num="29" id="5566" />
+<TGConnectingPoint num="30" id="5567" />
+<TGConnectingPoint num="31" id="5568" />
+<TGConnectingPoint num="32" id="5569" />
+<TGConnectingPoint num="33" id="5570" />
+<TGConnectingPoint num="34" id="5571" />
+<TGConnectingPoint num="35" id="5572" />
+<TGConnectingPoint num="36" id="5573" />
+<TGConnectingPoint num="37" id="5574" />
+<TGConnectingPoint num="38" id="5575" />
+<TGConnectingPoint num="39" id="5576" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4071" >
-<cdparam x="99" y="914" />
+<COMPONENT type="5106" id="5618" >
+<cdparam x="329" y="880" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidCert2" />
-<TGConnectingPoint num="0" id="4031" />
-<TGConnectingPoint num="1" id="4032" />
-<TGConnectingPoint num="2" id="4033" />
-<TGConnectingPoint num="3" id="4034" />
-<TGConnectingPoint num="4" id="4035" />
-<TGConnectingPoint num="5" id="4036" />
-<TGConnectingPoint num="6" id="4037" />
-<TGConnectingPoint num="7" id="4038" />
-<TGConnectingPoint num="8" id="4039" />
-<TGConnectingPoint num="9" id="4040" />
-<TGConnectingPoint num="10" id="4041" />
-<TGConnectingPoint num="11" id="4042" />
-<TGConnectingPoint num="12" id="4043" />
-<TGConnectingPoint num="13" id="4044" />
-<TGConnectingPoint num="14" id="4045" />
-<TGConnectingPoint num="15" id="4046" />
-<TGConnectingPoint num="16" id="4047" />
-<TGConnectingPoint num="17" id="4048" />
-<TGConnectingPoint num="18" id="4049" />
-<TGConnectingPoint num="19" id="4050" />
-<TGConnectingPoint num="20" id="4051" />
-<TGConnectingPoint num="21" id="4052" />
-<TGConnectingPoint num="22" id="4053" />
-<TGConnectingPoint num="23" id="4054" />
-<TGConnectingPoint num="24" id="4055" />
-<TGConnectingPoint num="25" id="4056" />
-<TGConnectingPoint num="26" id="4057" />
-<TGConnectingPoint num="27" id="4058" />
-<TGConnectingPoint num="28" id="4059" />
-<TGConnectingPoint num="29" id="4060" />
-<TGConnectingPoint num="30" id="4061" />
-<TGConnectingPoint num="31" id="4062" />
-<TGConnectingPoint num="32" id="4063" />
-<TGConnectingPoint num="33" id="4064" />
-<TGConnectingPoint num="34" id="4065" />
-<TGConnectingPoint num="35" id="4066" />
-<TGConnectingPoint num="36" id="4067" />
-<TGConnectingPoint num="37" id="4068" />
-<TGConnectingPoint num="38" id="4069" />
-<TGConnectingPoint num="39" id="4070" />
+<infoparam name="state0" value="Verifyrpk" />
+<TGConnectingPoint num="0" id="5578" />
+<TGConnectingPoint num="1" id="5579" />
+<TGConnectingPoint num="2" id="5580" />
+<TGConnectingPoint num="3" id="5581" />
+<TGConnectingPoint num="4" id="5582" />
+<TGConnectingPoint num="5" id="5583" />
+<TGConnectingPoint num="6" id="5584" />
+<TGConnectingPoint num="7" id="5585" />
+<TGConnectingPoint num="8" id="5586" />
+<TGConnectingPoint num="9" id="5587" />
+<TGConnectingPoint num="10" id="5588" />
+<TGConnectingPoint num="11" id="5589" />
+<TGConnectingPoint num="12" id="5590" />
+<TGConnectingPoint num="13" id="5591" />
+<TGConnectingPoint num="14" id="5592" />
+<TGConnectingPoint num="15" id="5593" />
+<TGConnectingPoint num="16" id="5594" />
+<TGConnectingPoint num="17" id="5595" />
+<TGConnectingPoint num="18" id="5596" />
+<TGConnectingPoint num="19" id="5597" />
+<TGConnectingPoint num="20" id="5598" />
+<TGConnectingPoint num="21" id="5599" />
+<TGConnectingPoint num="22" id="5600" />
+<TGConnectingPoint num="23" id="5601" />
+<TGConnectingPoint num="24" id="5602" />
+<TGConnectingPoint num="25" id="5603" />
+<TGConnectingPoint num="26" id="5604" />
+<TGConnectingPoint num="27" id="5605" />
+<TGConnectingPoint num="28" id="5606" />
+<TGConnectingPoint num="29" id="5607" />
+<TGConnectingPoint num="30" id="5608" />
+<TGConnectingPoint num="31" id="5609" />
+<TGConnectingPoint num="32" id="5610" />
+<TGConnectingPoint num="33" id="5611" />
+<TGConnectingPoint num="34" id="5612" />
+<TGConnectingPoint num="35" id="5613" />
+<TGConnectingPoint num="36" id="5614" />
+<TGConnectingPoint num="37" id="5615" />
+<TGConnectingPoint num="38" id="5616" />
+<TGConnectingPoint num="39" id="5617" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4112" >
-<cdparam x="198" y="809" />
+<COMPONENT type="5106" id="5659" >
+<cdparam x="149" y="877" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyCert2" />
-<TGConnectingPoint num="0" id="4072" />
-<TGConnectingPoint num="1" id="4073" />
-<TGConnectingPoint num="2" id="4074" />
-<TGConnectingPoint num="3" id="4075" />
-<TGConnectingPoint num="4" id="4076" />
-<TGConnectingPoint num="5" id="4077" />
-<TGConnectingPoint num="6" id="4078" />
-<TGConnectingPoint num="7" id="4079" />
-<TGConnectingPoint num="8" id="4080" />
-<TGConnectingPoint num="9" id="4081" />
-<TGConnectingPoint num="10" id="4082" />
-<TGConnectingPoint num="11" id="4083" />
-<TGConnectingPoint num="12" id="4084" />
-<TGConnectingPoint num="13" id="4085" />
-<TGConnectingPoint num="14" id="4086" />
-<TGConnectingPoint num="15" id="4087" />
-<TGConnectingPoint num="16" id="4088" />
-<TGConnectingPoint num="17" id="4089" />
-<TGConnectingPoint num="18" id="4090" />
-<TGConnectingPoint num="19" id="4091" />
-<TGConnectingPoint num="20" id="4092" />
-<TGConnectingPoint num="21" id="4093" />
-<TGConnectingPoint num="22" id="4094" />
-<TGConnectingPoint num="23" id="4095" />
-<TGConnectingPoint num="24" id="4096" />
-<TGConnectingPoint num="25" id="4097" />
-<TGConnectingPoint num="26" id="4098" />
-<TGConnectingPoint num="27" id="4099" />
-<TGConnectingPoint num="28" id="4100" />
-<TGConnectingPoint num="29" id="4101" />
-<TGConnectingPoint num="30" id="4102" />
-<TGConnectingPoint num="31" id="4103" />
-<TGConnectingPoint num="32" id="4104" />
-<TGConnectingPoint num="33" id="4105" />
-<TGConnectingPoint num="34" id="4106" />
-<TGConnectingPoint num="35" id="4107" />
-<TGConnectingPoint num="36" id="4108" />
-<TGConnectingPoint num="37" id="4109" />
-<TGConnectingPoint num="38" id="4110" />
-<TGConnectingPoint num="39" id="4111" />
+<infoparam name="state0" value="InvalidSig1" />
+<TGConnectingPoint num="0" id="5619" />
+<TGConnectingPoint num="1" id="5620" />
+<TGConnectingPoint num="2" id="5621" />
+<TGConnectingPoint num="3" id="5622" />
+<TGConnectingPoint num="4" id="5623" />
+<TGConnectingPoint num="5" id="5624" />
+<TGConnectingPoint num="6" id="5625" />
+<TGConnectingPoint num="7" id="5626" />
+<TGConnectingPoint num="8" id="5627" />
+<TGConnectingPoint num="9" id="5628" />
+<TGConnectingPoint num="10" id="5629" />
+<TGConnectingPoint num="11" id="5630" />
+<TGConnectingPoint num="12" id="5631" />
+<TGConnectingPoint num="13" id="5632" />
+<TGConnectingPoint num="14" id="5633" />
+<TGConnectingPoint num="15" id="5634" />
+<TGConnectingPoint num="16" id="5635" />
+<TGConnectingPoint num="17" id="5636" />
+<TGConnectingPoint num="18" id="5637" />
+<TGConnectingPoint num="19" id="5638" />
+<TGConnectingPoint num="20" id="5639" />
+<TGConnectingPoint num="21" id="5640" />
+<TGConnectingPoint num="22" id="5641" />
+<TGConnectingPoint num="23" id="5642" />
+<TGConnectingPoint num="24" id="5643" />
+<TGConnectingPoint num="25" id="5644" />
+<TGConnectingPoint num="26" id="5645" />
+<TGConnectingPoint num="27" id="5646" />
+<TGConnectingPoint num="28" id="5647" />
+<TGConnectingPoint num="29" id="5648" />
+<TGConnectingPoint num="30" id="5649" />
+<TGConnectingPoint num="31" id="5650" />
+<TGConnectingPoint num="32" id="5651" />
+<TGConnectingPoint num="33" id="5652" />
+<TGConnectingPoint num="34" id="5653" />
+<TGConnectingPoint num="35" id="5654" />
+<TGConnectingPoint num="36" id="5655" />
+<TGConnectingPoint num="37" id="5656" />
+<TGConnectingPoint num="38" id="5657" />
+<TGConnectingPoint num="39" id="5658" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4153" >
-<cdparam x="27" y="809" />
+<COMPONENT type="5106" id="5700" >
+<cdparam x="267" y="778" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts2" />
-<TGConnectingPoint num="0" id="4113" />
-<TGConnectingPoint num="1" id="4114" />
-<TGConnectingPoint num="2" id="4115" />
-<TGConnectingPoint num="3" id="4116" />
-<TGConnectingPoint num="4" id="4117" />
-<TGConnectingPoint num="5" id="4118" />
-<TGConnectingPoint num="6" id="4119" />
-<TGConnectingPoint num="7" id="4120" />
-<TGConnectingPoint num="8" id="4121" />
-<TGConnectingPoint num="9" id="4122" />
-<TGConnectingPoint num="10" id="4123" />
-<TGConnectingPoint num="11" id="4124" />
-<TGConnectingPoint num="12" id="4125" />
-<TGConnectingPoint num="13" id="4126" />
-<TGConnectingPoint num="14" id="4127" />
-<TGConnectingPoint num="15" id="4128" />
-<TGConnectingPoint num="16" id="4129" />
-<TGConnectingPoint num="17" id="4130" />
-<TGConnectingPoint num="18" id="4131" />
-<TGConnectingPoint num="19" id="4132" />
-<TGConnectingPoint num="20" id="4133" />
-<TGConnectingPoint num="21" id="4134" />
-<TGConnectingPoint num="22" id="4135" />
-<TGConnectingPoint num="23" id="4136" />
-<TGConnectingPoint num="24" id="4137" />
-<TGConnectingPoint num="25" id="4138" />
-<TGConnectingPoint num="26" id="4139" />
-<TGConnectingPoint num="27" id="4140" />
-<TGConnectingPoint num="28" id="4141" />
-<TGConnectingPoint num="29" id="4142" />
-<TGConnectingPoint num="30" id="4143" />
-<TGConnectingPoint num="31" id="4144" />
-<TGConnectingPoint num="32" id="4145" />
-<TGConnectingPoint num="33" id="4146" />
-<TGConnectingPoint num="34" id="4147" />
-<TGConnectingPoint num="35" id="4148" />
-<TGConnectingPoint num="36" id="4149" />
-<TGConnectingPoint num="37" id="4150" />
-<TGConnectingPoint num="38" id="4151" />
-<TGConnectingPoint num="39" id="4152" />
+<infoparam name="state0" value="VerifySig1" />
+<TGConnectingPoint num="0" id="5660" />
+<TGConnectingPoint num="1" id="5661" />
+<TGConnectingPoint num="2" id="5662" />
+<TGConnectingPoint num="3" id="5663" />
+<TGConnectingPoint num="4" id="5664" />
+<TGConnectingPoint num="5" id="5665" />
+<TGConnectingPoint num="6" id="5666" />
+<TGConnectingPoint num="7" id="5667" />
+<TGConnectingPoint num="8" id="5668" />
+<TGConnectingPoint num="9" id="5669" />
+<TGConnectingPoint num="10" id="5670" />
+<TGConnectingPoint num="11" id="5671" />
+<TGConnectingPoint num="12" id="5672" />
+<TGConnectingPoint num="13" id="5673" />
+<TGConnectingPoint num="14" id="5674" />
+<TGConnectingPoint num="15" id="5675" />
+<TGConnectingPoint num="16" id="5676" />
+<TGConnectingPoint num="17" id="5677" />
+<TGConnectingPoint num="18" id="5678" />
+<TGConnectingPoint num="19" id="5679" />
+<TGConnectingPoint num="20" id="5680" />
+<TGConnectingPoint num="21" id="5681" />
+<TGConnectingPoint num="22" id="5682" />
+<TGConnectingPoint num="23" id="5683" />
+<TGConnectingPoint num="24" id="5684" />
+<TGConnectingPoint num="25" id="5685" />
+<TGConnectingPoint num="26" id="5686" />
+<TGConnectingPoint num="27" id="5687" />
+<TGConnectingPoint num="28" id="5688" />
+<TGConnectingPoint num="29" id="5689" />
+<TGConnectingPoint num="30" id="5690" />
+<TGConnectingPoint num="31" id="5691" />
+<TGConnectingPoint num="32" id="5692" />
+<TGConnectingPoint num="33" id="5693" />
+<TGConnectingPoint num="34" id="5694" />
+<TGConnectingPoint num="35" id="5695" />
+<TGConnectingPoint num="36" id="5696" />
+<TGConnectingPoint num="37" id="5697" />
+<TGConnectingPoint num="38" id="5698" />
+<TGConnectingPoint num="39" id="5699" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4162" >
-<cdparam x="266" y="553" />
-<sizeparam width="288" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5741" >
+<cdparam x="63" y="778" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify m2: certified pk from ECU2
-" />
-<TGConnectingPoint num="0" id="4154" />
-<TGConnectingPoint num="1" id="4155" />
-<TGConnectingPoint num="2" id="4156" />
-<TGConnectingPoint num="3" id="4157" />
-<TGConnectingPoint num="4" id="4158" />
-<TGConnectingPoint num="5" id="4159" />
-<TGConnectingPoint num="6" id="4160" />
-<TGConnectingPoint num="7" id="4161" />
+<infoparam name="state0" value="Invalidts1" />
+<TGConnectingPoint num="0" id="5701" />
+<TGConnectingPoint num="1" id="5702" />
+<TGConnectingPoint num="2" id="5703" />
+<TGConnectingPoint num="3" id="5704" />
+<TGConnectingPoint num="4" id="5705" />
+<TGConnectingPoint num="5" id="5706" />
+<TGConnectingPoint num="6" id="5707" />
+<TGConnectingPoint num="7" id="5708" />
+<TGConnectingPoint num="8" id="5709" />
+<TGConnectingPoint num="9" id="5710" />
+<TGConnectingPoint num="10" id="5711" />
+<TGConnectingPoint num="11" id="5712" />
+<TGConnectingPoint num="12" id="5713" />
+<TGConnectingPoint num="13" id="5714" />
+<TGConnectingPoint num="14" id="5715" />
+<TGConnectingPoint num="15" id="5716" />
+<TGConnectingPoint num="16" id="5717" />
+<TGConnectingPoint num="17" id="5718" />
+<TGConnectingPoint num="18" id="5719" />
+<TGConnectingPoint num="19" id="5720" />
+<TGConnectingPoint num="20" id="5721" />
+<TGConnectingPoint num="21" id="5722" />
+<TGConnectingPoint num="22" id="5723" />
+<TGConnectingPoint num="23" id="5724" />
+<TGConnectingPoint num="24" id="5725" />
+<TGConnectingPoint num="25" id="5726" />
+<TGConnectingPoint num="26" id="5727" />
+<TGConnectingPoint num="27" id="5728" />
+<TGConnectingPoint num="28" id="5729" />
+<TGConnectingPoint num="29" id="5730" />
+<TGConnectingPoint num="30" id="5731" />
+<TGConnectingPoint num="31" id="5732" />
+<TGConnectingPoint num="32" id="5733" />
+<TGConnectingPoint num="33" id="5734" />
+<TGConnectingPoint num="34" id="5735" />
+<TGConnectingPoint num="35" id="5736" />
+<TGConnectingPoint num="36" id="5737" />
+<TGConnectingPoint num="37" id="5738" />
+<TGConnectingPoint num="38" id="5739" />
+<TGConnectingPoint num="39" id="5740" />
 <extraparam>
-<Line value="Receive and verify m2: certified pk from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4171" >
-<cdparam x="277" y="318" />
-<sizeparam width="356" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5782" >
+<cdparam x="277" y="384" />
+<sizeparam width="102" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create request message m1 to ask for public key of ECU2
-" />
-<TGConnectingPoint num="0" id="4163" />
-<TGConnectingPoint num="1" id="4164" />
-<TGConnectingPoint num="2" id="4165" />
-<TGConnectingPoint num="3" id="4166" />
-<TGConnectingPoint num="4" id="4167" />
-<TGConnectingPoint num="5" id="4168" />
-<TGConnectingPoint num="6" id="4169" />
-<TGConnectingPoint num="7" id="4170" />
+<infoparam name="state1" value="ValidCert0" />
+<TGConnectingPoint num="0" id="5742" />
+<TGConnectingPoint num="1" id="5743" />
+<TGConnectingPoint num="2" id="5744" />
+<TGConnectingPoint num="3" id="5745" />
+<TGConnectingPoint num="4" id="5746" />
+<TGConnectingPoint num="5" id="5747" />
+<TGConnectingPoint num="6" id="5748" />
+<TGConnectingPoint num="7" id="5749" />
+<TGConnectingPoint num="8" id="5750" />
+<TGConnectingPoint num="9" id="5751" />
+<TGConnectingPoint num="10" id="5752" />
+<TGConnectingPoint num="11" id="5753" />
+<TGConnectingPoint num="12" id="5754" />
+<TGConnectingPoint num="13" id="5755" />
+<TGConnectingPoint num="14" id="5756" />
+<TGConnectingPoint num="15" id="5757" />
+<TGConnectingPoint num="16" id="5758" />
+<TGConnectingPoint num="17" id="5759" />
+<TGConnectingPoint num="18" id="5760" />
+<TGConnectingPoint num="19" id="5761" />
+<TGConnectingPoint num="20" id="5762" />
+<TGConnectingPoint num="21" id="5763" />
+<TGConnectingPoint num="22" id="5764" />
+<TGConnectingPoint num="23" id="5765" />
+<TGConnectingPoint num="24" id="5766" />
+<TGConnectingPoint num="25" id="5767" />
+<TGConnectingPoint num="26" id="5768" />
+<TGConnectingPoint num="27" id="5769" />
+<TGConnectingPoint num="28" id="5770" />
+<TGConnectingPoint num="29" id="5771" />
+<TGConnectingPoint num="30" id="5772" />
+<TGConnectingPoint num="31" id="5773" />
+<TGConnectingPoint num="32" id="5774" />
+<TGConnectingPoint num="33" id="5775" />
+<TGConnectingPoint num="34" id="5776" />
+<TGConnectingPoint num="35" id="5777" />
+<TGConnectingPoint num="36" id="5778" />
+<TGConnectingPoint num="37" id="5779" />
+<TGConnectingPoint num="38" id="5780" />
+<TGConnectingPoint num="39" id="5781" />
 <extraparam>
-<Line value="Create request message m1 to ask for public key of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4180" >
-<cdparam x="278" y="59" />
-<sizeparam width="308" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5823" >
+<cdparam x="189" y="687" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create m0: Send own certified public key to ECU2
-" />
-<TGConnectingPoint num="0" id="4172" />
-<TGConnectingPoint num="1" id="4173" />
-<TGConnectingPoint num="2" id="4174" />
-<TGConnectingPoint num="3" id="4175" />
-<TGConnectingPoint num="4" id="4176" />
-<TGConnectingPoint num="5" id="4177" />
-<TGConnectingPoint num="6" id="4178" />
-<TGConnectingPoint num="7" id="4179" />
+<infoparam name="state1" value="Testts1" />
+<TGConnectingPoint num="0" id="5783" />
+<TGConnectingPoint num="1" id="5784" />
+<TGConnectingPoint num="2" id="5785" />
+<TGConnectingPoint num="3" id="5786" />
+<TGConnectingPoint num="4" id="5787" />
+<TGConnectingPoint num="5" id="5788" />
+<TGConnectingPoint num="6" id="5789" />
+<TGConnectingPoint num="7" id="5790" />
+<TGConnectingPoint num="8" id="5791" />
+<TGConnectingPoint num="9" id="5792" />
+<TGConnectingPoint num="10" id="5793" />
+<TGConnectingPoint num="11" id="5794" />
+<TGConnectingPoint num="12" id="5795" />
+<TGConnectingPoint num="13" id="5796" />
+<TGConnectingPoint num="14" id="5797" />
+<TGConnectingPoint num="15" id="5798" />
+<TGConnectingPoint num="16" id="5799" />
+<TGConnectingPoint num="17" id="5800" />
+<TGConnectingPoint num="18" id="5801" />
+<TGConnectingPoint num="19" id="5802" />
+<TGConnectingPoint num="20" id="5803" />
+<TGConnectingPoint num="21" id="5804" />
+<TGConnectingPoint num="22" id="5805" />
+<TGConnectingPoint num="23" id="5806" />
+<TGConnectingPoint num="24" id="5807" />
+<TGConnectingPoint num="25" id="5808" />
+<TGConnectingPoint num="26" id="5809" />
+<TGConnectingPoint num="27" id="5810" />
+<TGConnectingPoint num="28" id="5811" />
+<TGConnectingPoint num="29" id="5812" />
+<TGConnectingPoint num="30" id="5813" />
+<TGConnectingPoint num="31" id="5814" />
+<TGConnectingPoint num="32" id="5815" />
+<TGConnectingPoint num="33" id="5816" />
+<TGConnectingPoint num="34" id="5817" />
+<TGConnectingPoint num="35" id="5818" />
+<TGConnectingPoint num="36" id="5819" />
+<TGConnectingPoint num="37" id="5820" />
+<TGConnectingPoint num="38" id="5821" />
+<TGConnectingPoint num="39" id="5822" />
 <extraparam>
-<Line value="Create m0: Send own certified public key to ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4221" >
-<cdparam x="112" y="699" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="5834" >
+<cdparam x="214" y="629" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts2" />
-<TGConnectingPoint num="0" id="4181" />
-<TGConnectingPoint num="1" id="4182" />
-<TGConnectingPoint num="2" id="4183" />
-<TGConnectingPoint num="3" id="4184" />
-<TGConnectingPoint num="4" id="4185" />
-<TGConnectingPoint num="5" id="4186" />
-<TGConnectingPoint num="6" id="4187" />
-<TGConnectingPoint num="7" id="4188" />
-<TGConnectingPoint num="8" id="4189" />
-<TGConnectingPoint num="9" id="4190" />
-<TGConnectingPoint num="10" id="4191" />
-<TGConnectingPoint num="11" id="4192" />
-<TGConnectingPoint num="12" id="4193" />
-<TGConnectingPoint num="13" id="4194" />
-<TGConnectingPoint num="14" id="4195" />
-<TGConnectingPoint num="15" id="4196" />
-<TGConnectingPoint num="16" id="4197" />
-<TGConnectingPoint num="17" id="4198" />
-<TGConnectingPoint num="18" id="4199" />
-<TGConnectingPoint num="19" id="4200" />
-<TGConnectingPoint num="20" id="4201" />
-<TGConnectingPoint num="21" id="4202" />
-<TGConnectingPoint num="22" id="4203" />
-<TGConnectingPoint num="23" id="4204" />
-<TGConnectingPoint num="24" id="4205" />
-<TGConnectingPoint num="25" id="4206" />
-<TGConnectingPoint num="26" id="4207" />
-<TGConnectingPoint num="27" id="4208" />
-<TGConnectingPoint num="28" id="4209" />
-<TGConnectingPoint num="29" id="4210" />
-<TGConnectingPoint num="30" id="4211" />
-<TGConnectingPoint num="31" id="4212" />
-<TGConnectingPoint num="32" id="4213" />
-<TGConnectingPoint num="33" id="4214" />
-<TGConnectingPoint num="34" id="4215" />
-<TGConnectingPoint num="35" id="4216" />
-<TGConnectingPoint num="36" id="4217" />
-<TGConnectingPoint num="37" id="4218" />
-<TGConnectingPoint num="38" id="4219" />
-<TGConnectingPoint num="39" id="4220" />
+<infoparam name="Receive signal" value="chin(m1)" />
+<TGConnectingPoint num="0" id="5824" />
+<TGConnectingPoint num="1" id="5825" />
+<TGConnectingPoint num="2" id="5826" />
+<TGConnectingPoint num="3" id="5827" />
+<TGConnectingPoint num="4" id="5828" />
+<TGConnectingPoint num="5" id="5829" />
+<TGConnectingPoint num="6" id="5830" />
+<TGConnectingPoint num="7" id="5831" />
+<TGConnectingPoint num="8" id="5832" />
+<TGConnectingPoint num="9" id="5833" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5875" >
+<cdparam x="242" y="559" />
+<sizeparam width="118" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state1" value="WaitForMsg1" />
+<TGConnectingPoint num="0" id="5835" />
+<TGConnectingPoint num="1" id="5836" />
+<TGConnectingPoint num="2" id="5837" />
+<TGConnectingPoint num="3" id="5838" />
+<TGConnectingPoint num="4" id="5839" />
+<TGConnectingPoint num="5" id="5840" />
+<TGConnectingPoint num="6" id="5841" />
+<TGConnectingPoint num="7" id="5842" />
+<TGConnectingPoint num="8" id="5843" />
+<TGConnectingPoint num="9" id="5844" />
+<TGConnectingPoint num="10" id="5845" />
+<TGConnectingPoint num="11" id="5846" />
+<TGConnectingPoint num="12" id="5847" />
+<TGConnectingPoint num="13" id="5848" />
+<TGConnectingPoint num="14" id="5849" />
+<TGConnectingPoint num="15" id="5850" />
+<TGConnectingPoint num="16" id="5851" />
+<TGConnectingPoint num="17" id="5852" />
+<TGConnectingPoint num="18" id="5853" />
+<TGConnectingPoint num="19" id="5854" />
+<TGConnectingPoint num="20" id="5855" />
+<TGConnectingPoint num="21" id="5856" />
+<TGConnectingPoint num="22" id="5857" />
+<TGConnectingPoint num="23" id="5858" />
+<TGConnectingPoint num="24" id="5859" />
+<TGConnectingPoint num="25" id="5860" />
+<TGConnectingPoint num="26" id="5861" />
+<TGConnectingPoint num="27" id="5862" />
+<TGConnectingPoint num="28" id="5863" />
+<TGConnectingPoint num="29" id="5864" />
+<TGConnectingPoint num="30" id="5865" />
+<TGConnectingPoint num="31" id="5866" />
+<TGConnectingPoint num="32" id="5867" />
+<TGConnectingPoint num="33" id="5868" />
+<TGConnectingPoint num="34" id="5869" />
+<TGConnectingPoint num="35" id="5870" />
+<TGConnectingPoint num="36" id="5871" />
+<TGConnectingPoint num="37" id="5872" />
+<TGConnectingPoint num="38" id="5873" />
+<TGConnectingPoint num="39" id="5874" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4232" >
-<cdparam x="49" y="621" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="4222" />
-<TGConnectingPoint num="1" id="4223" />
-<TGConnectingPoint num="2" id="4224" />
-<TGConnectingPoint num="3" id="4225" />
-<TGConnectingPoint num="4" id="4226" />
-<TGConnectingPoint num="5" id="4227" />
-<TGConnectingPoint num="6" id="4228" />
-<TGConnectingPoint num="7" id="4229" />
-<TGConnectingPoint num="8" id="4230" />
-<TGConnectingPoint num="9" id="4231" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4273" >
-<cdparam x="27" y="550" />
+<COMPONENT type="5106" id="5916" >
+<cdparam x="18" y="560" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg2" />
-<TGConnectingPoint num="0" id="4233" />
-<TGConnectingPoint num="1" id="4234" />
-<TGConnectingPoint num="2" id="4235" />
-<TGConnectingPoint num="3" id="4236" />
-<TGConnectingPoint num="4" id="4237" />
-<TGConnectingPoint num="5" id="4238" />
-<TGConnectingPoint num="6" id="4239" />
-<TGConnectingPoint num="7" id="4240" />
-<TGConnectingPoint num="8" id="4241" />
-<TGConnectingPoint num="9" id="4242" />
-<TGConnectingPoint num="10" id="4243" />
-<TGConnectingPoint num="11" id="4244" />
-<TGConnectingPoint num="12" id="4245" />
-<TGConnectingPoint num="13" id="4246" />
-<TGConnectingPoint num="14" id="4247" />
-<TGConnectingPoint num="15" id="4248" />
-<TGConnectingPoint num="16" id="4249" />
-<TGConnectingPoint num="17" id="4250" />
-<TGConnectingPoint num="18" id="4251" />
-<TGConnectingPoint num="19" id="4252" />
-<TGConnectingPoint num="20" id="4253" />
-<TGConnectingPoint num="21" id="4254" />
-<TGConnectingPoint num="22" id="4255" />
-<TGConnectingPoint num="23" id="4256" />
-<TGConnectingPoint num="24" id="4257" />
-<TGConnectingPoint num="25" id="4258" />
-<TGConnectingPoint num="26" id="4259" />
-<TGConnectingPoint num="27" id="4260" />
-<TGConnectingPoint num="28" id="4261" />
-<TGConnectingPoint num="29" id="4262" />
-<TGConnectingPoint num="30" id="4263" />
-<TGConnectingPoint num="31" id="4264" />
-<TGConnectingPoint num="32" id="4265" />
-<TGConnectingPoint num="33" id="4266" />
-<TGConnectingPoint num="34" id="4267" />
-<TGConnectingPoint num="35" id="4268" />
-<TGConnectingPoint num="36" id="4269" />
-<TGConnectingPoint num="37" id="4270" />
-<TGConnectingPoint num="38" id="4271" />
-<TGConnectingPoint num="39" id="4272" />
+<infoparam name="state0" value="InvalidSig0" />
+<TGConnectingPoint num="0" id="5876" />
+<TGConnectingPoint num="1" id="5877" />
+<TGConnectingPoint num="2" id="5878" />
+<TGConnectingPoint num="3" id="5879" />
+<TGConnectingPoint num="4" id="5880" />
+<TGConnectingPoint num="5" id="5881" />
+<TGConnectingPoint num="6" id="5882" />
+<TGConnectingPoint num="7" id="5883" />
+<TGConnectingPoint num="8" id="5884" />
+<TGConnectingPoint num="9" id="5885" />
+<TGConnectingPoint num="10" id="5886" />
+<TGConnectingPoint num="11" id="5887" />
+<TGConnectingPoint num="12" id="5888" />
+<TGConnectingPoint num="13" id="5889" />
+<TGConnectingPoint num="14" id="5890" />
+<TGConnectingPoint num="15" id="5891" />
+<TGConnectingPoint num="16" id="5892" />
+<TGConnectingPoint num="17" id="5893" />
+<TGConnectingPoint num="18" id="5894" />
+<TGConnectingPoint num="19" id="5895" />
+<TGConnectingPoint num="20" id="5896" />
+<TGConnectingPoint num="21" id="5897" />
+<TGConnectingPoint num="22" id="5898" />
+<TGConnectingPoint num="23" id="5899" />
+<TGConnectingPoint num="24" id="5900" />
+<TGConnectingPoint num="25" id="5901" />
+<TGConnectingPoint num="26" id="5902" />
+<TGConnectingPoint num="27" id="5903" />
+<TGConnectingPoint num="28" id="5904" />
+<TGConnectingPoint num="29" id="5905" />
+<TGConnectingPoint num="30" id="5906" />
+<TGConnectingPoint num="31" id="5907" />
+<TGConnectingPoint num="32" id="5908" />
+<TGConnectingPoint num="33" id="5909" />
+<TGConnectingPoint num="34" id="5910" />
+<TGConnectingPoint num="35" id="5911" />
+<TGConnectingPoint num="36" id="5912" />
+<TGConnectingPoint num="37" id="5913" />
+<TGConnectingPoint num="38" id="5914" />
+<TGConnectingPoint num="39" id="5915" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="4284" >
-<cdparam x="57" y="508" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5957" >
+<cdparam x="240" y="479" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="4274" />
-<TGConnectingPoint num="1" id="4275" />
-<TGConnectingPoint num="2" id="4276" />
-<TGConnectingPoint num="3" id="4277" />
-<TGConnectingPoint num="4" id="4278" />
-<TGConnectingPoint num="5" id="4279" />
-<TGConnectingPoint num="6" id="4280" />
-<TGConnectingPoint num="7" id="4281" />
-<TGConnectingPoint num="8" id="4282" />
-<TGConnectingPoint num="9" id="4283" />
+<infoparam name="state1" value="VerifySig0" />
+<TGConnectingPoint num="0" id="5917" />
+<TGConnectingPoint num="1" id="5918" />
+<TGConnectingPoint num="2" id="5919" />
+<TGConnectingPoint num="3" id="5920" />
+<TGConnectingPoint num="4" id="5921" />
+<TGConnectingPoint num="5" id="5922" />
+<TGConnectingPoint num="6" id="5923" />
+<TGConnectingPoint num="7" id="5924" />
+<TGConnectingPoint num="8" id="5925" />
+<TGConnectingPoint num="9" id="5926" />
+<TGConnectingPoint num="10" id="5927" />
+<TGConnectingPoint num="11" id="5928" />
+<TGConnectingPoint num="12" id="5929" />
+<TGConnectingPoint num="13" id="5930" />
+<TGConnectingPoint num="14" id="5931" />
+<TGConnectingPoint num="15" id="5932" />
+<TGConnectingPoint num="16" id="5933" />
+<TGConnectingPoint num="17" id="5934" />
+<TGConnectingPoint num="18" id="5935" />
+<TGConnectingPoint num="19" id="5936" />
+<TGConnectingPoint num="20" id="5937" />
+<TGConnectingPoint num="21" id="5938" />
+<TGConnectingPoint num="22" id="5939" />
+<TGConnectingPoint num="23" id="5940" />
+<TGConnectingPoint num="24" id="5941" />
+<TGConnectingPoint num="25" id="5942" />
+<TGConnectingPoint num="26" id="5943" />
+<TGConnectingPoint num="27" id="5944" />
+<TGConnectingPoint num="28" id="5945" />
+<TGConnectingPoint num="29" id="5946" />
+<TGConnectingPoint num="30" id="5947" />
+<TGConnectingPoint num="31" id="5948" />
+<TGConnectingPoint num="32" id="5949" />
+<TGConnectingPoint num="33" id="5950" />
+<TGConnectingPoint num="34" id="5951" />
+<TGConnectingPoint num="35" id="5952" />
+<TGConnectingPoint num="36" id="5953" />
+<TGConnectingPoint num="37" id="5954" />
+<TGConnectingPoint num="38" id="5955" />
+<TGConnectingPoint num="39" id="5956" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4325" >
-<cdparam x="35" y="436" />
+<COMPONENT type="5106" id="5998" >
+<cdparam x="122" y="395" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg1" />
-<TGConnectingPoint num="0" id="4285" />
-<TGConnectingPoint num="1" id="4286" />
-<TGConnectingPoint num="2" id="4287" />
-<TGConnectingPoint num="3" id="4288" />
-<TGConnectingPoint num="4" id="4289" />
-<TGConnectingPoint num="5" id="4290" />
-<TGConnectingPoint num="6" id="4291" />
-<TGConnectingPoint num="7" id="4292" />
-<TGConnectingPoint num="8" id="4293" />
-<TGConnectingPoint num="9" id="4294" />
-<TGConnectingPoint num="10" id="4295" />
-<TGConnectingPoint num="11" id="4296" />
-<TGConnectingPoint num="12" id="4297" />
-<TGConnectingPoint num="13" id="4298" />
-<TGConnectingPoint num="14" id="4299" />
-<TGConnectingPoint num="15" id="4300" />
-<TGConnectingPoint num="16" id="4301" />
-<TGConnectingPoint num="17" id="4302" />
-<TGConnectingPoint num="18" id="4303" />
-<TGConnectingPoint num="19" id="4304" />
-<TGConnectingPoint num="20" id="4305" />
-<TGConnectingPoint num="21" id="4306" />
-<TGConnectingPoint num="22" id="4307" />
-<TGConnectingPoint num="23" id="4308" />
-<TGConnectingPoint num="24" id="4309" />
-<TGConnectingPoint num="25" id="4310" />
-<TGConnectingPoint num="26" id="4311" />
-<TGConnectingPoint num="27" id="4312" />
-<TGConnectingPoint num="28" id="4313" />
-<TGConnectingPoint num="29" id="4314" />
-<TGConnectingPoint num="30" id="4315" />
-<TGConnectingPoint num="31" id="4316" />
-<TGConnectingPoint num="32" id="4317" />
-<TGConnectingPoint num="33" id="4318" />
-<TGConnectingPoint num="34" id="4319" />
-<TGConnectingPoint num="35" id="4320" />
-<TGConnectingPoint num="36" id="4321" />
-<TGConnectingPoint num="37" id="4322" />
-<TGConnectingPoint num="38" id="4323" />
-<TGConnectingPoint num="39" id="4324" />
+<infoparam name="state0" value="InvalidCert0" />
+<TGConnectingPoint num="0" id="5958" />
+<TGConnectingPoint num="1" id="5959" />
+<TGConnectingPoint num="2" id="5960" />
+<TGConnectingPoint num="3" id="5961" />
+<TGConnectingPoint num="4" id="5962" />
+<TGConnectingPoint num="5" id="5963" />
+<TGConnectingPoint num="6" id="5964" />
+<TGConnectingPoint num="7" id="5965" />
+<TGConnectingPoint num="8" id="5966" />
+<TGConnectingPoint num="9" id="5967" />
+<TGConnectingPoint num="10" id="5968" />
+<TGConnectingPoint num="11" id="5969" />
+<TGConnectingPoint num="12" id="5970" />
+<TGConnectingPoint num="13" id="5971" />
+<TGConnectingPoint num="14" id="5972" />
+<TGConnectingPoint num="15" id="5973" />
+<TGConnectingPoint num="16" id="5974" />
+<TGConnectingPoint num="17" id="5975" />
+<TGConnectingPoint num="18" id="5976" />
+<TGConnectingPoint num="19" id="5977" />
+<TGConnectingPoint num="20" id="5978" />
+<TGConnectingPoint num="21" id="5979" />
+<TGConnectingPoint num="22" id="5980" />
+<TGConnectingPoint num="23" id="5981" />
+<TGConnectingPoint num="24" id="5982" />
+<TGConnectingPoint num="25" id="5983" />
+<TGConnectingPoint num="26" id="5984" />
+<TGConnectingPoint num="27" id="5985" />
+<TGConnectingPoint num="28" id="5986" />
+<TGConnectingPoint num="29" id="5987" />
+<TGConnectingPoint num="30" id="5988" />
+<TGConnectingPoint num="31" id="5989" />
+<TGConnectingPoint num="32" id="5990" />
+<TGConnectingPoint num="33" id="5991" />
+<TGConnectingPoint num="34" id="5992" />
+<TGConnectingPoint num="35" id="5993" />
+<TGConnectingPoint num="36" id="5994" />
+<TGConnectingPoint num="37" id="5995" />
+<TGConnectingPoint num="38" id="5996" />
+<TGConnectingPoint num="39" id="5997" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="4336" >
-<cdparam x="103" y="277" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6039" >
+<cdparam x="228" y="288" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m0)" />
-<TGConnectingPoint num="0" id="4326" />
-<TGConnectingPoint num="1" id="4327" />
-<TGConnectingPoint num="2" id="4328" />
-<TGConnectingPoint num="3" id="4329" />
-<TGConnectingPoint num="4" id="4330" />
-<TGConnectingPoint num="5" id="4331" />
-<TGConnectingPoint num="6" id="4332" />
-<TGConnectingPoint num="7" id="4333" />
-<TGConnectingPoint num="8" id="4334" />
-<TGConnectingPoint num="9" id="4335" />
+<infoparam name="state1" value="VerifyCert0" />
+<TGConnectingPoint num="0" id="5999" />
+<TGConnectingPoint num="1" id="6000" />
+<TGConnectingPoint num="2" id="6001" />
+<TGConnectingPoint num="3" id="6002" />
+<TGConnectingPoint num="4" id="6003" />
+<TGConnectingPoint num="5" id="6004" />
+<TGConnectingPoint num="6" id="6005" />
+<TGConnectingPoint num="7" id="6006" />
+<TGConnectingPoint num="8" id="6007" />
+<TGConnectingPoint num="9" id="6008" />
+<TGConnectingPoint num="10" id="6009" />
+<TGConnectingPoint num="11" id="6010" />
+<TGConnectingPoint num="12" id="6011" />
+<TGConnectingPoint num="13" id="6012" />
+<TGConnectingPoint num="14" id="6013" />
+<TGConnectingPoint num="15" id="6014" />
+<TGConnectingPoint num="16" id="6015" />
+<TGConnectingPoint num="17" id="6016" />
+<TGConnectingPoint num="18" id="6017" />
+<TGConnectingPoint num="19" id="6018" />
+<TGConnectingPoint num="20" id="6019" />
+<TGConnectingPoint num="21" id="6020" />
+<TGConnectingPoint num="22" id="6021" />
+<TGConnectingPoint num="23" id="6022" />
+<TGConnectingPoint num="24" id="6023" />
+<TGConnectingPoint num="25" id="6024" />
+<TGConnectingPoint num="26" id="6025" />
+<TGConnectingPoint num="27" id="6026" />
+<TGConnectingPoint num="28" id="6027" />
+<TGConnectingPoint num="29" id="6028" />
+<TGConnectingPoint num="30" id="6029" />
+<TGConnectingPoint num="31" id="6030" />
+<TGConnectingPoint num="32" id="6031" />
+<TGConnectingPoint num="33" id="6032" />
+<TGConnectingPoint num="34" id="6033" />
+<TGConnectingPoint num="35" id="6034" />
+<TGConnectingPoint num="36" id="6035" />
+<TGConnectingPoint num="37" id="6036" />
+<TGConnectingPoint num="38" id="6037" />
+<TGConnectingPoint num="39" id="6038" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4377" >
-<cdparam x="64" y="321" />
-<sizeparam width="90" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6080" >
+<cdparam x="33" y="314" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg1" />
-<TGConnectingPoint num="0" id="4337" />
-<TGConnectingPoint num="1" id="4338" />
-<TGConnectingPoint num="2" id="4339" />
-<TGConnectingPoint num="3" id="4340" />
-<TGConnectingPoint num="4" id="4341" />
-<TGConnectingPoint num="5" id="4342" />
-<TGConnectingPoint num="6" id="4343" />
-<TGConnectingPoint num="7" id="4344" />
-<TGConnectingPoint num="8" id="4345" />
-<TGConnectingPoint num="9" id="4346" />
-<TGConnectingPoint num="10" id="4347" />
-<TGConnectingPoint num="11" id="4348" />
-<TGConnectingPoint num="12" id="4349" />
-<TGConnectingPoint num="13" id="4350" />
-<TGConnectingPoint num="14" id="4351" />
-<TGConnectingPoint num="15" id="4352" />
-<TGConnectingPoint num="16" id="4353" />
-<TGConnectingPoint num="17" id="4354" />
-<TGConnectingPoint num="18" id="4355" />
-<TGConnectingPoint num="19" id="4356" />
-<TGConnectingPoint num="20" id="4357" />
-<TGConnectingPoint num="21" id="4358" />
-<TGConnectingPoint num="22" id="4359" />
-<TGConnectingPoint num="23" id="4360" />
-<TGConnectingPoint num="24" id="4361" />
-<TGConnectingPoint num="25" id="4362" />
-<TGConnectingPoint num="26" id="4363" />
-<TGConnectingPoint num="27" id="4364" />
-<TGConnectingPoint num="28" id="4365" />
-<TGConnectingPoint num="29" id="4366" />
-<TGConnectingPoint num="30" id="4367" />
-<TGConnectingPoint num="31" id="4368" />
-<TGConnectingPoint num="32" id="4369" />
-<TGConnectingPoint num="33" id="4370" />
-<TGConnectingPoint num="34" id="4371" />
-<TGConnectingPoint num="35" id="4372" />
-<TGConnectingPoint num="36" id="4373" />
-<TGConnectingPoint num="37" id="4374" />
-<TGConnectingPoint num="38" id="4375" />
-<TGConnectingPoint num="39" id="4376" />
+<infoparam name="state0" value="Invalidts0" />
+<TGConnectingPoint num="0" id="6040" />
+<TGConnectingPoint num="1" id="6041" />
+<TGConnectingPoint num="2" id="6042" />
+<TGConnectingPoint num="3" id="6043" />
+<TGConnectingPoint num="4" id="6044" />
+<TGConnectingPoint num="5" id="6045" />
+<TGConnectingPoint num="6" id="6046" />
+<TGConnectingPoint num="7" id="6047" />
+<TGConnectingPoint num="8" id="6048" />
+<TGConnectingPoint num="9" id="6049" />
+<TGConnectingPoint num="10" id="6050" />
+<TGConnectingPoint num="11" id="6051" />
+<TGConnectingPoint num="12" id="6052" />
+<TGConnectingPoint num="13" id="6053" />
+<TGConnectingPoint num="14" id="6054" />
+<TGConnectingPoint num="15" id="6055" />
+<TGConnectingPoint num="16" id="6056" />
+<TGConnectingPoint num="17" id="6057" />
+<TGConnectingPoint num="18" id="6058" />
+<TGConnectingPoint num="19" id="6059" />
+<TGConnectingPoint num="20" id="6060" />
+<TGConnectingPoint num="21" id="6061" />
+<TGConnectingPoint num="22" id="6062" />
+<TGConnectingPoint num="23" id="6063" />
+<TGConnectingPoint num="24" id="6064" />
+<TGConnectingPoint num="25" id="6065" />
+<TGConnectingPoint num="26" id="6066" />
+<TGConnectingPoint num="27" id="6067" />
+<TGConnectingPoint num="28" id="6068" />
+<TGConnectingPoint num="29" id="6069" />
+<TGConnectingPoint num="30" id="6070" />
+<TGConnectingPoint num="31" id="6071" />
+<TGConnectingPoint num="32" id="6072" />
+<TGConnectingPoint num="33" id="6073" />
+<TGConnectingPoint num="34" id="6074" />
+<TGConnectingPoint num="35" id="6075" />
+<TGConnectingPoint num="36" id="6076" />
+<TGConnectingPoint num="37" id="6077" />
+<TGConnectingPoint num="38" id="6078" />
+<TGConnectingPoint num="39" id="6079" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4418" >
-<cdparam x="46" y="205" />
-<sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6121" >
+<cdparam x="49" y="183" />
+<sizeparam width="182" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg0" />
-<TGConnectingPoint num="0" id="4378" />
-<TGConnectingPoint num="1" id="4379" />
-<TGConnectingPoint num="2" id="4380" />
-<TGConnectingPoint num="3" id="4381" />
-<TGConnectingPoint num="4" id="4382" />
-<TGConnectingPoint num="5" id="4383" />
-<TGConnectingPoint num="6" id="4384" />
-<TGConnectingPoint num="7" id="4385" />
-<TGConnectingPoint num="8" id="4386" />
-<TGConnectingPoint num="9" id="4387" />
-<TGConnectingPoint num="10" id="4388" />
-<TGConnectingPoint num="11" id="4389" />
-<TGConnectingPoint num="12" id="4390" />
-<TGConnectingPoint num="13" id="4391" />
-<TGConnectingPoint num="14" id="4392" />
-<TGConnectingPoint num="15" id="4393" />
-<TGConnectingPoint num="16" id="4394" />
-<TGConnectingPoint num="17" id="4395" />
-<TGConnectingPoint num="18" id="4396" />
-<TGConnectingPoint num="19" id="4397" />
-<TGConnectingPoint num="20" id="4398" />
-<TGConnectingPoint num="21" id="4399" />
-<TGConnectingPoint num="22" id="4400" />
-<TGConnectingPoint num="23" id="4401" />
-<TGConnectingPoint num="24" id="4402" />
-<TGConnectingPoint num="25" id="4403" />
-<TGConnectingPoint num="26" id="4404" />
-<TGConnectingPoint num="27" id="4405" />
-<TGConnectingPoint num="28" id="4406" />
-<TGConnectingPoint num="29" id="4407" />
-<TGConnectingPoint num="30" id="4408" />
-<TGConnectingPoint num="31" id="4409" />
-<TGConnectingPoint num="32" id="4410" />
-<TGConnectingPoint num="33" id="4411" />
-<TGConnectingPoint num="34" id="4412" />
-<TGConnectingPoint num="35" id="4413" />
-<TGConnectingPoint num="36" id="4414" />
-<TGConnectingPoint num="37" id="4415" />
-<TGConnectingPoint num="38" id="4416" />
-<TGConnectingPoint num="39" id="4417" />
+<infoparam name="state0" value="Testts0" />
+<TGConnectingPoint num="0" id="6081" />
+<TGConnectingPoint num="1" id="6082" />
+<TGConnectingPoint num="2" id="6083" />
+<TGConnectingPoint num="3" id="6084" />
+<TGConnectingPoint num="4" id="6085" />
+<TGConnectingPoint num="5" id="6086" />
+<TGConnectingPoint num="6" id="6087" />
+<TGConnectingPoint num="7" id="6088" />
+<TGConnectingPoint num="8" id="6089" />
+<TGConnectingPoint num="9" id="6090" />
+<TGConnectingPoint num="10" id="6091" />
+<TGConnectingPoint num="11" id="6092" />
+<TGConnectingPoint num="12" id="6093" />
+<TGConnectingPoint num="13" id="6094" />
+<TGConnectingPoint num="14" id="6095" />
+<TGConnectingPoint num="15" id="6096" />
+<TGConnectingPoint num="16" id="6097" />
+<TGConnectingPoint num="17" id="6098" />
+<TGConnectingPoint num="18" id="6099" />
+<TGConnectingPoint num="19" id="6100" />
+<TGConnectingPoint num="20" id="6101" />
+<TGConnectingPoint num="21" id="6102" />
+<TGConnectingPoint num="22" id="6103" />
+<TGConnectingPoint num="23" id="6104" />
+<TGConnectingPoint num="24" id="6105" />
+<TGConnectingPoint num="25" id="6106" />
+<TGConnectingPoint num="26" id="6107" />
+<TGConnectingPoint num="27" id="6108" />
+<TGConnectingPoint num="28" id="6109" />
+<TGConnectingPoint num="29" id="6110" />
+<TGConnectingPoint num="30" id="6111" />
+<TGConnectingPoint num="31" id="6112" />
+<TGConnectingPoint num="32" id="6113" />
+<TGConnectingPoint num="33" id="6114" />
+<TGConnectingPoint num="34" id="6115" />
+<TGConnectingPoint num="35" id="6116" />
+<TGConnectingPoint num="36" id="6117" />
+<TGConnectingPoint num="37" id="6118" />
+<TGConnectingPoint num="38" id="6119" />
+<TGConnectingPoint num="39" id="6120" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4459" >
-<cdparam x="39" y="65" />
-<sizeparam width="98" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="6132" >
+<cdparam x="104" y="126" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="Receive signal" value="chin(m0)" />
+<TGConnectingPoint num="0" id="6122" />
+<TGConnectingPoint num="1" id="6123" />
+<TGConnectingPoint num="2" id="6124" />
+<TGConnectingPoint num="3" id="6125" />
+<TGConnectingPoint num="4" id="6126" />
+<TGConnectingPoint num="5" id="6127" />
+<TGConnectingPoint num="6" id="6128" />
+<TGConnectingPoint num="7" id="6129" />
+<TGConnectingPoint num="8" id="6130" />
+<TGConnectingPoint num="9" id="6131" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="6173" >
+<cdparam x="50" y="58" />
+<sizeparam width="181" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg0" />
-<TGConnectingPoint num="0" id="4419" />
-<TGConnectingPoint num="1" id="4420" />
-<TGConnectingPoint num="2" id="4421" />
-<TGConnectingPoint num="3" id="4422" />
-<TGConnectingPoint num="4" id="4423" />
-<TGConnectingPoint num="5" id="4424" />
-<TGConnectingPoint num="6" id="4425" />
-<TGConnectingPoint num="7" id="4426" />
-<TGConnectingPoint num="8" id="4427" />
-<TGConnectingPoint num="9" id="4428" />
-<TGConnectingPoint num="10" id="4429" />
-<TGConnectingPoint num="11" id="4430" />
-<TGConnectingPoint num="12" id="4431" />
-<TGConnectingPoint num="13" id="4432" />
-<TGConnectingPoint num="14" id="4433" />
-<TGConnectingPoint num="15" id="4434" />
-<TGConnectingPoint num="16" id="4435" />
-<TGConnectingPoint num="17" id="4436" />
-<TGConnectingPoint num="18" id="4437" />
-<TGConnectingPoint num="19" id="4438" />
-<TGConnectingPoint num="20" id="4439" />
-<TGConnectingPoint num="21" id="4440" />
-<TGConnectingPoint num="22" id="4441" />
-<TGConnectingPoint num="23" id="4442" />
-<TGConnectingPoint num="24" id="4443" />
-<TGConnectingPoint num="25" id="4444" />
-<TGConnectingPoint num="26" id="4445" />
-<TGConnectingPoint num="27" id="4446" />
-<TGConnectingPoint num="28" id="4447" />
-<TGConnectingPoint num="29" id="4448" />
-<TGConnectingPoint num="30" id="4449" />
-<TGConnectingPoint num="31" id="4450" />
-<TGConnectingPoint num="32" id="4451" />
-<TGConnectingPoint num="33" id="4452" />
-<TGConnectingPoint num="34" id="4453" />
-<TGConnectingPoint num="35" id="4454" />
-<TGConnectingPoint num="36" id="4455" />
-<TGConnectingPoint num="37" id="4456" />
-<TGConnectingPoint num="38" id="4457" />
-<TGConnectingPoint num="39" id="4458" />
+<infoparam name="state0" value="WaitForMsg0" />
+<TGConnectingPoint num="0" id="6133" />
+<TGConnectingPoint num="1" id="6134" />
+<TGConnectingPoint num="2" id="6135" />
+<TGConnectingPoint num="3" id="6136" />
+<TGConnectingPoint num="4" id="6137" />
+<TGConnectingPoint num="5" id="6138" />
+<TGConnectingPoint num="6" id="6139" />
+<TGConnectingPoint num="7" id="6140" />
+<TGConnectingPoint num="8" id="6141" />
+<TGConnectingPoint num="9" id="6142" />
+<TGConnectingPoint num="10" id="6143" />
+<TGConnectingPoint num="11" id="6144" />
+<TGConnectingPoint num="12" id="6145" />
+<TGConnectingPoint num="13" id="6146" />
+<TGConnectingPoint num="14" id="6147" />
+<TGConnectingPoint num="15" id="6148" />
+<TGConnectingPoint num="16" id="6149" />
+<TGConnectingPoint num="17" id="6150" />
+<TGConnectingPoint num="18" id="6151" />
+<TGConnectingPoint num="19" id="6152" />
+<TGConnectingPoint num="20" id="6153" />
+<TGConnectingPoint num="21" id="6154" />
+<TGConnectingPoint num="22" id="6155" />
+<TGConnectingPoint num="23" id="6156" />
+<TGConnectingPoint num="24" id="6157" />
+<TGConnectingPoint num="25" id="6158" />
+<TGConnectingPoint num="26" id="6159" />
+<TGConnectingPoint num="27" id="6160" />
+<TGConnectingPoint num="28" id="6161" />
+<TGConnectingPoint num="29" id="6162" />
+<TGConnectingPoint num="30" id="6163" />
+<TGConnectingPoint num="31" id="6164" />
+<TGConnectingPoint num="32" id="6165" />
+<TGConnectingPoint num="33" id="6166" />
+<TGConnectingPoint num="34" id="6167" />
+<TGConnectingPoint num="35" id="6168" />
+<TGConnectingPoint num="36" id="6169" />
+<TGConnectingPoint num="37" id="6170" />
+<TGConnectingPoint num="38" id="6171" />
+<TGConnectingPoint num="39" id="6172" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="4461" >
-<cdparam x="67" y="27" />
+<COMPONENT type="5100" id="6175" >
+<cdparam x="133" y="25" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4460" />
+<TGConnectingPoint num="0" id="6174" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECU2" minX="10" maxX="1400" minY="10" maxY="2900" >
-<CONNECTOR type="118" id="4462" >
-<cdparam x="692" y="1924" />
+<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="2900" >
+<CONNECTOR type="118" id="2824" >
+<cdparam x="741" y="2090" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="692" y="1924" id="5052" />
-<P2  x="590" y="1936" id="5094" />
+<P1  x="741" y="2080" id="3391" />
+<P2  x="630" y="2102" id="3433" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4463" >
-<cdparam x="556" y="1263" />
+<CONNECTOR type="118" id="2825" >
+<cdparam x="729" y="1796" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="556" y="1263" id="5370" />
-<P2  x="475" y="1272" id="5412" />
+<P1  x="729" y="1786" id="3493" />
+<P2  x="643" y="1806" id="3535" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4470" >
-<cdparam x="434" y="1028" />
+<CONNECTOR type="118" id="2826" >
+<cdparam x="557" y="1335" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4469" />
-<P1  x="434" y="1028" id="5502" />
-<P2  x="429" y="1137" id="5429" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4468" >
-<father id="4470" num="0" />
-<cdparam x="436" y="1050" />
-<sizeparam width="168" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4464" />
-<TGConnectingPoint num="1" id="4465" />
-<TGConnectingPoint num="2" id="4466" />
-<TGConnectingPoint num="3" id="4467" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="tmp1 = sign(idk2pk,mvksk)" />
-<actions value="tmp2 = cert(idk2pk,tmp1)" />
-<actions value="tmp3.data = ts2" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk2sk)" />
-<actions value="m2 = concat2(tmp4,tmp5)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="118" id="4471" >
-<cdparam x="546" y="1000" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="557" y="1325" id="3800" />
+<P2  x="449" y="1349" id="3842" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<CONNECTOR type="118" id="2827" >
+<cdparam x="526" y="1036" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="546" y="1000" id="5472" />
-<P2  x="484" y="1003" id="5532" />
+<P1  x="526" y="1026" id="3902" />
+<P2  x="438" y="1044" id="3944" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4472" >
-<cdparam x="453" y="572" />
+<CONNECTOR type="118" id="2828" >
+<cdparam x="266" y="570" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state1" value="null" />
-<P1  x="453" y="572" id="5481" />
-<P2  x="360" y="584" id="5871" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="266" y="560" id="4157" />
+<P2  x="127" y="575" id="4269" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4473" >
-<cdparam x="231" y="83" />
+<CONNECTOR type="118" id="2829" >
+<cdparam x="334" y="333" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to UML Note" value="null" />
-<P1  x="231" y="83" id="6169" />
-<P2  x="272" y="83" id="5490" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="277" y="325" id="4166" />
+<P2  x="154" y="346" id="4373" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4480" >
-<cdparam x="277" y="445" />
+<CONNECTOR type="118" id="2830" >
+<cdparam x="175" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4479" />
-<P1  x="302" y="434" id="5756" />
-<P2  x="302" y="479" id="5935" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4478" >
-<father id="4480" num="0" />
-<cdparam x="314" y="453" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4474" />
-<TGConnectingPoint num="1" id="4475" />
-<TGConnectingPoint num="2" id="4476" />
-<TGConnectingPoint num="3" id="4477" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="idk1Pk = getpk(tmp2)" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4487" >
-<cdparam x="447" y="71" />
+<infoparam name="connector from state0 to UML Note" value="null" />
+<P1  x="137" y="90" id="4455" />
+<P2  x="278" y="66" id="4175" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<CONNECTOR type="5102" id="2837" >
+<cdparam x="428" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4486" />
-<P1  x="140" y="45" id="6174" />
-<P2  x="140" y="58" id="6134" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2836" />
+<P1  x="88" y="115" id="4425" />
+<P2  x="103" y="205" id="4379" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4485" >
-<father id="4487" num="0" />
-<cdparam x="447" y="111" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2835" >
+<father id="2837" num="0" />
+<cdparam x="123" y="126" />
+<sizeparam width="179" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4481" />
-<TGConnectingPoint num="1" id="4482" />
-<TGConnectingPoint num="2" id="4483" />
-<TGConnectingPoint num="3" id="4484" />
+<TGConnectingPoint num="0" id="2831" />
+<TGConnectingPoint num="1" id="2832" />
+<TGConnectingPoint num="2" id="2833" />
+<TGConnectingPoint num="3" id="2834" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1 = sign(idk1pk, mvksk)" />
+<actions value="tmp2 = cert(idk1pk, tmp1)" />
+<actions value="tmp3.data = ts0" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m0 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4494" >
-<cdparam x="447" y="158" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4493" />
-<P1  x="140" y="108" id="6139" />
-<P2  x="140" y="121" id="6122" />
+<CONNECTOR type="5102" id="2844" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2843" />
+<P1  x="74" y="47" id="4460" />
+<P2  x="75" y="65" id="4436" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4492" >
-<father id="4494" num="0" />
-<cdparam x="447" y="198" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2842" >
+<father id="2844" num="0" />
+<cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4488" />
-<TGConnectingPoint num="1" id="4489" />
-<TGConnectingPoint num="2" id="4490" />
-<TGConnectingPoint num="3" id="4491" />
+<TGConnectingPoint num="0" id="2838" />
+<TGConnectingPoint num="1" id="2839" />
+<TGConnectingPoint num="2" id="2840" />
+<TGConnectingPoint num="3" id="2841" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7729,57 +7455,55 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4501" >
-<cdparam x="451" y="236" />
+<CONNECTOR type="5102" id="2851" >
+<cdparam x="451" y="341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4500" />
-<P1  x="140" y="151" id="6123" />
-<P2  x="140" y="183" id="6082" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2850" />
+<P1  x="116" y="255" id="4408" />
+<P2  x="137" y="272" id="4326" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4499" >
-<father id="4501" num="0" />
-<cdparam x="187" y="157" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2849" >
+<father id="2851" num="0" />
+<cdparam x="451" y="381" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4495" />
-<TGConnectingPoint num="1" id="4496" />
-<TGConnectingPoint num="2" id="4497" />
-<TGConnectingPoint num="3" id="4498" />
+<TGConnectingPoint num="0" id="2845" />
+<TGConnectingPoint num="1" id="2846" />
+<TGConnectingPoint num="2" id="2847" />
+<TGConnectingPoint num="3" id="2848" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m0, tmp4, tmp5)" />
-<actions value="get2(tmp4, tmp2, tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4508" >
-<cdparam x="95" y="304" />
+<CONNECTOR type="5102" id="2858" >
+<cdparam x="445" y="417" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4507" />
-<P1  x="94" y="233" id="6095" />
-<P2  x="95" y="314" id="6058" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2857" />
+<P1  x="137" y="302" id="4327" />
+<P2  x="119" y="321" id="4355" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4506" >
-<father id="4508" num="0" />
-<cdparam x="25" y="274" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2856" >
+<father id="2858" num="0" />
+<cdparam x="445" y="457" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4502" />
-<TGConnectingPoint num="1" id="4503" />
-<TGConnectingPoint num="2" id="4504" />
-<TGConnectingPoint num="3" id="4505" />
+<TGConnectingPoint num="0" id="2852" />
+<TGConnectingPoint num="1" id="2853" />
+<TGConnectingPoint num="2" id="2854" />
+<TGConnectingPoint num="3" id="2855" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts0) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7787,56 +7511,61 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4515" >
-<cdparam x="232" y="304" />
+<CONNECTOR type="5102" id="2865" >
+<cdparam x="146" y="365" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state1" value="null" />
-<TGConnectingPoint num="0" id="4514" />
-<P1  x="231" y="233" id="6088" />
-<P2  x="253" y="288" id="6007" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2864" />
+<P1  x="119" y="371" id="4367" />
+<P2  x="85" y="436" id="4286" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4513" >
-<father id="4515" num="0" />
-<cdparam x="246" y="255" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2863" >
+<father id="2865" num="0" />
+<cdparam x="141" y="390" />
+<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4509" />
-<TGConnectingPoint num="1" id="4510" />
-<TGConnectingPoint num="2" id="4511" />
-<TGConnectingPoint num="3" id="4512" />
+<TGConnectingPoint num="0" id="2859" />
+<TGConnectingPoint num="1" id="2860" />
+<TGConnectingPoint num="2" id="2861" />
+<TGConnectingPoint num="3" id="2862" />
 <extraparam>
-<guard value="[ tmp3.data == ts0 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyCert(tmp2,mvkpk)" />
+<actions value="tmp1.data = rpk" />
+<actions value="tmp2.data = ecu2id" />
+<actions value="tmp3.data = ts1" />
+<actions value="tmp4 = concat3(tmp1,tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m1 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4522" >
-<cdparam x="231" y="423" />
+<CONNECTOR type="5102" id="2872" >
+<cdparam x="97" y="486" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4521" />
-<P1  x="240" y="338" id="6027" />
-<P2  x="184" y="395" id="5976" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2871" />
+<P1  x="97" y="486" id="4315" />
+<P2  x="91" y="503" id="4274" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4520" >
-<father id="4522" num="0" />
-<cdparam x="146" y="380" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2870" >
+<father id="2872" num="0" />
+<cdparam x="97" y="526" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4516" />
-<TGConnectingPoint num="1" id="4517" />
-<TGConnectingPoint num="2" id="4518" />
-<TGConnectingPoint num="3" id="4519" />
+<TGConnectingPoint num="0" id="2866" />
+<TGConnectingPoint num="1" id="2867" />
+<TGConnectingPoint num="2" id="2868" />
+<TGConnectingPoint num="3" id="2869" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7844,27 +7573,27 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4529" >
-<cdparam x="331" y="423" />
+<CONNECTOR type="5102" id="2879" >
+<cdparam x="91" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4528" />
-<P1  x="290" y="338" id="6029" />
-<P2  x="302" y="384" id="5750" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2878" />
+<P1  x="91" y="533" id="4275" />
+<P2  x="52" y="550" id="4241" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4527" >
-<father id="4529" num="0" />
-<cdparam x="306" y="367" />
-<sizeparam width="167" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2877" >
+<father id="2879" num="0" />
+<cdparam x="91" y="573" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4523" />
-<TGConnectingPoint num="1" id="4524" />
-<TGConnectingPoint num="2" id="4525" />
-<TGConnectingPoint num="3" id="4526" />
+<TGConnectingPoint num="0" id="2873" />
+<TGConnectingPoint num="1" id="2874" />
+<TGConnectingPoint num="2" id="2875" />
+<TGConnectingPoint num="3" id="2876" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7872,27 +7601,27 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4536" >
-<cdparam x="243" y="476" />
+<CONNECTOR type="5102" id="2886" >
+<cdparam x="89" y="600" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4535" />
-<P1  x="240" y="529" id="5922" />
-<P2  x="118" y="560" id="5878" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="2885" />
+<P1  x="89" y="600" id="4263" />
+<P2  x="83" y="616" id="4222" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4534" >
-<father id="4536" num="0" />
-<cdparam x="96" y="536" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2884" >
+<father id="2886" num="0" />
+<cdparam x="89" y="640" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4530" />
-<TGConnectingPoint num="1" id="4531" />
-<TGConnectingPoint num="2" id="4532" />
-<TGConnectingPoint num="3" id="4533" />
+<TGConnectingPoint num="0" id="2880" />
+<TGConnectingPoint num="1" id="2881" />
+<TGConnectingPoint num="2" id="2882" />
+<TGConnectingPoint num="3" id="2883" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7900,55 +7629,57 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4543" >
-<cdparam x="343" y="476" />
+<CONNECTOR type="5102" id="2893" >
+<cdparam x="83" y="646" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4542" />
-<P1  x="315" y="529" id="5932" />
-<P2  x="271" y="559" id="5843" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2892" />
+<P1  x="83" y="646" id="4223" />
+<P2  x="124" y="699" id="4197" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4541" >
-<father id="4543" num="0" />
-<cdparam x="270" y="544" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2891" >
+<father id="2893" num="0" />
+<cdparam x="114" y="662" />
+<sizeparam width="143" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4537" />
-<TGConnectingPoint num="1" id="4538" />
-<TGConnectingPoint num="2" id="4539" />
-<TGConnectingPoint num="3" id="4540" />
+<TGConnectingPoint num="0" id="2887" />
+<TGConnectingPoint num="1" id="2888" />
+<TGConnectingPoint num="2" id="2889" />
+<TGConnectingPoint num="3" id="2890" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m2,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4550" >
-<cdparam x="317" y="568" />
+<CONNECTOR type="5102" id="2900" >
+<cdparam x="112" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4549" />
-<P1  x="315" y="609" id="5865" />
-<P2  x="250" y="624" id="5824" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2899" />
+<P1  x="112" y="749" id="4186" />
+<P2  x="89" y="809" id="4131" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4548" >
-<father id="4550" num="0" />
-<cdparam x="303" y="638" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2898" >
+<father id="2900" num="0" />
+<cdparam x="12" y="775" />
+<sizeparam width="158" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4544" />
-<TGConnectingPoint num="1" id="4545" />
-<TGConnectingPoint num="2" id="4546" />
-<TGConnectingPoint num="3" id="4547" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2894" />
+<TGConnectingPoint num="1" id="2895" />
+<TGConnectingPoint num="2" id="2896" />
+<TGConnectingPoint num="3" id="2897" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp3.data == ts2)]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7956,57 +7687,56 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4557" >
-<cdparam x="313" y="621" />
+<CONNECTOR type="5102" id="2907" >
+<cdparam x="212" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state1" value="null" />
-<TGConnectingPoint num="0" id="4556" />
-<P1  x="250" y="654" id="5825" />
-<P2  x="201" y="687" id="5799" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2906" />
+<P1  x="212" y="749" id="4188" />
+<P2  x="198" y="809" id="4072" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4555" >
-<father id="4557" num="0" />
-<cdparam x="271" y="666" />
-<sizeparam width="170" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2905" >
+<father id="2907" num="0" />
+<cdparam x="212" y="777" />
+<sizeparam width="169" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4551" />
-<TGConnectingPoint num="1" id="4552" />
-<TGConnectingPoint num="2" id="4553" />
-<TGConnectingPoint num="3" id="4554" />
+<TGConnectingPoint num="0" id="2901" />
+<TGConnectingPoint num="1" id="2902" />
+<TGConnectingPoint num="2" id="2903" />
+<TGConnectingPoint num="3" id="2904" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp3.data == ts2 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m1,tmp4,tmp5)" />
-<actions value="get3(tmp4,tmp1,tmp2,tmp3)" />
+<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4564" >
-<cdparam x="189" y="737" />
+<CONNECTOR type="5102" id="2914" >
+<cdparam x="198" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4563" />
-<P1  x="201" y="737" id="5811" />
-<P2  x="163" y="778" id="5703" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2913" />
+<P1  x="198" y="859" id="4077" />
+<P2  x="149" y="914" id="4032" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4562" >
-<father id="4564" num="0" />
-<cdparam x="34" y="748" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2912" >
+<father id="2914" num="0" />
+<cdparam x="111" y="886" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4558" />
-<TGConnectingPoint num="1" id="4559" />
-<TGConnectingPoint num="2" id="4560" />
-<TGConnectingPoint num="3" id="4561" />
+<TGConnectingPoint num="0" id="2908" />
+<TGConnectingPoint num="1" id="2909" />
+<TGConnectingPoint num="2" id="2910" />
+<TGConnectingPoint num="3" id="2911" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts1) ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8014,54 +7744,55 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4571" >
-<cdparam x="289" y="737" />
+<CONNECTOR type="5102" id="2921" >
+<cdparam x="298" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4570" />
-<P1  x="264" y="737" id="5798" />
-<P2  x="292" y="778" id="5668" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2920" />
+<P1  x="298" y="859" id="4079" />
+<P2  x="290" y="914" id="4006" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4569" >
-<father id="4571" num="0" />
-<cdparam x="288" y="752" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2919" >
+<father id="2921" num="0" />
+<cdparam x="303" y="873" />
+<sizeparam width="208" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4565" />
-<TGConnectingPoint num="1" id="4566" />
-<TGConnectingPoint num="2" id="4567" />
-<TGConnectingPoint num="3" id="4568" />
+<TGConnectingPoint num="0" id="2915" />
+<TGConnectingPoint num="1" id="2916" />
+<TGConnectingPoint num="2" id="2917" />
+<TGConnectingPoint num="3" id="2918" />
 <extraparam>
-<guard value="[ tmp3.data == ts1 ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
+<actions value="idk2Pk = getpk(tmp2)" />
+<actions value="b = verifySign(tmp4,tmp5,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4578" >
-<cdparam x="267" y="828" />
+<CONNECTOR type="5102" id="2928" >
+<cdparam x="199" y="964" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4577" />
-<P1  x="279" y="828" id="5688" />
-<P2  x="249" y="877" id="5621" />
+<TGConnectingPoint num="0" id="2927" />
+<P1  x="278" y="964" id="3995" />
+<P2  x="185" y="1019" id="3957" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4576" >
-<father id="4578" num="0" />
-<cdparam x="187" y="850" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2926" >
+<father id="2928" num="0" />
+<cdparam x="169" y="993" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4572" />
-<TGConnectingPoint num="1" id="4573" />
-<TGConnectingPoint num="2" id="4574" />
-<TGConnectingPoint num="3" id="4575" />
+<TGConnectingPoint num="0" id="2922" />
+<TGConnectingPoint num="1" id="2923" />
+<TGConnectingPoint num="2" id="2924" />
+<TGConnectingPoint num="3" id="2925" />
 <extraparam>
 <guard value="[ not(b) ]" />
 <afterMin value="" />
@@ -8071,25 +7802,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4585" >
-<cdparam x="367" y="828" />
+<CONNECTOR type="5102" id="2935" >
+<cdparam x="378" y="964" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4584" />
-<P1  x="342" y="828" id="5675" />
-<P2  x="354" y="880" id="5586" />
+<TGConnectingPoint num="0" id="2934" />
+<P1  x="378" y="964" id="3997" />
+<P2  x="388" y="1019" id="3909" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4583" >
-<father id="4585" num="0" />
-<cdparam x="368" y="850" />
-<sizeparam width="198" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2933" >
+<father id="2935" num="0" />
+<cdparam x="388" y="985" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4579" />
-<TGConnectingPoint num="1" id="4580" />
-<TGConnectingPoint num="2" id="4581" />
-<TGConnectingPoint num="3" id="4582" />
+<TGConnectingPoint num="0" id="2929" />
+<TGConnectingPoint num="1" id="2930" />
+<TGConnectingPoint num="2" id="2931" />
+<TGConnectingPoint num="3" id="2932" />
 <extraparam>
 <guard value="[ b ]" />
 <afterMin value="" />
@@ -8099,55 +7830,61 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4592" >
-<cdparam x="329" y="930" />
+<CONNECTOR type="5102" id="2942" >
+<cdparam x="425" y="1069" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4591" />
-<P1  x="341" y="930" id="5606" />
-<P2  x="290" y="980" id="5556" />
+<TGConnectingPoint num="0" id="2941" />
+<P1  x="388" y="1069" id="3914" />
+<P2  x="385" y="1185" id="3859" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4590" >
-<father id="4592" num="0" />
-<cdparam x="159" y="957" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2940" >
+<father id="2942" num="0" />
+<cdparam x="402" y="1087" />
+<sizeparam width="192" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4586" />
-<TGConnectingPoint num="1" id="4587" />
-<TGConnectingPoint num="2" id="4588" />
-<TGConnectingPoint num="3" id="4589" />
+<TGConnectingPoint num="0" id="2936" />
+<TGConnectingPoint num="1" id="2937" />
+<TGConnectingPoint num="2" id="2938" />
+<TGConnectingPoint num="3" id="2939" />
 <extraparam>
-<guard value="[ not(tmp1.data == rpk) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = SesK.data" />
+<actions value="tmp2 = aencrypt(tmp1,idk2Pk)" />
+<actions value="tmp3.data = ts3" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m3 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4599" >
-<cdparam x="429" y="930" />
+<CONNECTOR type="5102" id="2949" >
+<cdparam x="397" y="1235" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4598" />
-<P1  x="404" y="930" id="5593" />
-<P2  x="434" y="978" id="5497" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2948" />
+<P1  x="397" y="1235" id="3888" />
+<P2  x="392" y="1257" id="3847" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4597" >
-<father id="4599" num="0" />
-<cdparam x="443" y="958" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2947" >
+<father id="2949" num="0" />
+<cdparam x="397" y="1275" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4593" />
-<TGConnectingPoint num="1" id="4594" />
-<TGConnectingPoint num="2" id="4595" />
-<TGConnectingPoint num="3" id="4596" />
+<TGConnectingPoint num="0" id="2943" />
+<TGConnectingPoint num="1" id="2944" />
+<TGConnectingPoint num="2" id="2945" />
+<TGConnectingPoint num="3" id="2946" />
 <extraparam>
-<guard value="[ tmp1.data == rpk ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8155,25 +7892,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4606" >
-<cdparam x="429" y="1187" />
+<CONNECTOR type="5102" id="2956" >
+<cdparam x="392" y="1287" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4605" />
-<P1  x="429" y="1187" id="5434" />
-<P2  x="434" y="1192" id="5417" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2955" />
+<P1  x="392" y="1287" id="3848" />
+<P2  x="399" y="1324" id="3807" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4604" >
-<father id="4606" num="0" />
-<cdparam x="429" y="1227" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2954" >
+<father id="2956" num="0" />
+<cdparam x="408" y="1300" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4600" />
-<TGConnectingPoint num="1" id="4601" />
-<TGConnectingPoint num="2" id="4602" />
-<TGConnectingPoint num="3" id="4603" />
+<TGConnectingPoint num="0" id="2950" />
+<TGConnectingPoint num="1" id="2951" />
+<TGConnectingPoint num="2" id="2952" />
+<TGConnectingPoint num="3" id="2953" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8183,25 +7920,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4613" >
-<cdparam x="434" y="1222" />
+<CONNECTOR type="5102" id="2963" >
+<cdparam x="386" y="1374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4612" />
-<P1  x="434" y="1222" id="5418" />
-<P2  x="412" y="1247" id="5393" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="2962" />
+<P1  x="386" y="1374" id="3835" />
+<P2  x="390" y="1405" id="3786" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4611" >
-<father id="4613" num="0" />
-<cdparam x="434" y="1262" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2961" >
+<father id="2963" num="0" />
+<cdparam x="386" y="1414" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4607" />
-<TGConnectingPoint num="1" id="4608" />
-<TGConnectingPoint num="2" id="4609" />
-<TGConnectingPoint num="3" id="4610" />
+<TGConnectingPoint num="0" id="2957" />
+<TGConnectingPoint num="1" id="2958" />
+<TGConnectingPoint num="2" id="2959" />
+<TGConnectingPoint num="3" id="2960" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8211,142 +7948,142 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4620" >
-<cdparam x="412" y="1297" />
+<CONNECTOR type="5102" id="2970" >
+<cdparam x="390" y="1435" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4619" />
-<P1  x="412" y="1297" id="5405" />
-<P2  x="412" y="1311" id="5356" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2969" />
+<P1  x="390" y="1435" id="3787" />
+<P2  x="400" y="1491" id="3746" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4618" >
-<father id="4620" num="0" />
-<cdparam x="412" y="1337" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2968" >
+<father id="2970" num="0" />
+<cdparam x="406" y="1456" />
+<sizeparam width="143" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4614" />
-<TGConnectingPoint num="1" id="4615" />
-<TGConnectingPoint num="2" id="4616" />
-<TGConnectingPoint num="3" id="4617" />
+<TGConnectingPoint num="0" id="2964" />
+<TGConnectingPoint num="1" id="2965" />
+<TGConnectingPoint num="2" id="2966" />
+<TGConnectingPoint num="3" id="2967" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m4,tmp3,tmp4)" />
+<actions value="get2(tmp3,tmp1,tmp2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4627" >
-<cdparam x="412" y="1341" />
+<CONNECTOR type="5102" id="2977" >
+<cdparam x="350" y="1541" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4626" />
-<P1  x="412" y="1341" id="5357" />
-<P2  x="406" y="1402" id="5316" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2976" />
+<P1  x="350" y="1541" id="3750" />
+<P2  x="327" y="1579" id="3706" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4625" >
-<father id="4627" num="0" />
-<cdparam x="420" y="1366" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2975" >
+<father id="2977" num="0" />
+<cdparam x="184" y="1554" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4621" />
-<TGConnectingPoint num="1" id="4622" />
-<TGConnectingPoint num="2" id="4623" />
-<TGConnectingPoint num="3" id="4624" />
+<TGConnectingPoint num="0" id="2971" />
+<TGConnectingPoint num="1" id="2972" />
+<TGConnectingPoint num="2" id="2973" />
+<TGConnectingPoint num="3" id="2974" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp2.data == ts4) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m3,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4634" >
-<cdparam x="356" y="1452" />
+<CONNECTOR type="5102" id="2984" >
+<cdparam x="450" y="1541" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4633" />
-<P1  x="368" y="1452" id="5343" />
-<P2  x="326" y="1507" id="5292" />
+<TGConnectingPoint num="0" id="2983" />
+<P1  x="450" y="1541" id="3752" />
+<P2  x="454" y="1583" id="3671" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4632" >
-<father id="4634" num="0" />
-<cdparam x="188" y="1471" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2982" >
+<father id="2984" num="0" />
+<cdparam x="459" y="1556" />
+<sizeparam width="208" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4628" />
-<TGConnectingPoint num="1" id="4629" />
-<TGConnectingPoint num="2" id="4630" />
-<TGConnectingPoint num="3" id="4631" />
+<TGConnectingPoint num="0" id="2978" />
+<TGConnectingPoint num="1" id="2979" />
+<TGConnectingPoint num="2" id="2980" />
+<TGConnectingPoint num="3" id="2981" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts3) ]" />
+<guard value="[ tmp2.data == ts4 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifySign(tmp3,tmp4,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4641" >
-<cdparam x="456" y="1452" />
+<CONNECTOR type="5102" id="2991" >
+<cdparam x="429" y="1633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4640" />
-<P1  x="431" y="1452" id="5330" />
-<P2  x="446" y="1506" id="5241" />
+<TGConnectingPoint num="0" id="2990" />
+<P1  x="429" y="1633" id="3668" />
+<P2  x="393" y="1673" id="3641" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4639" >
-<father id="4641" num="0" />
-<cdparam x="443" y="1474" />
-<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2989" >
+<father id="2991" num="0" />
+<cdparam x="346" y="1656" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4635" />
-<TGConnectingPoint num="1" id="4636" />
-<TGConnectingPoint num="2" id="4637" />
-<TGConnectingPoint num="3" id="4638" />
+<TGConnectingPoint num="0" id="2985" />
+<TGConnectingPoint num="1" id="2986" />
+<TGConnectingPoint num="2" id="2987" />
+<TGConnectingPoint num="3" id="2988" />
 <extraparam>
-<guard value="[ tmp3.data == ts3 ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4648" >
-<cdparam x="421" y="1565" />
+<CONNECTOR type="5102" id="2998" >
+<cdparam x="529" y="1633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4647" />
-<P1  x="433" y="1556" id="5261" />
-<P2  x="388" y="1623" id="5210" />
+<TGConnectingPoint num="0" id="2997" />
+<P1  x="529" y="1633" id="3670" />
+<P2  x="509" y="1674" id="3589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4646" >
-<father id="4648" num="0" />
-<cdparam x="348" y="1589" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2996" >
+<father id="2998" num="0" />
+<cdparam x="532" y="1649" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4642" />
-<TGConnectingPoint num="1" id="4643" />
-<TGConnectingPoint num="2" id="4644" />
-<TGConnectingPoint num="3" id="4645" />
+<TGConnectingPoint num="0" id="2992" />
+<TGConnectingPoint num="1" id="2993" />
+<TGConnectingPoint num="2" id="2994" />
+<TGConnectingPoint num="3" id="2995" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8354,115 +8091,115 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4655" >
-<cdparam x="521" y="1565" />
+<CONNECTOR type="5102" id="3005" >
+<cdparam x="406" y="1723" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4654" />
-<P1  x="496" y="1556" id="5248" />
-<P2  x="501" y="1625" id="5159" />
+<TGConnectingPoint num="0" id="3004" />
+<P1  x="484" y="1724" id="3586" />
+<P2  x="415" y="1780" id="3557" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4653" >
-<father id="4655" num="0" />
-<cdparam x="508" y="1597" />
-<sizeparam width="195" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3003" >
+<father id="3005" num="0" />
+<cdparam x="285" y="1756" />
+<sizeparam width="164" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4649" />
-<TGConnectingPoint num="1" id="4650" />
-<TGConnectingPoint num="2" id="4651" />
-<TGConnectingPoint num="3" id="4652" />
+<TGConnectingPoint num="0" id="2999" />
+<TGConnectingPoint num="1" id="3000" />
+<TGConnectingPoint num="2" id="3001" />
+<TGConnectingPoint num="3" id="3002" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(tmp1.data == ack) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sesk = adecrypt(tmp2,idk2sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4662" >
-<cdparam x="549" y="1687" />
+<CONNECTOR type="5102" id="3012" >
+<cdparam x="584" y="1724" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4661" />
-<P1  x="532" y="1675" id="5157" />
-<P2  x="533" y="1783" id="5111" />
+<TGConnectingPoint num="0" id="3011" />
+<P1  x="584" y="1724" id="3588" />
+<P2  x="580" y="1781" id="3516" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4660" >
-<father id="4662" num="0" />
-<cdparam x="550" y="1707" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3010" >
+<father id="3012" num="0" />
+<cdparam x="589" y="1756" />
+<sizeparam width="133" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4656" />
-<TGConnectingPoint num="1" id="4657" />
-<TGConnectingPoint num="2" id="4658" />
-<TGConnectingPoint num="3" id="4659" />
+<TGConnectingPoint num="0" id="3006" />
+<TGConnectingPoint num="1" id="3007" />
+<TGConnectingPoint num="2" id="3008" />
+<TGConnectingPoint num="3" id="3009" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp1.data == ack ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = ack" />
-<actions value="tmp2.data = ts4" />
-<actions value="tmp3 = concat2(tmp1,tmp2)" />
-<actions value="tmp4 = sign(tmp3,idk2sk)" />
-<actions value="m4 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4669" >
-<cdparam x="520" y="1833" />
+<CONNECTOR type="5102" id="3019" >
+<cdparam x="593" y="1831" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4668" />
-<P1  x="520" y="1833" id="5139" />
-<P2  x="519" y="1853" id="5099" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3018" />
+<P1  x="593" y="1831" id="3505" />
+<P2  x="583" y="1944" id="3450" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4667" >
-<father id="4669" num="0" />
-<cdparam x="520" y="1873" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3017" >
+<father id="3019" num="0" />
+<cdparam x="601" y="1856" />
+<sizeparam width="222" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4663" />
-<TGConnectingPoint num="1" id="4664" />
-<TGConnectingPoint num="2" id="4665" />
-<TGConnectingPoint num="3" id="4666" />
+<TGConnectingPoint num="0" id="3013" />
+<TGConnectingPoint num="1" id="3014" />
+<TGConnectingPoint num="2" id="3015" />
+<TGConnectingPoint num="3" id="3016" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = secretData" />
+<actions value="tmp2 = sencrypt(secretData, SesK)" />
+<actions value="tmp3.data = ts5" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = MAC(tmp4,SesK)" />
+<actions value="m5 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4676" >
-<cdparam x="519" y="1883" />
+<CONNECTOR type="5102" id="3026" >
+<cdparam x="595" y="1994" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4675" />
-<P1  x="519" y="1883" id="5100" />
-<P2  x="515" y="1911" id="5066" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3025" />
+<P1  x="583" y="1994" id="3455" />
+<P2  x="583" y="2015" id="3438" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4674" >
-<father id="4676" num="0" />
-<cdparam x="519" y="1923" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3024" >
+<father id="3026" num="0" />
+<cdparam x="595" y="2034" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4670" />
-<TGConnectingPoint num="1" id="4671" />
-<TGConnectingPoint num="2" id="4672" />
-<TGConnectingPoint num="3" id="4673" />
+<TGConnectingPoint num="0" id="3020" />
+<TGConnectingPoint num="1" id="3021" />
+<TGConnectingPoint num="2" id="3022" />
+<TGConnectingPoint num="3" id="3023" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8472,25 +8209,25 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4683" >
-<cdparam x="527" y="1961" />
+<CONNECTOR type="5102" id="3033" >
+<cdparam x="583" y="2045" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4682" />
-<P1  x="527" y="1961" id="5087" />
-<P2  x="531" y="1989" id="5038" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3032" />
+<P1  x="583" y="2045" id="3439" />
+<P2  x="580" y="2077" id="3398" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4681" >
-<father id="4683" num="0" />
-<cdparam x="527" y="2001" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3031" >
+<father id="3033" num="0" />
+<cdparam x="583" y="2085" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4677" />
-<TGConnectingPoint num="1" id="4678" />
-<TGConnectingPoint num="2" id="4679" />
-<TGConnectingPoint num="3" id="4680" />
+<TGConnectingPoint num="0" id="3027" />
+<TGConnectingPoint num="1" id="3028" />
+<TGConnectingPoint num="2" id="3029" />
+<TGConnectingPoint num="3" id="3030" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8500,204 +8237,198 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4690" >
-<cdparam x="531" y="2019" />
+<CONNECTOR type="5102" id="3040" >
+<cdparam x="567" y="2127" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4689" />
-<P1  x="531" y="2019" id="5039" />
-<P2  x="532" y="2073" id="4998" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="3039" />
+<P1  x="567" y="2127" id="3426" />
+<P2  x="566" y="2151" id="3377" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4688" >
-<father id="4690" num="0" />
-<cdparam x="540" y="2041" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3038" >
+<father id="3040" num="0" />
+<cdparam x="567" y="2167" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4684" />
-<TGConnectingPoint num="1" id="4685" />
-<TGConnectingPoint num="2" id="4686" />
-<TGConnectingPoint num="3" id="4687" />
+<TGConnectingPoint num="0" id="3034" />
+<TGConnectingPoint num="1" id="3035" />
+<TGConnectingPoint num="2" id="3036" />
+<TGConnectingPoint num="3" id="3037" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m5,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4697" >
-<cdparam x="494" y="2123" />
+<CONNECTOR type="5102" id="3047" >
+<cdparam x="566" y="2181" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4696" />
-<P1  x="494" y="2123" id="5025" />
-<P2  x="428" y="2165" id="4974" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3046" />
+<P1  x="566" y="2181" id="3378" />
+<P2  x="544" y="2227" id="3344" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4695" >
-<father id="4697" num="0" />
-<cdparam x="313" y="2141" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3045" >
+<father id="3047" num="0" />
+<cdparam x="569" y="2200" />
+<sizeparam width="143" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4691" />
-<TGConnectingPoint num="1" id="4692" />
-<TGConnectingPoint num="2" id="4693" />
-<TGConnectingPoint num="3" id="4694" />
+<TGConnectingPoint num="0" id="3041" />
+<TGConnectingPoint num="1" id="3042" />
+<TGConnectingPoint num="2" id="3043" />
+<TGConnectingPoint num="3" id="3044" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts5) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m6,tmp3,tmp4)" />
+<actions value="get2(tmp3,tmp1,tmp2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4704" >
-<cdparam x="582" y="2123" />
+<CONNECTOR type="5102" id="3054" >
+<cdparam x="519" y="2277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4703" />
-<P1  x="557" y="2123" id="5012" />
-<P2  x="578" y="2165" id="4932" />
+<TGConnectingPoint num="0" id="3053" />
+<P1  x="531" y="2277" id="3364" />
+<P2  x="497" y="2323" id="3297" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4702" >
-<father id="4704" num="0" />
-<cdparam x="590" y="2138" />
-<sizeparam width="187" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3052" >
+<father id="3054" num="0" />
+<cdparam x="358" y="2298" />
+<sizeparam width="162" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4698" />
-<TGConnectingPoint num="1" id="4699" />
-<TGConnectingPoint num="2" id="4700" />
-<TGConnectingPoint num="3" id="4701" />
+<TGConnectingPoint num="0" id="3048" />
+<TGConnectingPoint num="1" id="3049" />
+<TGConnectingPoint num="2" id="3050" />
+<TGConnectingPoint num="3" id="3051" />
 <extraparam>
-<guard value="[ tmp3.data == ts5 ]" />
+<guard value="[ not(tmp2.data == ts6) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(tmp4,tmp5,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4711" >
-<cdparam x="466" y="2215" />
+<CONNECTOR type="5102" id="3061" >
+<cdparam x="619" y="2277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4710" />
-<P1  x="553" y="2215" id="4943" />
-<P2  x="469" y="2265" id="4891" />
+<TGConnectingPoint num="0" id="3060" />
+<P1  x="594" y="2277" id="3351" />
+<P2  x="618" y="2321" id="3271" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4709" >
-<father id="4711" num="0" />
-<cdparam x="460" y="2238" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3059" >
+<father id="3061" num="0" />
+<cdparam x="616" y="2293" />
+<sizeparam width="196" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4705" />
-<TGConnectingPoint num="1" id="4706" />
-<TGConnectingPoint num="2" id="4707" />
-<TGConnectingPoint num="3" id="4708" />
+<TGConnectingPoint num="0" id="3055" />
+<TGConnectingPoint num="1" id="3056" />
+<TGConnectingPoint num="2" id="3057" />
+<TGConnectingPoint num="3" id="3058" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ tmp2.data == ts6 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifyMAC(tmp3,tmp4,SesK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4718" >
-<cdparam x="641" y="2215" />
+<CONNECTOR type="5102" id="3068" >
+<cdparam x="581" y="2371" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4717" />
-<P1  x="616" y="2215" id="4930" />
-<P2  x="650" y="2265" id="4841" />
+<TGConnectingPoint num="0" id="3067" />
+<P1  x="593" y="2371" id="3282" />
+<P2  x="540" y="2408" id="3214" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4716" >
-<father id="4718" num="0" />
-<cdparam x="638" y="2235" />
-<sizeparam width="151" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3066" >
+<father id="3068" num="0" />
+<cdparam x="506" y="2388" />
+<sizeparam width="57" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4712" />
-<TGConnectingPoint num="1" id="4713" />
-<TGConnectingPoint num="2" id="4714" />
-<TGConnectingPoint num="3" id="4715" />
+<TGConnectingPoint num="0" id="3062" />
+<TGConnectingPoint num="1" id="3063" />
+<TGConnectingPoint num="2" id="3064" />
+<TGConnectingPoint num="3" id="3065" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sd = sdecrypt(tmp2,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4725" >
-<cdparam x="695" y="2315" />
+<CONNECTOR type="5102" id="3075" >
+<cdparam x="681" y="2371" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4724" />
-<P1  x="681" y="2315" id="4839" />
-<P2  x="670" y="2407" id="4793" />
+<TGConnectingPoint num="0" id="3074" />
+<P1  x="656" y="2371" id="3269" />
+<P2  x="687" y="2408" id="3189" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4723" >
-<father id="4725" num="0" />
-<cdparam x="677" y="2337" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3073" >
+<father id="3075" num="0" />
+<cdparam x="693" y="2391" />
+<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4719" />
-<TGConnectingPoint num="1" id="4720" />
-<TGConnectingPoint num="2" id="4721" />
-<TGConnectingPoint num="3" id="4722" />
+<TGConnectingPoint num="0" id="3069" />
+<TGConnectingPoint num="1" id="3070" />
+<TGConnectingPoint num="2" id="3071" />
+<TGConnectingPoint num="3" id="3072" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = ack" />
-<actions value="tmp2.data = ts6" />
-<actions value="tmp3 = concat2(tmp1,tmp2)" />
-<actions value="tmp4 = MAC(tmp3,sesk)" />
-<actions value="m6 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4732" >
-<cdparam x="657" y="2457" />
+<CONNECTOR type="5102" id="3082" >
+<cdparam x="650" y="2458" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4731" />
-<P1  x="657" y="2457" id="4821" />
-<P2  x="660" y="2480" id="4781" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3081" />
+<P1  x="662" y="2458" id="3200" />
+<P2  x="604" y="2519" id="3140" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4730" >
-<father id="4732" num="0" />
-<cdparam x="657" y="2497" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3080" >
+<father id="3082" num="0" />
+<cdparam x="473" y="2491" />
+<sizeparam width="164" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4726" />
-<TGConnectingPoint num="1" id="4727" />
-<TGConnectingPoint num="2" id="4728" />
-<TGConnectingPoint num="3" id="4729" />
+<TGConnectingPoint num="0" id="3076" />
+<TGConnectingPoint num="1" id="3077" />
+<TGConnectingPoint num="2" id="3078" />
+<TGConnectingPoint num="3" id="3079" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp1.data == ack) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8705,27 +8436,27 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4739" >
-<cdparam x="660" y="2510" />
+<CONNECTOR type="5102" id="3089" >
+<cdparam x="750" y="2458" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4738" />
-<P1  x="660" y="2510" id="4782" />
-<P2  x="642" y="2537" id="4757" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4737" >
-<father id="4739" num="0" />
-<cdparam x="660" y="2550" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3088" />
+<P1  x="712" y="2458" id="3202" />
+<P2  x="726" y="2522" id="3106" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3087" >
+<father id="3089" num="0" />
+<cdparam x="725" y="2486" />
+<sizeparam width="133" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4733" />
-<TGConnectingPoint num="1" id="4734" />
-<TGConnectingPoint num="2" id="4735" />
-<TGConnectingPoint num="3" id="4736" />
+<TGConnectingPoint num="0" id="3083" />
+<TGConnectingPoint num="1" id="3084" />
+<TGConnectingPoint num="2" id="3085" />
+<TGConnectingPoint num="3" id="3086" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp1.data == ack ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8733,1839 +8464,1835 @@ key is deleted in case there is one.
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4780" >
-<cdparam x="595" y="2537" />
-<sizeparam width="128" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3130" >
+<cdparam x="711" y="2522" />
+<sizeparam width="131" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="state0" value="ProtocolRunEnded" />
-<TGConnectingPoint num="0" id="4740" />
-<TGConnectingPoint num="1" id="4741" />
-<TGConnectingPoint num="2" id="4742" />
-<TGConnectingPoint num="3" id="4743" />
-<TGConnectingPoint num="4" id="4744" />
-<TGConnectingPoint num="5" id="4745" />
-<TGConnectingPoint num="6" id="4746" />
-<TGConnectingPoint num="7" id="4747" />
-<TGConnectingPoint num="8" id="4748" />
-<TGConnectingPoint num="9" id="4749" />
-<TGConnectingPoint num="10" id="4750" />
-<TGConnectingPoint num="11" id="4751" />
-<TGConnectingPoint num="12" id="4752" />
-<TGConnectingPoint num="13" id="4753" />
-<TGConnectingPoint num="14" id="4754" />
-<TGConnectingPoint num="15" id="4755" />
-<TGConnectingPoint num="16" id="4756" />
-<TGConnectingPoint num="17" id="4757" />
-<TGConnectingPoint num="18" id="4758" />
-<TGConnectingPoint num="19" id="4759" />
-<TGConnectingPoint num="20" id="4760" />
-<TGConnectingPoint num="21" id="4761" />
-<TGConnectingPoint num="22" id="4762" />
-<TGConnectingPoint num="23" id="4763" />
-<TGConnectingPoint num="24" id="4764" />
-<TGConnectingPoint num="25" id="4765" />
-<TGConnectingPoint num="26" id="4766" />
-<TGConnectingPoint num="27" id="4767" />
-<TGConnectingPoint num="28" id="4768" />
-<TGConnectingPoint num="29" id="4769" />
-<TGConnectingPoint num="30" id="4770" />
-<TGConnectingPoint num="31" id="4771" />
-<TGConnectingPoint num="32" id="4772" />
-<TGConnectingPoint num="33" id="4773" />
-<TGConnectingPoint num="34" id="4774" />
-<TGConnectingPoint num="35" id="4775" />
-<TGConnectingPoint num="36" id="4776" />
-<TGConnectingPoint num="37" id="4777" />
-<TGConnectingPoint num="38" id="4778" />
-<TGConnectingPoint num="39" id="4779" />
+<TGConnectingPoint num="0" id="3090" />
+<TGConnectingPoint num="1" id="3091" />
+<TGConnectingPoint num="2" id="3092" />
+<TGConnectingPoint num="3" id="3093" />
+<TGConnectingPoint num="4" id="3094" />
+<TGConnectingPoint num="5" id="3095" />
+<TGConnectingPoint num="6" id="3096" />
+<TGConnectingPoint num="7" id="3097" />
+<TGConnectingPoint num="8" id="3098" />
+<TGConnectingPoint num="9" id="3099" />
+<TGConnectingPoint num="10" id="3100" />
+<TGConnectingPoint num="11" id="3101" />
+<TGConnectingPoint num="12" id="3102" />
+<TGConnectingPoint num="13" id="3103" />
+<TGConnectingPoint num="14" id="3104" />
+<TGConnectingPoint num="15" id="3105" />
+<TGConnectingPoint num="16" id="3106" />
+<TGConnectingPoint num="17" id="3107" />
+<TGConnectingPoint num="18" id="3108" />
+<TGConnectingPoint num="19" id="3109" />
+<TGConnectingPoint num="20" id="3110" />
+<TGConnectingPoint num="21" id="3111" />
+<TGConnectingPoint num="22" id="3112" />
+<TGConnectingPoint num="23" id="3113" />
+<TGConnectingPoint num="24" id="3114" />
+<TGConnectingPoint num="25" id="3115" />
+<TGConnectingPoint num="26" id="3116" />
+<TGConnectingPoint num="27" id="3117" />
+<TGConnectingPoint num="28" id="3118" />
+<TGConnectingPoint num="29" id="3119" />
+<TGConnectingPoint num="30" id="3120" />
+<TGConnectingPoint num="31" id="3121" />
+<TGConnectingPoint num="32" id="3122" />
+<TGConnectingPoint num="33" id="3123" />
+<TGConnectingPoint num="34" id="3124" />
+<TGConnectingPoint num="35" id="3125" />
+<TGConnectingPoint num="36" id="3126" />
+<TGConnectingPoint num="37" id="3127" />
+<TGConnectingPoint num="38" id="3128" />
+<TGConnectingPoint num="39" id="3129" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="4791" >
-<cdparam x="626" y="2485" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m6)" />
-<TGConnectingPoint num="0" id="4781" />
-<TGConnectingPoint num="1" id="4782" />
-<TGConnectingPoint num="2" id="4783" />
-<TGConnectingPoint num="3" id="4784" />
-<TGConnectingPoint num="4" id="4785" />
-<TGConnectingPoint num="5" id="4786" />
-<TGConnectingPoint num="6" id="4787" />
-<TGConnectingPoint num="7" id="4788" />
-<TGConnectingPoint num="8" id="4789" />
-<TGConnectingPoint num="9" id="4790" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4832" >
-<cdparam x="620" y="2407" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3171" >
+<cdparam x="514" y="2519" />
+<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg6" />
-<TGConnectingPoint num="0" id="4792" />
-<TGConnectingPoint num="1" id="4793" />
-<TGConnectingPoint num="2" id="4794" />
-<TGConnectingPoint num="3" id="4795" />
-<TGConnectingPoint num="4" id="4796" />
-<TGConnectingPoint num="5" id="4797" />
-<TGConnectingPoint num="6" id="4798" />
-<TGConnectingPoint num="7" id="4799" />
-<TGConnectingPoint num="8" id="4800" />
-<TGConnectingPoint num="9" id="4801" />
-<TGConnectingPoint num="10" id="4802" />
-<TGConnectingPoint num="11" id="4803" />
-<TGConnectingPoint num="12" id="4804" />
-<TGConnectingPoint num="13" id="4805" />
-<TGConnectingPoint num="14" id="4806" />
-<TGConnectingPoint num="15" id="4807" />
-<TGConnectingPoint num="16" id="4808" />
-<TGConnectingPoint num="17" id="4809" />
-<TGConnectingPoint num="18" id="4810" />
-<TGConnectingPoint num="19" id="4811" />
-<TGConnectingPoint num="20" id="4812" />
-<TGConnectingPoint num="21" id="4813" />
-<TGConnectingPoint num="22" id="4814" />
-<TGConnectingPoint num="23" id="4815" />
-<TGConnectingPoint num="24" id="4816" />
-<TGConnectingPoint num="25" id="4817" />
-<TGConnectingPoint num="26" id="4818" />
-<TGConnectingPoint num="27" id="4819" />
-<TGConnectingPoint num="28" id="4820" />
-<TGConnectingPoint num="29" id="4821" />
-<TGConnectingPoint num="30" id="4822" />
-<TGConnectingPoint num="31" id="4823" />
-<TGConnectingPoint num="32" id="4824" />
-<TGConnectingPoint num="33" id="4825" />
-<TGConnectingPoint num="34" id="4826" />
-<TGConnectingPoint num="35" id="4827" />
-<TGConnectingPoint num="36" id="4828" />
-<TGConnectingPoint num="37" id="4829" />
-<TGConnectingPoint num="38" id="4830" />
-<TGConnectingPoint num="39" id="4831" />
+<infoparam name="state0" value="UnexpectedMsg6" />
+<TGConnectingPoint num="0" id="3131" />
+<TGConnectingPoint num="1" id="3132" />
+<TGConnectingPoint num="2" id="3133" />
+<TGConnectingPoint num="3" id="3134" />
+<TGConnectingPoint num="4" id="3135" />
+<TGConnectingPoint num="5" id="3136" />
+<TGConnectingPoint num="6" id="3137" />
+<TGConnectingPoint num="7" id="3138" />
+<TGConnectingPoint num="8" id="3139" />
+<TGConnectingPoint num="9" id="3140" />
+<TGConnectingPoint num="10" id="3141" />
+<TGConnectingPoint num="11" id="3142" />
+<TGConnectingPoint num="12" id="3143" />
+<TGConnectingPoint num="13" id="3144" />
+<TGConnectingPoint num="14" id="3145" />
+<TGConnectingPoint num="15" id="3146" />
+<TGConnectingPoint num="16" id="3147" />
+<TGConnectingPoint num="17" id="3148" />
+<TGConnectingPoint num="18" id="3149" />
+<TGConnectingPoint num="19" id="3150" />
+<TGConnectingPoint num="20" id="3151" />
+<TGConnectingPoint num="21" id="3152" />
+<TGConnectingPoint num="22" id="3153" />
+<TGConnectingPoint num="23" id="3154" />
+<TGConnectingPoint num="24" id="3155" />
+<TGConnectingPoint num="25" id="3156" />
+<TGConnectingPoint num="26" id="3157" />
+<TGConnectingPoint num="27" id="3158" />
+<TGConnectingPoint num="28" id="3159" />
+<TGConnectingPoint num="29" id="3160" />
+<TGConnectingPoint num="30" id="3161" />
+<TGConnectingPoint num="31" id="3162" />
+<TGConnectingPoint num="32" id="3163" />
+<TGConnectingPoint num="33" id="3164" />
+<TGConnectingPoint num="34" id="3165" />
+<TGConnectingPoint num="35" id="3166" />
+<TGConnectingPoint num="36" id="3167" />
+<TGConnectingPoint num="37" id="3168" />
+<TGConnectingPoint num="38" id="3169" />
+<TGConnectingPoint num="39" id="3170" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4873" >
-<cdparam x="620" y="2265" />
-<sizeparam width="123" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3212" >
+<cdparam x="650" y="2408" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="4833" />
-<TGConnectingPoint num="1" id="4834" />
-<TGConnectingPoint num="2" id="4835" />
-<TGConnectingPoint num="3" id="4836" />
-<TGConnectingPoint num="4" id="4837" />
-<TGConnectingPoint num="5" id="4838" />
-<TGConnectingPoint num="6" id="4839" />
-<TGConnectingPoint num="7" id="4840" />
-<TGConnectingPoint num="8" id="4841" />
-<TGConnectingPoint num="9" id="4842" />
-<TGConnectingPoint num="10" id="4843" />
-<TGConnectingPoint num="11" id="4844" />
-<TGConnectingPoint num="12" id="4845" />
-<TGConnectingPoint num="13" id="4846" />
-<TGConnectingPoint num="14" id="4847" />
-<TGConnectingPoint num="15" id="4848" />
-<TGConnectingPoint num="16" id="4849" />
-<TGConnectingPoint num="17" id="4850" />
-<TGConnectingPoint num="18" id="4851" />
-<TGConnectingPoint num="19" id="4852" />
-<TGConnectingPoint num="20" id="4853" />
-<TGConnectingPoint num="21" id="4854" />
-<TGConnectingPoint num="22" id="4855" />
-<TGConnectingPoint num="23" id="4856" />
-<TGConnectingPoint num="24" id="4857" />
-<TGConnectingPoint num="25" id="4858" />
-<TGConnectingPoint num="26" id="4859" />
-<TGConnectingPoint num="27" id="4860" />
-<TGConnectingPoint num="28" id="4861" />
-<TGConnectingPoint num="29" id="4862" />
-<TGConnectingPoint num="30" id="4863" />
-<TGConnectingPoint num="31" id="4864" />
-<TGConnectingPoint num="32" id="4865" />
-<TGConnectingPoint num="33" id="4866" />
-<TGConnectingPoint num="34" id="4867" />
-<TGConnectingPoint num="35" id="4868" />
-<TGConnectingPoint num="36" id="4869" />
-<TGConnectingPoint num="37" id="4870" />
-<TGConnectingPoint num="38" id="4871" />
-<TGConnectingPoint num="39" id="4872" />
+<infoparam name="state0" value="Verifyack6" />
+<TGConnectingPoint num="0" id="3172" />
+<TGConnectingPoint num="1" id="3173" />
+<TGConnectingPoint num="2" id="3174" />
+<TGConnectingPoint num="3" id="3175" />
+<TGConnectingPoint num="4" id="3176" />
+<TGConnectingPoint num="5" id="3177" />
+<TGConnectingPoint num="6" id="3178" />
+<TGConnectingPoint num="7" id="3179" />
+<TGConnectingPoint num="8" id="3180" />
+<TGConnectingPoint num="9" id="3181" />
+<TGConnectingPoint num="10" id="3182" />
+<TGConnectingPoint num="11" id="3183" />
+<TGConnectingPoint num="12" id="3184" />
+<TGConnectingPoint num="13" id="3185" />
+<TGConnectingPoint num="14" id="3186" />
+<TGConnectingPoint num="15" id="3187" />
+<TGConnectingPoint num="16" id="3188" />
+<TGConnectingPoint num="17" id="3189" />
+<TGConnectingPoint num="18" id="3190" />
+<TGConnectingPoint num="19" id="3191" />
+<TGConnectingPoint num="20" id="3192" />
+<TGConnectingPoint num="21" id="3193" />
+<TGConnectingPoint num="22" id="3194" />
+<TGConnectingPoint num="23" id="3195" />
+<TGConnectingPoint num="24" id="3196" />
+<TGConnectingPoint num="25" id="3197" />
+<TGConnectingPoint num="26" id="3198" />
+<TGConnectingPoint num="27" id="3199" />
+<TGConnectingPoint num="28" id="3200" />
+<TGConnectingPoint num="29" id="3201" />
+<TGConnectingPoint num="30" id="3202" />
+<TGConnectingPoint num="31" id="3203" />
+<TGConnectingPoint num="32" id="3204" />
+<TGConnectingPoint num="33" id="3205" />
+<TGConnectingPoint num="34" id="3206" />
+<TGConnectingPoint num="35" id="3207" />
+<TGConnectingPoint num="36" id="3208" />
+<TGConnectingPoint num="37" id="3209" />
+<TGConnectingPoint num="38" id="3210" />
+<TGConnectingPoint num="39" id="3211" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4914" >
-<cdparam x="432" y="2265" />
+<COMPONENT type="5106" id="3253" >
+<cdparam x="490" y="2408" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidMAC5" />
-<TGConnectingPoint num="0" id="4874" />
-<TGConnectingPoint num="1" id="4875" />
-<TGConnectingPoint num="2" id="4876" />
-<TGConnectingPoint num="3" id="4877" />
-<TGConnectingPoint num="4" id="4878" />
-<TGConnectingPoint num="5" id="4879" />
-<TGConnectingPoint num="6" id="4880" />
-<TGConnectingPoint num="7" id="4881" />
-<TGConnectingPoint num="8" id="4882" />
-<TGConnectingPoint num="9" id="4883" />
-<TGConnectingPoint num="10" id="4884" />
-<TGConnectingPoint num="11" id="4885" />
-<TGConnectingPoint num="12" id="4886" />
-<TGConnectingPoint num="13" id="4887" />
-<TGConnectingPoint num="14" id="4888" />
-<TGConnectingPoint num="15" id="4889" />
-<TGConnectingPoint num="16" id="4890" />
-<TGConnectingPoint num="17" id="4891" />
-<TGConnectingPoint num="18" id="4892" />
-<TGConnectingPoint num="19" id="4893" />
-<TGConnectingPoint num="20" id="4894" />
-<TGConnectingPoint num="21" id="4895" />
-<TGConnectingPoint num="22" id="4896" />
-<TGConnectingPoint num="23" id="4897" />
-<TGConnectingPoint num="24" id="4898" />
-<TGConnectingPoint num="25" id="4899" />
-<TGConnectingPoint num="26" id="4900" />
-<TGConnectingPoint num="27" id="4901" />
-<TGConnectingPoint num="28" id="4902" />
-<TGConnectingPoint num="29" id="4903" />
-<TGConnectingPoint num="30" id="4904" />
-<TGConnectingPoint num="31" id="4905" />
-<TGConnectingPoint num="32" id="4906" />
-<TGConnectingPoint num="33" id="4907" />
-<TGConnectingPoint num="34" id="4908" />
-<TGConnectingPoint num="35" id="4909" />
-<TGConnectingPoint num="36" id="4910" />
-<TGConnectingPoint num="37" id="4911" />
-<TGConnectingPoint num="38" id="4912" />
-<TGConnectingPoint num="39" id="4913" />
+<infoparam name="state0" value="InvalidMAC6" />
+<TGConnectingPoint num="0" id="3213" />
+<TGConnectingPoint num="1" id="3214" />
+<TGConnectingPoint num="2" id="3215" />
+<TGConnectingPoint num="3" id="3216" />
+<TGConnectingPoint num="4" id="3217" />
+<TGConnectingPoint num="5" id="3218" />
+<TGConnectingPoint num="6" id="3219" />
+<TGConnectingPoint num="7" id="3220" />
+<TGConnectingPoint num="8" id="3221" />
+<TGConnectingPoint num="9" id="3222" />
+<TGConnectingPoint num="10" id="3223" />
+<TGConnectingPoint num="11" id="3224" />
+<TGConnectingPoint num="12" id="3225" />
+<TGConnectingPoint num="13" id="3226" />
+<TGConnectingPoint num="14" id="3227" />
+<TGConnectingPoint num="15" id="3228" />
+<TGConnectingPoint num="16" id="3229" />
+<TGConnectingPoint num="17" id="3230" />
+<TGConnectingPoint num="18" id="3231" />
+<TGConnectingPoint num="19" id="3232" />
+<TGConnectingPoint num="20" id="3233" />
+<TGConnectingPoint num="21" id="3234" />
+<TGConnectingPoint num="22" id="3235" />
+<TGConnectingPoint num="23" id="3236" />
+<TGConnectingPoint num="24" id="3237" />
+<TGConnectingPoint num="25" id="3238" />
+<TGConnectingPoint num="26" id="3239" />
+<TGConnectingPoint num="27" id="3240" />
+<TGConnectingPoint num="28" id="3241" />
+<TGConnectingPoint num="29" id="3242" />
+<TGConnectingPoint num="30" id="3243" />
+<TGConnectingPoint num="31" id="3244" />
+<TGConnectingPoint num="32" id="3245" />
+<TGConnectingPoint num="33" id="3246" />
+<TGConnectingPoint num="34" id="3247" />
+<TGConnectingPoint num="35" id="3248" />
+<TGConnectingPoint num="36" id="3249" />
+<TGConnectingPoint num="37" id="3250" />
+<TGConnectingPoint num="38" id="3251" />
+<TGConnectingPoint num="39" id="3252" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4955" >
-<cdparam x="541" y="2165" />
+<COMPONENT type="5106" id="3294" >
+<cdparam x="581" y="2321" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyMAC5" />
-<TGConnectingPoint num="0" id="4915" />
-<TGConnectingPoint num="1" id="4916" />
-<TGConnectingPoint num="2" id="4917" />
-<TGConnectingPoint num="3" id="4918" />
-<TGConnectingPoint num="4" id="4919" />
-<TGConnectingPoint num="5" id="4920" />
-<TGConnectingPoint num="6" id="4921" />
-<TGConnectingPoint num="7" id="4922" />
-<TGConnectingPoint num="8" id="4923" />
-<TGConnectingPoint num="9" id="4924" />
-<TGConnectingPoint num="10" id="4925" />
-<TGConnectingPoint num="11" id="4926" />
-<TGConnectingPoint num="12" id="4927" />
-<TGConnectingPoint num="13" id="4928" />
-<TGConnectingPoint num="14" id="4929" />
-<TGConnectingPoint num="15" id="4930" />
-<TGConnectingPoint num="16" id="4931" />
-<TGConnectingPoint num="17" id="4932" />
-<TGConnectingPoint num="18" id="4933" />
-<TGConnectingPoint num="19" id="4934" />
-<TGConnectingPoint num="20" id="4935" />
-<TGConnectingPoint num="21" id="4936" />
-<TGConnectingPoint num="22" id="4937" />
-<TGConnectingPoint num="23" id="4938" />
-<TGConnectingPoint num="24" id="4939" />
-<TGConnectingPoint num="25" id="4940" />
-<TGConnectingPoint num="26" id="4941" />
-<TGConnectingPoint num="27" id="4942" />
-<TGConnectingPoint num="28" id="4943" />
-<TGConnectingPoint num="29" id="4944" />
-<TGConnectingPoint num="30" id="4945" />
-<TGConnectingPoint num="31" id="4946" />
-<TGConnectingPoint num="32" id="4947" />
-<TGConnectingPoint num="33" id="4948" />
-<TGConnectingPoint num="34" id="4949" />
-<TGConnectingPoint num="35" id="4950" />
-<TGConnectingPoint num="36" id="4951" />
-<TGConnectingPoint num="37" id="4952" />
-<TGConnectingPoint num="38" id="4953" />
-<TGConnectingPoint num="39" id="4954" />
+<infoparam name="state0" value="VerifyMAC6" />
+<TGConnectingPoint num="0" id="3254" />
+<TGConnectingPoint num="1" id="3255" />
+<TGConnectingPoint num="2" id="3256" />
+<TGConnectingPoint num="3" id="3257" />
+<TGConnectingPoint num="4" id="3258" />
+<TGConnectingPoint num="5" id="3259" />
+<TGConnectingPoint num="6" id="3260" />
+<TGConnectingPoint num="7" id="3261" />
+<TGConnectingPoint num="8" id="3262" />
+<TGConnectingPoint num="9" id="3263" />
+<TGConnectingPoint num="10" id="3264" />
+<TGConnectingPoint num="11" id="3265" />
+<TGConnectingPoint num="12" id="3266" />
+<TGConnectingPoint num="13" id="3267" />
+<TGConnectingPoint num="14" id="3268" />
+<TGConnectingPoint num="15" id="3269" />
+<TGConnectingPoint num="16" id="3270" />
+<TGConnectingPoint num="17" id="3271" />
+<TGConnectingPoint num="18" id="3272" />
+<TGConnectingPoint num="19" id="3273" />
+<TGConnectingPoint num="20" id="3274" />
+<TGConnectingPoint num="21" id="3275" />
+<TGConnectingPoint num="22" id="3276" />
+<TGConnectingPoint num="23" id="3277" />
+<TGConnectingPoint num="24" id="3278" />
+<TGConnectingPoint num="25" id="3279" />
+<TGConnectingPoint num="26" id="3280" />
+<TGConnectingPoint num="27" id="3281" />
+<TGConnectingPoint num="28" id="3282" />
+<TGConnectingPoint num="29" id="3283" />
+<TGConnectingPoint num="30" id="3284" />
+<TGConnectingPoint num="31" id="3285" />
+<TGConnectingPoint num="32" id="3286" />
+<TGConnectingPoint num="33" id="3287" />
+<TGConnectingPoint num="34" id="3288" />
+<TGConnectingPoint num="35" id="3289" />
+<TGConnectingPoint num="36" id="3290" />
+<TGConnectingPoint num="37" id="3291" />
+<TGConnectingPoint num="38" id="3292" />
+<TGConnectingPoint num="39" id="3293" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4996" >
-<cdparam x="366" y="2165" />
+<COMPONENT type="5106" id="3335" >
+<cdparam x="397" y="2323" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts5" />
-<TGConnectingPoint num="0" id="4956" />
-<TGConnectingPoint num="1" id="4957" />
-<TGConnectingPoint num="2" id="4958" />
-<TGConnectingPoint num="3" id="4959" />
-<TGConnectingPoint num="4" id="4960" />
-<TGConnectingPoint num="5" id="4961" />
-<TGConnectingPoint num="6" id="4962" />
-<TGConnectingPoint num="7" id="4963" />
-<TGConnectingPoint num="8" id="4964" />
-<TGConnectingPoint num="9" id="4965" />
-<TGConnectingPoint num="10" id="4966" />
-<TGConnectingPoint num="11" id="4967" />
-<TGConnectingPoint num="12" id="4968" />
-<TGConnectingPoint num="13" id="4969" />
-<TGConnectingPoint num="14" id="4970" />
-<TGConnectingPoint num="15" id="4971" />
-<TGConnectingPoint num="16" id="4972" />
-<TGConnectingPoint num="17" id="4973" />
-<TGConnectingPoint num="18" id="4974" />
-<TGConnectingPoint num="19" id="4975" />
-<TGConnectingPoint num="20" id="4976" />
-<TGConnectingPoint num="21" id="4977" />
-<TGConnectingPoint num="22" id="4978" />
-<TGConnectingPoint num="23" id="4979" />
-<TGConnectingPoint num="24" id="4980" />
-<TGConnectingPoint num="25" id="4981" />
-<TGConnectingPoint num="26" id="4982" />
-<TGConnectingPoint num="27" id="4983" />
-<TGConnectingPoint num="28" id="4984" />
-<TGConnectingPoint num="29" id="4985" />
-<TGConnectingPoint num="30" id="4986" />
-<TGConnectingPoint num="31" id="4987" />
-<TGConnectingPoint num="32" id="4988" />
-<TGConnectingPoint num="33" id="4989" />
-<TGConnectingPoint num="34" id="4990" />
-<TGConnectingPoint num="35" id="4991" />
-<TGConnectingPoint num="36" id="4992" />
-<TGConnectingPoint num="37" id="4993" />
-<TGConnectingPoint num="38" id="4994" />
-<TGConnectingPoint num="39" id="4995" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="Invalidt6" />
+<TGConnectingPoint num="0" id="3295" />
+<TGConnectingPoint num="1" id="3296" />
+<TGConnectingPoint num="2" id="3297" />
+<TGConnectingPoint num="3" id="3298" />
+<TGConnectingPoint num="4" id="3299" />
+<TGConnectingPoint num="5" id="3300" />
+<TGConnectingPoint num="6" id="3301" />
+<TGConnectingPoint num="7" id="3302" />
+<TGConnectingPoint num="8" id="3303" />
+<TGConnectingPoint num="9" id="3304" />
+<TGConnectingPoint num="10" id="3305" />
+<TGConnectingPoint num="11" id="3306" />
+<TGConnectingPoint num="12" id="3307" />
+<TGConnectingPoint num="13" id="3308" />
+<TGConnectingPoint num="14" id="3309" />
+<TGConnectingPoint num="15" id="3310" />
+<TGConnectingPoint num="16" id="3311" />
+<TGConnectingPoint num="17" id="3312" />
+<TGConnectingPoint num="18" id="3313" />
+<TGConnectingPoint num="19" id="3314" />
+<TGConnectingPoint num="20" id="3315" />
+<TGConnectingPoint num="21" id="3316" />
+<TGConnectingPoint num="22" id="3317" />
+<TGConnectingPoint num="23" id="3318" />
+<TGConnectingPoint num="24" id="3319" />
+<TGConnectingPoint num="25" id="3320" />
+<TGConnectingPoint num="26" id="3321" />
+<TGConnectingPoint num="27" id="3322" />
+<TGConnectingPoint num="28" id="3323" />
+<TGConnectingPoint num="29" id="3324" />
+<TGConnectingPoint num="30" id="3325" />
+<TGConnectingPoint num="31" id="3326" />
+<TGConnectingPoint num="32" id="3327" />
+<TGConnectingPoint num="33" id="3328" />
+<TGConnectingPoint num="34" id="3329" />
+<TGConnectingPoint num="35" id="3330" />
+<TGConnectingPoint num="36" id="3331" />
+<TGConnectingPoint num="37" id="3332" />
+<TGConnectingPoint num="38" id="3333" />
+<TGConnectingPoint num="39" id="3334" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5037" >
-<cdparam x="482" y="2073" />
+<COMPONENT type="5106" id="3376" >
+<cdparam x="519" y="2227" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts5" />
-<TGConnectingPoint num="0" id="4997" />
-<TGConnectingPoint num="1" id="4998" />
-<TGConnectingPoint num="2" id="4999" />
-<TGConnectingPoint num="3" id="5000" />
-<TGConnectingPoint num="4" id="5001" />
-<TGConnectingPoint num="5" id="5002" />
-<TGConnectingPoint num="6" id="5003" />
-<TGConnectingPoint num="7" id="5004" />
-<TGConnectingPoint num="8" id="5005" />
-<TGConnectingPoint num="9" id="5006" />
-<TGConnectingPoint num="10" id="5007" />
-<TGConnectingPoint num="11" id="5008" />
-<TGConnectingPoint num="12" id="5009" />
-<TGConnectingPoint num="13" id="5010" />
-<TGConnectingPoint num="14" id="5011" />
-<TGConnectingPoint num="15" id="5012" />
-<TGConnectingPoint num="16" id="5013" />
-<TGConnectingPoint num="17" id="5014" />
-<TGConnectingPoint num="18" id="5015" />
-<TGConnectingPoint num="19" id="5016" />
-<TGConnectingPoint num="20" id="5017" />
-<TGConnectingPoint num="21" id="5018" />
-<TGConnectingPoint num="22" id="5019" />
-<TGConnectingPoint num="23" id="5020" />
-<TGConnectingPoint num="24" id="5021" />
-<TGConnectingPoint num="25" id="5022" />
-<TGConnectingPoint num="26" id="5023" />
-<TGConnectingPoint num="27" id="5024" />
-<TGConnectingPoint num="28" id="5025" />
-<TGConnectingPoint num="29" id="5026" />
-<TGConnectingPoint num="30" id="5027" />
-<TGConnectingPoint num="31" id="5028" />
-<TGConnectingPoint num="32" id="5029" />
-<TGConnectingPoint num="33" id="5030" />
-<TGConnectingPoint num="34" id="5031" />
-<TGConnectingPoint num="35" id="5032" />
-<TGConnectingPoint num="36" id="5033" />
-<TGConnectingPoint num="37" id="5034" />
-<TGConnectingPoint num="38" id="5035" />
-<TGConnectingPoint num="39" id="5036" />
+<infoparam name="state0" value="Testt6" />
+<TGConnectingPoint num="0" id="3336" />
+<TGConnectingPoint num="1" id="3337" />
+<TGConnectingPoint num="2" id="3338" />
+<TGConnectingPoint num="3" id="3339" />
+<TGConnectingPoint num="4" id="3340" />
+<TGConnectingPoint num="5" id="3341" />
+<TGConnectingPoint num="6" id="3342" />
+<TGConnectingPoint num="7" id="3343" />
+<TGConnectingPoint num="8" id="3344" />
+<TGConnectingPoint num="9" id="3345" />
+<TGConnectingPoint num="10" id="3346" />
+<TGConnectingPoint num="11" id="3347" />
+<TGConnectingPoint num="12" id="3348" />
+<TGConnectingPoint num="13" id="3349" />
+<TGConnectingPoint num="14" id="3350" />
+<TGConnectingPoint num="15" id="3351" />
+<TGConnectingPoint num="16" id="3352" />
+<TGConnectingPoint num="17" id="3353" />
+<TGConnectingPoint num="18" id="3354" />
+<TGConnectingPoint num="19" id="3355" />
+<TGConnectingPoint num="20" id="3356" />
+<TGConnectingPoint num="21" id="3357" />
+<TGConnectingPoint num="22" id="3358" />
+<TGConnectingPoint num="23" id="3359" />
+<TGConnectingPoint num="24" id="3360" />
+<TGConnectingPoint num="25" id="3361" />
+<TGConnectingPoint num="26" id="3362" />
+<TGConnectingPoint num="27" id="3363" />
+<TGConnectingPoint num="28" id="3364" />
+<TGConnectingPoint num="29" id="3365" />
+<TGConnectingPoint num="30" id="3366" />
+<TGConnectingPoint num="31" id="3367" />
+<TGConnectingPoint num="32" id="3368" />
+<TGConnectingPoint num="33" id="3369" />
+<TGConnectingPoint num="34" id="3370" />
+<TGConnectingPoint num="35" id="3371" />
+<TGConnectingPoint num="36" id="3372" />
+<TGConnectingPoint num="37" id="3373" />
+<TGConnectingPoint num="38" id="3374" />
+<TGConnectingPoint num="39" id="3375" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5048" >
-<cdparam x="497" y="1994" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3387" >
+<cdparam x="530" y="2156" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m5)" />
-<TGConnectingPoint num="0" id="5038" />
-<TGConnectingPoint num="1" id="5039" />
-<TGConnectingPoint num="2" id="5040" />
-<TGConnectingPoint num="3" id="5041" />
-<TGConnectingPoint num="4" id="5042" />
-<TGConnectingPoint num="5" id="5043" />
-<TGConnectingPoint num="6" id="5044" />
-<TGConnectingPoint num="7" id="5045" />
-<TGConnectingPoint num="8" id="5046" />
-<TGConnectingPoint num="9" id="5047" />
+<infoparam name="Receive signal" value="chin(m6)" />
+<TGConnectingPoint num="0" id="3377" />
+<TGConnectingPoint num="1" id="3378" />
+<TGConnectingPoint num="2" id="3379" />
+<TGConnectingPoint num="3" id="3380" />
+<TGConnectingPoint num="4" id="3381" />
+<TGConnectingPoint num="5" id="3382" />
+<TGConnectingPoint num="6" id="3383" />
+<TGConnectingPoint num="7" id="3384" />
+<TGConnectingPoint num="8" id="3385" />
+<TGConnectingPoint num="9" id="3386" />
 </COMPONENT>
 
-<COMPONENT type="301" id="5057" >
-<cdparam x="692" y="1907" />
-<sizeparam width="276" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="3396" >
+<cdparam x="741" y="2073" />
+<sizeparam width="288" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify message with secret data
+<infoparam name="UML Note" value="Receive and verify ack message from ECU2
 " />
-<TGConnectingPoint num="0" id="5049" />
-<TGConnectingPoint num="1" id="5050" />
-<TGConnectingPoint num="2" id="5051" />
-<TGConnectingPoint num="3" id="5052" />
-<TGConnectingPoint num="4" id="5053" />
-<TGConnectingPoint num="5" id="5054" />
-<TGConnectingPoint num="6" id="5055" />
-<TGConnectingPoint num="7" id="5056" />
+<TGConnectingPoint num="0" id="3388" />
+<TGConnectingPoint num="1" id="3389" />
+<TGConnectingPoint num="2" id="3390" />
+<TGConnectingPoint num="3" id="3391" />
+<TGConnectingPoint num="4" id="3392" />
+<TGConnectingPoint num="5" id="3393" />
+<TGConnectingPoint num="6" id="3394" />
+<TGConnectingPoint num="7" id="3395" />
+<TGConnectingPoint num="8" id="102765" />
+<TGConnectingPoint num="9" id="102766" />
+<TGConnectingPoint num="10" id="102767" />
+<TGConnectingPoint num="11" id="102768" />
+<TGConnectingPoint num="12" id="102769" />
+<TGConnectingPoint num="13" id="102770" />
+<TGConnectingPoint num="14" id="102771" />
+<TGConnectingPoint num="15" id="102772" />
 <extraparam>
-<Line value="Receive and verify message with secret data" />
+<Line value="Receive and verify ack message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5098" >
-<cdparam x="490" y="1911" />
+<COMPONENT type="5106" id="3437" >
+<cdparam x="530" y="2077" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg5" />
-<TGConnectingPoint num="0" id="5058" />
-<TGConnectingPoint num="1" id="5059" />
-<TGConnectingPoint num="2" id="5060" />
-<TGConnectingPoint num="3" id="5061" />
-<TGConnectingPoint num="4" id="5062" />
-<TGConnectingPoint num="5" id="5063" />
-<TGConnectingPoint num="6" id="5064" />
-<TGConnectingPoint num="7" id="5065" />
-<TGConnectingPoint num="8" id="5066" />
-<TGConnectingPoint num="9" id="5067" />
-<TGConnectingPoint num="10" id="5068" />
-<TGConnectingPoint num="11" id="5069" />
-<TGConnectingPoint num="12" id="5070" />
-<TGConnectingPoint num="13" id="5071" />
-<TGConnectingPoint num="14" id="5072" />
-<TGConnectingPoint num="15" id="5073" />
-<TGConnectingPoint num="16" id="5074" />
-<TGConnectingPoint num="17" id="5075" />
-<TGConnectingPoint num="18" id="5076" />
-<TGConnectingPoint num="19" id="5077" />
-<TGConnectingPoint num="20" id="5078" />
-<TGConnectingPoint num="21" id="5079" />
-<TGConnectingPoint num="22" id="5080" />
-<TGConnectingPoint num="23" id="5081" />
-<TGConnectingPoint num="24" id="5082" />
-<TGConnectingPoint num="25" id="5083" />
-<TGConnectingPoint num="26" id="5084" />
-<TGConnectingPoint num="27" id="5085" />
-<TGConnectingPoint num="28" id="5086" />
-<TGConnectingPoint num="29" id="5087" />
-<TGConnectingPoint num="30" id="5088" />
-<TGConnectingPoint num="31" id="5089" />
-<TGConnectingPoint num="32" id="5090" />
-<TGConnectingPoint num="33" id="5091" />
-<TGConnectingPoint num="34" id="5092" />
-<TGConnectingPoint num="35" id="5093" />
-<TGConnectingPoint num="36" id="5094" />
-<TGConnectingPoint num="37" id="5095" />
-<TGConnectingPoint num="38" id="5096" />
-<TGConnectingPoint num="39" id="5097" />
+<infoparam name="state0" value="WaitForMsg6" />
+<TGConnectingPoint num="0" id="3397" />
+<TGConnectingPoint num="1" id="3398" />
+<TGConnectingPoint num="2" id="3399" />
+<TGConnectingPoint num="3" id="3400" />
+<TGConnectingPoint num="4" id="3401" />
+<TGConnectingPoint num="5" id="3402" />
+<TGConnectingPoint num="6" id="3403" />
+<TGConnectingPoint num="7" id="3404" />
+<TGConnectingPoint num="8" id="3405" />
+<TGConnectingPoint num="9" id="3406" />
+<TGConnectingPoint num="10" id="3407" />
+<TGConnectingPoint num="11" id="3408" />
+<TGConnectingPoint num="12" id="3409" />
+<TGConnectingPoint num="13" id="3410" />
+<TGConnectingPoint num="14" id="3411" />
+<TGConnectingPoint num="15" id="3412" />
+<TGConnectingPoint num="16" id="3413" />
+<TGConnectingPoint num="17" id="3414" />
+<TGConnectingPoint num="18" id="3415" />
+<TGConnectingPoint num="19" id="3416" />
+<TGConnectingPoint num="20" id="3417" />
+<TGConnectingPoint num="21" id="3418" />
+<TGConnectingPoint num="22" id="3419" />
+<TGConnectingPoint num="23" id="3420" />
+<TGConnectingPoint num="24" id="3421" />
+<TGConnectingPoint num="25" id="3422" />
+<TGConnectingPoint num="26" id="3423" />
+<TGConnectingPoint num="27" id="3424" />
+<TGConnectingPoint num="28" id="3425" />
+<TGConnectingPoint num="29" id="3426" />
+<TGConnectingPoint num="30" id="3427" />
+<TGConnectingPoint num="31" id="3428" />
+<TGConnectingPoint num="32" id="3429" />
+<TGConnectingPoint num="33" id="3430" />
+<TGConnectingPoint num="34" id="3431" />
+<TGConnectingPoint num="35" id="3432" />
+<TGConnectingPoint num="36" id="3433" />
+<TGConnectingPoint num="37" id="3434" />
+<TGConnectingPoint num="38" id="3435" />
+<TGConnectingPoint num="39" id="3436" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="5109" >
-<cdparam x="485" y="1858" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3448" >
+<cdparam x="546" y="2020" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m4)" />
-<TGConnectingPoint num="0" id="5099" />
-<TGConnectingPoint num="1" id="5100" />
-<TGConnectingPoint num="2" id="5101" />
-<TGConnectingPoint num="3" id="5102" />
-<TGConnectingPoint num="4" id="5103" />
-<TGConnectingPoint num="5" id="5104" />
-<TGConnectingPoint num="6" id="5105" />
-<TGConnectingPoint num="7" id="5106" />
-<TGConnectingPoint num="8" id="5107" />
-<TGConnectingPoint num="9" id="5108" />
+<infoparam name="Send signal" value="chout(m5)" />
+<TGConnectingPoint num="0" id="3438" />
+<TGConnectingPoint num="1" id="3439" />
+<TGConnectingPoint num="2" id="3440" />
+<TGConnectingPoint num="3" id="3441" />
+<TGConnectingPoint num="4" id="3442" />
+<TGConnectingPoint num="5" id="3443" />
+<TGConnectingPoint num="6" id="3444" />
+<TGConnectingPoint num="7" id="3445" />
+<TGConnectingPoint num="8" id="3446" />
+<TGConnectingPoint num="9" id="3447" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="5150" >
-<cdparam x="483" y="1783" />
+<COMPONENT type="5106" id="3489" >
+<cdparam x="533" y="1944" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg4" />
-<TGConnectingPoint num="0" id="5110" />
-<TGConnectingPoint num="1" id="5111" />
-<TGConnectingPoint num="2" id="5112" />
-<TGConnectingPoint num="3" id="5113" />
-<TGConnectingPoint num="4" id="5114" />
-<TGConnectingPoint num="5" id="5115" />
-<TGConnectingPoint num="6" id="5116" />
-<TGConnectingPoint num="7" id="5117" />
-<TGConnectingPoint num="8" id="5118" />
-<TGConnectingPoint num="9" id="5119" />
-<TGConnectingPoint num="10" id="5120" />
-<TGConnectingPoint num="11" id="5121" />
-<TGConnectingPoint num="12" id="5122" />
-<TGConnectingPoint num="13" id="5123" />
-<TGConnectingPoint num="14" id="5124" />
-<TGConnectingPoint num="15" id="5125" />
-<TGConnectingPoint num="16" id="5126" />
-<TGConnectingPoint num="17" id="5127" />
-<TGConnectingPoint num="18" id="5128" />
-<TGConnectingPoint num="19" id="5129" />
-<TGConnectingPoint num="20" id="5130" />
-<TGConnectingPoint num="21" id="5131" />
-<TGConnectingPoint num="22" id="5132" />
-<TGConnectingPoint num="23" id="5133" />
-<TGConnectingPoint num="24" id="5134" />
-<TGConnectingPoint num="25" id="5135" />
-<TGConnectingPoint num="26" id="5136" />
-<TGConnectingPoint num="27" id="5137" />
-<TGConnectingPoint num="28" id="5138" />
-<TGConnectingPoint num="29" id="5139" />
-<TGConnectingPoint num="30" id="5140" />
-<TGConnectingPoint num="31" id="5141" />
-<TGConnectingPoint num="32" id="5142" />
-<TGConnectingPoint num="33" id="5143" />
-<TGConnectingPoint num="34" id="5144" />
-<TGConnectingPoint num="35" id="5145" />
-<TGConnectingPoint num="36" id="5146" />
-<TGConnectingPoint num="37" id="5147" />
-<TGConnectingPoint num="38" id="5148" />
-<TGConnectingPoint num="39" id="5149" />
+<infoparam name="state0" value="SendMsg5" />
+<TGConnectingPoint num="0" id="3449" />
+<TGConnectingPoint num="1" id="3450" />
+<TGConnectingPoint num="2" id="3451" />
+<TGConnectingPoint num="3" id="3452" />
+<TGConnectingPoint num="4" id="3453" />
+<TGConnectingPoint num="5" id="3454" />
+<TGConnectingPoint num="6" id="3455" />
+<TGConnectingPoint num="7" id="3456" />
+<TGConnectingPoint num="8" id="3457" />
+<TGConnectingPoint num="9" id="3458" />
+<TGConnectingPoint num="10" id="3459" />
+<TGConnectingPoint num="11" id="3460" />
+<TGConnectingPoint num="12" id="3461" />
+<TGConnectingPoint num="13" id="3462" />
+<TGConnectingPoint num="14" id="3463" />
+<TGConnectingPoint num="15" id="3464" />
+<TGConnectingPoint num="16" id="3465" />
+<TGConnectingPoint num="17" id="3466" />
+<TGConnectingPoint num="18" id="3467" />
+<TGConnectingPoint num="19" id="3468" />
+<TGConnectingPoint num="20" id="3469" />
+<TGConnectingPoint num="21" id="3470" />
+<TGConnectingPoint num="22" id="3471" />
+<TGConnectingPoint num="23" id="3472" />
+<TGConnectingPoint num="24" id="3473" />
+<TGConnectingPoint num="25" id="3474" />
+<TGConnectingPoint num="26" id="3475" />
+<TGConnectingPoint num="27" id="3476" />
+<TGConnectingPoint num="28" id="3477" />
+<TGConnectingPoint num="29" id="3478" />
+<TGConnectingPoint num="30" id="3479" />
+<TGConnectingPoint num="31" id="3480" />
+<TGConnectingPoint num="32" id="3481" />
+<TGConnectingPoint num="33" id="3482" />
+<TGConnectingPoint num="34" id="3483" />
+<TGConnectingPoint num="35" id="3484" />
+<TGConnectingPoint num="36" id="3485" />
+<TGConnectingPoint num="37" id="3486" />
+<TGConnectingPoint num="38" id="3487" />
+<TGConnectingPoint num="39" id="3488" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5191" >
-<cdparam x="470" y="1625" />
-<sizeparam width="124" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="3498" >
+<cdparam x="729" y="1779" />
+<sizeparam width="294" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="AdoptSessionKey" />
-<TGConnectingPoint num="0" id="5151" />
-<TGConnectingPoint num="1" id="5152" />
-<TGConnectingPoint num="2" id="5153" />
-<TGConnectingPoint num="3" id="5154" />
-<TGConnectingPoint num="4" id="5155" />
-<TGConnectingPoint num="5" id="5156" />
-<TGConnectingPoint num="6" id="5157" />
-<TGConnectingPoint num="7" id="5158" />
-<TGConnectingPoint num="8" id="5159" />
-<TGConnectingPoint num="9" id="5160" />
-<TGConnectingPoint num="10" id="5161" />
-<TGConnectingPoint num="11" id="5162" />
-<TGConnectingPoint num="12" id="5163" />
-<TGConnectingPoint num="13" id="5164" />
-<TGConnectingPoint num="14" id="5165" />
-<TGConnectingPoint num="15" id="5166" />
-<TGConnectingPoint num="16" id="5167" />
-<TGConnectingPoint num="17" id="5168" />
-<TGConnectingPoint num="18" id="5169" />
-<TGConnectingPoint num="19" id="5170" />
-<TGConnectingPoint num="20" id="5171" />
-<TGConnectingPoint num="21" id="5172" />
-<TGConnectingPoint num="22" id="5173" />
-<TGConnectingPoint num="23" id="5174" />
-<TGConnectingPoint num="24" id="5175" />
-<TGConnectingPoint num="25" id="5176" />
-<TGConnectingPoint num="26" id="5177" />
-<TGConnectingPoint num="27" id="5178" />
-<TGConnectingPoint num="28" id="5179" />
-<TGConnectingPoint num="29" id="5180" />
-<TGConnectingPoint num="30" id="5181" />
-<TGConnectingPoint num="31" id="5182" />
-<TGConnectingPoint num="32" id="5183" />
-<TGConnectingPoint num="33" id="5184" />
-<TGConnectingPoint num="34" id="5185" />
-<TGConnectingPoint num="35" id="5186" />
-<TGConnectingPoint num="36" id="5187" />
-<TGConnectingPoint num="37" id="5188" />
-<TGConnectingPoint num="38" id="5189" />
-<TGConnectingPoint num="39" id="5190" />
+<infoparam name="UML Note" value="Encrypt secret data with new symmetric key
+" />
+<TGConnectingPoint num="0" id="3490" />
+<TGConnectingPoint num="1" id="3491" />
+<TGConnectingPoint num="2" id="3492" />
+<TGConnectingPoint num="3" id="3493" />
+<TGConnectingPoint num="4" id="3494" />
+<TGConnectingPoint num="5" id="3495" />
+<TGConnectingPoint num="6" id="3496" />
+<TGConnectingPoint num="7" id="3497" />
+<TGConnectingPoint num="8" id="102875" />
+<TGConnectingPoint num="9" id="102876" />
+<TGConnectingPoint num="10" id="102877" />
+<TGConnectingPoint num="11" id="102878" />
+<TGConnectingPoint num="12" id="102879" />
+<TGConnectingPoint num="13" id="102880" />
+<TGConnectingPoint num="14" id="102881" />
+<TGConnectingPoint num="15" id="102882" />
 <extraparam>
+<Line value="Encrypt secret data with new symmetric key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5232" >
-<cdparam x="326" y="1623" />
+<COMPONENT type="5106" id="3539" >
+<cdparam x="543" y="1781" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig3" />
-<TGConnectingPoint num="0" id="5192" />
-<TGConnectingPoint num="1" id="5193" />
-<TGConnectingPoint num="2" id="5194" />
-<TGConnectingPoint num="3" id="5195" />
-<TGConnectingPoint num="4" id="5196" />
-<TGConnectingPoint num="5" id="5197" />
-<TGConnectingPoint num="6" id="5198" />
-<TGConnectingPoint num="7" id="5199" />
-<TGConnectingPoint num="8" id="5200" />
-<TGConnectingPoint num="9" id="5201" />
-<TGConnectingPoint num="10" id="5202" />
-<TGConnectingPoint num="11" id="5203" />
-<TGConnectingPoint num="12" id="5204" />
-<TGConnectingPoint num="13" id="5205" />
-<TGConnectingPoint num="14" id="5206" />
-<TGConnectingPoint num="15" id="5207" />
-<TGConnectingPoint num="16" id="5208" />
-<TGConnectingPoint num="17" id="5209" />
-<TGConnectingPoint num="18" id="5210" />
-<TGConnectingPoint num="19" id="5211" />
-<TGConnectingPoint num="20" id="5212" />
-<TGConnectingPoint num="21" id="5213" />
-<TGConnectingPoint num="22" id="5214" />
-<TGConnectingPoint num="23" id="5215" />
-<TGConnectingPoint num="24" id="5216" />
-<TGConnectingPoint num="25" id="5217" />
-<TGConnectingPoint num="26" id="5218" />
-<TGConnectingPoint num="27" id="5219" />
-<TGConnectingPoint num="28" id="5220" />
-<TGConnectingPoint num="29" id="5221" />
-<TGConnectingPoint num="30" id="5222" />
-<TGConnectingPoint num="31" id="5223" />
-<TGConnectingPoint num="32" id="5224" />
-<TGConnectingPoint num="33" id="5225" />
-<TGConnectingPoint num="34" id="5226" />
-<TGConnectingPoint num="35" id="5227" />
-<TGConnectingPoint num="36" id="5228" />
-<TGConnectingPoint num="37" id="5229" />
-<TGConnectingPoint num="38" id="5230" />
-<TGConnectingPoint num="39" id="5231" />
+<infoparam name="state0" value="ForgeMsg5" />
+<TGConnectingPoint num="0" id="3499" />
+<TGConnectingPoint num="1" id="3500" />
+<TGConnectingPoint num="2" id="3501" />
+<TGConnectingPoint num="3" id="3502" />
+<TGConnectingPoint num="4" id="3503" />
+<TGConnectingPoint num="5" id="3504" />
+<TGConnectingPoint num="6" id="3505" />
+<TGConnectingPoint num="7" id="3506" />
+<TGConnectingPoint num="8" id="3507" />
+<TGConnectingPoint num="9" id="3508" />
+<TGConnectingPoint num="10" id="3509" />
+<TGConnectingPoint num="11" id="3510" />
+<TGConnectingPoint num="12" id="3511" />
+<TGConnectingPoint num="13" id="3512" />
+<TGConnectingPoint num="14" id="3513" />
+<TGConnectingPoint num="15" id="3514" />
+<TGConnectingPoint num="16" id="3515" />
+<TGConnectingPoint num="17" id="3516" />
+<TGConnectingPoint num="18" id="3517" />
+<TGConnectingPoint num="19" id="3518" />
+<TGConnectingPoint num="20" id="3519" />
+<TGConnectingPoint num="21" id="3520" />
+<TGConnectingPoint num="22" id="3521" />
+<TGConnectingPoint num="23" id="3522" />
+<TGConnectingPoint num="24" id="3523" />
+<TGConnectingPoint num="25" id="3524" />
+<TGConnectingPoint num="26" id="3525" />
+<TGConnectingPoint num="27" id="3526" />
+<TGConnectingPoint num="28" id="3527" />
+<TGConnectingPoint num="29" id="3528" />
+<TGConnectingPoint num="30" id="3529" />
+<TGConnectingPoint num="31" id="3530" />
+<TGConnectingPoint num="32" id="3531" />
+<TGConnectingPoint num="33" id="3532" />
+<TGConnectingPoint num="34" id="3533" />
+<TGConnectingPoint num="35" id="3534" />
+<TGConnectingPoint num="36" id="3535" />
+<TGConnectingPoint num="37" id="3536" />
+<TGConnectingPoint num="38" id="3537" />
+<TGConnectingPoint num="39" id="3538" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5273" >
-<cdparam x="421" y="1506" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3580" >
+<cdparam x="371" y="1780" />
+<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig3" />
-<TGConnectingPoint num="0" id="5233" />
-<TGConnectingPoint num="1" id="5234" />
-<TGConnectingPoint num="2" id="5235" />
-<TGConnectingPoint num="3" id="5236" />
-<TGConnectingPoint num="4" id="5237" />
-<TGConnectingPoint num="5" id="5238" />
-<TGConnectingPoint num="6" id="5239" />
-<TGConnectingPoint num="7" id="5240" />
-<TGConnectingPoint num="8" id="5241" />
-<TGConnectingPoint num="9" id="5242" />
-<TGConnectingPoint num="10" id="5243" />
-<TGConnectingPoint num="11" id="5244" />
-<TGConnectingPoint num="12" id="5245" />
-<TGConnectingPoint num="13" id="5246" />
-<TGConnectingPoint num="14" id="5247" />
-<TGConnectingPoint num="15" id="5248" />
-<TGConnectingPoint num="16" id="5249" />
-<TGConnectingPoint num="17" id="5250" />
-<TGConnectingPoint num="18" id="5251" />
-<TGConnectingPoint num="19" id="5252" />
-<TGConnectingPoint num="20" id="5253" />
-<TGConnectingPoint num="21" id="5254" />
-<TGConnectingPoint num="22" id="5255" />
-<TGConnectingPoint num="23" id="5256" />
-<TGConnectingPoint num="24" id="5257" />
-<TGConnectingPoint num="25" id="5258" />
-<TGConnectingPoint num="26" id="5259" />
-<TGConnectingPoint num="27" id="5260" />
-<TGConnectingPoint num="28" id="5261" />
-<TGConnectingPoint num="29" id="5262" />
-<TGConnectingPoint num="30" id="5263" />
-<TGConnectingPoint num="31" id="5264" />
-<TGConnectingPoint num="32" id="5265" />
-<TGConnectingPoint num="33" id="5266" />
-<TGConnectingPoint num="34" id="5267" />
-<TGConnectingPoint num="35" id="5268" />
-<TGConnectingPoint num="36" id="5269" />
-<TGConnectingPoint num="37" id="5270" />
-<TGConnectingPoint num="38" id="5271" />
-<TGConnectingPoint num="39" id="5272" />
+<infoparam name="state0" value="UnexpectedMsg4" />
+<TGConnectingPoint num="0" id="3540" />
+<TGConnectingPoint num="1" id="3541" />
+<TGConnectingPoint num="2" id="3542" />
+<TGConnectingPoint num="3" id="3543" />
+<TGConnectingPoint num="4" id="3544" />
+<TGConnectingPoint num="5" id="3545" />
+<TGConnectingPoint num="6" id="3546" />
+<TGConnectingPoint num="7" id="3547" />
+<TGConnectingPoint num="8" id="3548" />
+<TGConnectingPoint num="9" id="3549" />
+<TGConnectingPoint num="10" id="3550" />
+<TGConnectingPoint num="11" id="3551" />
+<TGConnectingPoint num="12" id="3552" />
+<TGConnectingPoint num="13" id="3553" />
+<TGConnectingPoint num="14" id="3554" />
+<TGConnectingPoint num="15" id="3555" />
+<TGConnectingPoint num="16" id="3556" />
+<TGConnectingPoint num="17" id="3557" />
+<TGConnectingPoint num="18" id="3558" />
+<TGConnectingPoint num="19" id="3559" />
+<TGConnectingPoint num="20" id="3560" />
+<TGConnectingPoint num="21" id="3561" />
+<TGConnectingPoint num="22" id="3562" />
+<TGConnectingPoint num="23" id="3563" />
+<TGConnectingPoint num="24" id="3564" />
+<TGConnectingPoint num="25" id="3565" />
+<TGConnectingPoint num="26" id="3566" />
+<TGConnectingPoint num="27" id="3567" />
+<TGConnectingPoint num="28" id="3568" />
+<TGConnectingPoint num="29" id="3569" />
+<TGConnectingPoint num="30" id="3570" />
+<TGConnectingPoint num="31" id="3571" />
+<TGConnectingPoint num="32" id="3572" />
+<TGConnectingPoint num="33" id="3573" />
+<TGConnectingPoint num="34" id="3574" />
+<TGConnectingPoint num="35" id="3575" />
+<TGConnectingPoint num="36" id="3576" />
+<TGConnectingPoint num="37" id="3577" />
+<TGConnectingPoint num="38" id="3578" />
+<TGConnectingPoint num="39" id="3579" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5314" >
-<cdparam x="264" y="1507" />
+<COMPONENT type="5106" id="3621" >
+<cdparam x="484" y="1674" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts3" />
-<TGConnectingPoint num="0" id="5274" />
-<TGConnectingPoint num="1" id="5275" />
-<TGConnectingPoint num="2" id="5276" />
-<TGConnectingPoint num="3" id="5277" />
-<TGConnectingPoint num="4" id="5278" />
-<TGConnectingPoint num="5" id="5279" />
-<TGConnectingPoint num="6" id="5280" />
-<TGConnectingPoint num="7" id="5281" />
-<TGConnectingPoint num="8" id="5282" />
-<TGConnectingPoint num="9" id="5283" />
-<TGConnectingPoint num="10" id="5284" />
-<TGConnectingPoint num="11" id="5285" />
-<TGConnectingPoint num="12" id="5286" />
-<TGConnectingPoint num="13" id="5287" />
-<TGConnectingPoint num="14" id="5288" />
-<TGConnectingPoint num="15" id="5289" />
-<TGConnectingPoint num="16" id="5290" />
-<TGConnectingPoint num="17" id="5291" />
-<TGConnectingPoint num="18" id="5292" />
-<TGConnectingPoint num="19" id="5293" />
-<TGConnectingPoint num="20" id="5294" />
-<TGConnectingPoint num="21" id="5295" />
-<TGConnectingPoint num="22" id="5296" />
-<TGConnectingPoint num="23" id="5297" />
-<TGConnectingPoint num="24" id="5298" />
-<TGConnectingPoint num="25" id="5299" />
-<TGConnectingPoint num="26" id="5300" />
-<TGConnectingPoint num="27" id="5301" />
-<TGConnectingPoint num="28" id="5302" />
-<TGConnectingPoint num="29" id="5303" />
-<TGConnectingPoint num="30" id="5304" />
-<TGConnectingPoint num="31" id="5305" />
-<TGConnectingPoint num="32" id="5306" />
-<TGConnectingPoint num="33" id="5307" />
-<TGConnectingPoint num="34" id="5308" />
-<TGConnectingPoint num="35" id="5309" />
-<TGConnectingPoint num="36" id="5310" />
-<TGConnectingPoint num="37" id="5311" />
-<TGConnectingPoint num="38" id="5312" />
-<TGConnectingPoint num="39" id="5313" />
+<infoparam name="state0" value="Verifyack4" />
+<TGConnectingPoint num="0" id="3581" />
+<TGConnectingPoint num="1" id="3582" />
+<TGConnectingPoint num="2" id="3583" />
+<TGConnectingPoint num="3" id="3584" />
+<TGConnectingPoint num="4" id="3585" />
+<TGConnectingPoint num="5" id="3586" />
+<TGConnectingPoint num="6" id="3587" />
+<TGConnectingPoint num="7" id="3588" />
+<TGConnectingPoint num="8" id="3589" />
+<TGConnectingPoint num="9" id="3590" />
+<TGConnectingPoint num="10" id="3591" />
+<TGConnectingPoint num="11" id="3592" />
+<TGConnectingPoint num="12" id="3593" />
+<TGConnectingPoint num="13" id="3594" />
+<TGConnectingPoint num="14" id="3595" />
+<TGConnectingPoint num="15" id="3596" />
+<TGConnectingPoint num="16" id="3597" />
+<TGConnectingPoint num="17" id="3598" />
+<TGConnectingPoint num="18" id="3599" />
+<TGConnectingPoint num="19" id="3600" />
+<TGConnectingPoint num="20" id="3601" />
+<TGConnectingPoint num="21" id="3602" />
+<TGConnectingPoint num="22" id="3603" />
+<TGConnectingPoint num="23" id="3604" />
+<TGConnectingPoint num="24" id="3605" />
+<TGConnectingPoint num="25" id="3606" />
+<TGConnectingPoint num="26" id="3607" />
+<TGConnectingPoint num="27" id="3608" />
+<TGConnectingPoint num="28" id="3609" />
+<TGConnectingPoint num="29" id="3610" />
+<TGConnectingPoint num="30" id="3611" />
+<TGConnectingPoint num="31" id="3612" />
+<TGConnectingPoint num="32" id="3613" />
+<TGConnectingPoint num="33" id="3614" />
+<TGConnectingPoint num="34" id="3615" />
+<TGConnectingPoint num="35" id="3616" />
+<TGConnectingPoint num="36" id="3617" />
+<TGConnectingPoint num="37" id="3618" />
+<TGConnectingPoint num="38" id="3619" />
+<TGConnectingPoint num="39" id="3620" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5355" >
-<cdparam x="356" y="1402" />
+<COMPONENT type="5106" id="3662" >
+<cdparam x="306" y="1673" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts3" />
-<TGConnectingPoint num="0" id="5315" />
-<TGConnectingPoint num="1" id="5316" />
-<TGConnectingPoint num="2" id="5317" />
-<TGConnectingPoint num="3" id="5318" />
-<TGConnectingPoint num="4" id="5319" />
-<TGConnectingPoint num="5" id="5320" />
-<TGConnectingPoint num="6" id="5321" />
-<TGConnectingPoint num="7" id="5322" />
-<TGConnectingPoint num="8" id="5323" />
-<TGConnectingPoint num="9" id="5324" />
-<TGConnectingPoint num="10" id="5325" />
-<TGConnectingPoint num="11" id="5326" />
-<TGConnectingPoint num="12" id="5327" />
-<TGConnectingPoint num="13" id="5328" />
-<TGConnectingPoint num="14" id="5329" />
-<TGConnectingPoint num="15" id="5330" />
-<TGConnectingPoint num="16" id="5331" />
-<TGConnectingPoint num="17" id="5332" />
-<TGConnectingPoint num="18" id="5333" />
-<TGConnectingPoint num="19" id="5334" />
-<TGConnectingPoint num="20" id="5335" />
-<TGConnectingPoint num="21" id="5336" />
-<TGConnectingPoint num="22" id="5337" />
-<TGConnectingPoint num="23" id="5338" />
-<TGConnectingPoint num="24" id="5339" />
-<TGConnectingPoint num="25" id="5340" />
-<TGConnectingPoint num="26" id="5341" />
-<TGConnectingPoint num="27" id="5342" />
-<TGConnectingPoint num="28" id="5343" />
-<TGConnectingPoint num="29" id="5344" />
-<TGConnectingPoint num="30" id="5345" />
-<TGConnectingPoint num="31" id="5346" />
-<TGConnectingPoint num="32" id="5347" />
-<TGConnectingPoint num="33" id="5348" />
-<TGConnectingPoint num="34" id="5349" />
-<TGConnectingPoint num="35" id="5350" />
-<TGConnectingPoint num="36" id="5351" />
-<TGConnectingPoint num="37" id="5352" />
-<TGConnectingPoint num="38" id="5353" />
-<TGConnectingPoint num="39" id="5354" />
+<infoparam name="state0" value="InvalidSig4" />
+<TGConnectingPoint num="0" id="3622" />
+<TGConnectingPoint num="1" id="3623" />
+<TGConnectingPoint num="2" id="3624" />
+<TGConnectingPoint num="3" id="3625" />
+<TGConnectingPoint num="4" id="3626" />
+<TGConnectingPoint num="5" id="3627" />
+<TGConnectingPoint num="6" id="3628" />
+<TGConnectingPoint num="7" id="3629" />
+<TGConnectingPoint num="8" id="3630" />
+<TGConnectingPoint num="9" id="3631" />
+<TGConnectingPoint num="10" id="3632" />
+<TGConnectingPoint num="11" id="3633" />
+<TGConnectingPoint num="12" id="3634" />
+<TGConnectingPoint num="13" id="3635" />
+<TGConnectingPoint num="14" id="3636" />
+<TGConnectingPoint num="15" id="3637" />
+<TGConnectingPoint num="16" id="3638" />
+<TGConnectingPoint num="17" id="3639" />
+<TGConnectingPoint num="18" id="3640" />
+<TGConnectingPoint num="19" id="3641" />
+<TGConnectingPoint num="20" id="3642" />
+<TGConnectingPoint num="21" id="3643" />
+<TGConnectingPoint num="22" id="3644" />
+<TGConnectingPoint num="23" id="3645" />
+<TGConnectingPoint num="24" id="3646" />
+<TGConnectingPoint num="25" id="3647" />
+<TGConnectingPoint num="26" id="3648" />
+<TGConnectingPoint num="27" id="3649" />
+<TGConnectingPoint num="28" id="3650" />
+<TGConnectingPoint num="29" id="3651" />
+<TGConnectingPoint num="30" id="3652" />
+<TGConnectingPoint num="31" id="3653" />
+<TGConnectingPoint num="32" id="3654" />
+<TGConnectingPoint num="33" id="3655" />
+<TGConnectingPoint num="34" id="3656" />
+<TGConnectingPoint num="35" id="3657" />
+<TGConnectingPoint num="36" id="3658" />
+<TGConnectingPoint num="37" id="3659" />
+<TGConnectingPoint num="38" id="3660" />
+<TGConnectingPoint num="39" id="3661" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5366" >
-<cdparam x="378" y="1316" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m3)" />
-<TGConnectingPoint num="0" id="5356" />
-<TGConnectingPoint num="1" id="5357" />
-<TGConnectingPoint num="2" id="5358" />
-<TGConnectingPoint num="3" id="5359" />
-<TGConnectingPoint num="4" id="5360" />
-<TGConnectingPoint num="5" id="5361" />
-<TGConnectingPoint num="6" id="5362" />
-<TGConnectingPoint num="7" id="5363" />
-<TGConnectingPoint num="8" id="5364" />
-<TGConnectingPoint num="9" id="5365" />
-</COMPONENT>
-
-<COMPONENT type="301" id="5375" >
-<cdparam x="556" y="1246" />
-<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3703" >
+<cdparam x="429" y="1583" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Verify Message with session key from ECU1
-" />
-<TGConnectingPoint num="0" id="5367" />
-<TGConnectingPoint num="1" id="5368" />
-<TGConnectingPoint num="2" id="5369" />
-<TGConnectingPoint num="3" id="5370" />
-<TGConnectingPoint num="4" id="5371" />
-<TGConnectingPoint num="5" id="5372" />
-<TGConnectingPoint num="6" id="5373" />
-<TGConnectingPoint num="7" id="5374" />
+<infoparam name="state0" value="VerifySig4" />
+<TGConnectingPoint num="0" id="3663" />
+<TGConnectingPoint num="1" id="3664" />
+<TGConnectingPoint num="2" id="3665" />
+<TGConnectingPoint num="3" id="3666" />
+<TGConnectingPoint num="4" id="3667" />
+<TGConnectingPoint num="5" id="3668" />
+<TGConnectingPoint num="6" id="3669" />
+<TGConnectingPoint num="7" id="3670" />
+<TGConnectingPoint num="8" id="3671" />
+<TGConnectingPoint num="9" id="3672" />
+<TGConnectingPoint num="10" id="3673" />
+<TGConnectingPoint num="11" id="3674" />
+<TGConnectingPoint num="12" id="3675" />
+<TGConnectingPoint num="13" id="3676" />
+<TGConnectingPoint num="14" id="3677" />
+<TGConnectingPoint num="15" id="3678" />
+<TGConnectingPoint num="16" id="3679" />
+<TGConnectingPoint num="17" id="3680" />
+<TGConnectingPoint num="18" id="3681" />
+<TGConnectingPoint num="19" id="3682" />
+<TGConnectingPoint num="20" id="3683" />
+<TGConnectingPoint num="21" id="3684" />
+<TGConnectingPoint num="22" id="3685" />
+<TGConnectingPoint num="23" id="3686" />
+<TGConnectingPoint num="24" id="3687" />
+<TGConnectingPoint num="25" id="3688" />
+<TGConnectingPoint num="26" id="3689" />
+<TGConnectingPoint num="27" id="3690" />
+<TGConnectingPoint num="28" id="3691" />
+<TGConnectingPoint num="29" id="3692" />
+<TGConnectingPoint num="30" id="3693" />
+<TGConnectingPoint num="31" id="3694" />
+<TGConnectingPoint num="32" id="3695" />
+<TGConnectingPoint num="33" id="3696" />
+<TGConnectingPoint num="34" id="3697" />
+<TGConnectingPoint num="35" id="3698" />
+<TGConnectingPoint num="36" id="3699" />
+<TGConnectingPoint num="37" id="3700" />
+<TGConnectingPoint num="38" id="3701" />
+<TGConnectingPoint num="39" id="3702" />
 <extraparam>
-<Line value="Verify Message with session key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5416" >
-<cdparam x="375" y="1247" />
+<COMPONENT type="5106" id="3744" >
+<cdparam x="227" y="1579" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg3" />
-<TGConnectingPoint num="0" id="5376" />
-<TGConnectingPoint num="1" id="5377" />
-<TGConnectingPoint num="2" id="5378" />
-<TGConnectingPoint num="3" id="5379" />
-<TGConnectingPoint num="4" id="5380" />
-<TGConnectingPoint num="5" id="5381" />
-<TGConnectingPoint num="6" id="5382" />
-<TGConnectingPoint num="7" id="5383" />
-<TGConnectingPoint num="8" id="5384" />
-<TGConnectingPoint num="9" id="5385" />
-<TGConnectingPoint num="10" id="5386" />
-<TGConnectingPoint num="11" id="5387" />
-<TGConnectingPoint num="12" id="5388" />
-<TGConnectingPoint num="13" id="5389" />
-<TGConnectingPoint num="14" id="5390" />
-<TGConnectingPoint num="15" id="5391" />
-<TGConnectingPoint num="16" id="5392" />
-<TGConnectingPoint num="17" id="5393" />
-<TGConnectingPoint num="18" id="5394" />
-<TGConnectingPoint num="19" id="5395" />
-<TGConnectingPoint num="20" id="5396" />
-<TGConnectingPoint num="21" id="5397" />
-<TGConnectingPoint num="22" id="5398" />
-<TGConnectingPoint num="23" id="5399" />
-<TGConnectingPoint num="24" id="5400" />
-<TGConnectingPoint num="25" id="5401" />
-<TGConnectingPoint num="26" id="5402" />
-<TGConnectingPoint num="27" id="5403" />
-<TGConnectingPoint num="28" id="5404" />
-<TGConnectingPoint num="29" id="5405" />
-<TGConnectingPoint num="30" id="5406" />
-<TGConnectingPoint num="31" id="5407" />
-<TGConnectingPoint num="32" id="5408" />
-<TGConnectingPoint num="33" id="5409" />
-<TGConnectingPoint num="34" id="5410" />
-<TGConnectingPoint num="35" id="5411" />
-<TGConnectingPoint num="36" id="5412" />
-<TGConnectingPoint num="37" id="5413" />
-<TGConnectingPoint num="38" id="5414" />
-<TGConnectingPoint num="39" id="5415" />
+<infoparam name="state0" value="Invalidts4" />
+<TGConnectingPoint num="0" id="3704" />
+<TGConnectingPoint num="1" id="3705" />
+<TGConnectingPoint num="2" id="3706" />
+<TGConnectingPoint num="3" id="3707" />
+<TGConnectingPoint num="4" id="3708" />
+<TGConnectingPoint num="5" id="3709" />
+<TGConnectingPoint num="6" id="3710" />
+<TGConnectingPoint num="7" id="3711" />
+<TGConnectingPoint num="8" id="3712" />
+<TGConnectingPoint num="9" id="3713" />
+<TGConnectingPoint num="10" id="3714" />
+<TGConnectingPoint num="11" id="3715" />
+<TGConnectingPoint num="12" id="3716" />
+<TGConnectingPoint num="13" id="3717" />
+<TGConnectingPoint num="14" id="3718" />
+<TGConnectingPoint num="15" id="3719" />
+<TGConnectingPoint num="16" id="3720" />
+<TGConnectingPoint num="17" id="3721" />
+<TGConnectingPoint num="18" id="3722" />
+<TGConnectingPoint num="19" id="3723" />
+<TGConnectingPoint num="20" id="3724" />
+<TGConnectingPoint num="21" id="3725" />
+<TGConnectingPoint num="22" id="3726" />
+<TGConnectingPoint num="23" id="3727" />
+<TGConnectingPoint num="24" id="3728" />
+<TGConnectingPoint num="25" id="3729" />
+<TGConnectingPoint num="26" id="3730" />
+<TGConnectingPoint num="27" id="3731" />
+<TGConnectingPoint num="28" id="3732" />
+<TGConnectingPoint num="29" id="3733" />
+<TGConnectingPoint num="30" id="3734" />
+<TGConnectingPoint num="31" id="3735" />
+<TGConnectingPoint num="32" id="3736" />
+<TGConnectingPoint num="33" id="3737" />
+<TGConnectingPoint num="34" id="3738" />
+<TGConnectingPoint num="35" id="3739" />
+<TGConnectingPoint num="36" id="3740" />
+<TGConnectingPoint num="37" id="3741" />
+<TGConnectingPoint num="38" id="3742" />
+<TGConnectingPoint num="39" id="3743" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="5427" >
-<cdparam x="400" y="1197" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m2)" />
-<TGConnectingPoint num="0" id="5417" />
-<TGConnectingPoint num="1" id="5418" />
-<TGConnectingPoint num="2" id="5419" />
-<TGConnectingPoint num="3" id="5420" />
-<TGConnectingPoint num="4" id="5421" />
-<TGConnectingPoint num="5" id="5422" />
-<TGConnectingPoint num="6" id="5423" />
-<TGConnectingPoint num="7" id="5424" />
-<TGConnectingPoint num="8" id="5425" />
-<TGConnectingPoint num="9" id="5426" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5468" >
-<cdparam x="379" y="1137" />
+<COMPONENT type="5106" id="3785" >
+<cdparam x="350" y="1491" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg2" />
-<TGConnectingPoint num="0" id="5428" />
-<TGConnectingPoint num="1" id="5429" />
-<TGConnectingPoint num="2" id="5430" />
-<TGConnectingPoint num="3" id="5431" />
-<TGConnectingPoint num="4" id="5432" />
-<TGConnectingPoint num="5" id="5433" />
-<TGConnectingPoint num="6" id="5434" />
-<TGConnectingPoint num="7" id="5435" />
-<TGConnectingPoint num="8" id="5436" />
-<TGConnectingPoint num="9" id="5437" />
-<TGConnectingPoint num="10" id="5438" />
-<TGConnectingPoint num="11" id="5439" />
-<TGConnectingPoint num="12" id="5440" />
-<TGConnectingPoint num="13" id="5441" />
-<TGConnectingPoint num="14" id="5442" />
-<TGConnectingPoint num="15" id="5443" />
-<TGConnectingPoint num="16" id="5444" />
-<TGConnectingPoint num="17" id="5445" />
-<TGConnectingPoint num="18" id="5446" />
-<TGConnectingPoint num="19" id="5447" />
-<TGConnectingPoint num="20" id="5448" />
-<TGConnectingPoint num="21" id="5449" />
-<TGConnectingPoint num="22" id="5450" />
-<TGConnectingPoint num="23" id="5451" />
-<TGConnectingPoint num="24" id="5452" />
-<TGConnectingPoint num="25" id="5453" />
-<TGConnectingPoint num="26" id="5454" />
-<TGConnectingPoint num="27" id="5455" />
-<TGConnectingPoint num="28" id="5456" />
-<TGConnectingPoint num="29" id="5457" />
-<TGConnectingPoint num="30" id="5458" />
-<TGConnectingPoint num="31" id="5459" />
-<TGConnectingPoint num="32" id="5460" />
-<TGConnectingPoint num="33" id="5461" />
-<TGConnectingPoint num="34" id="5462" />
-<TGConnectingPoint num="35" id="5463" />
-<TGConnectingPoint num="36" id="5464" />
-<TGConnectingPoint num="37" id="5465" />
-<TGConnectingPoint num="38" id="5466" />
-<TGConnectingPoint num="39" id="5467" />
+<infoparam name="state0" value="Testts4" />
+<TGConnectingPoint num="0" id="3745" />
+<TGConnectingPoint num="1" id="3746" />
+<TGConnectingPoint num="2" id="3747" />
+<TGConnectingPoint num="3" id="3748" />
+<TGConnectingPoint num="4" id="3749" />
+<TGConnectingPoint num="5" id="3750" />
+<TGConnectingPoint num="6" id="3751" />
+<TGConnectingPoint num="7" id="3752" />
+<TGConnectingPoint num="8" id="3753" />
+<TGConnectingPoint num="9" id="3754" />
+<TGConnectingPoint num="10" id="3755" />
+<TGConnectingPoint num="11" id="3756" />
+<TGConnectingPoint num="12" id="3757" />
+<TGConnectingPoint num="13" id="3758" />
+<TGConnectingPoint num="14" id="3759" />
+<TGConnectingPoint num="15" id="3760" />
+<TGConnectingPoint num="16" id="3761" />
+<TGConnectingPoint num="17" id="3762" />
+<TGConnectingPoint num="18" id="3763" />
+<TGConnectingPoint num="19" id="3764" />
+<TGConnectingPoint num="20" id="3765" />
+<TGConnectingPoint num="21" id="3766" />
+<TGConnectingPoint num="22" id="3767" />
+<TGConnectingPoint num="23" id="3768" />
+<TGConnectingPoint num="24" id="3769" />
+<TGConnectingPoint num="25" id="3770" />
+<TGConnectingPoint num="26" id="3771" />
+<TGConnectingPoint num="27" id="3772" />
+<TGConnectingPoint num="28" id="3773" />
+<TGConnectingPoint num="29" id="3774" />
+<TGConnectingPoint num="30" id="3775" />
+<TGConnectingPoint num="31" id="3776" />
+<TGConnectingPoint num="32" id="3777" />
+<TGConnectingPoint num="33" id="3778" />
+<TGConnectingPoint num="34" id="3779" />
+<TGConnectingPoint num="35" id="3780" />
+<TGConnectingPoint num="36" id="3781" />
+<TGConnectingPoint num="37" id="3782" />
+<TGConnectingPoint num="38" id="3783" />
+<TGConnectingPoint num="39" id="3784" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="5477" >
-<cdparam x="546" y="983" />
-<sizeparam width="342" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3796" >
+<cdparam x="354" y="1410" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create and send answer for ECU1: Certified pk of ECU2
-" />
-<TGConnectingPoint num="0" id="5469" />
-<TGConnectingPoint num="1" id="5470" />
-<TGConnectingPoint num="2" id="5471" />
-<TGConnectingPoint num="3" id="5472" />
-<TGConnectingPoint num="4" id="5473" />
-<TGConnectingPoint num="5" id="5474" />
-<TGConnectingPoint num="6" id="5475" />
-<TGConnectingPoint num="7" id="5476" />
-<extraparam>
-<Line value="Create and send answer for ECU1: Certified pk of ECU2" />
-</extraparam>
+<infoparam name="Receive signal" value="chin(m4)" />
+<TGConnectingPoint num="0" id="3786" />
+<TGConnectingPoint num="1" id="3787" />
+<TGConnectingPoint num="2" id="3788" />
+<TGConnectingPoint num="3" id="3789" />
+<TGConnectingPoint num="4" id="3790" />
+<TGConnectingPoint num="5" id="3791" />
+<TGConnectingPoint num="6" id="3792" />
+<TGConnectingPoint num="7" id="3793" />
+<TGConnectingPoint num="8" id="3794" />
+<TGConnectingPoint num="9" id="3795" />
 </COMPONENT>
 
-<COMPONENT type="301" id="5486" >
-<cdparam x="453" y="555" />
-<sizeparam width="324" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="3805" >
+<cdparam x="557" y="1318" />
+<sizeparam width="288" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Begin verifying m1: PK-Request message from ECU1
+<infoparam name="UML Note" value="Receive and verify ack-message from ECU2
 " />
-<TGConnectingPoint num="0" id="5478" />
-<TGConnectingPoint num="1" id="5479" />
-<TGConnectingPoint num="2" id="5480" />
-<TGConnectingPoint num="3" id="5481" />
-<TGConnectingPoint num="4" id="5482" />
-<TGConnectingPoint num="5" id="5483" />
-<TGConnectingPoint num="6" id="5484" />
-<TGConnectingPoint num="7" id="5485" />
+<TGConnectingPoint num="0" id="3797" />
+<TGConnectingPoint num="1" id="3798" />
+<TGConnectingPoint num="2" id="3799" />
+<TGConnectingPoint num="3" id="3800" />
+<TGConnectingPoint num="4" id="3801" />
+<TGConnectingPoint num="5" id="3802" />
+<TGConnectingPoint num="6" id="3803" />
+<TGConnectingPoint num="7" id="3804" />
+<TGConnectingPoint num="8" id="103190" />
+<TGConnectingPoint num="9" id="103191" />
+<TGConnectingPoint num="10" id="103192" />
+<TGConnectingPoint num="11" id="103193" />
+<TGConnectingPoint num="12" id="103194" />
+<TGConnectingPoint num="13" id="103195" />
+<TGConnectingPoint num="14" id="103196" />
+<TGConnectingPoint num="15" id="103197" />
 <extraparam>
-<Line value="Begin verifying m1: PK-Request message from ECU1" />
+<Line value="Receive and verify ack-message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="5495" >
-<cdparam x="272" y="66" />
-<sizeparam width="310" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3846" >
+<cdparam x="349" y="1324" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Begin verifying m0: certified public key from ECU1
-" />
-<TGConnectingPoint num="0" id="5487" />
-<TGConnectingPoint num="1" id="5488" />
-<TGConnectingPoint num="2" id="5489" />
-<TGConnectingPoint num="3" id="5490" />
-<TGConnectingPoint num="4" id="5491" />
-<TGConnectingPoint num="5" id="5492" />
-<TGConnectingPoint num="6" id="5493" />
-<TGConnectingPoint num="7" id="5494" />
+<infoparam name="state0" value="WaitForMsg4" />
+<TGConnectingPoint num="0" id="3806" />
+<TGConnectingPoint num="1" id="3807" />
+<TGConnectingPoint num="2" id="3808" />
+<TGConnectingPoint num="3" id="3809" />
+<TGConnectingPoint num="4" id="3810" />
+<TGConnectingPoint num="5" id="3811" />
+<TGConnectingPoint num="6" id="3812" />
+<TGConnectingPoint num="7" id="3813" />
+<TGConnectingPoint num="8" id="3814" />
+<TGConnectingPoint num="9" id="3815" />
+<TGConnectingPoint num="10" id="3816" />
+<TGConnectingPoint num="11" id="3817" />
+<TGConnectingPoint num="12" id="3818" />
+<TGConnectingPoint num="13" id="3819" />
+<TGConnectingPoint num="14" id="3820" />
+<TGConnectingPoint num="15" id="3821" />
+<TGConnectingPoint num="16" id="3822" />
+<TGConnectingPoint num="17" id="3823" />
+<TGConnectingPoint num="18" id="3824" />
+<TGConnectingPoint num="19" id="3825" />
+<TGConnectingPoint num="20" id="3826" />
+<TGConnectingPoint num="21" id="3827" />
+<TGConnectingPoint num="22" id="3828" />
+<TGConnectingPoint num="23" id="3829" />
+<TGConnectingPoint num="24" id="3830" />
+<TGConnectingPoint num="25" id="3831" />
+<TGConnectingPoint num="26" id="3832" />
+<TGConnectingPoint num="27" id="3833" />
+<TGConnectingPoint num="28" id="3834" />
+<TGConnectingPoint num="29" id="3835" />
+<TGConnectingPoint num="30" id="3836" />
+<TGConnectingPoint num="31" id="3837" />
+<TGConnectingPoint num="32" id="3838" />
+<TGConnectingPoint num="33" id="3839" />
+<TGConnectingPoint num="34" id="3840" />
+<TGConnectingPoint num="35" id="3841" />
+<TGConnectingPoint num="36" id="3842" />
+<TGConnectingPoint num="37" id="3843" />
+<TGConnectingPoint num="38" id="3844" />
+<TGConnectingPoint num="39" id="3845" />
 <extraparam>
-<Line value="Begin verifying m0: certified public key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5536" >
-<cdparam x="384" y="978" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3857" >
+<cdparam x="355" y="1262" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg2" />
-<TGConnectingPoint num="0" id="5496" />
-<TGConnectingPoint num="1" id="5497" />
-<TGConnectingPoint num="2" id="5498" />
-<TGConnectingPoint num="3" id="5499" />
-<TGConnectingPoint num="4" id="5500" />
-<TGConnectingPoint num="5" id="5501" />
-<TGConnectingPoint num="6" id="5502" />
-<TGConnectingPoint num="7" id="5503" />
-<TGConnectingPoint num="8" id="5504" />
-<TGConnectingPoint num="9" id="5505" />
-<TGConnectingPoint num="10" id="5506" />
-<TGConnectingPoint num="11" id="5507" />
-<TGConnectingPoint num="12" id="5508" />
-<TGConnectingPoint num="13" id="5509" />
-<TGConnectingPoint num="14" id="5510" />
-<TGConnectingPoint num="15" id="5511" />
-<TGConnectingPoint num="16" id="5512" />
-<TGConnectingPoint num="17" id="5513" />
-<TGConnectingPoint num="18" id="5514" />
-<TGConnectingPoint num="19" id="5515" />
-<TGConnectingPoint num="20" id="5516" />
-<TGConnectingPoint num="21" id="5517" />
-<TGConnectingPoint num="22" id="5518" />
-<TGConnectingPoint num="23" id="5519" />
-<TGConnectingPoint num="24" id="5520" />
-<TGConnectingPoint num="25" id="5521" />
-<TGConnectingPoint num="26" id="5522" />
-<TGConnectingPoint num="27" id="5523" />
-<TGConnectingPoint num="28" id="5524" />
-<TGConnectingPoint num="29" id="5525" />
-<TGConnectingPoint num="30" id="5526" />
-<TGConnectingPoint num="31" id="5527" />
-<TGConnectingPoint num="32" id="5528" />
-<TGConnectingPoint num="33" id="5529" />
-<TGConnectingPoint num="34" id="5530" />
-<TGConnectingPoint num="35" id="5531" />
-<TGConnectingPoint num="36" id="5532" />
-<TGConnectingPoint num="37" id="5533" />
-<TGConnectingPoint num="38" id="5534" />
-<TGConnectingPoint num="39" id="5535" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m3)" />
+<TGConnectingPoint num="0" id="3847" />
+<TGConnectingPoint num="1" id="3848" />
+<TGConnectingPoint num="2" id="3849" />
+<TGConnectingPoint num="3" id="3850" />
+<TGConnectingPoint num="4" id="3851" />
+<TGConnectingPoint num="5" id="3852" />
+<TGConnectingPoint num="6" id="3853" />
+<TGConnectingPoint num="7" id="3854" />
+<TGConnectingPoint num="8" id="3855" />
+<TGConnectingPoint num="9" id="3856" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="5577" >
-<cdparam x="197" y="980" />
-<sizeparam width="107" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3898" >
+<cdparam x="335" y="1185" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="UnexpectedMsg" />
-<TGConnectingPoint num="0" id="5537" />
-<TGConnectingPoint num="1" id="5538" />
-<TGConnectingPoint num="2" id="5539" />
-<TGConnectingPoint num="3" id="5540" />
-<TGConnectingPoint num="4" id="5541" />
-<TGConnectingPoint num="5" id="5542" />
-<TGConnectingPoint num="6" id="5543" />
-<TGConnectingPoint num="7" id="5544" />
-<TGConnectingPoint num="8" id="5545" />
-<TGConnectingPoint num="9" id="5546" />
-<TGConnectingPoint num="10" id="5547" />
-<TGConnectingPoint num="11" id="5548" />
-<TGConnectingPoint num="12" id="5549" />
-<TGConnectingPoint num="13" id="5550" />
-<TGConnectingPoint num="14" id="5551" />
-<TGConnectingPoint num="15" id="5552" />
-<TGConnectingPoint num="16" id="5553" />
-<TGConnectingPoint num="17" id="5554" />
-<TGConnectingPoint num="18" id="5555" />
-<TGConnectingPoint num="19" id="5556" />
-<TGConnectingPoint num="20" id="5557" />
-<TGConnectingPoint num="21" id="5558" />
-<TGConnectingPoint num="22" id="5559" />
-<TGConnectingPoint num="23" id="5560" />
-<TGConnectingPoint num="24" id="5561" />
-<TGConnectingPoint num="25" id="5562" />
-<TGConnectingPoint num="26" id="5563" />
-<TGConnectingPoint num="27" id="5564" />
-<TGConnectingPoint num="28" id="5565" />
-<TGConnectingPoint num="29" id="5566" />
-<TGConnectingPoint num="30" id="5567" />
-<TGConnectingPoint num="31" id="5568" />
-<TGConnectingPoint num="32" id="5569" />
-<TGConnectingPoint num="33" id="5570" />
-<TGConnectingPoint num="34" id="5571" />
-<TGConnectingPoint num="35" id="5572" />
-<TGConnectingPoint num="36" id="5573" />
-<TGConnectingPoint num="37" id="5574" />
-<TGConnectingPoint num="38" id="5575" />
-<TGConnectingPoint num="39" id="5576" />
+<infoparam name="state0" value="SendMsg3" />
+<TGConnectingPoint num="0" id="3858" />
+<TGConnectingPoint num="1" id="3859" />
+<TGConnectingPoint num="2" id="3860" />
+<TGConnectingPoint num="3" id="3861" />
+<TGConnectingPoint num="4" id="3862" />
+<TGConnectingPoint num="5" id="3863" />
+<TGConnectingPoint num="6" id="3864" />
+<TGConnectingPoint num="7" id="3865" />
+<TGConnectingPoint num="8" id="3866" />
+<TGConnectingPoint num="9" id="3867" />
+<TGConnectingPoint num="10" id="3868" />
+<TGConnectingPoint num="11" id="3869" />
+<TGConnectingPoint num="12" id="3870" />
+<TGConnectingPoint num="13" id="3871" />
+<TGConnectingPoint num="14" id="3872" />
+<TGConnectingPoint num="15" id="3873" />
+<TGConnectingPoint num="16" id="3874" />
+<TGConnectingPoint num="17" id="3875" />
+<TGConnectingPoint num="18" id="3876" />
+<TGConnectingPoint num="19" id="3877" />
+<TGConnectingPoint num="20" id="3878" />
+<TGConnectingPoint num="21" id="3879" />
+<TGConnectingPoint num="22" id="3880" />
+<TGConnectingPoint num="23" id="3881" />
+<TGConnectingPoint num="24" id="3882" />
+<TGConnectingPoint num="25" id="3883" />
+<TGConnectingPoint num="26" id="3884" />
+<TGConnectingPoint num="27" id="3885" />
+<TGConnectingPoint num="28" id="3886" />
+<TGConnectingPoint num="29" id="3887" />
+<TGConnectingPoint num="30" id="3888" />
+<TGConnectingPoint num="31" id="3889" />
+<TGConnectingPoint num="32" id="3890" />
+<TGConnectingPoint num="33" id="3891" />
+<TGConnectingPoint num="34" id="3892" />
+<TGConnectingPoint num="35" id="3893" />
+<TGConnectingPoint num="36" id="3894" />
+<TGConnectingPoint num="37" id="3895" />
+<TGConnectingPoint num="38" id="3896" />
+<TGConnectingPoint num="39" id="3897" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5618" >
-<cdparam x="329" y="880" />
+<COMPONENT type="301" id="3907" >
+<cdparam x="526" y="1019" />
+<sizeparam width="452" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="UML Note" value="Create and send m3, message containing the encrypted session key
+" />
+<TGConnectingPoint num="0" id="3899" />
+<TGConnectingPoint num="1" id="3900" />
+<TGConnectingPoint num="2" id="3901" />
+<TGConnectingPoint num="3" id="3902" />
+<TGConnectingPoint num="4" id="3903" />
+<TGConnectingPoint num="5" id="3904" />
+<TGConnectingPoint num="6" id="3905" />
+<TGConnectingPoint num="7" id="3906" />
+<TGConnectingPoint num="8" id="103300" />
+<TGConnectingPoint num="9" id="103301" />
+<TGConnectingPoint num="10" id="103302" />
+<TGConnectingPoint num="11" id="103303" />
+<TGConnectingPoint num="12" id="103304" />
+<TGConnectingPoint num="13" id="103305" />
+<TGConnectingPoint num="14" id="103306" />
+<TGConnectingPoint num="15" id="103307" />
+<extraparam>
+<Line value="Create and send m3, message containing the encrypted session key" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3948" >
+<cdparam x="338" y="1019" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyrpk" />
-<TGConnectingPoint num="0" id="5578" />
-<TGConnectingPoint num="1" id="5579" />
-<TGConnectingPoint num="2" id="5580" />
-<TGConnectingPoint num="3" id="5581" />
-<TGConnectingPoint num="4" id="5582" />
-<TGConnectingPoint num="5" id="5583" />
-<TGConnectingPoint num="6" id="5584" />
-<TGConnectingPoint num="7" id="5585" />
-<TGConnectingPoint num="8" id="5586" />
-<TGConnectingPoint num="9" id="5587" />
-<TGConnectingPoint num="10" id="5588" />
-<TGConnectingPoint num="11" id="5589" />
-<TGConnectingPoint num="12" id="5590" />
-<TGConnectingPoint num="13" id="5591" />
-<TGConnectingPoint num="14" id="5592" />
-<TGConnectingPoint num="15" id="5593" />
-<TGConnectingPoint num="16" id="5594" />
-<TGConnectingPoint num="17" id="5595" />
-<TGConnectingPoint num="18" id="5596" />
-<TGConnectingPoint num="19" id="5597" />
-<TGConnectingPoint num="20" id="5598" />
-<TGConnectingPoint num="21" id="5599" />
-<TGConnectingPoint num="22" id="5600" />
-<TGConnectingPoint num="23" id="5601" />
-<TGConnectingPoint num="24" id="5602" />
-<TGConnectingPoint num="25" id="5603" />
-<TGConnectingPoint num="26" id="5604" />
-<TGConnectingPoint num="27" id="5605" />
-<TGConnectingPoint num="28" id="5606" />
-<TGConnectingPoint num="29" id="5607" />
-<TGConnectingPoint num="30" id="5608" />
-<TGConnectingPoint num="31" id="5609" />
-<TGConnectingPoint num="32" id="5610" />
-<TGConnectingPoint num="33" id="5611" />
-<TGConnectingPoint num="34" id="5612" />
-<TGConnectingPoint num="35" id="5613" />
-<TGConnectingPoint num="36" id="5614" />
-<TGConnectingPoint num="37" id="5615" />
-<TGConnectingPoint num="38" id="5616" />
-<TGConnectingPoint num="39" id="5617" />
+<infoparam name="state0" value="ForgeMsg3" />
+<TGConnectingPoint num="0" id="3908" />
+<TGConnectingPoint num="1" id="3909" />
+<TGConnectingPoint num="2" id="3910" />
+<TGConnectingPoint num="3" id="3911" />
+<TGConnectingPoint num="4" id="3912" />
+<TGConnectingPoint num="5" id="3913" />
+<TGConnectingPoint num="6" id="3914" />
+<TGConnectingPoint num="7" id="3915" />
+<TGConnectingPoint num="8" id="3916" />
+<TGConnectingPoint num="9" id="3917" />
+<TGConnectingPoint num="10" id="3918" />
+<TGConnectingPoint num="11" id="3919" />
+<TGConnectingPoint num="12" id="3920" />
+<TGConnectingPoint num="13" id="3921" />
+<TGConnectingPoint num="14" id="3922" />
+<TGConnectingPoint num="15" id="3923" />
+<TGConnectingPoint num="16" id="3924" />
+<TGConnectingPoint num="17" id="3925" />
+<TGConnectingPoint num="18" id="3926" />
+<TGConnectingPoint num="19" id="3927" />
+<TGConnectingPoint num="20" id="3928" />
+<TGConnectingPoint num="21" id="3929" />
+<TGConnectingPoint num="22" id="3930" />
+<TGConnectingPoint num="23" id="3931" />
+<TGConnectingPoint num="24" id="3932" />
+<TGConnectingPoint num="25" id="3933" />
+<TGConnectingPoint num="26" id="3934" />
+<TGConnectingPoint num="27" id="3935" />
+<TGConnectingPoint num="28" id="3936" />
+<TGConnectingPoint num="29" id="3937" />
+<TGConnectingPoint num="30" id="3938" />
+<TGConnectingPoint num="31" id="3939" />
+<TGConnectingPoint num="32" id="3940" />
+<TGConnectingPoint num="33" id="3941" />
+<TGConnectingPoint num="34" id="3942" />
+<TGConnectingPoint num="35" id="3943" />
+<TGConnectingPoint num="36" id="3944" />
+<TGConnectingPoint num="37" id="3945" />
+<TGConnectingPoint num="38" id="3946" />
+<TGConnectingPoint num="39" id="3947" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5659" >
-<cdparam x="149" y="877" />
+<COMPONENT type="5106" id="3989" >
+<cdparam x="160" y="1019" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig1" />
-<TGConnectingPoint num="0" id="5619" />
-<TGConnectingPoint num="1" id="5620" />
-<TGConnectingPoint num="2" id="5621" />
-<TGConnectingPoint num="3" id="5622" />
-<TGConnectingPoint num="4" id="5623" />
-<TGConnectingPoint num="5" id="5624" />
-<TGConnectingPoint num="6" id="5625" />
-<TGConnectingPoint num="7" id="5626" />
-<TGConnectingPoint num="8" id="5627" />
-<TGConnectingPoint num="9" id="5628" />
-<TGConnectingPoint num="10" id="5629" />
-<TGConnectingPoint num="11" id="5630" />
-<TGConnectingPoint num="12" id="5631" />
-<TGConnectingPoint num="13" id="5632" />
-<TGConnectingPoint num="14" id="5633" />
-<TGConnectingPoint num="15" id="5634" />
-<TGConnectingPoint num="16" id="5635" />
-<TGConnectingPoint num="17" id="5636" />
-<TGConnectingPoint num="18" id="5637" />
-<TGConnectingPoint num="19" id="5638" />
-<TGConnectingPoint num="20" id="5639" />
-<TGConnectingPoint num="21" id="5640" />
-<TGConnectingPoint num="22" id="5641" />
-<TGConnectingPoint num="23" id="5642" />
-<TGConnectingPoint num="24" id="5643" />
-<TGConnectingPoint num="25" id="5644" />
-<TGConnectingPoint num="26" id="5645" />
-<TGConnectingPoint num="27" id="5646" />
-<TGConnectingPoint num="28" id="5647" />
-<TGConnectingPoint num="29" id="5648" />
-<TGConnectingPoint num="30" id="5649" />
-<TGConnectingPoint num="31" id="5650" />
-<TGConnectingPoint num="32" id="5651" />
-<TGConnectingPoint num="33" id="5652" />
-<TGConnectingPoint num="34" id="5653" />
-<TGConnectingPoint num="35" id="5654" />
-<TGConnectingPoint num="36" id="5655" />
-<TGConnectingPoint num="37" id="5656" />
-<TGConnectingPoint num="38" id="5657" />
-<TGConnectingPoint num="39" id="5658" />
+<infoparam name="state0" value="InvalidSig2" />
+<TGConnectingPoint num="0" id="3949" />
+<TGConnectingPoint num="1" id="3950" />
+<TGConnectingPoint num="2" id="3951" />
+<TGConnectingPoint num="3" id="3952" />
+<TGConnectingPoint num="4" id="3953" />
+<TGConnectingPoint num="5" id="3954" />
+<TGConnectingPoint num="6" id="3955" />
+<TGConnectingPoint num="7" id="3956" />
+<TGConnectingPoint num="8" id="3957" />
+<TGConnectingPoint num="9" id="3958" />
+<TGConnectingPoint num="10" id="3959" />
+<TGConnectingPoint num="11" id="3960" />
+<TGConnectingPoint num="12" id="3961" />
+<TGConnectingPoint num="13" id="3962" />
+<TGConnectingPoint num="14" id="3963" />
+<TGConnectingPoint num="15" id="3964" />
+<TGConnectingPoint num="16" id="3965" />
+<TGConnectingPoint num="17" id="3966" />
+<TGConnectingPoint num="18" id="3967" />
+<TGConnectingPoint num="19" id="3968" />
+<TGConnectingPoint num="20" id="3969" />
+<TGConnectingPoint num="21" id="3970" />
+<TGConnectingPoint num="22" id="3971" />
+<TGConnectingPoint num="23" id="3972" />
+<TGConnectingPoint num="24" id="3973" />
+<TGConnectingPoint num="25" id="3974" />
+<TGConnectingPoint num="26" id="3975" />
+<TGConnectingPoint num="27" id="3976" />
+<TGConnectingPoint num="28" id="3977" />
+<TGConnectingPoint num="29" id="3978" />
+<TGConnectingPoint num="30" id="3979" />
+<TGConnectingPoint num="31" id="3980" />
+<TGConnectingPoint num="32" id="3981" />
+<TGConnectingPoint num="33" id="3982" />
+<TGConnectingPoint num="34" id="3983" />
+<TGConnectingPoint num="35" id="3984" />
+<TGConnectingPoint num="36" id="3985" />
+<TGConnectingPoint num="37" id="3986" />
+<TGConnectingPoint num="38" id="3987" />
+<TGConnectingPoint num="39" id="3988" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5700" >
-<cdparam x="267" y="778" />
+<COMPONENT type="5106" id="4030" >
+<cdparam x="278" y="914" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig1" />
-<TGConnectingPoint num="0" id="5660" />
-<TGConnectingPoint num="1" id="5661" />
-<TGConnectingPoint num="2" id="5662" />
-<TGConnectingPoint num="3" id="5663" />
-<TGConnectingPoint num="4" id="5664" />
-<TGConnectingPoint num="5" id="5665" />
-<TGConnectingPoint num="6" id="5666" />
-<TGConnectingPoint num="7" id="5667" />
-<TGConnectingPoint num="8" id="5668" />
-<TGConnectingPoint num="9" id="5669" />
-<TGConnectingPoint num="10" id="5670" />
-<TGConnectingPoint num="11" id="5671" />
-<TGConnectingPoint num="12" id="5672" />
-<TGConnectingPoint num="13" id="5673" />
-<TGConnectingPoint num="14" id="5674" />
-<TGConnectingPoint num="15" id="5675" />
-<TGConnectingPoint num="16" id="5676" />
-<TGConnectingPoint num="17" id="5677" />
-<TGConnectingPoint num="18" id="5678" />
-<TGConnectingPoint num="19" id="5679" />
-<TGConnectingPoint num="20" id="5680" />
-<TGConnectingPoint num="21" id="5681" />
-<TGConnectingPoint num="22" id="5682" />
-<TGConnectingPoint num="23" id="5683" />
-<TGConnectingPoint num="24" id="5684" />
-<TGConnectingPoint num="25" id="5685" />
-<TGConnectingPoint num="26" id="5686" />
-<TGConnectingPoint num="27" id="5687" />
-<TGConnectingPoint num="28" id="5688" />
-<TGConnectingPoint num="29" id="5689" />
-<TGConnectingPoint num="30" id="5690" />
-<TGConnectingPoint num="31" id="5691" />
-<TGConnectingPoint num="32" id="5692" />
-<TGConnectingPoint num="33" id="5693" />
-<TGConnectingPoint num="34" id="5694" />
-<TGConnectingPoint num="35" id="5695" />
-<TGConnectingPoint num="36" id="5696" />
-<TGConnectingPoint num="37" id="5697" />
-<TGConnectingPoint num="38" id="5698" />
-<TGConnectingPoint num="39" id="5699" />
+<infoparam name="state0" value="VerifySig2" />
+<TGConnectingPoint num="0" id="3990" />
+<TGConnectingPoint num="1" id="3991" />
+<TGConnectingPoint num="2" id="3992" />
+<TGConnectingPoint num="3" id="3993" />
+<TGConnectingPoint num="4" id="3994" />
+<TGConnectingPoint num="5" id="3995" />
+<TGConnectingPoint num="6" id="3996" />
+<TGConnectingPoint num="7" id="3997" />
+<TGConnectingPoint num="8" id="3998" />
+<TGConnectingPoint num="9" id="3999" />
+<TGConnectingPoint num="10" id="4000" />
+<TGConnectingPoint num="11" id="4001" />
+<TGConnectingPoint num="12" id="4002" />
+<TGConnectingPoint num="13" id="4003" />
+<TGConnectingPoint num="14" id="4004" />
+<TGConnectingPoint num="15" id="4005" />
+<TGConnectingPoint num="16" id="4006" />
+<TGConnectingPoint num="17" id="4007" />
+<TGConnectingPoint num="18" id="4008" />
+<TGConnectingPoint num="19" id="4009" />
+<TGConnectingPoint num="20" id="4010" />
+<TGConnectingPoint num="21" id="4011" />
+<TGConnectingPoint num="22" id="4012" />
+<TGConnectingPoint num="23" id="4013" />
+<TGConnectingPoint num="24" id="4014" />
+<TGConnectingPoint num="25" id="4015" />
+<TGConnectingPoint num="26" id="4016" />
+<TGConnectingPoint num="27" id="4017" />
+<TGConnectingPoint num="28" id="4018" />
+<TGConnectingPoint num="29" id="4019" />
+<TGConnectingPoint num="30" id="4020" />
+<TGConnectingPoint num="31" id="4021" />
+<TGConnectingPoint num="32" id="4022" />
+<TGConnectingPoint num="33" id="4023" />
+<TGConnectingPoint num="34" id="4024" />
+<TGConnectingPoint num="35" id="4025" />
+<TGConnectingPoint num="36" id="4026" />
+<TGConnectingPoint num="37" id="4027" />
+<TGConnectingPoint num="38" id="4028" />
+<TGConnectingPoint num="39" id="4029" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5741" >
-<cdparam x="63" y="778" />
+<COMPONENT type="5106" id="4071" >
+<cdparam x="99" y="914" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts1" />
-<TGConnectingPoint num="0" id="5701" />
-<TGConnectingPoint num="1" id="5702" />
-<TGConnectingPoint num="2" id="5703" />
-<TGConnectingPoint num="3" id="5704" />
-<TGConnectingPoint num="4" id="5705" />
-<TGConnectingPoint num="5" id="5706" />
-<TGConnectingPoint num="6" id="5707" />
-<TGConnectingPoint num="7" id="5708" />
-<TGConnectingPoint num="8" id="5709" />
-<TGConnectingPoint num="9" id="5710" />
-<TGConnectingPoint num="10" id="5711" />
-<TGConnectingPoint num="11" id="5712" />
-<TGConnectingPoint num="12" id="5713" />
-<TGConnectingPoint num="13" id="5714" />
-<TGConnectingPoint num="14" id="5715" />
-<TGConnectingPoint num="15" id="5716" />
-<TGConnectingPoint num="16" id="5717" />
-<TGConnectingPoint num="17" id="5718" />
-<TGConnectingPoint num="18" id="5719" />
-<TGConnectingPoint num="19" id="5720" />
-<TGConnectingPoint num="20" id="5721" />
-<TGConnectingPoint num="21" id="5722" />
-<TGConnectingPoint num="22" id="5723" />
-<TGConnectingPoint num="23" id="5724" />
-<TGConnectingPoint num="24" id="5725" />
-<TGConnectingPoint num="25" id="5726" />
-<TGConnectingPoint num="26" id="5727" />
-<TGConnectingPoint num="27" id="5728" />
-<TGConnectingPoint num="28" id="5729" />
-<TGConnectingPoint num="29" id="5730" />
-<TGConnectingPoint num="30" id="5731" />
-<TGConnectingPoint num="31" id="5732" />
-<TGConnectingPoint num="32" id="5733" />
-<TGConnectingPoint num="33" id="5734" />
-<TGConnectingPoint num="34" id="5735" />
-<TGConnectingPoint num="35" id="5736" />
-<TGConnectingPoint num="36" id="5737" />
-<TGConnectingPoint num="37" id="5738" />
-<TGConnectingPoint num="38" id="5739" />
-<TGConnectingPoint num="39" id="5740" />
+<infoparam name="state0" value="InvalidCert2" />
+<TGConnectingPoint num="0" id="4031" />
+<TGConnectingPoint num="1" id="4032" />
+<TGConnectingPoint num="2" id="4033" />
+<TGConnectingPoint num="3" id="4034" />
+<TGConnectingPoint num="4" id="4035" />
+<TGConnectingPoint num="5" id="4036" />
+<TGConnectingPoint num="6" id="4037" />
+<TGConnectingPoint num="7" id="4038" />
+<TGConnectingPoint num="8" id="4039" />
+<TGConnectingPoint num="9" id="4040" />
+<TGConnectingPoint num="10" id="4041" />
+<TGConnectingPoint num="11" id="4042" />
+<TGConnectingPoint num="12" id="4043" />
+<TGConnectingPoint num="13" id="4044" />
+<TGConnectingPoint num="14" id="4045" />
+<TGConnectingPoint num="15" id="4046" />
+<TGConnectingPoint num="16" id="4047" />
+<TGConnectingPoint num="17" id="4048" />
+<TGConnectingPoint num="18" id="4049" />
+<TGConnectingPoint num="19" id="4050" />
+<TGConnectingPoint num="20" id="4051" />
+<TGConnectingPoint num="21" id="4052" />
+<TGConnectingPoint num="22" id="4053" />
+<TGConnectingPoint num="23" id="4054" />
+<TGConnectingPoint num="24" id="4055" />
+<TGConnectingPoint num="25" id="4056" />
+<TGConnectingPoint num="26" id="4057" />
+<TGConnectingPoint num="27" id="4058" />
+<TGConnectingPoint num="28" id="4059" />
+<TGConnectingPoint num="29" id="4060" />
+<TGConnectingPoint num="30" id="4061" />
+<TGConnectingPoint num="31" id="4062" />
+<TGConnectingPoint num="32" id="4063" />
+<TGConnectingPoint num="33" id="4064" />
+<TGConnectingPoint num="34" id="4065" />
+<TGConnectingPoint num="35" id="4066" />
+<TGConnectingPoint num="36" id="4067" />
+<TGConnectingPoint num="37" id="4068" />
+<TGConnectingPoint num="38" id="4069" />
+<TGConnectingPoint num="39" id="4070" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5782" >
-<cdparam x="277" y="384" />
-<sizeparam width="102" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4112" >
+<cdparam x="198" y="809" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="ValidCert0" />
-<TGConnectingPoint num="0" id="5742" />
-<TGConnectingPoint num="1" id="5743" />
-<TGConnectingPoint num="2" id="5744" />
-<TGConnectingPoint num="3" id="5745" />
-<TGConnectingPoint num="4" id="5746" />
-<TGConnectingPoint num="5" id="5747" />
-<TGConnectingPoint num="6" id="5748" />
-<TGConnectingPoint num="7" id="5749" />
-<TGConnectingPoint num="8" id="5750" />
-<TGConnectingPoint num="9" id="5751" />
-<TGConnectingPoint num="10" id="5752" />
-<TGConnectingPoint num="11" id="5753" />
-<TGConnectingPoint num="12" id="5754" />
-<TGConnectingPoint num="13" id="5755" />
-<TGConnectingPoint num="14" id="5756" />
-<TGConnectingPoint num="15" id="5757" />
-<TGConnectingPoint num="16" id="5758" />
-<TGConnectingPoint num="17" id="5759" />
-<TGConnectingPoint num="18" id="5760" />
-<TGConnectingPoint num="19" id="5761" />
-<TGConnectingPoint num="20" id="5762" />
-<TGConnectingPoint num="21" id="5763" />
-<TGConnectingPoint num="22" id="5764" />
-<TGConnectingPoint num="23" id="5765" />
-<TGConnectingPoint num="24" id="5766" />
-<TGConnectingPoint num="25" id="5767" />
-<TGConnectingPoint num="26" id="5768" />
-<TGConnectingPoint num="27" id="5769" />
-<TGConnectingPoint num="28" id="5770" />
-<TGConnectingPoint num="29" id="5771" />
-<TGConnectingPoint num="30" id="5772" />
-<TGConnectingPoint num="31" id="5773" />
-<TGConnectingPoint num="32" id="5774" />
-<TGConnectingPoint num="33" id="5775" />
-<TGConnectingPoint num="34" id="5776" />
-<TGConnectingPoint num="35" id="5777" />
-<TGConnectingPoint num="36" id="5778" />
-<TGConnectingPoint num="37" id="5779" />
-<TGConnectingPoint num="38" id="5780" />
-<TGConnectingPoint num="39" id="5781" />
+<infoparam name="state0" value="VerifyCert2" />
+<TGConnectingPoint num="0" id="4072" />
+<TGConnectingPoint num="1" id="4073" />
+<TGConnectingPoint num="2" id="4074" />
+<TGConnectingPoint num="3" id="4075" />
+<TGConnectingPoint num="4" id="4076" />
+<TGConnectingPoint num="5" id="4077" />
+<TGConnectingPoint num="6" id="4078" />
+<TGConnectingPoint num="7" id="4079" />
+<TGConnectingPoint num="8" id="4080" />
+<TGConnectingPoint num="9" id="4081" />
+<TGConnectingPoint num="10" id="4082" />
+<TGConnectingPoint num="11" id="4083" />
+<TGConnectingPoint num="12" id="4084" />
+<TGConnectingPoint num="13" id="4085" />
+<TGConnectingPoint num="14" id="4086" />
+<TGConnectingPoint num="15" id="4087" />
+<TGConnectingPoint num="16" id="4088" />
+<TGConnectingPoint num="17" id="4089" />
+<TGConnectingPoint num="18" id="4090" />
+<TGConnectingPoint num="19" id="4091" />
+<TGConnectingPoint num="20" id="4092" />
+<TGConnectingPoint num="21" id="4093" />
+<TGConnectingPoint num="22" id="4094" />
+<TGConnectingPoint num="23" id="4095" />
+<TGConnectingPoint num="24" id="4096" />
+<TGConnectingPoint num="25" id="4097" />
+<TGConnectingPoint num="26" id="4098" />
+<TGConnectingPoint num="27" id="4099" />
+<TGConnectingPoint num="28" id="4100" />
+<TGConnectingPoint num="29" id="4101" />
+<TGConnectingPoint num="30" id="4102" />
+<TGConnectingPoint num="31" id="4103" />
+<TGConnectingPoint num="32" id="4104" />
+<TGConnectingPoint num="33" id="4105" />
+<TGConnectingPoint num="34" id="4106" />
+<TGConnectingPoint num="35" id="4107" />
+<TGConnectingPoint num="36" id="4108" />
+<TGConnectingPoint num="37" id="4109" />
+<TGConnectingPoint num="38" id="4110" />
+<TGConnectingPoint num="39" id="4111" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5823" >
-<cdparam x="189" y="687" />
+<COMPONENT type="5106" id="4153" >
+<cdparam x="27" y="809" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="Testts1" />
-<TGConnectingPoint num="0" id="5783" />
-<TGConnectingPoint num="1" id="5784" />
-<TGConnectingPoint num="2" id="5785" />
-<TGConnectingPoint num="3" id="5786" />
-<TGConnectingPoint num="4" id="5787" />
-<TGConnectingPoint num="5" id="5788" />
-<TGConnectingPoint num="6" id="5789" />
-<TGConnectingPoint num="7" id="5790" />
-<TGConnectingPoint num="8" id="5791" />
-<TGConnectingPoint num="9" id="5792" />
-<TGConnectingPoint num="10" id="5793" />
-<TGConnectingPoint num="11" id="5794" />
-<TGConnectingPoint num="12" id="5795" />
-<TGConnectingPoint num="13" id="5796" />
-<TGConnectingPoint num="14" id="5797" />
-<TGConnectingPoint num="15" id="5798" />
-<TGConnectingPoint num="16" id="5799" />
-<TGConnectingPoint num="17" id="5800" />
-<TGConnectingPoint num="18" id="5801" />
-<TGConnectingPoint num="19" id="5802" />
-<TGConnectingPoint num="20" id="5803" />
-<TGConnectingPoint num="21" id="5804" />
-<TGConnectingPoint num="22" id="5805" />
-<TGConnectingPoint num="23" id="5806" />
-<TGConnectingPoint num="24" id="5807" />
-<TGConnectingPoint num="25" id="5808" />
-<TGConnectingPoint num="26" id="5809" />
-<TGConnectingPoint num="27" id="5810" />
-<TGConnectingPoint num="28" id="5811" />
-<TGConnectingPoint num="29" id="5812" />
-<TGConnectingPoint num="30" id="5813" />
-<TGConnectingPoint num="31" id="5814" />
-<TGConnectingPoint num="32" id="5815" />
-<TGConnectingPoint num="33" id="5816" />
-<TGConnectingPoint num="34" id="5817" />
-<TGConnectingPoint num="35" id="5818" />
-<TGConnectingPoint num="36" id="5819" />
-<TGConnectingPoint num="37" id="5820" />
-<TGConnectingPoint num="38" id="5821" />
-<TGConnectingPoint num="39" id="5822" />
+<infoparam name="state0" value="Invalidts2" />
+<TGConnectingPoint num="0" id="4113" />
+<TGConnectingPoint num="1" id="4114" />
+<TGConnectingPoint num="2" id="4115" />
+<TGConnectingPoint num="3" id="4116" />
+<TGConnectingPoint num="4" id="4117" />
+<TGConnectingPoint num="5" id="4118" />
+<TGConnectingPoint num="6" id="4119" />
+<TGConnectingPoint num="7" id="4120" />
+<TGConnectingPoint num="8" id="4121" />
+<TGConnectingPoint num="9" id="4122" />
+<TGConnectingPoint num="10" id="4123" />
+<TGConnectingPoint num="11" id="4124" />
+<TGConnectingPoint num="12" id="4125" />
+<TGConnectingPoint num="13" id="4126" />
+<TGConnectingPoint num="14" id="4127" />
+<TGConnectingPoint num="15" id="4128" />
+<TGConnectingPoint num="16" id="4129" />
+<TGConnectingPoint num="17" id="4130" />
+<TGConnectingPoint num="18" id="4131" />
+<TGConnectingPoint num="19" id="4132" />
+<TGConnectingPoint num="20" id="4133" />
+<TGConnectingPoint num="21" id="4134" />
+<TGConnectingPoint num="22" id="4135" />
+<TGConnectingPoint num="23" id="4136" />
+<TGConnectingPoint num="24" id="4137" />
+<TGConnectingPoint num="25" id="4138" />
+<TGConnectingPoint num="26" id="4139" />
+<TGConnectingPoint num="27" id="4140" />
+<TGConnectingPoint num="28" id="4141" />
+<TGConnectingPoint num="29" id="4142" />
+<TGConnectingPoint num="30" id="4143" />
+<TGConnectingPoint num="31" id="4144" />
+<TGConnectingPoint num="32" id="4145" />
+<TGConnectingPoint num="33" id="4146" />
+<TGConnectingPoint num="34" id="4147" />
+<TGConnectingPoint num="35" id="4148" />
+<TGConnectingPoint num="36" id="4149" />
+<TGConnectingPoint num="37" id="4150" />
+<TGConnectingPoint num="38" id="4151" />
+<TGConnectingPoint num="39" id="4152" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5834" >
-<cdparam x="216" y="629" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="4162" >
+<cdparam x="266" y="553" />
+<sizeparam width="302" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m1)" />
-<TGConnectingPoint num="0" id="5824" />
-<TGConnectingPoint num="1" id="5825" />
-<TGConnectingPoint num="2" id="5826" />
-<TGConnectingPoint num="3" id="5827" />
-<TGConnectingPoint num="4" id="5828" />
-<TGConnectingPoint num="5" id="5829" />
-<TGConnectingPoint num="6" id="5830" />
-<TGConnectingPoint num="7" id="5831" />
-<TGConnectingPoint num="8" id="5832" />
-<TGConnectingPoint num="9" id="5833" />
+<infoparam name="UML Note" value="Receive and verify m2: certified pk from ECU2
+" />
+<TGConnectingPoint num="0" id="4154" />
+<TGConnectingPoint num="1" id="4155" />
+<TGConnectingPoint num="2" id="4156" />
+<TGConnectingPoint num="3" id="4157" />
+<TGConnectingPoint num="4" id="4158" />
+<TGConnectingPoint num="5" id="4159" />
+<TGConnectingPoint num="6" id="4160" />
+<TGConnectingPoint num="7" id="4161" />
+<TGConnectingPoint num="8" id="103563" />
+<TGConnectingPoint num="9" id="103564" />
+<TGConnectingPoint num="10" id="103565" />
+<TGConnectingPoint num="11" id="103566" />
+<TGConnectingPoint num="12" id="103567" />
+<TGConnectingPoint num="13" id="103568" />
+<TGConnectingPoint num="14" id="103569" />
+<TGConnectingPoint num="15" id="103570" />
+<extraparam>
+<Line value="Receive and verify m2: certified pk from ECU2" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5875" >
-<cdparam x="242" y="559" />
-<sizeparam width="118" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="4171" >
+<cdparam x="277" y="318" />
+<sizeparam width="382" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="WaitForMsg1" />
-<TGConnectingPoint num="0" id="5835" />
-<TGConnectingPoint num="1" id="5836" />
-<TGConnectingPoint num="2" id="5837" />
-<TGConnectingPoint num="3" id="5838" />
-<TGConnectingPoint num="4" id="5839" />
-<TGConnectingPoint num="5" id="5840" />
-<TGConnectingPoint num="6" id="5841" />
-<TGConnectingPoint num="7" id="5842" />
-<TGConnectingPoint num="8" id="5843" />
-<TGConnectingPoint num="9" id="5844" />
-<TGConnectingPoint num="10" id="5845" />
-<TGConnectingPoint num="11" id="5846" />
-<TGConnectingPoint num="12" id="5847" />
-<TGConnectingPoint num="13" id="5848" />
-<TGConnectingPoint num="14" id="5849" />
-<TGConnectingPoint num="15" id="5850" />
-<TGConnectingPoint num="16" id="5851" />
-<TGConnectingPoint num="17" id="5852" />
-<TGConnectingPoint num="18" id="5853" />
-<TGConnectingPoint num="19" id="5854" />
-<TGConnectingPoint num="20" id="5855" />
-<TGConnectingPoint num="21" id="5856" />
-<TGConnectingPoint num="22" id="5857" />
-<TGConnectingPoint num="23" id="5858" />
-<TGConnectingPoint num="24" id="5859" />
-<TGConnectingPoint num="25" id="5860" />
-<TGConnectingPoint num="26" id="5861" />
-<TGConnectingPoint num="27" id="5862" />
-<TGConnectingPoint num="28" id="5863" />
-<TGConnectingPoint num="29" id="5864" />
-<TGConnectingPoint num="30" id="5865" />
-<TGConnectingPoint num="31" id="5866" />
-<TGConnectingPoint num="32" id="5867" />
-<TGConnectingPoint num="33" id="5868" />
-<TGConnectingPoint num="34" id="5869" />
-<TGConnectingPoint num="35" id="5870" />
-<TGConnectingPoint num="36" id="5871" />
-<TGConnectingPoint num="37" id="5872" />
-<TGConnectingPoint num="38" id="5873" />
-<TGConnectingPoint num="39" id="5874" />
+<infoparam name="UML Note" value="Create request message m1 to ask for public key of ECU2
+" />
+<TGConnectingPoint num="0" id="4163" />
+<TGConnectingPoint num="1" id="4164" />
+<TGConnectingPoint num="2" id="4165" />
+<TGConnectingPoint num="3" id="4166" />
+<TGConnectingPoint num="4" id="4167" />
+<TGConnectingPoint num="5" id="4168" />
+<TGConnectingPoint num="6" id="4169" />
+<TGConnectingPoint num="7" id="4170" />
+<TGConnectingPoint num="8" id="103580" />
+<TGConnectingPoint num="9" id="103581" />
+<TGConnectingPoint num="10" id="103582" />
+<TGConnectingPoint num="11" id="103583" />
+<TGConnectingPoint num="12" id="103584" />
+<TGConnectingPoint num="13" id="103585" />
+<TGConnectingPoint num="14" id="103586" />
+<TGConnectingPoint num="15" id="103587" />
 <extraparam>
+<Line value="Create request message m1 to ask for public key of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5916" >
-<cdparam x="18" y="560" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="4180" >
+<cdparam x="278" y="59" />
+<sizeparam width="329" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig0" />
-<TGConnectingPoint num="0" id="5876" />
-<TGConnectingPoint num="1" id="5877" />
-<TGConnectingPoint num="2" id="5878" />
-<TGConnectingPoint num="3" id="5879" />
-<TGConnectingPoint num="4" id="5880" />
-<TGConnectingPoint num="5" id="5881" />
-<TGConnectingPoint num="6" id="5882" />
-<TGConnectingPoint num="7" id="5883" />
-<TGConnectingPoint num="8" id="5884" />
-<TGConnectingPoint num="9" id="5885" />
-<TGConnectingPoint num="10" id="5886" />
-<TGConnectingPoint num="11" id="5887" />
-<TGConnectingPoint num="12" id="5888" />
-<TGConnectingPoint num="13" id="5889" />
-<TGConnectingPoint num="14" id="5890" />
-<TGConnectingPoint num="15" id="5891" />
-<TGConnectingPoint num="16" id="5892" />
-<TGConnectingPoint num="17" id="5893" />
-<TGConnectingPoint num="18" id="5894" />
-<TGConnectingPoint num="19" id="5895" />
-<TGConnectingPoint num="20" id="5896" />
-<TGConnectingPoint num="21" id="5897" />
-<TGConnectingPoint num="22" id="5898" />
-<TGConnectingPoint num="23" id="5899" />
-<TGConnectingPoint num="24" id="5900" />
-<TGConnectingPoint num="25" id="5901" />
-<TGConnectingPoint num="26" id="5902" />
-<TGConnectingPoint num="27" id="5903" />
-<TGConnectingPoint num="28" id="5904" />
-<TGConnectingPoint num="29" id="5905" />
-<TGConnectingPoint num="30" id="5906" />
-<TGConnectingPoint num="31" id="5907" />
-<TGConnectingPoint num="32" id="5908" />
-<TGConnectingPoint num="33" id="5909" />
-<TGConnectingPoint num="34" id="5910" />
-<TGConnectingPoint num="35" id="5911" />
-<TGConnectingPoint num="36" id="5912" />
-<TGConnectingPoint num="37" id="5913" />
-<TGConnectingPoint num="38" id="5914" />
-<TGConnectingPoint num="39" id="5915" />
+<infoparam name="UML Note" value="Create m0: Send own certified public key to ECU2
+" />
+<TGConnectingPoint num="0" id="4172" />
+<TGConnectingPoint num="1" id="4173" />
+<TGConnectingPoint num="2" id="4174" />
+<TGConnectingPoint num="3" id="4175" />
+<TGConnectingPoint num="4" id="4176" />
+<TGConnectingPoint num="5" id="4177" />
+<TGConnectingPoint num="6" id="4178" />
+<TGConnectingPoint num="7" id="4179" />
+<TGConnectingPoint num="8" id="103597" />
+<TGConnectingPoint num="9" id="103598" />
+<TGConnectingPoint num="10" id="103599" />
+<TGConnectingPoint num="11" id="103600" />
+<TGConnectingPoint num="12" id="103601" />
+<TGConnectingPoint num="13" id="103602" />
+<TGConnectingPoint num="14" id="103603" />
+<TGConnectingPoint num="15" id="103604" />
 <extraparam>
+<Line value="Create m0: Send own certified public key to ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5957" >
-<cdparam x="240" y="479" />
+<COMPONENT type="5106" id="4221" >
+<cdparam x="112" y="699" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="VerifySig0" />
-<TGConnectingPoint num="0" id="5917" />
-<TGConnectingPoint num="1" id="5918" />
-<TGConnectingPoint num="2" id="5919" />
-<TGConnectingPoint num="3" id="5920" />
-<TGConnectingPoint num="4" id="5921" />
-<TGConnectingPoint num="5" id="5922" />
-<TGConnectingPoint num="6" id="5923" />
-<TGConnectingPoint num="7" id="5924" />
-<TGConnectingPoint num="8" id="5925" />
-<TGConnectingPoint num="9" id="5926" />
-<TGConnectingPoint num="10" id="5927" />
-<TGConnectingPoint num="11" id="5928" />
-<TGConnectingPoint num="12" id="5929" />
-<TGConnectingPoint num="13" id="5930" />
-<TGConnectingPoint num="14" id="5931" />
-<TGConnectingPoint num="15" id="5932" />
-<TGConnectingPoint num="16" id="5933" />
-<TGConnectingPoint num="17" id="5934" />
-<TGConnectingPoint num="18" id="5935" />
-<TGConnectingPoint num="19" id="5936" />
-<TGConnectingPoint num="20" id="5937" />
-<TGConnectingPoint num="21" id="5938" />
-<TGConnectingPoint num="22" id="5939" />
-<TGConnectingPoint num="23" id="5940" />
-<TGConnectingPoint num="24" id="5941" />
-<TGConnectingPoint num="25" id="5942" />
-<TGConnectingPoint num="26" id="5943" />
-<TGConnectingPoint num="27" id="5944" />
-<TGConnectingPoint num="28" id="5945" />
-<TGConnectingPoint num="29" id="5946" />
-<TGConnectingPoint num="30" id="5947" />
-<TGConnectingPoint num="31" id="5948" />
-<TGConnectingPoint num="32" id="5949" />
-<TGConnectingPoint num="33" id="5950" />
-<TGConnectingPoint num="34" id="5951" />
-<TGConnectingPoint num="35" id="5952" />
-<TGConnectingPoint num="36" id="5953" />
-<TGConnectingPoint num="37" id="5954" />
-<TGConnectingPoint num="38" id="5955" />
-<TGConnectingPoint num="39" id="5956" />
+<infoparam name="state0" value="Testts2" />
+<TGConnectingPoint num="0" id="4181" />
+<TGConnectingPoint num="1" id="4182" />
+<TGConnectingPoint num="2" id="4183" />
+<TGConnectingPoint num="3" id="4184" />
+<TGConnectingPoint num="4" id="4185" />
+<TGConnectingPoint num="5" id="4186" />
+<TGConnectingPoint num="6" id="4187" />
+<TGConnectingPoint num="7" id="4188" />
+<TGConnectingPoint num="8" id="4189" />
+<TGConnectingPoint num="9" id="4190" />
+<TGConnectingPoint num="10" id="4191" />
+<TGConnectingPoint num="11" id="4192" />
+<TGConnectingPoint num="12" id="4193" />
+<TGConnectingPoint num="13" id="4194" />
+<TGConnectingPoint num="14" id="4195" />
+<TGConnectingPoint num="15" id="4196" />
+<TGConnectingPoint num="16" id="4197" />
+<TGConnectingPoint num="17" id="4198" />
+<TGConnectingPoint num="18" id="4199" />
+<TGConnectingPoint num="19" id="4200" />
+<TGConnectingPoint num="20" id="4201" />
+<TGConnectingPoint num="21" id="4202" />
+<TGConnectingPoint num="22" id="4203" />
+<TGConnectingPoint num="23" id="4204" />
+<TGConnectingPoint num="24" id="4205" />
+<TGConnectingPoint num="25" id="4206" />
+<TGConnectingPoint num="26" id="4207" />
+<TGConnectingPoint num="27" id="4208" />
+<TGConnectingPoint num="28" id="4209" />
+<TGConnectingPoint num="29" id="4210" />
+<TGConnectingPoint num="30" id="4211" />
+<TGConnectingPoint num="31" id="4212" />
+<TGConnectingPoint num="32" id="4213" />
+<TGConnectingPoint num="33" id="4214" />
+<TGConnectingPoint num="34" id="4215" />
+<TGConnectingPoint num="35" id="4216" />
+<TGConnectingPoint num="36" id="4217" />
+<TGConnectingPoint num="37" id="4218" />
+<TGConnectingPoint num="38" id="4219" />
+<TGConnectingPoint num="39" id="4220" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5998" >
-<cdparam x="122" y="395" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="4232" >
+<cdparam x="47" y="621" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidCert0" />
-<TGConnectingPoint num="0" id="5958" />
-<TGConnectingPoint num="1" id="5959" />
-<TGConnectingPoint num="2" id="5960" />
-<TGConnectingPoint num="3" id="5961" />
-<TGConnectingPoint num="4" id="5962" />
-<TGConnectingPoint num="5" id="5963" />
-<TGConnectingPoint num="6" id="5964" />
-<TGConnectingPoint num="7" id="5965" />
-<TGConnectingPoint num="8" id="5966" />
-<TGConnectingPoint num="9" id="5967" />
-<TGConnectingPoint num="10" id="5968" />
-<TGConnectingPoint num="11" id="5969" />
-<TGConnectingPoint num="12" id="5970" />
-<TGConnectingPoint num="13" id="5971" />
-<TGConnectingPoint num="14" id="5972" />
-<TGConnectingPoint num="15" id="5973" />
-<TGConnectingPoint num="16" id="5974" />
-<TGConnectingPoint num="17" id="5975" />
-<TGConnectingPoint num="18" id="5976" />
-<TGConnectingPoint num="19" id="5977" />
-<TGConnectingPoint num="20" id="5978" />
-<TGConnectingPoint num="21" id="5979" />
-<TGConnectingPoint num="22" id="5980" />
-<TGConnectingPoint num="23" id="5981" />
-<TGConnectingPoint num="24" id="5982" />
-<TGConnectingPoint num="25" id="5983" />
-<TGConnectingPoint num="26" id="5984" />
-<TGConnectingPoint num="27" id="5985" />
-<TGConnectingPoint num="28" id="5986" />
-<TGConnectingPoint num="29" id="5987" />
-<TGConnectingPoint num="30" id="5988" />
-<TGConnectingPoint num="31" id="5989" />
-<TGConnectingPoint num="32" id="5990" />
-<TGConnectingPoint num="33" id="5991" />
-<TGConnectingPoint num="34" id="5992" />
-<TGConnectingPoint num="35" id="5993" />
-<TGConnectingPoint num="36" id="5994" />
-<TGConnectingPoint num="37" id="5995" />
-<TGConnectingPoint num="38" id="5996" />
-<TGConnectingPoint num="39" id="5997" />
-<extraparam>
-</extraparam>
+<infoparam name="Receive signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="4222" />
+<TGConnectingPoint num="1" id="4223" />
+<TGConnectingPoint num="2" id="4224" />
+<TGConnectingPoint num="3" id="4225" />
+<TGConnectingPoint num="4" id="4226" />
+<TGConnectingPoint num="5" id="4227" />
+<TGConnectingPoint num="6" id="4228" />
+<TGConnectingPoint num="7" id="4229" />
+<TGConnectingPoint num="8" id="4230" />
+<TGConnectingPoint num="9" id="4231" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="6039" >
-<cdparam x="228" y="288" />
+<COMPONENT type="5106" id="4273" >
+<cdparam x="27" y="550" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="VerifyCert0" />
-<TGConnectingPoint num="0" id="5999" />
-<TGConnectingPoint num="1" id="6000" />
-<TGConnectingPoint num="2" id="6001" />
-<TGConnectingPoint num="3" id="6002" />
-<TGConnectingPoint num="4" id="6003" />
-<TGConnectingPoint num="5" id="6004" />
-<TGConnectingPoint num="6" id="6005" />
-<TGConnectingPoint num="7" id="6006" />
-<TGConnectingPoint num="8" id="6007" />
-<TGConnectingPoint num="9" id="6008" />
-<TGConnectingPoint num="10" id="6009" />
-<TGConnectingPoint num="11" id="6010" />
-<TGConnectingPoint num="12" id="6011" />
-<TGConnectingPoint num="13" id="6012" />
-<TGConnectingPoint num="14" id="6013" />
-<TGConnectingPoint num="15" id="6014" />
-<TGConnectingPoint num="16" id="6015" />
-<TGConnectingPoint num="17" id="6016" />
-<TGConnectingPoint num="18" id="6017" />
-<TGConnectingPoint num="19" id="6018" />
-<TGConnectingPoint num="20" id="6019" />
-<TGConnectingPoint num="21" id="6020" />
-<TGConnectingPoint num="22" id="6021" />
-<TGConnectingPoint num="23" id="6022" />
-<TGConnectingPoint num="24" id="6023" />
-<TGConnectingPoint num="25" id="6024" />
-<TGConnectingPoint num="26" id="6025" />
-<TGConnectingPoint num="27" id="6026" />
-<TGConnectingPoint num="28" id="6027" />
-<TGConnectingPoint num="29" id="6028" />
-<TGConnectingPoint num="30" id="6029" />
-<TGConnectingPoint num="31" id="6030" />
-<TGConnectingPoint num="32" id="6031" />
-<TGConnectingPoint num="33" id="6032" />
-<TGConnectingPoint num="34" id="6033" />
-<TGConnectingPoint num="35" id="6034" />
-<TGConnectingPoint num="36" id="6035" />
-<TGConnectingPoint num="37" id="6036" />
-<TGConnectingPoint num="38" id="6037" />
-<TGConnectingPoint num="39" id="6038" />
+<infoparam name="state0" value="WaitForMsg2" />
+<TGConnectingPoint num="0" id="4233" />
+<TGConnectingPoint num="1" id="4234" />
+<TGConnectingPoint num="2" id="4235" />
+<TGConnectingPoint num="3" id="4236" />
+<TGConnectingPoint num="4" id="4237" />
+<TGConnectingPoint num="5" id="4238" />
+<TGConnectingPoint num="6" id="4239" />
+<TGConnectingPoint num="7" id="4240" />
+<TGConnectingPoint num="8" id="4241" />
+<TGConnectingPoint num="9" id="4242" />
+<TGConnectingPoint num="10" id="4243" />
+<TGConnectingPoint num="11" id="4244" />
+<TGConnectingPoint num="12" id="4245" />
+<TGConnectingPoint num="13" id="4246" />
+<TGConnectingPoint num="14" id="4247" />
+<TGConnectingPoint num="15" id="4248" />
+<TGConnectingPoint num="16" id="4249" />
+<TGConnectingPoint num="17" id="4250" />
+<TGConnectingPoint num="18" id="4251" />
+<TGConnectingPoint num="19" id="4252" />
+<TGConnectingPoint num="20" id="4253" />
+<TGConnectingPoint num="21" id="4254" />
+<TGConnectingPoint num="22" id="4255" />
+<TGConnectingPoint num="23" id="4256" />
+<TGConnectingPoint num="24" id="4257" />
+<TGConnectingPoint num="25" id="4258" />
+<TGConnectingPoint num="26" id="4259" />
+<TGConnectingPoint num="27" id="4260" />
+<TGConnectingPoint num="28" id="4261" />
+<TGConnectingPoint num="29" id="4262" />
+<TGConnectingPoint num="30" id="4263" />
+<TGConnectingPoint num="31" id="4264" />
+<TGConnectingPoint num="32" id="4265" />
+<TGConnectingPoint num="33" id="4266" />
+<TGConnectingPoint num="34" id="4267" />
+<TGConnectingPoint num="35" id="4268" />
+<TGConnectingPoint num="36" id="4269" />
+<TGConnectingPoint num="37" id="4270" />
+<TGConnectingPoint num="38" id="4271" />
+<TGConnectingPoint num="39" id="4272" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6080" >
-<cdparam x="33" y="314" />
+<COMPONENT type="5103" id="4284" >
+<cdparam x="54" y="508" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="4274" />
+<TGConnectingPoint num="1" id="4275" />
+<TGConnectingPoint num="2" id="4276" />
+<TGConnectingPoint num="3" id="4277" />
+<TGConnectingPoint num="4" id="4278" />
+<TGConnectingPoint num="5" id="4279" />
+<TGConnectingPoint num="6" id="4280" />
+<TGConnectingPoint num="7" id="4281" />
+<TGConnectingPoint num="8" id="4282" />
+<TGConnectingPoint num="9" id="4283" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4325" >
+<cdparam x="35" y="436" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts0" />
-<TGConnectingPoint num="0" id="6040" />
-<TGConnectingPoint num="1" id="6041" />
-<TGConnectingPoint num="2" id="6042" />
-<TGConnectingPoint num="3" id="6043" />
-<TGConnectingPoint num="4" id="6044" />
-<TGConnectingPoint num="5" id="6045" />
-<TGConnectingPoint num="6" id="6046" />
-<TGConnectingPoint num="7" id="6047" />
-<TGConnectingPoint num="8" id="6048" />
-<TGConnectingPoint num="9" id="6049" />
-<TGConnectingPoint num="10" id="6050" />
-<TGConnectingPoint num="11" id="6051" />
-<TGConnectingPoint num="12" id="6052" />
-<TGConnectingPoint num="13" id="6053" />
-<TGConnectingPoint num="14" id="6054" />
-<TGConnectingPoint num="15" id="6055" />
-<TGConnectingPoint num="16" id="6056" />
-<TGConnectingPoint num="17" id="6057" />
-<TGConnectingPoint num="18" id="6058" />
-<TGConnectingPoint num="19" id="6059" />
-<TGConnectingPoint num="20" id="6060" />
-<TGConnectingPoint num="21" id="6061" />
-<TGConnectingPoint num="22" id="6062" />
-<TGConnectingPoint num="23" id="6063" />
-<TGConnectingPoint num="24" id="6064" />
-<TGConnectingPoint num="25" id="6065" />
-<TGConnectingPoint num="26" id="6066" />
-<TGConnectingPoint num="27" id="6067" />
-<TGConnectingPoint num="28" id="6068" />
-<TGConnectingPoint num="29" id="6069" />
-<TGConnectingPoint num="30" id="6070" />
-<TGConnectingPoint num="31" id="6071" />
-<TGConnectingPoint num="32" id="6072" />
-<TGConnectingPoint num="33" id="6073" />
-<TGConnectingPoint num="34" id="6074" />
-<TGConnectingPoint num="35" id="6075" />
-<TGConnectingPoint num="36" id="6076" />
-<TGConnectingPoint num="37" id="6077" />
-<TGConnectingPoint num="38" id="6078" />
-<TGConnectingPoint num="39" id="6079" />
+<infoparam name="state0" value="SendMsg1" />
+<TGConnectingPoint num="0" id="4285" />
+<TGConnectingPoint num="1" id="4286" />
+<TGConnectingPoint num="2" id="4287" />
+<TGConnectingPoint num="3" id="4288" />
+<TGConnectingPoint num="4" id="4289" />
+<TGConnectingPoint num="5" id="4290" />
+<TGConnectingPoint num="6" id="4291" />
+<TGConnectingPoint num="7" id="4292" />
+<TGConnectingPoint num="8" id="4293" />
+<TGConnectingPoint num="9" id="4294" />
+<TGConnectingPoint num="10" id="4295" />
+<TGConnectingPoint num="11" id="4296" />
+<TGConnectingPoint num="12" id="4297" />
+<TGConnectingPoint num="13" id="4298" />
+<TGConnectingPoint num="14" id="4299" />
+<TGConnectingPoint num="15" id="4300" />
+<TGConnectingPoint num="16" id="4301" />
+<TGConnectingPoint num="17" id="4302" />
+<TGConnectingPoint num="18" id="4303" />
+<TGConnectingPoint num="19" id="4304" />
+<TGConnectingPoint num="20" id="4305" />
+<TGConnectingPoint num="21" id="4306" />
+<TGConnectingPoint num="22" id="4307" />
+<TGConnectingPoint num="23" id="4308" />
+<TGConnectingPoint num="24" id="4309" />
+<TGConnectingPoint num="25" id="4310" />
+<TGConnectingPoint num="26" id="4311" />
+<TGConnectingPoint num="27" id="4312" />
+<TGConnectingPoint num="28" id="4313" />
+<TGConnectingPoint num="29" id="4314" />
+<TGConnectingPoint num="30" id="4315" />
+<TGConnectingPoint num="31" id="4316" />
+<TGConnectingPoint num="32" id="4317" />
+<TGConnectingPoint num="33" id="4318" />
+<TGConnectingPoint num="34" id="4319" />
+<TGConnectingPoint num="35" id="4320" />
+<TGConnectingPoint num="36" id="4321" />
+<TGConnectingPoint num="37" id="4322" />
+<TGConnectingPoint num="38" id="4323" />
+<TGConnectingPoint num="39" id="4324" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6121" >
-<cdparam x="49" y="183" />
-<sizeparam width="182" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="4336" >
+<cdparam x="100" y="277" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts0" />
-<TGConnectingPoint num="0" id="6081" />
-<TGConnectingPoint num="1" id="6082" />
-<TGConnectingPoint num="2" id="6083" />
-<TGConnectingPoint num="3" id="6084" />
-<TGConnectingPoint num="4" id="6085" />
-<TGConnectingPoint num="5" id="6086" />
-<TGConnectingPoint num="6" id="6087" />
-<TGConnectingPoint num="7" id="6088" />
-<TGConnectingPoint num="8" id="6089" />
-<TGConnectingPoint num="9" id="6090" />
-<TGConnectingPoint num="10" id="6091" />
-<TGConnectingPoint num="11" id="6092" />
-<TGConnectingPoint num="12" id="6093" />
-<TGConnectingPoint num="13" id="6094" />
-<TGConnectingPoint num="14" id="6095" />
-<TGConnectingPoint num="15" id="6096" />
-<TGConnectingPoint num="16" id="6097" />
-<TGConnectingPoint num="17" id="6098" />
-<TGConnectingPoint num="18" id="6099" />
-<TGConnectingPoint num="19" id="6100" />
-<TGConnectingPoint num="20" id="6101" />
-<TGConnectingPoint num="21" id="6102" />
-<TGConnectingPoint num="22" id="6103" />
-<TGConnectingPoint num="23" id="6104" />
-<TGConnectingPoint num="24" id="6105" />
-<TGConnectingPoint num="25" id="6106" />
-<TGConnectingPoint num="26" id="6107" />
-<TGConnectingPoint num="27" id="6108" />
-<TGConnectingPoint num="28" id="6109" />
-<TGConnectingPoint num="29" id="6110" />
-<TGConnectingPoint num="30" id="6111" />
-<TGConnectingPoint num="31" id="6112" />
-<TGConnectingPoint num="32" id="6113" />
-<TGConnectingPoint num="33" id="6114" />
-<TGConnectingPoint num="34" id="6115" />
-<TGConnectingPoint num="35" id="6116" />
-<TGConnectingPoint num="36" id="6117" />
-<TGConnectingPoint num="37" id="6118" />
-<TGConnectingPoint num="38" id="6119" />
-<TGConnectingPoint num="39" id="6120" />
+<infoparam name="Send signal" value="chout(m0)" />
+<TGConnectingPoint num="0" id="4326" />
+<TGConnectingPoint num="1" id="4327" />
+<TGConnectingPoint num="2" id="4328" />
+<TGConnectingPoint num="3" id="4329" />
+<TGConnectingPoint num="4" id="4330" />
+<TGConnectingPoint num="5" id="4331" />
+<TGConnectingPoint num="6" id="4332" />
+<TGConnectingPoint num="7" id="4333" />
+<TGConnectingPoint num="8" id="4334" />
+<TGConnectingPoint num="9" id="4335" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4377" >
+<cdparam x="64" y="321" />
+<sizeparam width="90" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="ForgeMsg1" />
+<TGConnectingPoint num="0" id="4337" />
+<TGConnectingPoint num="1" id="4338" />
+<TGConnectingPoint num="2" id="4339" />
+<TGConnectingPoint num="3" id="4340" />
+<TGConnectingPoint num="4" id="4341" />
+<TGConnectingPoint num="5" id="4342" />
+<TGConnectingPoint num="6" id="4343" />
+<TGConnectingPoint num="7" id="4344" />
+<TGConnectingPoint num="8" id="4345" />
+<TGConnectingPoint num="9" id="4346" />
+<TGConnectingPoint num="10" id="4347" />
+<TGConnectingPoint num="11" id="4348" />
+<TGConnectingPoint num="12" id="4349" />
+<TGConnectingPoint num="13" id="4350" />
+<TGConnectingPoint num="14" id="4351" />
+<TGConnectingPoint num="15" id="4352" />
+<TGConnectingPoint num="16" id="4353" />
+<TGConnectingPoint num="17" id="4354" />
+<TGConnectingPoint num="18" id="4355" />
+<TGConnectingPoint num="19" id="4356" />
+<TGConnectingPoint num="20" id="4357" />
+<TGConnectingPoint num="21" id="4358" />
+<TGConnectingPoint num="22" id="4359" />
+<TGConnectingPoint num="23" id="4360" />
+<TGConnectingPoint num="24" id="4361" />
+<TGConnectingPoint num="25" id="4362" />
+<TGConnectingPoint num="26" id="4363" />
+<TGConnectingPoint num="27" id="4364" />
+<TGConnectingPoint num="28" id="4365" />
+<TGConnectingPoint num="29" id="4366" />
+<TGConnectingPoint num="30" id="4367" />
+<TGConnectingPoint num="31" id="4368" />
+<TGConnectingPoint num="32" id="4369" />
+<TGConnectingPoint num="33" id="4370" />
+<TGConnectingPoint num="34" id="4371" />
+<TGConnectingPoint num="35" id="4372" />
+<TGConnectingPoint num="36" id="4373" />
+<TGConnectingPoint num="37" id="4374" />
+<TGConnectingPoint num="38" id="4375" />
+<TGConnectingPoint num="39" id="4376" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="6132" >
-<cdparam x="106" y="126" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4418" >
+<cdparam x="46" y="205" />
+<sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m0)" />
-<TGConnectingPoint num="0" id="6122" />
-<TGConnectingPoint num="1" id="6123" />
-<TGConnectingPoint num="2" id="6124" />
-<TGConnectingPoint num="3" id="6125" />
-<TGConnectingPoint num="4" id="6126" />
-<TGConnectingPoint num="5" id="6127" />
-<TGConnectingPoint num="6" id="6128" />
-<TGConnectingPoint num="7" id="6129" />
-<TGConnectingPoint num="8" id="6130" />
-<TGConnectingPoint num="9" id="6131" />
+<infoparam name="state0" value="SendMsg0" />
+<TGConnectingPoint num="0" id="4378" />
+<TGConnectingPoint num="1" id="4379" />
+<TGConnectingPoint num="2" id="4380" />
+<TGConnectingPoint num="3" id="4381" />
+<TGConnectingPoint num="4" id="4382" />
+<TGConnectingPoint num="5" id="4383" />
+<TGConnectingPoint num="6" id="4384" />
+<TGConnectingPoint num="7" id="4385" />
+<TGConnectingPoint num="8" id="4386" />
+<TGConnectingPoint num="9" id="4387" />
+<TGConnectingPoint num="10" id="4388" />
+<TGConnectingPoint num="11" id="4389" />
+<TGConnectingPoint num="12" id="4390" />
+<TGConnectingPoint num="13" id="4391" />
+<TGConnectingPoint num="14" id="4392" />
+<TGConnectingPoint num="15" id="4393" />
+<TGConnectingPoint num="16" id="4394" />
+<TGConnectingPoint num="17" id="4395" />
+<TGConnectingPoint num="18" id="4396" />
+<TGConnectingPoint num="19" id="4397" />
+<TGConnectingPoint num="20" id="4398" />
+<TGConnectingPoint num="21" id="4399" />
+<TGConnectingPoint num="22" id="4400" />
+<TGConnectingPoint num="23" id="4401" />
+<TGConnectingPoint num="24" id="4402" />
+<TGConnectingPoint num="25" id="4403" />
+<TGConnectingPoint num="26" id="4404" />
+<TGConnectingPoint num="27" id="4405" />
+<TGConnectingPoint num="28" id="4406" />
+<TGConnectingPoint num="29" id="4407" />
+<TGConnectingPoint num="30" id="4408" />
+<TGConnectingPoint num="31" id="4409" />
+<TGConnectingPoint num="32" id="4410" />
+<TGConnectingPoint num="33" id="4411" />
+<TGConnectingPoint num="34" id="4412" />
+<TGConnectingPoint num="35" id="4413" />
+<TGConnectingPoint num="36" id="4414" />
+<TGConnectingPoint num="37" id="4415" />
+<TGConnectingPoint num="38" id="4416" />
+<TGConnectingPoint num="39" id="4417" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6173" >
-<cdparam x="50" y="58" />
-<sizeparam width="181" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4459" >
+<cdparam x="39" y="65" />
+<sizeparam width="98" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg0" />
-<TGConnectingPoint num="0" id="6133" />
-<TGConnectingPoint num="1" id="6134" />
-<TGConnectingPoint num="2" id="6135" />
-<TGConnectingPoint num="3" id="6136" />
-<TGConnectingPoint num="4" id="6137" />
-<TGConnectingPoint num="5" id="6138" />
-<TGConnectingPoint num="6" id="6139" />
-<TGConnectingPoint num="7" id="6140" />
-<TGConnectingPoint num="8" id="6141" />
-<TGConnectingPoint num="9" id="6142" />
-<TGConnectingPoint num="10" id="6143" />
-<TGConnectingPoint num="11" id="6144" />
-<TGConnectingPoint num="12" id="6145" />
-<TGConnectingPoint num="13" id="6146" />
-<TGConnectingPoint num="14" id="6147" />
-<TGConnectingPoint num="15" id="6148" />
-<TGConnectingPoint num="16" id="6149" />
-<TGConnectingPoint num="17" id="6150" />
-<TGConnectingPoint num="18" id="6151" />
-<TGConnectingPoint num="19" id="6152" />
-<TGConnectingPoint num="20" id="6153" />
-<TGConnectingPoint num="21" id="6154" />
-<TGConnectingPoint num="22" id="6155" />
-<TGConnectingPoint num="23" id="6156" />
-<TGConnectingPoint num="24" id="6157" />
-<TGConnectingPoint num="25" id="6158" />
-<TGConnectingPoint num="26" id="6159" />
-<TGConnectingPoint num="27" id="6160" />
-<TGConnectingPoint num="28" id="6161" />
-<TGConnectingPoint num="29" id="6162" />
-<TGConnectingPoint num="30" id="6163" />
-<TGConnectingPoint num="31" id="6164" />
-<TGConnectingPoint num="32" id="6165" />
-<TGConnectingPoint num="33" id="6166" />
-<TGConnectingPoint num="34" id="6167" />
-<TGConnectingPoint num="35" id="6168" />
-<TGConnectingPoint num="36" id="6169" />
-<TGConnectingPoint num="37" id="6170" />
-<TGConnectingPoint num="38" id="6171" />
-<TGConnectingPoint num="39" id="6172" />
+<infoparam name="state0" value="ForgeMsg0" />
+<TGConnectingPoint num="0" id="4419" />
+<TGConnectingPoint num="1" id="4420" />
+<TGConnectingPoint num="2" id="4421" />
+<TGConnectingPoint num="3" id="4422" />
+<TGConnectingPoint num="4" id="4423" />
+<TGConnectingPoint num="5" id="4424" />
+<TGConnectingPoint num="6" id="4425" />
+<TGConnectingPoint num="7" id="4426" />
+<TGConnectingPoint num="8" id="4427" />
+<TGConnectingPoint num="9" id="4428" />
+<TGConnectingPoint num="10" id="4429" />
+<TGConnectingPoint num="11" id="4430" />
+<TGConnectingPoint num="12" id="4431" />
+<TGConnectingPoint num="13" id="4432" />
+<TGConnectingPoint num="14" id="4433" />
+<TGConnectingPoint num="15" id="4434" />
+<TGConnectingPoint num="16" id="4435" />
+<TGConnectingPoint num="17" id="4436" />
+<TGConnectingPoint num="18" id="4437" />
+<TGConnectingPoint num="19" id="4438" />
+<TGConnectingPoint num="20" id="4439" />
+<TGConnectingPoint num="21" id="4440" />
+<TGConnectingPoint num="22" id="4441" />
+<TGConnectingPoint num="23" id="4442" />
+<TGConnectingPoint num="24" id="4443" />
+<TGConnectingPoint num="25" id="4444" />
+<TGConnectingPoint num="26" id="4445" />
+<TGConnectingPoint num="27" id="4446" />
+<TGConnectingPoint num="28" id="4447" />
+<TGConnectingPoint num="29" id="4448" />
+<TGConnectingPoint num="30" id="4449" />
+<TGConnectingPoint num="31" id="4450" />
+<TGConnectingPoint num="32" id="4451" />
+<TGConnectingPoint num="33" id="4452" />
+<TGConnectingPoint num="34" id="4453" />
+<TGConnectingPoint num="35" id="4454" />
+<TGConnectingPoint num="36" id="4455" />
+<TGConnectingPoint num="37" id="4456" />
+<TGConnectingPoint num="38" id="4457" />
+<TGConnectingPoint num="39" id="4458" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="6175" >
-<cdparam x="133" y="25" />
+<COMPONENT type="5100" id="4461" >
+<cdparam x="67" y="27" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="6174" />
+<TGConnectingPoint num="0" id="4460" />
 </COMPONENT>
 
 
diff --git a/modeling/SysMLSec/SimpleTLS.xml b/modeling/SysMLSec/SimpleTLS.xml
index 850be7913980aeba071b7b71db15a4ae63f71b25..3b5861314d608c799a208d4da4ff000bc5c6d761 100644
--- a/modeling/SysMLSec/SimpleTLS.xml
+++ b/modeling/SysMLSec/SimpleTLS.xml
@@ -42,19 +42,19 @@
 </COMPONENT>
 <SUBCOMPONENT type="5707" id="11" >
 <father id="18" num="0" />
-<cdparam x="855" y="541" />
+<cdparam x="855" y="556" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="855" maxX="855" minY="540" maxY="540" />
-<infoparam name="value " value="NonAuthenticatedClient" />
+<cdrectangleparam minX="855" maxX="855" minY="555" maxY="555" />
+<infoparam name="value " value="AuthenticatedClient" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5707" id="12" >
 <father id="18" num="1" />
-<cdparam x="855" y="556" />
+<cdparam x="855" y="541" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="855" maxX="855" minY="555" maxY="555" />
-<infoparam name="value " value="AuthenticatedClient" />
+<cdrectangleparam minX="855" maxX="855" minY="540" maxY="540" />
+<infoparam name="value " value="NonAuthenticatedClient" />
 </SUBCOMPONENT>
 
 <COMPONENT type="5703" id="24" >
@@ -803,11 +803,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="381" >
 <father id="431" num="0" />
-<cdparam x="124" y="142" />
+<cdparam x="403" y="145" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="346" minY="0" maxY="189" />
-<infoparam name="Block0" value="Client" />
+<infoparam name="Block0" value="Server" />
 <TGConnectingPoint num="0" id="357" />
 <TGConnectingPoint num="1" id="358" />
 <TGConnectingPoint num="2" id="359" />
@@ -834,19 +834,20 @@
 <TGConnectingPoint num="23" id="380" />
 <extraparam>
 <CryptoBlock value="true" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PMS" value="" type="8" typeOther="Message" />
+<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
-<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
-<Attribute access="0" id="secretMessage2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="receivedSID" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="message1" 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)" />
@@ -871,11 +872,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="406" >
 <father id="431" num="1" />
-<cdparam x="403" y="145" />
+<cdparam x="124" y="142" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="346" minY="0" maxY="189" />
-<infoparam name="Block0" value="Server" />
+<infoparam name="Block0" value="Client" />
 <TGConnectingPoint num="0" id="382" />
 <TGConnectingPoint num="1" id="383" />
 <TGConnectingPoint num="2" id="384" />
@@ -902,20 +903,19 @@
 <TGConnectingPoint num="23" id="405" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="PMS" value="" type="8" typeOther="Message" />
 <Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
+<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
-<Attribute access="0" id="receivedSID" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="message1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="secretMessage2" 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)" />
@@ -955,46 +955,26 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="444" >
-<cdparam x="791" y="1060" />
+<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="440" >
+<cdparam x="648" y="1235" />
 <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="441" />
-<TGConnectingPoint num="1" id="442" />
-<TGConnectingPoint num="2" id="443" />
-<P1  x="791" y="1060" id="612" />
-<P2  x="790" y="589" id="640" />
-<Point x="1172" y="1060" />
-<Point x="1172" y="589" />
+<TGConnectingPoint num="0" id="439" />
+<P1  x="578" y="1226" id="597" />
+<P2  x="578" y="1252" id="649" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="434" >
-<father id="444" num="0" />
-<cdparam x="1172" y="1060" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="435" >
-<father id="444" num="1" />
-<cdparam x="1172" y="589" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="440" >
-<father id="444" num="2" />
-<cdparam x="791" y="1100" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="438" >
+<father id="440" num="0" />
+<cdparam x="648" y="1275" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="436" />
-<TGConnectingPoint num="1" id="437" />
-<TGConnectingPoint num="2" id="438" />
-<TGConnectingPoint num="3" id="439" />
+<TGConnectingPoint num="0" id="434" />
+<TGConnectingPoint num="1" id="435" />
+<TGConnectingPoint num="2" id="436" />
+<TGConnectingPoint num="3" id="437" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1004,27 +984,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="451" >
-<cdparam x="697" y="890" />
+<CONNECTOR type="5102" id="447" >
+<cdparam x="407" y="35" />
 <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="450" />
-<P1  x="697" y="890" id="946" />
-<P2  x="697" y="1029" id="603" />
+<TGConnectingPoint num="0" id="446" />
+<P1  x="407" y="35" id="873" />
+<P2  x="407" y="81" id="862" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="449" >
-<father id="451" num="0" />
-<cdparam x="415" y="933" />
-<sizeparam width="273" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="445" >
+<father id="447" num="0" />
+<cdparam x="421" y="56" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="445" />
-<TGConnectingPoint num="1" id="446" />
-<TGConnectingPoint num="2" id="447" />
-<TGConnectingPoint num="3" id="448" />
+<TGConnectingPoint num="0" id="441" />
+<TGConnectingPoint num="1" id="442" />
+<TGConnectingPoint num="2" id="443" />
+<TGConnectingPoint num="3" id="444" />
 <extraparam>
-<guard value="[ message1.data == secretMessage.data ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1032,74 +1012,53 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="458" >
-<cdparam x="628" y="602" />
+<CONNECTOR type="5102" id="454" >
+<cdparam x="528" y="626" />
 <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="457" />
-<P1  x="690" y="602" id="632" />
-<P2  x="457" y="602" id="767" />
+<TGConnectingPoint num="0" id="453" />
+<P1  x="528" y="714" id="706" />
+<P2  x="242" y="496" id="795" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="456" >
-<father id="458" num="0" />
-<cdparam x="532" y="591" />
-<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="452" >
+<father id="454" num="0" />
+<cdparam x="412" y="686" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="452" />
-<TGConnectingPoint num="1" id="453" />
-<TGConnectingPoint num="2" id="454" />
-<TGConnectingPoint num="3" id="455" />
+<TGConnectingPoint num="0" id="448" />
+<TGConnectingPoint num="1" id="449" />
+<TGConnectingPoint num="2" id="450" />
+<TGConnectingPoint num="3" id="451" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = sid+1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="469" >
-<cdparam x="740" y="736" />
+<CONNECTOR type="5102" id="461" >
+<cdparam x="407" y="288" />
 <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="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<P1  x="740" y="736" id="671" />
-<P2  x="871" y="673" id="627" />
-<Point x="740" y="654" />
-<Point x="871" y="654" />
+<TGConnectingPoint num="0" id="460" />
+<P1  x="407" y="288" id="824" />
+<P2  x="217" y="465" id="778" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="459" >
-<father id="469" num="0" />
-<cdparam x="740" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="460" >
-<father id="469" num="1" />
-<cdparam x="871" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="465" >
-<father id="469" num="2" />
-<cdparam x="749" y="707" />
+<father id="461" num="0" />
+<cdparam x="261" y="362" />
 <sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="461" />
-<TGConnectingPoint num="1" id="462" />
-<TGConnectingPoint num="2" id="463" />
-<TGConnectingPoint num="3" id="464" />
+<TGConnectingPoint num="0" id="455" />
+<TGConnectingPoint num="1" id="456" />
+<TGConnectingPoint num="2" id="457" />
+<TGConnectingPoint num="3" id="458" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -1109,230 +1068,144 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="482" >
-<cdparam x="942" y="891" />
+<CONNECTOR type="5102" id="468" >
+<cdparam x="407" y="107" />
 <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="478" />
-<TGConnectingPoint num="1" id="479" />
-<TGConnectingPoint num="2" id="480" />
-<TGConnectingPoint num="3" id="481" />
-<P1  x="942" y="891" id="851" />
-<P2  x="790" y="602" id="633" />
-<Point x="942" y="945" />
-<Point x="1080" y="945" />
-<Point x="1080" y="602" />
+<TGConnectingPoint num="0" id="467" />
+<P1  x="407" y="111" id="863" />
+<P2  x="407" y="143" id="851" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="470" >
-<father id="482" num="0" />
-<cdparam x="942" y="945" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="471" >
-<father id="482" num="1" />
-<cdparam x="1080" y="945" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="472" >
-<father id="482" num="2" />
-<cdparam x="1080" y="602" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="477" >
-<father id="482" num="3" />
-<cdparam x="921" y="934" />
-<sizeparam width="183" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="466" >
+<father id="468" num="0" />
+<cdparam x="407" y="147" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="473" />
-<TGConnectingPoint num="1" id="474" />
-<TGConnectingPoint num="2" id="475" />
-<TGConnectingPoint num="3" id="476" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="message1.data = filler1.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="495" >
-<cdparam x="740" y="890" />
+<CONNECTOR type="5102" id="475" >
+<cdparam x="407" y="198" />
 <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" />
-<TGConnectingPoint num="1" id="492" />
-<TGConnectingPoint num="2" id="493" />
-<TGConnectingPoint num="3" id="494" />
-<P1  x="740" y="890" id="938" />
-<P2  x="790" y="595" id="652" />
-<Point x="740" y="978" />
-<Point x="1126" y="978" />
-<Point x="1126" y="595" />
+<TGConnectingPoint num="0" id="474" />
+<P1  x="407" y="173" id="852" />
+<P2  x="407" y="238" id="818" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="483" >
-<father id="495" num="0" />
-<cdparam x="740" y="978" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="484" >
-<father id="495" num="1" />
-<cdparam x="1126" y="978" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="485" >
-<father id="495" num="2" />
-<cdparam x="1126" y="595" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="490" >
-<father id="495" num="3" />
-<cdparam x="757" y="936" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="473" >
+<father id="475" num="0" />
+<cdparam x="436" y="192" />
+<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="486" />
-<TGConnectingPoint num="1" id="487" />
-<TGConnectingPoint num="2" id="488" />
-<TGConnectingPoint num="3" id="489" />
+<TGConnectingPoint num="0" id="469" />
+<TGConnectingPoint num="1" id="470" />
+<TGConnectingPoint num="2" id="471" />
+<TGConnectingPoint num="3" id="472" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(filler1, serverHello, serverCert) " />
+<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="504" >
-<cdparam x="790" y="761" />
+<CONNECTOR type="5102" id="482" >
+<cdparam x="514" y="288" />
 <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="502" />
-<TGConnectingPoint num="1" id="503" />
-<P1  x="790" y="761" id="674" />
-<P2  x="942" y="841" id="846" />
-<Point x="942" y="761" />
+<TGConnectingPoint num="0" id="481" />
+<P1  x="514" y="288" id="841" />
+<P2  x="540" y="341" id="766" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="496" >
-<father id="504" num="0" />
-<cdparam x="942" y="761" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="501" >
-<father id="504" num="1" />
-<cdparam x="825" y="749" />
-<sizeparam width="68" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="480" >
+<father id="482" num="0" />
+<cdparam x="546" y="308" />
+<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="497" />
-<TGConnectingPoint num="1" id="498" />
-<TGConnectingPoint num="2" id="499" />
-<TGConnectingPoint num="3" id="500" />
+<TGConnectingPoint num="0" id="476" />
+<TGConnectingPoint num="1" id="477" />
+<TGConnectingPoint num="2" id="478" />
+<TGConnectingPoint num="3" id="479" />
 <extraparam>
-<guard value="[ sid == 0]" />
+<guard value="[ certVerified ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="serverPubK = getpk(serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="511" >
-<cdparam x="457" y="761" />
+<CONNECTOR type="5102" id="489" >
+<cdparam x="540" y="371" />
 <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="510" />
-<P1  x="457" y="761" id="715" />
-<P2  x="690" y="761" id="673" />
+<TGConnectingPoint num="0" id="488" />
+<P1  x="540" y="371" id="767" />
+<P2  x="540" y="511" id="755" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="509" >
-<father id="511" num="0" />
-<cdparam x="484" y="781" />
-<sizeparam width="170" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="487" >
+<father id="489" num="0" />
+<cdparam x="566" y="431" />
+<sizeparam width="229" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="505" />
-<TGConnectingPoint num="1" id="506" />
-<TGConnectingPoint num="2" id="507" />
-<TGConnectingPoint num="3" id="508" />
+<TGConnectingPoint num="0" id="483" />
+<TGConnectingPoint num="1" id="484" />
+<TGConnectingPoint num="2" id="485" />
+<TGConnectingPoint num="3" id="486" />
 <extraparam>
-<guard value="[ receivedSID.data == sid ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1.data = PMS" />
+<actions value="filler1 = aencrypt(filler1, serverPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="522" >
-<cdparam x="357" y="767" />
+<CONNECTOR type="5102" id="496" >
+<cdparam x="540" y="541" />
 <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" />
-<TGConnectingPoint num="1" id="520" />
-<TGConnectingPoint num="2" id="521" />
-<P1  x="357" y="767" id="735" />
-<P2  x="357" y="595" id="784" />
-<Point x="309" y="767" />
-<Point x="309" y="595" />
+<TGConnectingPoint num="0" id="495" />
+<P1  x="540" y="541" id="756" />
+<P2  x="540" y="578" id="744" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="512" >
-<father id="522" num="0" />
-<cdparam x="309" y="767" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="513" >
-<father id="522" num="1" />
-<cdparam x="309" y="595" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="518" >
-<father id="522" num="2" />
-<cdparam x="241" y="693" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="494" >
+<father id="496" num="0" />
+<cdparam x="540" y="581" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="514" />
-<TGConnectingPoint num="1" id="515" />
-<TGConnectingPoint num="2" id="516" />
-<TGConnectingPoint num="3" id="517" />
+<TGConnectingPoint num="0" id="490" />
+<TGConnectingPoint num="1" id="491" />
+<TGConnectingPoint num="2" id="492" />
+<TGConnectingPoint num="3" id="493" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1340,201 +1213,696 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="529" >
-<cdparam x="407" y="542" />
+<CONNECTOR type="5102" id="503" >
+<cdparam x="540" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="528" />
-<P1  x="407" y="542" id="887" />
-<P2  x="407" y="577" id="764" />
+<TGConnectingPoint num="0" id="502" />
+<P1  x="540" y="608" id="745" />
+<P2  x="540" y="689" id="719" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="527" >
-<father id="529" num="0" />
-<cdparam x="422" y="562" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="501" >
+<father id="503" num="0" />
+<cdparam x="556" y="635" />
+<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="523" />
-<TGConnectingPoint num="1" id="524" />
-<TGConnectingPoint num="2" id="525" />
-<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="1" id="498" />
+<TGConnectingPoint num="2" id="499" />
+<TGConnectingPoint num="3" id="500" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = 0" />
+<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
+<actions value="MS = hash(filler2)" />
+<actions value="filler2 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="536" >
-<cdparam x="407" y="352" />
+<CONNECTOR type="5102" id="510" >
+<cdparam x="578" y="739" />
 <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="535" />
-<P1  x="407" y="318" id="898" />
-<P2  x="407" y="365" id="805" />
+<TGConnectingPoint num="0" id="509" />
+<P1  x="578" y="739" id="709" />
+<P2  x="578" y="810" id="663" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="534" >
-<father id="536" num="0" />
-<cdparam x="407" y="392" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="508" >
+<father id="510" num="0" />
+<cdparam x="591" y="766" />
+<sizeparam width="180" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="530" />
-<TGConnectingPoint num="1" id="531" />
-<TGConnectingPoint num="2" id="532" />
-<TGConnectingPoint num="3" id="533" />
+<TGConnectingPoint num="0" id="504" />
+<TGConnectingPoint num="1" id="505" />
+<TGConnectingPoint num="2" id="506" />
+<TGConnectingPoint num="3" id="507" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ filler1.data == filler2.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sid = 0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="543" >
-<cdparam x="407" y="469" />
+<CONNECTOR type="5102" id="517" >
+<cdparam x="570" y="858" />
 <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="542" />
-<P1  x="407" y="415" id="810" />
-<P2  x="407" y="512" id="886" />
+<TGConnectingPoint num="0" id="516" />
+<P1  x="578" y="860" id="668" />
+<P2  x="578" y="903" id="651" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="541" >
-<father id="543" num="0" />
-<cdparam x="439" y="439" />
-<sizeparam width="294" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="515" >
+<father id="517" num="0" />
+<cdparam x="619" y="873" />
+<sizeparam width="251" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="537" />
-<TGConnectingPoint num="1" id="538" />
-<TGConnectingPoint num="2" id="539" />
-<TGConnectingPoint num="3" id="540" />
+<TGConnectingPoint num="0" id="511" />
+<TGConnectingPoint num="1" id="512" />
+<TGConnectingPoint num="2" id="513" />
+<TGConnectingPoint num="3" id="514" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="PMS = adecrypt(filler1, serverPrivK)" />
-<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
-<actions value="MS = hash(filler1)" />
-<actions value="filler1 = hash(MS)" />
+<actions value="filler1.data = sid" />
+<actions value="filler1 = concat2(filler1, secretMessage)" />
+<actions value="filler1 = sencrypt(filler1, MS) " />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="550" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="524" >
+<cdparam x="578" y="918" />
 <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="549" />
-<P1  x="407" y="70" id="930" />
-<P2  x="407" y="124" id="919" />
+<TGConnectingPoint num="0" id="523" />
+<P1  x="578" y="933" id="652" />
+<P2  x="578" y="973" id="540" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="548" >
-<father id="550" num="0" />
-<cdparam x="416" y="96" />
-<sizeparam width="230" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="522" >
+<father id="524" num="0" />
+<cdparam x="619" y="951" />
+<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="544" />
-<TGConnectingPoint num="1" id="545" />
-<TGConnectingPoint num="2" id="546" />
-<TGConnectingPoint num="3" id="547" />
+<TGConnectingPoint num="0" id="518" />
+<TGConnectingPoint num="1" id="519" />
+<TGConnectingPoint num="2" id="520" />
+<TGConnectingPoint num="3" id="521" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sign(serverPubK, CAPrivK)" />
-<actions value="serverCert = cert(serverPubK, filler1)" />
+<actions value="sid = sid+1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="557" >
-<cdparam x="407" y="207" />
+<CONNECTOR type="5102" id="531" >
+<cdparam x="570" y="1131" />
 <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="556" />
-<P1  x="407" y="154" id="920" />
-<P2  x="407" y="190" id="908" />
+<TGConnectingPoint num="0" id="530" />
+<P1  x="578" y="1130" id="581" />
+<P2  x="578" y="1176" id="592" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="555" >
-<father id="557" num="0" />
-<cdparam x="420" y="178" />
-<sizeparam width="256" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="529" >
+<father id="531" num="0" />
+<cdparam x="621" y="1151" />
+<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="551" />
-<TGConnectingPoint num="1" id="552" />
-<TGConnectingPoint num="2" id="553" />
-<TGConnectingPoint num="3" id="554" />
+<TGConnectingPoint num="0" id="525" />
+<TGConnectingPoint num="1" id="526" />
+<TGConnectingPoint num="2" id="527" />
+<TGConnectingPoint num="3" id="528" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = concat2(serverHello, serverCert)" />
+<actions value="sid = sid+1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="564" >
-<cdparam x="407" y="242" />
+<CONNECTOR type="5102" id="538" >
+<cdparam x="598" y="1088" />
 <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="563" />
-<P1  x="407" y="220" id="909" />
-<P2  x="407" y="288" id="897" />
+<TGConnectingPoint num="0" id="537" />
+<P1  x="578" y="1023" id="545" />
+<P2  x="578" y="1100" id="580" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="562" >
-<father id="564" num="0" />
-<cdparam x="315" y="335" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="536" >
+<father id="538" num="0" />
+<cdparam x="609" y="1048" />
+<sizeparam width="259" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="558" />
-<TGConnectingPoint num="1" id="559" />
-<TGConnectingPoint num="2" id="560" />
-<TGConnectingPoint num="3" id="561" />
+<TGConnectingPoint num="0" id="532" />
+<TGConnectingPoint num="1" id="533" />
+<TGConnectingPoint num="2" id="534" />
+<TGConnectingPoint num="3" id="535" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1.data = sid" />
+<actions value="filler1 = concat2(filler1, secretMessage2)" />
+<actions value="filler1 = sencrypt(filler1, MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="571" >
-<cdparam x="407" y="627" />
+<COMPONENT type="5106" id="579" >
+<cdparam x="518" y="973" />
+<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="sendMessage2" />
+<TGConnectingPoint num="0" id="539" />
+<TGConnectingPoint num="1" id="540" />
+<TGConnectingPoint num="2" id="541" />
+<TGConnectingPoint num="3" id="542" />
+<TGConnectingPoint num="4" id="543" />
+<TGConnectingPoint num="5" id="544" />
+<TGConnectingPoint num="6" id="545" />
+<TGConnectingPoint num="7" id="546" />
+<TGConnectingPoint num="8" id="547" />
+<TGConnectingPoint num="9" id="548" />
+<TGConnectingPoint num="10" id="549" />
+<TGConnectingPoint num="11" id="550" />
+<TGConnectingPoint num="12" id="551" />
+<TGConnectingPoint num="13" id="552" />
+<TGConnectingPoint num="14" id="553" />
+<TGConnectingPoint num="15" id="554" />
+<TGConnectingPoint num="16" id="555" />
+<TGConnectingPoint num="17" id="556" />
+<TGConnectingPoint num="18" id="557" />
+<TGConnectingPoint num="19" id="558" />
+<TGConnectingPoint num="20" id="559" />
+<TGConnectingPoint num="21" id="560" />
+<TGConnectingPoint num="22" id="561" />
+<TGConnectingPoint num="23" id="562" />
+<TGConnectingPoint num="24" id="563" />
+<TGConnectingPoint num="25" id="564" />
+<TGConnectingPoint num="26" id="565" />
+<TGConnectingPoint num="27" id="566" />
+<TGConnectingPoint num="28" id="567" />
+<TGConnectingPoint num="29" id="568" />
+<TGConnectingPoint num="30" id="569" />
+<TGConnectingPoint num="31" id="570" />
+<TGConnectingPoint num="32" id="571" />
+<TGConnectingPoint num="33" id="572" />
+<TGConnectingPoint num="34" id="573" />
+<TGConnectingPoint num="35" id="574" />
+<TGConnectingPoint num="36" id="575" />
+<TGConnectingPoint num="37" id="576" />
+<TGConnectingPoint num="38" id="577" />
+<TGConnectingPoint num="39" id="578" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="590" >
+<cdparam x="533" y="1105" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="580" />
+<TGConnectingPoint num="1" id="581" />
+<TGConnectingPoint num="2" id="582" />
+<TGConnectingPoint num="3" id="583" />
+<TGConnectingPoint num="4" id="584" />
+<TGConnectingPoint num="5" id="585" />
+<TGConnectingPoint num="6" id="586" />
+<TGConnectingPoint num="7" id="587" />
+<TGConnectingPoint num="8" id="588" />
+<TGConnectingPoint num="9" id="589" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="631" >
+<cdparam x="528" y="1176" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="verif" />
+<TGConnectingPoint num="0" id="591" />
+<TGConnectingPoint num="1" id="592" />
+<TGConnectingPoint num="2" id="593" />
+<TGConnectingPoint num="3" id="594" />
+<TGConnectingPoint num="4" id="595" />
+<TGConnectingPoint num="5" id="596" />
+<TGConnectingPoint num="6" id="597" />
+<TGConnectingPoint num="7" id="598" />
+<TGConnectingPoint num="8" id="599" />
+<TGConnectingPoint num="9" id="600" />
+<TGConnectingPoint num="10" id="601" />
+<TGConnectingPoint num="11" id="602" />
+<TGConnectingPoint num="12" id="603" />
+<TGConnectingPoint num="13" id="604" />
+<TGConnectingPoint num="14" id="605" />
+<TGConnectingPoint num="15" id="606" />
+<TGConnectingPoint num="16" id="607" />
+<TGConnectingPoint num="17" id="608" />
+<TGConnectingPoint num="18" id="609" />
+<TGConnectingPoint num="19" id="610" />
+<TGConnectingPoint num="20" id="611" />
+<TGConnectingPoint num="21" id="612" />
+<TGConnectingPoint num="22" id="613" />
+<TGConnectingPoint num="23" id="614" />
+<TGConnectingPoint num="24" id="615" />
+<TGConnectingPoint num="25" id="616" />
+<TGConnectingPoint num="26" id="617" />
+<TGConnectingPoint num="27" id="618" />
+<TGConnectingPoint num="28" id="619" />
+<TGConnectingPoint num="29" id="620" />
+<TGConnectingPoint num="30" id="621" />
+<TGConnectingPoint num="31" id="622" />
+<TGConnectingPoint num="32" id="623" />
+<TGConnectingPoint num="33" id="624" />
+<TGConnectingPoint num="34" id="625" />
+<TGConnectingPoint num="35" id="626" />
+<TGConnectingPoint num="36" id="627" />
+<TGConnectingPoint num="37" id="628" />
+<TGConnectingPoint num="38" id="629" />
+<TGConnectingPoint num="39" id="630" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="648" >
+<cdparam x="579" y="53" />
+<sizeparam width="296" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="UML Note" value="https://tools.ietf.org/html/rfc5246#section-7
+" />
+<TGConnectingPoint num="0" id="632" />
+<TGConnectingPoint num="1" id="633" />
+<TGConnectingPoint num="2" id="634" />
+<TGConnectingPoint num="3" id="635" />
+<TGConnectingPoint num="4" id="636" />
+<TGConnectingPoint num="5" id="637" />
+<TGConnectingPoint num="6" id="638" />
+<TGConnectingPoint num="7" id="639" />
+<TGConnectingPoint num="8" id="640" />
+<TGConnectingPoint num="9" id="641" />
+<TGConnectingPoint num="10" id="642" />
+<TGConnectingPoint num="11" id="643" />
+<TGConnectingPoint num="12" id="644" />
+<TGConnectingPoint num="13" id="645" />
+<TGConnectingPoint num="14" id="646" />
+<TGConnectingPoint num="15" id="647" />
+<extraparam>
+<Line value="https://tools.ietf.org/html/rfc5246#section-7" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="650" >
+<cdparam x="568" y="1257" />
+<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="649" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="661" >
+<cdparam x="533" y="908" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="651" />
+<TGConnectingPoint num="1" id="652" />
+<TGConnectingPoint num="2" id="653" />
+<TGConnectingPoint num="3" id="654" />
+<TGConnectingPoint num="4" id="655" />
+<TGConnectingPoint num="5" id="656" />
+<TGConnectingPoint num="6" id="657" />
+<TGConnectingPoint num="7" id="658" />
+<TGConnectingPoint num="8" id="659" />
+<TGConnectingPoint num="9" id="660" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="702" >
+<cdparam x="528" y="810" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="sendMessage" />
+<TGConnectingPoint num="0" id="662" />
+<TGConnectingPoint num="1" id="663" />
+<TGConnectingPoint num="2" id="664" />
+<TGConnectingPoint num="3" id="665" />
+<TGConnectingPoint num="4" id="666" />
+<TGConnectingPoint num="5" id="667" />
+<TGConnectingPoint num="6" id="668" />
+<TGConnectingPoint num="7" id="669" />
+<TGConnectingPoint num="8" id="670" />
+<TGConnectingPoint num="9" id="671" />
+<TGConnectingPoint num="10" id="672" />
+<TGConnectingPoint num="11" id="673" />
+<TGConnectingPoint num="12" id="674" />
+<TGConnectingPoint num="13" id="675" />
+<TGConnectingPoint num="14" id="676" />
+<TGConnectingPoint num="15" id="677" />
+<TGConnectingPoint num="16" id="678" />
+<TGConnectingPoint num="17" id="679" />
+<TGConnectingPoint num="18" id="680" />
+<TGConnectingPoint num="19" id="681" />
+<TGConnectingPoint num="20" id="682" />
+<TGConnectingPoint num="21" id="683" />
+<TGConnectingPoint num="22" id="684" />
+<TGConnectingPoint num="23" id="685" />
+<TGConnectingPoint num="24" id="686" />
+<TGConnectingPoint num="25" id="687" />
+<TGConnectingPoint num="26" id="688" />
+<TGConnectingPoint num="27" id="689" />
+<TGConnectingPoint num="28" id="690" />
+<TGConnectingPoint num="29" id="691" />
+<TGConnectingPoint num="30" id="692" />
+<TGConnectingPoint num="31" id="693" />
+<TGConnectingPoint num="32" id="694" />
+<TGConnectingPoint num="33" id="695" />
+<TGConnectingPoint num="34" id="696" />
+<TGConnectingPoint num="35" id="697" />
+<TGConnectingPoint num="36" id="698" />
+<TGConnectingPoint num="37" id="699" />
+<TGConnectingPoint num="38" id="700" />
+<TGConnectingPoint num="39" id="701" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="743" >
+<cdparam x="528" y="689" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="checkMS" />
+<TGConnectingPoint num="0" id="703" />
+<TGConnectingPoint num="1" id="704" />
+<TGConnectingPoint num="2" id="705" />
+<TGConnectingPoint num="3" id="706" />
+<TGConnectingPoint num="4" id="707" />
+<TGConnectingPoint num="5" id="708" />
+<TGConnectingPoint num="6" id="709" />
+<TGConnectingPoint num="7" id="710" />
+<TGConnectingPoint num="8" id="711" />
+<TGConnectingPoint num="9" id="712" />
+<TGConnectingPoint num="10" id="713" />
+<TGConnectingPoint num="11" id="714" />
+<TGConnectingPoint num="12" id="715" />
+<TGConnectingPoint num="13" id="716" />
+<TGConnectingPoint num="14" id="717" />
+<TGConnectingPoint num="15" id="718" />
+<TGConnectingPoint num="16" id="719" />
+<TGConnectingPoint num="17" id="720" />
+<TGConnectingPoint num="18" id="721" />
+<TGConnectingPoint num="19" id="722" />
+<TGConnectingPoint num="20" id="723" />
+<TGConnectingPoint num="21" id="724" />
+<TGConnectingPoint num="22" id="725" />
+<TGConnectingPoint num="23" id="726" />
+<TGConnectingPoint num="24" id="727" />
+<TGConnectingPoint num="25" id="728" />
+<TGConnectingPoint num="26" id="729" />
+<TGConnectingPoint num="27" id="730" />
+<TGConnectingPoint num="28" id="731" />
+<TGConnectingPoint num="29" id="732" />
+<TGConnectingPoint num="30" id="733" />
+<TGConnectingPoint num="31" id="734" />
+<TGConnectingPoint num="32" id="735" />
+<TGConnectingPoint num="33" id="736" />
+<TGConnectingPoint num="34" id="737" />
+<TGConnectingPoint num="35" id="738" />
+<TGConnectingPoint num="36" id="739" />
+<TGConnectingPoint num="37" id="740" />
+<TGConnectingPoint num="38" id="741" />
+<TGConnectingPoint num="39" id="742" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="754" >
+<cdparam x="496" y="583" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="744" />
+<TGConnectingPoint num="1" id="745" />
+<TGConnectingPoint num="2" id="746" />
+<TGConnectingPoint num="3" id="747" />
+<TGConnectingPoint num="4" id="748" />
+<TGConnectingPoint num="5" id="749" />
+<TGConnectingPoint num="6" id="750" />
+<TGConnectingPoint num="7" id="751" />
+<TGConnectingPoint num="8" id="752" />
+<TGConnectingPoint num="9" id="753" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="765" >
+<cdparam x="495" y="516" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="755" />
+<TGConnectingPoint num="1" id="756" />
+<TGConnectingPoint num="2" id="757" />
+<TGConnectingPoint num="3" id="758" />
+<TGConnectingPoint num="4" id="759" />
+<TGConnectingPoint num="5" id="760" />
+<TGConnectingPoint num="6" id="761" />
+<TGConnectingPoint num="7" id="762" />
+<TGConnectingPoint num="8" id="763" />
+<TGConnectingPoint num="9" id="764" />
+</COMPONENT>
+
+<COMPONENT type="5108" id="768" >
+<cdparam x="454" y="346" />
+<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
+<extraparam>
+<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="809" >
+<cdparam x="142" y="465" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="error" />
+<TGConnectingPoint num="0" id="769" />
+<TGConnectingPoint num="1" id="770" />
+<TGConnectingPoint num="2" id="771" />
+<TGConnectingPoint num="3" id="772" />
+<TGConnectingPoint num="4" id="773" />
+<TGConnectingPoint num="5" id="774" />
+<TGConnectingPoint num="6" id="775" />
+<TGConnectingPoint num="7" id="776" />
+<TGConnectingPoint num="8" id="777" />
+<TGConnectingPoint num="9" id="778" />
+<TGConnectingPoint num="10" id="779" />
+<TGConnectingPoint num="11" id="780" />
+<TGConnectingPoint num="12" id="781" />
+<TGConnectingPoint num="13" id="782" />
+<TGConnectingPoint num="14" id="783" />
+<TGConnectingPoint num="15" id="784" />
+<TGConnectingPoint num="16" id="785" />
+<TGConnectingPoint num="17" id="786" />
+<TGConnectingPoint num="18" id="787" />
+<TGConnectingPoint num="19" id="788" />
+<TGConnectingPoint num="20" id="789" />
+<TGConnectingPoint num="21" id="790" />
+<TGConnectingPoint num="22" id="791" />
+<TGConnectingPoint num="23" id="792" />
+<TGConnectingPoint num="24" id="793" />
+<TGConnectingPoint num="25" id="794" />
+<TGConnectingPoint num="26" id="795" />
+<TGConnectingPoint num="27" id="796" />
+<TGConnectingPoint num="28" id="797" />
+<TGConnectingPoint num="29" id="798" />
+<TGConnectingPoint num="30" id="799" />
+<TGConnectingPoint num="31" id="800" />
+<TGConnectingPoint num="32" id="801" />
+<TGConnectingPoint num="33" id="802" />
+<TGConnectingPoint num="34" id="803" />
+<TGConnectingPoint num="35" id="804" />
+<TGConnectingPoint num="36" id="805" />
+<TGConnectingPoint num="37" id="806" />
+<TGConnectingPoint num="38" id="807" />
+<TGConnectingPoint num="39" id="808" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="850" >
+<cdparam x="364" y="238" />
+<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="VerifyServerCert" />
+<TGConnectingPoint num="0" id="810" />
+<TGConnectingPoint num="1" id="811" />
+<TGConnectingPoint num="2" id="812" />
+<TGConnectingPoint num="3" id="813" />
+<TGConnectingPoint num="4" id="814" />
+<TGConnectingPoint num="5" id="815" />
+<TGConnectingPoint num="6" id="816" />
+<TGConnectingPoint num="7" id="817" />
+<TGConnectingPoint num="8" id="818" />
+<TGConnectingPoint num="9" id="819" />
+<TGConnectingPoint num="10" id="820" />
+<TGConnectingPoint num="11" id="821" />
+<TGConnectingPoint num="12" id="822" />
+<TGConnectingPoint num="13" id="823" />
+<TGConnectingPoint num="14" id="824" />
+<TGConnectingPoint num="15" id="825" />
+<TGConnectingPoint num="16" id="826" />
+<TGConnectingPoint num="17" id="827" />
+<TGConnectingPoint num="18" id="828" />
+<TGConnectingPoint num="19" id="829" />
+<TGConnectingPoint num="20" id="830" />
+<TGConnectingPoint num="21" id="831" />
+<TGConnectingPoint num="22" id="832" />
+<TGConnectingPoint num="23" id="833" />
+<TGConnectingPoint num="24" id="834" />
+<TGConnectingPoint num="25" id="835" />
+<TGConnectingPoint num="26" id="836" />
+<TGConnectingPoint num="27" id="837" />
+<TGConnectingPoint num="28" id="838" />
+<TGConnectingPoint num="29" id="839" />
+<TGConnectingPoint num="30" id="840" />
+<TGConnectingPoint num="31" id="841" />
+<TGConnectingPoint num="32" id="842" />
+<TGConnectingPoint num="33" id="843" />
+<TGConnectingPoint num="34" id="844" />
+<TGConnectingPoint num="35" id="845" />
+<TGConnectingPoint num="36" id="846" />
+<TGConnectingPoint num="37" id="847" />
+<TGConnectingPoint num="38" id="848" />
+<TGConnectingPoint num="39" id="849" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="861" >
+<cdparam x="363" y="148" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="851" />
+<TGConnectingPoint num="1" id="852" />
+<TGConnectingPoint num="2" id="853" />
+<TGConnectingPoint num="3" id="854" />
+<TGConnectingPoint num="4" id="855" />
+<TGConnectingPoint num="5" id="856" />
+<TGConnectingPoint num="6" id="857" />
+<TGConnectingPoint num="7" id="858" />
+<TGConnectingPoint num="8" id="859" />
+<TGConnectingPoint num="9" id="860" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="872" >
+<cdparam x="346" y="86" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(clientHello)" />
+<TGConnectingPoint num="0" id="862" />
+<TGConnectingPoint num="1" id="863" />
+<TGConnectingPoint num="2" id="864" />
+<TGConnectingPoint num="3" id="865" />
+<TGConnectingPoint num="4" id="866" />
+<TGConnectingPoint num="5" id="867" />
+<TGConnectingPoint num="6" id="868" />
+<TGConnectingPoint num="7" id="869" />
+<TGConnectingPoint num="8" id="870" />
+<TGConnectingPoint num="9" id="871" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="874" >
+<cdparam x="400" y="15" />
+<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="873" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="885" >
+<cdparam x="791" y="1060" />
 <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="570" />
-<P1  x="407" y="627" id="769" />
-<P2  x="407" y="656" id="752" />
+<TGConnectingPoint num="0" id="882" />
+<TGConnectingPoint num="1" id="883" />
+<TGConnectingPoint num="2" id="884" />
+<P1  x="791" y="1060" id="1053" />
+<P2  x="790" y="589" id="1081" />
+<Point x="1172" y="1060" />
+<Point x="1172" y="589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="569" >
-<father id="571" num="0" />
-<cdparam x="407" y="667" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="875" >
+<father id="885" num="0" />
+<cdparam x="1172" y="1060" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="876" >
+<father id="885" num="1" />
+<cdparam x="1172" y="589" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="881" >
+<father id="885" num="2" />
+<cdparam x="791" y="1100" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="565" />
-<TGConnectingPoint num="1" id="566" />
-<TGConnectingPoint num="2" id="567" />
-<TGConnectingPoint num="3" id="568" />
+<TGConnectingPoint num="0" id="877" />
+<TGConnectingPoint num="1" id="878" />
+<TGConnectingPoint num="2" id="879" />
+<TGConnectingPoint num="3" id="880" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1544,651 +1912,219 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="578" >
-<cdparam x="407" y="686" />
+<CONNECTOR type="5102" id="892" >
+<cdparam x="697" y="890" />
 <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="577" />
-<P1  x="407" y="686" id="753" />
-<P2  x="407" y="736" id="712" />
+<TGConnectingPoint num="0" id="891" />
+<P1  x="697" y="890" id="1387" />
+<P2  x="697" y="1029" id="1044" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="576" >
-<father id="578" num="0" />
-<cdparam x="429" y="704" />
-<sizeparam width="196" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="890" >
+<father id="892" num="0" />
+<cdparam x="415" y="933" />
+<sizeparam width="273" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="572" />
-<TGConnectingPoint num="1" id="573" />
-<TGConnectingPoint num="2" id="574" />
-<TGConnectingPoint num="3" id="575" />
+<TGConnectingPoint num="0" id="886" />
+<TGConnectingPoint num="1" id="887" />
+<TGConnectingPoint num="2" id="888" />
+<TGConnectingPoint num="3" id="889" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ message1.data == secretMessage.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sdecrypt(filler1, MS)" />
-<actions value="get2(filler1, receivedSID, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="585" >
-<cdparam x="767" y="819" />
+<CONNECTOR type="5102" id="899" >
+<cdparam x="628" y="602" />
 <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="584" />
-<P1  x="740" y="786" id="676" />
-<P2  x="740" y="840" id="933" />
+<TGConnectingPoint num="0" id="898" />
+<P1  x="690" y="602" id="1073" />
+<P2  x="457" y="602" id="1208" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="583" >
-<father id="585" num="0" />
-<cdparam x="751" y="815" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="897" >
+<father id="899" num="0" />
+<cdparam x="532" y="591" />
 <sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="579" />
-<TGConnectingPoint num="1" id="580" />
-<TGConnectingPoint num="2" id="581" />
-<TGConnectingPoint num="3" id="582" />
+<TGConnectingPoint num="0" id="893" />
+<TGConnectingPoint num="1" id="894" />
+<TGConnectingPoint num="2" id="895" />
+<TGConnectingPoint num="3" id="896" />
 <extraparam>
-<guard value="[ sid == 1 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sid = sid+1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="626" >
-<cdparam x="642" y="1029" />
-<sizeparam width="149" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="authenticityCheck" />
-<TGConnectingPoint num="0" id="586" />
-<TGConnectingPoint num="1" id="587" />
-<TGConnectingPoint num="2" id="588" />
-<TGConnectingPoint num="3" id="589" />
-<TGConnectingPoint num="4" id="590" />
-<TGConnectingPoint num="5" id="591" />
-<TGConnectingPoint num="6" id="592" />
-<TGConnectingPoint num="7" id="593" />
-<TGConnectingPoint num="8" id="594" />
-<TGConnectingPoint num="9" id="595" />
-<TGConnectingPoint num="10" id="596" />
-<TGConnectingPoint num="11" id="597" />
-<TGConnectingPoint num="12" id="598" />
-<TGConnectingPoint num="13" id="599" />
-<TGConnectingPoint num="14" id="600" />
-<TGConnectingPoint num="15" id="601" />
-<TGConnectingPoint num="16" id="602" />
-<TGConnectingPoint num="17" id="603" />
-<TGConnectingPoint num="18" id="604" />
-<TGConnectingPoint num="19" id="605" />
-<TGConnectingPoint num="20" id="606" />
-<TGConnectingPoint num="21" id="607" />
-<TGConnectingPoint num="22" id="608" />
-<TGConnectingPoint num="23" id="609" />
-<TGConnectingPoint num="24" id="610" />
-<TGConnectingPoint num="25" id="611" />
-<TGConnectingPoint num="26" id="612" />
-<TGConnectingPoint num="27" id="613" />
-<TGConnectingPoint num="28" id="614" />
-<TGConnectingPoint num="29" id="615" />
-<TGConnectingPoint num="30" id="616" />
-<TGConnectingPoint num="31" id="617" />
-<TGConnectingPoint num="32" id="618" />
-<TGConnectingPoint num="33" id="619" />
-<TGConnectingPoint num="34" id="620" />
-<TGConnectingPoint num="35" id="621" />
-<TGConnectingPoint num="36" id="622" />
-<TGConnectingPoint num="37" id="623" />
-<TGConnectingPoint num="38" id="624" />
-<TGConnectingPoint num="39" id="625" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="628" >
-<cdparam x="861" y="678" />
-<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="627" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="669" >
-<cdparam x="690" y="577" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="waitBack" />
-<TGConnectingPoint num="0" id="629" />
-<TGConnectingPoint num="1" id="630" />
-<TGConnectingPoint num="2" id="631" />
-<TGConnectingPoint num="3" id="632" />
-<TGConnectingPoint num="4" id="633" />
-<TGConnectingPoint num="5" id="634" />
-<TGConnectingPoint num="6" id="635" />
-<TGConnectingPoint num="7" id="636" />
-<TGConnectingPoint num="8" id="637" />
-<TGConnectingPoint num="9" id="638" />
-<TGConnectingPoint num="10" id="639" />
-<TGConnectingPoint num="11" id="640" />
-<TGConnectingPoint num="12" id="641" />
-<TGConnectingPoint num="13" id="642" />
-<TGConnectingPoint num="14" id="643" />
-<TGConnectingPoint num="15" id="644" />
-<TGConnectingPoint num="16" id="645" />
-<TGConnectingPoint num="17" id="646" />
-<TGConnectingPoint num="18" id="647" />
-<TGConnectingPoint num="19" id="648" />
-<TGConnectingPoint num="20" id="649" />
-<TGConnectingPoint num="21" id="650" />
-<TGConnectingPoint num="22" id="651" />
-<TGConnectingPoint num="23" id="652" />
-<TGConnectingPoint num="24" id="653" />
-<TGConnectingPoint num="25" id="654" />
-<TGConnectingPoint num="26" id="655" />
-<TGConnectingPoint num="27" id="656" />
-<TGConnectingPoint num="28" id="657" />
-<TGConnectingPoint num="29" id="658" />
-<TGConnectingPoint num="30" id="659" />
-<TGConnectingPoint num="31" id="660" />
-<TGConnectingPoint num="32" id="661" />
-<TGConnectingPoint num="33" id="662" />
-<TGConnectingPoint num="34" id="663" />
-<TGConnectingPoint num="35" id="664" />
-<TGConnectingPoint num="36" id="665" />
-<TGConnectingPoint num="37" id="666" />
-<TGConnectingPoint num="38" id="667" />
-<TGConnectingPoint num="39" id="668" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="710" >
-<cdparam x="690" y="736" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="dispatchSID" />
-<TGConnectingPoint num="0" id="670" />
-<TGConnectingPoint num="1" id="671" />
-<TGConnectingPoint num="2" id="672" />
-<TGConnectingPoint num="3" id="673" />
-<TGConnectingPoint num="4" id="674" />
-<TGConnectingPoint num="5" id="675" />
-<TGConnectingPoint num="6" id="676" />
-<TGConnectingPoint num="7" id="677" />
-<TGConnectingPoint num="8" id="678" />
-<TGConnectingPoint num="9" id="679" />
-<TGConnectingPoint num="10" id="680" />
-<TGConnectingPoint num="11" id="681" />
-<TGConnectingPoint num="12" id="682" />
-<TGConnectingPoint num="13" id="683" />
-<TGConnectingPoint num="14" id="684" />
-<TGConnectingPoint num="15" id="685" />
-<TGConnectingPoint num="16" id="686" />
-<TGConnectingPoint num="17" id="687" />
-<TGConnectingPoint num="18" id="688" />
-<TGConnectingPoint num="19" id="689" />
-<TGConnectingPoint num="20" id="690" />
-<TGConnectingPoint num="21" id="691" />
-<TGConnectingPoint num="22" id="692" />
-<TGConnectingPoint num="23" id="693" />
-<TGConnectingPoint num="24" id="694" />
-<TGConnectingPoint num="25" id="695" />
-<TGConnectingPoint num="26" id="696" />
-<TGConnectingPoint num="27" id="697" />
-<TGConnectingPoint num="28" id="698" />
-<TGConnectingPoint num="29" id="699" />
-<TGConnectingPoint num="30" id="700" />
-<TGConnectingPoint num="31" id="701" />
-<TGConnectingPoint num="32" id="702" />
-<TGConnectingPoint num="33" id="703" />
-<TGConnectingPoint num="34" id="704" />
-<TGConnectingPoint num="35" id="705" />
-<TGConnectingPoint num="36" id="706" />
-<TGConnectingPoint num="37" id="707" />
-<TGConnectingPoint num="38" id="708" />
-<TGConnectingPoint num="39" id="709" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="751" >
-<cdparam x="357" y="736" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="checkSID" />
-<TGConnectingPoint num="0" id="711" />
-<TGConnectingPoint num="1" id="712" />
-<TGConnectingPoint num="2" id="713" />
-<TGConnectingPoint num="3" id="714" />
-<TGConnectingPoint num="4" id="715" />
-<TGConnectingPoint num="5" id="716" />
-<TGConnectingPoint num="6" id="717" />
-<TGConnectingPoint num="7" id="718" />
-<TGConnectingPoint num="8" id="719" />
-<TGConnectingPoint num="9" id="720" />
-<TGConnectingPoint num="10" id="721" />
-<TGConnectingPoint num="11" id="722" />
-<TGConnectingPoint num="12" id="723" />
-<TGConnectingPoint num="13" id="724" />
-<TGConnectingPoint num="14" id="725" />
-<TGConnectingPoint num="15" id="726" />
-<TGConnectingPoint num="16" id="727" />
-<TGConnectingPoint num="17" id="728" />
-<TGConnectingPoint num="18" id="729" />
-<TGConnectingPoint num="19" id="730" />
-<TGConnectingPoint num="20" id="731" />
-<TGConnectingPoint num="21" id="732" />
-<TGConnectingPoint num="22" id="733" />
-<TGConnectingPoint num="23" id="734" />
-<TGConnectingPoint num="24" id="735" />
-<TGConnectingPoint num="25" id="736" />
-<TGConnectingPoint num="26" id="737" />
-<TGConnectingPoint num="27" id="738" />
-<TGConnectingPoint num="28" id="739" />
-<TGConnectingPoint num="29" id="740" />
-<TGConnectingPoint num="30" id="741" />
-<TGConnectingPoint num="31" id="742" />
-<TGConnectingPoint num="32" id="743" />
-<TGConnectingPoint num="33" id="744" />
-<TGConnectingPoint num="34" id="745" />
-<TGConnectingPoint num="35" id="746" />
-<TGConnectingPoint num="36" id="747" />
-<TGConnectingPoint num="37" id="748" />
-<TGConnectingPoint num="38" id="749" />
-<TGConnectingPoint num="39" id="750" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="762" >
-<cdparam x="363" y="661" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="752" />
-<TGConnectingPoint num="1" id="753" />
-<TGConnectingPoint num="2" id="754" />
-<TGConnectingPoint num="3" id="755" />
-<TGConnectingPoint num="4" id="756" />
-<TGConnectingPoint num="5" id="757" />
-<TGConnectingPoint num="6" id="758" />
-<TGConnectingPoint num="7" id="759" />
-<TGConnectingPoint num="8" id="760" />
-<TGConnectingPoint num="9" id="761" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="803" >
-<cdparam x="357" y="577" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="receiveMsg" />
-<TGConnectingPoint num="0" id="763" />
-<TGConnectingPoint num="1" id="764" />
-<TGConnectingPoint num="2" id="765" />
-<TGConnectingPoint num="3" id="766" />
-<TGConnectingPoint num="4" id="767" />
-<TGConnectingPoint num="5" id="768" />
-<TGConnectingPoint num="6" id="769" />
-<TGConnectingPoint num="7" id="770" />
-<TGConnectingPoint num="8" id="771" />
-<TGConnectingPoint num="9" id="772" />
-<TGConnectingPoint num="10" id="773" />
-<TGConnectingPoint num="11" id="774" />
-<TGConnectingPoint num="12" id="775" />
-<TGConnectingPoint num="13" id="776" />
-<TGConnectingPoint num="14" id="777" />
-<TGConnectingPoint num="15" id="778" />
-<TGConnectingPoint num="16" id="779" />
-<TGConnectingPoint num="17" id="780" />
-<TGConnectingPoint num="18" id="781" />
-<TGConnectingPoint num="19" id="782" />
-<TGConnectingPoint num="20" id="783" />
-<TGConnectingPoint num="21" id="784" />
-<TGConnectingPoint num="22" id="785" />
-<TGConnectingPoint num="23" id="786" />
-<TGConnectingPoint num="24" id="787" />
-<TGConnectingPoint num="25" id="788" />
-<TGConnectingPoint num="26" id="789" />
-<TGConnectingPoint num="27" id="790" />
-<TGConnectingPoint num="28" id="791" />
-<TGConnectingPoint num="29" id="792" />
-<TGConnectingPoint num="30" id="793" />
-<TGConnectingPoint num="31" id="794" />
-<TGConnectingPoint num="32" id="795" />
-<TGConnectingPoint num="33" id="796" />
-<TGConnectingPoint num="34" id="797" />
-<TGConnectingPoint num="35" id="798" />
-<TGConnectingPoint num="36" id="799" />
-<TGConnectingPoint num="37" id="800" />
-<TGConnectingPoint num="38" id="801" />
-<TGConnectingPoint num="39" id="802" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="844" >
-<cdparam x="357" y="365" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="910" >
+<cdparam x="740" y="736" />
+<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="907" />
+<TGConnectingPoint num="1" id="908" />
+<TGConnectingPoint num="2" id="909" />
+<P1  x="740" y="736" id="1112" />
+<P2  x="871" y="673" id="1068" />
+<Point x="740" y="654" />
+<Point x="871" y="654" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="900" >
+<father id="910" num="0" />
+<cdparam x="740" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="SendingMS" />
-<TGConnectingPoint num="0" id="804" />
-<TGConnectingPoint num="1" id="805" />
-<TGConnectingPoint num="2" id="806" />
-<TGConnectingPoint num="3" id="807" />
-<TGConnectingPoint num="4" id="808" />
-<TGConnectingPoint num="5" id="809" />
-<TGConnectingPoint num="6" id="810" />
-<TGConnectingPoint num="7" id="811" />
-<TGConnectingPoint num="8" id="812" />
-<TGConnectingPoint num="9" id="813" />
-<TGConnectingPoint num="10" id="814" />
-<TGConnectingPoint num="11" id="815" />
-<TGConnectingPoint num="12" id="816" />
-<TGConnectingPoint num="13" id="817" />
-<TGConnectingPoint num="14" id="818" />
-<TGConnectingPoint num="15" id="819" />
-<TGConnectingPoint num="16" id="820" />
-<TGConnectingPoint num="17" id="821" />
-<TGConnectingPoint num="18" id="822" />
-<TGConnectingPoint num="19" id="823" />
-<TGConnectingPoint num="20" id="824" />
-<TGConnectingPoint num="21" id="825" />
-<TGConnectingPoint num="22" id="826" />
-<TGConnectingPoint num="23" id="827" />
-<TGConnectingPoint num="24" id="828" />
-<TGConnectingPoint num="25" id="829" />
-<TGConnectingPoint num="26" id="830" />
-<TGConnectingPoint num="27" id="831" />
-<TGConnectingPoint num="28" id="832" />
-<TGConnectingPoint num="29" id="833" />
-<TGConnectingPoint num="30" id="834" />
-<TGConnectingPoint num="31" id="835" />
-<TGConnectingPoint num="32" id="836" />
-<TGConnectingPoint num="33" id="837" />
-<TGConnectingPoint num="34" id="838" />
-<TGConnectingPoint num="35" id="839" />
-<TGConnectingPoint num="36" id="840" />
-<TGConnectingPoint num="37" id="841" />
-<TGConnectingPoint num="38" id="842" />
-<TGConnectingPoint num="39" id="843" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="885" >
-<cdparam x="860" y="841" />
-<sizeparam width="165" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="901" >
+<father id="910" num="1" />
+<cdparam x="871" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="receiveMessage1" />
-<TGConnectingPoint num="0" id="845" />
-<TGConnectingPoint num="1" id="846" />
-<TGConnectingPoint num="2" id="847" />
-<TGConnectingPoint num="3" id="848" />
-<TGConnectingPoint num="4" id="849" />
-<TGConnectingPoint num="5" id="850" />
-<TGConnectingPoint num="6" id="851" />
-<TGConnectingPoint num="7" id="852" />
-<TGConnectingPoint num="8" id="853" />
-<TGConnectingPoint num="9" id="854" />
-<TGConnectingPoint num="10" id="855" />
-<TGConnectingPoint num="11" id="856" />
-<TGConnectingPoint num="12" id="857" />
-<TGConnectingPoint num="13" id="858" />
-<TGConnectingPoint num="14" id="859" />
-<TGConnectingPoint num="15" id="860" />
-<TGConnectingPoint num="16" id="861" />
-<TGConnectingPoint num="17" id="862" />
-<TGConnectingPoint num="18" id="863" />
-<TGConnectingPoint num="19" id="864" />
-<TGConnectingPoint num="20" id="865" />
-<TGConnectingPoint num="21" id="866" />
-<TGConnectingPoint num="22" id="867" />
-<TGConnectingPoint num="23" id="868" />
-<TGConnectingPoint num="24" id="869" />
-<TGConnectingPoint num="25" id="870" />
-<TGConnectingPoint num="26" id="871" />
-<TGConnectingPoint num="27" id="872" />
-<TGConnectingPoint num="28" id="873" />
-<TGConnectingPoint num="29" id="874" />
-<TGConnectingPoint num="30" id="875" />
-<TGConnectingPoint num="31" id="876" />
-<TGConnectingPoint num="32" id="877" />
-<TGConnectingPoint num="33" id="878" />
-<TGConnectingPoint num="34" id="879" />
-<TGConnectingPoint num="35" id="880" />
-<TGConnectingPoint num="36" id="881" />
-<TGConnectingPoint num="37" id="882" />
-<TGConnectingPoint num="38" id="883" />
-<TGConnectingPoint num="39" id="884" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="896" >
-<cdparam x="362" y="517" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="906" >
+<father id="910" num="2" />
+<cdparam x="749" y="707" />
+<sizeparam width="44" 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="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="886" />
-<TGConnectingPoint num="1" id="887" />
-<TGConnectingPoint num="2" id="888" />
-<TGConnectingPoint num="3" id="889" />
-<TGConnectingPoint num="4" id="890" />
-<TGConnectingPoint num="5" id="891" />
-<TGConnectingPoint num="6" id="892" />
-<TGConnectingPoint num="7" id="893" />
-<TGConnectingPoint num="8" id="894" />
-<TGConnectingPoint num="9" id="895" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="902" />
+<TGConnectingPoint num="1" id="903" />
+<TGConnectingPoint num="2" id="904" />
+<TGConnectingPoint num="3" id="905" />
+<extraparam>
+<guard value="[ else ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5104" id="907" >
-<cdparam x="363" y="293" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="897" />
-<TGConnectingPoint num="1" id="898" />
-<TGConnectingPoint num="2" id="899" />
-<TGConnectingPoint num="3" id="900" />
-<TGConnectingPoint num="4" id="901" />
-<TGConnectingPoint num="5" id="902" />
-<TGConnectingPoint num="6" id="903" />
-<TGConnectingPoint num="7" id="904" />
-<TGConnectingPoint num="8" id="905" />
-<TGConnectingPoint num="9" id="906" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="918" >
-<cdparam x="362" y="195" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="908" />
-<TGConnectingPoint num="1" id="909" />
-<TGConnectingPoint num="2" id="910" />
-<TGConnectingPoint num="3" id="911" />
-<TGConnectingPoint num="4" id="912" />
-<TGConnectingPoint num="5" id="913" />
-<TGConnectingPoint num="6" id="914" />
-<TGConnectingPoint num="7" id="915" />
-<TGConnectingPoint num="8" id="916" />
-<TGConnectingPoint num="9" id="917" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="929" >
-<cdparam x="348" y="129" />
-<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(clientHello)" />
+<CONNECTOR type="5102" id="923" >
+<cdparam x="942" y="891" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="919" />
 <TGConnectingPoint num="1" id="920" />
 <TGConnectingPoint num="2" id="921" />
 <TGConnectingPoint num="3" id="922" />
-<TGConnectingPoint num="4" id="923" />
-<TGConnectingPoint num="5" id="924" />
-<TGConnectingPoint num="6" id="925" />
-<TGConnectingPoint num="7" id="926" />
-<TGConnectingPoint num="8" id="927" />
-<TGConnectingPoint num="9" id="928" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="931" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<P1  x="942" y="891" id="1292" />
+<P2  x="790" y="602" id="1074" />
+<Point x="942" y="945" />
+<Point x="1080" y="945" />
+<Point x="1080" y="602" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="911" >
+<father id="923" num="0" />
+<cdparam x="942" y="945" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="930" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="972" >
-<cdparam x="654" y="840" />
-<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="912" >
+<father id="923" num="1" />
+<cdparam x="1080" y="945" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="receiveMessage2" />
-<TGConnectingPoint num="0" id="932" />
-<TGConnectingPoint num="1" id="933" />
-<TGConnectingPoint num="2" id="934" />
-<TGConnectingPoint num="3" id="935" />
-<TGConnectingPoint num="4" id="936" />
-<TGConnectingPoint num="5" id="937" />
-<TGConnectingPoint num="6" id="938" />
-<TGConnectingPoint num="7" id="939" />
-<TGConnectingPoint num="8" id="940" />
-<TGConnectingPoint num="9" id="941" />
-<TGConnectingPoint num="10" id="942" />
-<TGConnectingPoint num="11" id="943" />
-<TGConnectingPoint num="12" id="944" />
-<TGConnectingPoint num="13" id="945" />
-<TGConnectingPoint num="14" id="946" />
-<TGConnectingPoint num="15" id="947" />
-<TGConnectingPoint num="16" id="948" />
-<TGConnectingPoint num="17" id="949" />
-<TGConnectingPoint num="18" id="950" />
-<TGConnectingPoint num="19" id="951" />
-<TGConnectingPoint num="20" id="952" />
-<TGConnectingPoint num="21" id="953" />
-<TGConnectingPoint num="22" id="954" />
-<TGConnectingPoint num="23" id="955" />
-<TGConnectingPoint num="24" id="956" />
-<TGConnectingPoint num="25" id="957" />
-<TGConnectingPoint num="26" id="958" />
-<TGConnectingPoint num="27" id="959" />
-<TGConnectingPoint num="28" id="960" />
-<TGConnectingPoint num="29" id="961" />
-<TGConnectingPoint num="30" id="962" />
-<TGConnectingPoint num="31" id="963" />
-<TGConnectingPoint num="32" id="964" />
-<TGConnectingPoint num="33" id="965" />
-<TGConnectingPoint num="34" id="966" />
-<TGConnectingPoint num="35" id="967" />
-<TGConnectingPoint num="36" id="968" />
-<TGConnectingPoint num="37" id="969" />
-<TGConnectingPoint num="38" id="970" />
-<TGConnectingPoint num="39" id="971" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="979" >
-<cdparam x="648" y="1235" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="913" >
+<father id="923" num="2" />
+<cdparam x="1080" y="602" />
 <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="978" />
-<P1  x="578" y="1226" id="1136" />
-<P2  x="578" y="1252" id="1188" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="977" >
-<father id="979" num="0" />
-<cdparam x="648" y="1275" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="918" >
+<father id="923" num="3" />
+<cdparam x="921" y="934" />
+<sizeparam width="183" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="973" />
-<TGConnectingPoint num="1" id="974" />
-<TGConnectingPoint num="2" id="975" />
-<TGConnectingPoint num="3" id="976" />
+<TGConnectingPoint num="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
+<TGConnectingPoint num="2" id="916" />
+<TGConnectingPoint num="3" id="917" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[  ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="message1.data = filler1.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="986" >
-<cdparam x="407" y="35" />
+<CONNECTOR type="5102" id="936" >
+<cdparam x="740" y="890" />
 <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="985" />
-<P1  x="407" y="35" id="1412" />
-<P2  x="407" y="81" id="1401" />
+<TGConnectingPoint num="0" id="932" />
+<TGConnectingPoint num="1" id="933" />
+<TGConnectingPoint num="2" id="934" />
+<TGConnectingPoint num="3" id="935" />
+<P1  x="740" y="890" id="1379" />
+<P2  x="790" y="595" id="1093" />
+<Point x="740" y="978" />
+<Point x="1126" y="978" />
+<Point x="1126" y="595" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="984" >
-<father id="986" num="0" />
-<cdparam x="421" y="56" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="924" >
+<father id="936" num="0" />
+<cdparam x="740" y="978" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="980" />
-<TGConnectingPoint num="1" id="981" />
-<TGConnectingPoint num="2" id="982" />
-<TGConnectingPoint num="3" id="983" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="993" >
-<cdparam x="528" y="626" />
+<SUBCOMPONENT type="-1" id="925" >
+<father id="936" num="1" />
+<cdparam x="1126" y="978" />
 <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="992" />
-<P1  x="528" y="714" id="1245" />
-<P2  x="242" y="496" id="1334" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="991" >
-<father id="993" num="0" />
-<cdparam x="412" y="686" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="926" >
+<father id="936" num="2" />
+<cdparam x="1126" y="595" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="931" >
+<father id="936" num="3" />
+<cdparam x="757" y="936" />
 <sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="987" />
-<TGConnectingPoint num="1" id="988" />
-<TGConnectingPoint num="2" id="989" />
-<TGConnectingPoint num="3" id="990" />
+<TGConnectingPoint num="0" id="927" />
+<TGConnectingPoint num="1" id="928" />
+<TGConnectingPoint num="2" id="929" />
+<TGConnectingPoint num="3" id="930" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -2198,27 +2134,37 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1000" >
-<cdparam x="407" y="288" />
+<CONNECTOR type="5102" id="945" >
+<cdparam x="790" y="761" />
 <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="999" />
-<P1  x="407" y="288" id="1363" />
-<P2  x="217" y="465" id="1317" />
+<TGConnectingPoint num="0" id="943" />
+<TGConnectingPoint num="1" id="944" />
+<P1  x="790" y="761" id="1115" />
+<P2  x="942" y="841" id="1287" />
+<Point x="942" y="761" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="998" >
-<father id="1000" num="0" />
-<cdparam x="261" y="362" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="937" >
+<father id="945" num="0" />
+<cdparam x="942" y="761" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="942" >
+<father id="945" num="1" />
+<cdparam x="825" y="749" />
+<sizeparam width="68" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="994" />
-<TGConnectingPoint num="1" id="995" />
-<TGConnectingPoint num="2" id="996" />
-<TGConnectingPoint num="3" id="997" />
+<TGConnectingPoint num="0" id="938" />
+<TGConnectingPoint num="1" id="939" />
+<TGConnectingPoint num="2" id="940" />
+<TGConnectingPoint num="3" id="941" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ sid == 0]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -2226,27 +2172,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1007" >
-<cdparam x="407" y="107" />
+<CONNECTOR type="5102" id="952" >
+<cdparam x="457" y="761" />
 <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="1006" />
-<P1  x="407" y="111" id="1402" />
-<P2  x="407" y="143" id="1390" />
+<TGConnectingPoint num="0" id="951" />
+<P1  x="457" y="761" id="1156" />
+<P2  x="690" y="761" id="1114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1005" >
-<father id="1007" num="0" />
-<cdparam x="407" y="147" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="950" >
+<father id="952" num="0" />
+<cdparam x="484" y="781" />
+<sizeparam width="170" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
-<TGConnectingPoint num="2" id="1003" />
-<TGConnectingPoint num="3" id="1004" />
+<TGConnectingPoint num="0" id="946" />
+<TGConnectingPoint num="1" id="947" />
+<TGConnectingPoint num="2" id="948" />
+<TGConnectingPoint num="3" id="949" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ receivedSID.data == sid ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -2254,681 +2200,735 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1014" >
-<cdparam x="407" y="198" />
+<CONNECTOR type="5102" id="963" >
+<cdparam x="357" y="767" />
 <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="1013" />
-<P1  x="407" y="173" id="1391" />
-<P2  x="407" y="238" id="1357" />
+<TGConnectingPoint num="0" id="960" />
+<TGConnectingPoint num="1" id="961" />
+<TGConnectingPoint num="2" id="962" />
+<P1  x="357" y="767" id="1176" />
+<P2  x="357" y="595" id="1225" />
+<Point x="309" y="767" />
+<Point x="309" y="595" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1012" >
-<father id="1014" num="0" />
-<cdparam x="436" y="192" />
-<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="953" >
+<father id="963" num="0" />
+<cdparam x="309" y="767" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="954" >
+<father id="963" num="1" />
+<cdparam x="309" y="595" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="959" >
+<father id="963" num="2" />
+<cdparam x="241" y="693" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1008" />
-<TGConnectingPoint num="1" id="1009" />
-<TGConnectingPoint num="2" id="1010" />
-<TGConnectingPoint num="3" id="1011" />
+<TGConnectingPoint num="0" id="955" />
+<TGConnectingPoint num="1" id="956" />
+<TGConnectingPoint num="2" id="957" />
+<TGConnectingPoint num="3" id="958" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(filler1, serverHello, serverCert) " />
-<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1021" >
-<cdparam x="514" y="288" />
+<CONNECTOR type="5102" id="970" >
+<cdparam x="407" y="542" />
 <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="1020" />
-<P1  x="514" y="288" id="1380" />
-<P2  x="540" y="341" id="1305" />
+<TGConnectingPoint num="0" id="969" />
+<P1  x="407" y="542" id="1328" />
+<P2  x="407" y="577" id="1205" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1019" >
-<father id="1021" num="0" />
-<cdparam x="546" y="308" />
-<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="968" >
+<father id="970" num="0" />
+<cdparam x="422" y="562" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1015" />
-<TGConnectingPoint num="1" id="1016" />
-<TGConnectingPoint num="2" id="1017" />
-<TGConnectingPoint num="3" id="1018" />
+<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="2" id="966" />
+<TGConnectingPoint num="3" id="967" />
 <extraparam>
-<guard value="[ certVerified ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="serverPubK = getpk(serverCert)" />
+<actions value="sid = 0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1028" >
-<cdparam x="540" y="371" />
+<CONNECTOR type="5102" id="977" >
+<cdparam x="407" y="352" />
 <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="1027" />
-<P1  x="540" y="371" id="1306" />
-<P2  x="540" y="511" id="1294" />
+<TGConnectingPoint num="0" id="976" />
+<P1  x="407" y="318" id="1339" />
+<P2  x="407" y="365" id="1246" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1026" >
-<father id="1028" num="0" />
-<cdparam x="566" y="431" />
-<sizeparam width="229" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="975" >
+<father id="977" num="0" />
+<cdparam x="407" y="392" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1022" />
-<TGConnectingPoint num="1" id="1023" />
-<TGConnectingPoint num="2" id="1024" />
-<TGConnectingPoint num="3" id="1025" />
+<TGConnectingPoint num="0" id="971" />
+<TGConnectingPoint num="1" id="972" />
+<TGConnectingPoint num="2" id="973" />
+<TGConnectingPoint num="3" id="974" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1.data = PMS" />
-<actions value="filler1 = aencrypt(filler1, serverPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1035" >
-<cdparam x="540" y="541" />
+<CONNECTOR type="5102" id="984" >
+<cdparam x="407" y="469" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1034" />
-<P1  x="540" y="541" id="1295" />
-<P2  x="540" y="578" id="1283" />
+<TGConnectingPoint num="0" id="983" />
+<P1  x="407" y="415" id="1251" />
+<P2  x="407" y="512" id="1327" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1033" >
-<father id="1035" num="0" />
-<cdparam x="540" y="581" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="982" >
+<father id="984" num="0" />
+<cdparam x="439" y="439" />
+<sizeparam width="294" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1029" />
-<TGConnectingPoint num="1" id="1030" />
-<TGConnectingPoint num="2" id="1031" />
-<TGConnectingPoint num="3" id="1032" />
+<TGConnectingPoint num="0" id="978" />
+<TGConnectingPoint num="1" id="979" />
+<TGConnectingPoint num="2" id="980" />
+<TGConnectingPoint num="3" id="981" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="PMS = adecrypt(filler1, serverPrivK)" />
+<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
+<actions value="MS = hash(filler1)" />
+<actions value="filler1 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1042" >
-<cdparam x="540" y="608" />
+<CONNECTOR type="5102" id="991" >
+<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="1041" />
-<P1  x="540" y="608" id="1284" />
-<P2  x="540" y="689" id="1258" />
+<TGConnectingPoint num="0" id="990" />
+<P1  x="407" y="70" id="1371" />
+<P2  x="407" y="124" id="1360" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1040" >
-<father id="1042" num="0" />
-<cdparam x="556" y="635" />
-<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="989" >
+<father id="991" num="0" />
+<cdparam x="416" y="96" />
+<sizeparam width="230" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1036" />
-<TGConnectingPoint num="1" id="1037" />
-<TGConnectingPoint num="2" id="1038" />
-<TGConnectingPoint num="3" id="1039" />
+<TGConnectingPoint num="0" id="985" />
+<TGConnectingPoint num="1" id="986" />
+<TGConnectingPoint num="2" id="987" />
+<TGConnectingPoint num="3" id="988" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
-<actions value="MS = hash(filler2)" />
-<actions value="filler2 = hash(MS)" />
+<actions value="filler1 = sign(serverPubK, CAPrivK)" />
+<actions value="serverCert = cert(serverPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1049" >
-<cdparam x="578" y="739" />
+<CONNECTOR type="5102" id="998" >
+<cdparam x="407" y="207" />
 <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="1048" />
-<P1  x="578" y="739" id="1248" />
-<P2  x="578" y="810" id="1202" />
+<TGConnectingPoint num="0" id="997" />
+<P1  x="407" y="154" id="1361" />
+<P2  x="407" y="190" id="1349" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1047" >
-<father id="1049" num="0" />
-<cdparam x="591" y="766" />
-<sizeparam width="180" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="996" >
+<father id="998" num="0" />
+<cdparam x="420" y="178" />
+<sizeparam width="256" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1043" />
-<TGConnectingPoint num="1" id="1044" />
-<TGConnectingPoint num="2" id="1045" />
-<TGConnectingPoint num="3" id="1046" />
+<TGConnectingPoint num="0" id="992" />
+<TGConnectingPoint num="1" id="993" />
+<TGConnectingPoint num="2" id="994" />
+<TGConnectingPoint num="3" id="995" />
 <extraparam>
-<guard value="[ filler1.data == filler2.data ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = 0" />
+<actions value="filler1 = concat2(serverHello, serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1056" >
-<cdparam x="570" y="858" />
+<CONNECTOR type="5102" id="1005" >
+<cdparam x="407" y="242" />
 <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="1055" />
-<P1  x="578" y="860" id="1207" />
-<P2  x="578" y="903" id="1190" />
+<TGConnectingPoint num="0" id="1004" />
+<P1  x="407" y="220" id="1350" />
+<P2  x="407" y="288" id="1338" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1054" >
-<father id="1056" num="0" />
-<cdparam x="619" y="873" />
-<sizeparam width="251" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1003" >
+<father id="1005" num="0" />
+<cdparam x="315" y="335" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1050" />
-<TGConnectingPoint num="1" id="1051" />
-<TGConnectingPoint num="2" id="1052" />
-<TGConnectingPoint num="3" id="1053" />
+<TGConnectingPoint num="0" id="999" />
+<TGConnectingPoint num="1" id="1000" />
+<TGConnectingPoint num="2" id="1001" />
+<TGConnectingPoint num="3" id="1002" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1.data = sid" />
-<actions value="filler1 = concat2(filler1, secretMessage)" />
-<actions value="filler1 = sencrypt(filler1, MS) " />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1063" >
-<cdparam x="578" y="918" />
+<CONNECTOR type="5102" id="1012" >
+<cdparam x="407" y="627" />
 <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="1062" />
-<P1  x="578" y="933" id="1191" />
-<P2  x="578" y="973" id="1079" />
+<TGConnectingPoint num="0" id="1011" />
+<P1  x="407" y="627" id="1210" />
+<P2  x="407" y="656" id="1193" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1061" >
-<father id="1063" num="0" />
-<cdparam x="619" y="951" />
-<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1010" >
+<father id="1012" num="0" />
+<cdparam x="407" y="667" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1057" />
-<TGConnectingPoint num="1" id="1058" />
-<TGConnectingPoint num="2" id="1059" />
-<TGConnectingPoint num="3" id="1060" />
+<TGConnectingPoint num="0" id="1006" />
+<TGConnectingPoint num="1" id="1007" />
+<TGConnectingPoint num="2" id="1008" />
+<TGConnectingPoint num="3" id="1009" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = sid+1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1070" >
-<cdparam x="570" y="1131" />
+<CONNECTOR type="5102" id="1019" >
+<cdparam x="407" y="686" />
 <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="1069" />
-<P1  x="578" y="1130" id="1120" />
-<P2  x="578" y="1176" id="1131" />
+<TGConnectingPoint num="0" id="1018" />
+<P1  x="407" y="686" id="1194" />
+<P2  x="407" y="736" id="1153" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1068" >
-<father id="1070" num="0" />
-<cdparam x="621" y="1151" />
-<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1017" >
+<father id="1019" num="0" />
+<cdparam x="429" y="704" />
+<sizeparam width="196" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1064" />
-<TGConnectingPoint num="1" id="1065" />
-<TGConnectingPoint num="2" id="1066" />
-<TGConnectingPoint num="3" id="1067" />
+<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="1" id="1014" />
+<TGConnectingPoint num="2" id="1015" />
+<TGConnectingPoint num="3" id="1016" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = sid+1" />
+<actions value="filler1 = sdecrypt(filler1, MS)" />
+<actions value="get2(filler1, receivedSID, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1077" >
-<cdparam x="598" y="1088" />
+<CONNECTOR type="5102" id="1026" >
+<cdparam x="767" y="819" />
 <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="1076" />
-<P1  x="578" y="1023" id="1084" />
-<P2  x="578" y="1100" id="1119" />
+<TGConnectingPoint num="0" id="1025" />
+<P1  x="740" y="786" id="1117" />
+<P2  x="740" y="840" id="1374" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1075" >
-<father id="1077" num="0" />
-<cdparam x="609" y="1048" />
-<sizeparam width="259" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1024" >
+<father id="1026" num="0" />
+<cdparam x="751" y="815" />
+<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1071" />
-<TGConnectingPoint num="1" id="1072" />
-<TGConnectingPoint num="2" id="1073" />
-<TGConnectingPoint num="3" id="1074" />
+<TGConnectingPoint num="0" id="1020" />
+<TGConnectingPoint num="1" id="1021" />
+<TGConnectingPoint num="2" id="1022" />
+<TGConnectingPoint num="3" id="1023" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ sid == 1 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1.data = sid" />
-<actions value="filler1 = concat2(filler1, secretMessage2)" />
-<actions value="filler1 = sencrypt(filler1, MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1118" >
-<cdparam x="518" y="973" />
-<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="sendMessage2" />
-<TGConnectingPoint num="0" id="1078" />
-<TGConnectingPoint num="1" id="1079" />
-<TGConnectingPoint num="2" id="1080" />
-<TGConnectingPoint num="3" id="1081" />
-<TGConnectingPoint num="4" id="1082" />
-<TGConnectingPoint num="5" id="1083" />
-<TGConnectingPoint num="6" id="1084" />
-<TGConnectingPoint num="7" id="1085" />
-<TGConnectingPoint num="8" id="1086" />
-<TGConnectingPoint num="9" id="1087" />
-<TGConnectingPoint num="10" id="1088" />
-<TGConnectingPoint num="11" id="1089" />
-<TGConnectingPoint num="12" id="1090" />
-<TGConnectingPoint num="13" id="1091" />
-<TGConnectingPoint num="14" id="1092" />
-<TGConnectingPoint num="15" id="1093" />
-<TGConnectingPoint num="16" id="1094" />
-<TGConnectingPoint num="17" id="1095" />
-<TGConnectingPoint num="18" id="1096" />
-<TGConnectingPoint num="19" id="1097" />
-<TGConnectingPoint num="20" id="1098" />
-<TGConnectingPoint num="21" id="1099" />
-<TGConnectingPoint num="22" id="1100" />
-<TGConnectingPoint num="23" id="1101" />
-<TGConnectingPoint num="24" id="1102" />
-<TGConnectingPoint num="25" id="1103" />
-<TGConnectingPoint num="26" id="1104" />
-<TGConnectingPoint num="27" id="1105" />
-<TGConnectingPoint num="28" id="1106" />
-<TGConnectingPoint num="29" id="1107" />
-<TGConnectingPoint num="30" id="1108" />
-<TGConnectingPoint num="31" id="1109" />
-<TGConnectingPoint num="32" id="1110" />
-<TGConnectingPoint num="33" id="1111" />
-<TGConnectingPoint num="34" id="1112" />
-<TGConnectingPoint num="35" id="1113" />
-<TGConnectingPoint num="36" id="1114" />
-<TGConnectingPoint num="37" id="1115" />
-<TGConnectingPoint num="38" id="1116" />
-<TGConnectingPoint num="39" id="1117" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1129" >
-<cdparam x="533" y="1105" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="1119" />
-<TGConnectingPoint num="1" id="1120" />
-<TGConnectingPoint num="2" id="1121" />
-<TGConnectingPoint num="3" id="1122" />
-<TGConnectingPoint num="4" id="1123" />
-<TGConnectingPoint num="5" id="1124" />
-<TGConnectingPoint num="6" id="1125" />
-<TGConnectingPoint num="7" id="1126" />
-<TGConnectingPoint num="8" id="1127" />
-<TGConnectingPoint num="9" id="1128" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1170" >
-<cdparam x="528" y="1176" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verif" />
-<TGConnectingPoint num="0" id="1130" />
-<TGConnectingPoint num="1" id="1131" />
-<TGConnectingPoint num="2" id="1132" />
-<TGConnectingPoint num="3" id="1133" />
-<TGConnectingPoint num="4" id="1134" />
-<TGConnectingPoint num="5" id="1135" />
-<TGConnectingPoint num="6" id="1136" />
-<TGConnectingPoint num="7" id="1137" />
-<TGConnectingPoint num="8" id="1138" />
-<TGConnectingPoint num="9" id="1139" />
-<TGConnectingPoint num="10" id="1140" />
-<TGConnectingPoint num="11" id="1141" />
-<TGConnectingPoint num="12" id="1142" />
-<TGConnectingPoint num="13" id="1143" />
-<TGConnectingPoint num="14" id="1144" />
-<TGConnectingPoint num="15" id="1145" />
-<TGConnectingPoint num="16" id="1146" />
-<TGConnectingPoint num="17" id="1147" />
-<TGConnectingPoint num="18" id="1148" />
-<TGConnectingPoint num="19" id="1149" />
-<TGConnectingPoint num="20" id="1150" />
-<TGConnectingPoint num="21" id="1151" />
-<TGConnectingPoint num="22" id="1152" />
-<TGConnectingPoint num="23" id="1153" />
-<TGConnectingPoint num="24" id="1154" />
-<TGConnectingPoint num="25" id="1155" />
-<TGConnectingPoint num="26" id="1156" />
-<TGConnectingPoint num="27" id="1157" />
-<TGConnectingPoint num="28" id="1158" />
-<TGConnectingPoint num="29" id="1159" />
-<TGConnectingPoint num="30" id="1160" />
-<TGConnectingPoint num="31" id="1161" />
-<TGConnectingPoint num="32" id="1162" />
-<TGConnectingPoint num="33" id="1163" />
-<TGConnectingPoint num="34" id="1164" />
-<TGConnectingPoint num="35" id="1165" />
-<TGConnectingPoint num="36" id="1166" />
-<TGConnectingPoint num="37" id="1167" />
-<TGConnectingPoint num="38" id="1168" />
-<TGConnectingPoint num="39" id="1169" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="1187" >
-<cdparam x="579" y="53" />
-<sizeparam width="296" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1067" >
+<cdparam x="642" y="1029" />
+<sizeparam width="149" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="UML Note" value="https://tools.ietf.org/html/rfc5246#section-7
-" />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
-<TGConnectingPoint num="2" id="1173" />
-<TGConnectingPoint num="3" id="1174" />
-<TGConnectingPoint num="4" id="1175" />
-<TGConnectingPoint num="5" id="1176" />
-<TGConnectingPoint num="6" id="1177" />
-<TGConnectingPoint num="7" id="1178" />
-<TGConnectingPoint num="8" id="1179" />
-<TGConnectingPoint num="9" id="1180" />
-<TGConnectingPoint num="10" id="1181" />
-<TGConnectingPoint num="11" id="1182" />
-<TGConnectingPoint num="12" id="1183" />
-<TGConnectingPoint num="13" id="1184" />
-<TGConnectingPoint num="14" id="1185" />
-<TGConnectingPoint num="15" id="1186" />
-<extraparam>
-<Line value="https://tools.ietf.org/html/rfc5246#section-7" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="1189" >
-<cdparam x="568" y="1257" />
+<infoparam name="State" value="authenticityCheck" />
+<TGConnectingPoint num="0" id="1027" />
+<TGConnectingPoint num="1" id="1028" />
+<TGConnectingPoint num="2" id="1029" />
+<TGConnectingPoint num="3" id="1030" />
+<TGConnectingPoint num="4" id="1031" />
+<TGConnectingPoint num="5" id="1032" />
+<TGConnectingPoint num="6" id="1033" />
+<TGConnectingPoint num="7" id="1034" />
+<TGConnectingPoint num="8" id="1035" />
+<TGConnectingPoint num="9" id="1036" />
+<TGConnectingPoint num="10" id="1037" />
+<TGConnectingPoint num="11" id="1038" />
+<TGConnectingPoint num="12" id="1039" />
+<TGConnectingPoint num="13" id="1040" />
+<TGConnectingPoint num="14" id="1041" />
+<TGConnectingPoint num="15" id="1042" />
+<TGConnectingPoint num="16" id="1043" />
+<TGConnectingPoint num="17" id="1044" />
+<TGConnectingPoint num="18" id="1045" />
+<TGConnectingPoint num="19" id="1046" />
+<TGConnectingPoint num="20" id="1047" />
+<TGConnectingPoint num="21" id="1048" />
+<TGConnectingPoint num="22" id="1049" />
+<TGConnectingPoint num="23" id="1050" />
+<TGConnectingPoint num="24" id="1051" />
+<TGConnectingPoint num="25" id="1052" />
+<TGConnectingPoint num="26" id="1053" />
+<TGConnectingPoint num="27" id="1054" />
+<TGConnectingPoint num="28" id="1055" />
+<TGConnectingPoint num="29" id="1056" />
+<TGConnectingPoint num="30" id="1057" />
+<TGConnectingPoint num="31" id="1058" />
+<TGConnectingPoint num="32" id="1059" />
+<TGConnectingPoint num="33" id="1060" />
+<TGConnectingPoint num="34" id="1061" />
+<TGConnectingPoint num="35" id="1062" />
+<TGConnectingPoint num="36" id="1063" />
+<TGConnectingPoint num="37" id="1064" />
+<TGConnectingPoint num="38" id="1065" />
+<TGConnectingPoint num="39" id="1066" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="1069" >
+<cdparam x="861" y="678" />
 <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="1188" />
+<TGConnectingPoint num="0" id="1068" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1200" >
-<cdparam x="533" y="908" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1110" >
+<cdparam x="690" y="577" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="1190" />
-<TGConnectingPoint num="1" id="1191" />
-<TGConnectingPoint num="2" id="1192" />
-<TGConnectingPoint num="3" id="1193" />
-<TGConnectingPoint num="4" id="1194" />
-<TGConnectingPoint num="5" id="1195" />
-<TGConnectingPoint num="6" id="1196" />
-<TGConnectingPoint num="7" id="1197" />
-<TGConnectingPoint num="8" id="1198" />
-<TGConnectingPoint num="9" id="1199" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1241" >
-<cdparam x="528" y="810" />
+<infoparam name="State" value="waitBack" />
+<TGConnectingPoint num="0" id="1070" />
+<TGConnectingPoint num="1" id="1071" />
+<TGConnectingPoint num="2" id="1072" />
+<TGConnectingPoint num="3" id="1073" />
+<TGConnectingPoint num="4" id="1074" />
+<TGConnectingPoint num="5" id="1075" />
+<TGConnectingPoint num="6" id="1076" />
+<TGConnectingPoint num="7" id="1077" />
+<TGConnectingPoint num="8" id="1078" />
+<TGConnectingPoint num="9" id="1079" />
+<TGConnectingPoint num="10" id="1080" />
+<TGConnectingPoint num="11" id="1081" />
+<TGConnectingPoint num="12" id="1082" />
+<TGConnectingPoint num="13" id="1083" />
+<TGConnectingPoint num="14" id="1084" />
+<TGConnectingPoint num="15" id="1085" />
+<TGConnectingPoint num="16" id="1086" />
+<TGConnectingPoint num="17" id="1087" />
+<TGConnectingPoint num="18" id="1088" />
+<TGConnectingPoint num="19" id="1089" />
+<TGConnectingPoint num="20" id="1090" />
+<TGConnectingPoint num="21" id="1091" />
+<TGConnectingPoint num="22" id="1092" />
+<TGConnectingPoint num="23" id="1093" />
+<TGConnectingPoint num="24" id="1094" />
+<TGConnectingPoint num="25" id="1095" />
+<TGConnectingPoint num="26" id="1096" />
+<TGConnectingPoint num="27" id="1097" />
+<TGConnectingPoint num="28" id="1098" />
+<TGConnectingPoint num="29" id="1099" />
+<TGConnectingPoint num="30" id="1100" />
+<TGConnectingPoint num="31" id="1101" />
+<TGConnectingPoint num="32" id="1102" />
+<TGConnectingPoint num="33" id="1103" />
+<TGConnectingPoint num="34" id="1104" />
+<TGConnectingPoint num="35" id="1105" />
+<TGConnectingPoint num="36" id="1106" />
+<TGConnectingPoint num="37" id="1107" />
+<TGConnectingPoint num="38" id="1108" />
+<TGConnectingPoint num="39" id="1109" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1151" >
+<cdparam x="690" y="736" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="sendMessage" />
-<TGConnectingPoint num="0" id="1201" />
-<TGConnectingPoint num="1" id="1202" />
-<TGConnectingPoint num="2" id="1203" />
-<TGConnectingPoint num="3" id="1204" />
-<TGConnectingPoint num="4" id="1205" />
-<TGConnectingPoint num="5" id="1206" />
-<TGConnectingPoint num="6" id="1207" />
-<TGConnectingPoint num="7" id="1208" />
-<TGConnectingPoint num="8" id="1209" />
-<TGConnectingPoint num="9" id="1210" />
-<TGConnectingPoint num="10" id="1211" />
-<TGConnectingPoint num="11" id="1212" />
-<TGConnectingPoint num="12" id="1213" />
-<TGConnectingPoint num="13" id="1214" />
-<TGConnectingPoint num="14" id="1215" />
-<TGConnectingPoint num="15" id="1216" />
-<TGConnectingPoint num="16" id="1217" />
-<TGConnectingPoint num="17" id="1218" />
-<TGConnectingPoint num="18" id="1219" />
-<TGConnectingPoint num="19" id="1220" />
-<TGConnectingPoint num="20" id="1221" />
-<TGConnectingPoint num="21" id="1222" />
-<TGConnectingPoint num="22" id="1223" />
-<TGConnectingPoint num="23" id="1224" />
-<TGConnectingPoint num="24" id="1225" />
-<TGConnectingPoint num="25" id="1226" />
-<TGConnectingPoint num="26" id="1227" />
-<TGConnectingPoint num="27" id="1228" />
-<TGConnectingPoint num="28" id="1229" />
-<TGConnectingPoint num="29" id="1230" />
-<TGConnectingPoint num="30" id="1231" />
-<TGConnectingPoint num="31" id="1232" />
-<TGConnectingPoint num="32" id="1233" />
-<TGConnectingPoint num="33" id="1234" />
-<TGConnectingPoint num="34" id="1235" />
-<TGConnectingPoint num="35" id="1236" />
-<TGConnectingPoint num="36" id="1237" />
-<TGConnectingPoint num="37" id="1238" />
-<TGConnectingPoint num="38" id="1239" />
-<TGConnectingPoint num="39" id="1240" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1282" >
-<cdparam x="528" y="689" />
+<infoparam name="State" value="dispatchSID" />
+<TGConnectingPoint num="0" id="1111" />
+<TGConnectingPoint num="1" id="1112" />
+<TGConnectingPoint num="2" id="1113" />
+<TGConnectingPoint num="3" id="1114" />
+<TGConnectingPoint num="4" id="1115" />
+<TGConnectingPoint num="5" id="1116" />
+<TGConnectingPoint num="6" id="1117" />
+<TGConnectingPoint num="7" id="1118" />
+<TGConnectingPoint num="8" id="1119" />
+<TGConnectingPoint num="9" id="1120" />
+<TGConnectingPoint num="10" id="1121" />
+<TGConnectingPoint num="11" id="1122" />
+<TGConnectingPoint num="12" id="1123" />
+<TGConnectingPoint num="13" id="1124" />
+<TGConnectingPoint num="14" id="1125" />
+<TGConnectingPoint num="15" id="1126" />
+<TGConnectingPoint num="16" id="1127" />
+<TGConnectingPoint num="17" id="1128" />
+<TGConnectingPoint num="18" id="1129" />
+<TGConnectingPoint num="19" id="1130" />
+<TGConnectingPoint num="20" id="1131" />
+<TGConnectingPoint num="21" id="1132" />
+<TGConnectingPoint num="22" id="1133" />
+<TGConnectingPoint num="23" id="1134" />
+<TGConnectingPoint num="24" id="1135" />
+<TGConnectingPoint num="25" id="1136" />
+<TGConnectingPoint num="26" id="1137" />
+<TGConnectingPoint num="27" id="1138" />
+<TGConnectingPoint num="28" id="1139" />
+<TGConnectingPoint num="29" id="1140" />
+<TGConnectingPoint num="30" id="1141" />
+<TGConnectingPoint num="31" id="1142" />
+<TGConnectingPoint num="32" id="1143" />
+<TGConnectingPoint num="33" id="1144" />
+<TGConnectingPoint num="34" id="1145" />
+<TGConnectingPoint num="35" id="1146" />
+<TGConnectingPoint num="36" id="1147" />
+<TGConnectingPoint num="37" id="1148" />
+<TGConnectingPoint num="38" id="1149" />
+<TGConnectingPoint num="39" id="1150" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1192" >
+<cdparam x="357" y="736" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="checkMS" />
-<TGConnectingPoint num="0" id="1242" />
-<TGConnectingPoint num="1" id="1243" />
-<TGConnectingPoint num="2" id="1244" />
-<TGConnectingPoint num="3" id="1245" />
-<TGConnectingPoint num="4" id="1246" />
-<TGConnectingPoint num="5" id="1247" />
-<TGConnectingPoint num="6" id="1248" />
-<TGConnectingPoint num="7" id="1249" />
-<TGConnectingPoint num="8" id="1250" />
-<TGConnectingPoint num="9" id="1251" />
-<TGConnectingPoint num="10" id="1252" />
-<TGConnectingPoint num="11" id="1253" />
-<TGConnectingPoint num="12" id="1254" />
-<TGConnectingPoint num="13" id="1255" />
-<TGConnectingPoint num="14" id="1256" />
-<TGConnectingPoint num="15" id="1257" />
-<TGConnectingPoint num="16" id="1258" />
-<TGConnectingPoint num="17" id="1259" />
-<TGConnectingPoint num="18" id="1260" />
-<TGConnectingPoint num="19" id="1261" />
-<TGConnectingPoint num="20" id="1262" />
-<TGConnectingPoint num="21" id="1263" />
-<TGConnectingPoint num="22" id="1264" />
-<TGConnectingPoint num="23" id="1265" />
-<TGConnectingPoint num="24" id="1266" />
-<TGConnectingPoint num="25" id="1267" />
-<TGConnectingPoint num="26" id="1268" />
-<TGConnectingPoint num="27" id="1269" />
-<TGConnectingPoint num="28" id="1270" />
-<TGConnectingPoint num="29" id="1271" />
-<TGConnectingPoint num="30" id="1272" />
-<TGConnectingPoint num="31" id="1273" />
-<TGConnectingPoint num="32" id="1274" />
-<TGConnectingPoint num="33" id="1275" />
-<TGConnectingPoint num="34" id="1276" />
-<TGConnectingPoint num="35" id="1277" />
-<TGConnectingPoint num="36" id="1278" />
-<TGConnectingPoint num="37" id="1279" />
-<TGConnectingPoint num="38" id="1280" />
-<TGConnectingPoint num="39" id="1281" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1293" >
-<cdparam x="496" y="583" />
+<infoparam name="State" value="checkSID" />
+<TGConnectingPoint num="0" id="1152" />
+<TGConnectingPoint num="1" id="1153" />
+<TGConnectingPoint num="2" id="1154" />
+<TGConnectingPoint num="3" id="1155" />
+<TGConnectingPoint num="4" id="1156" />
+<TGConnectingPoint num="5" id="1157" />
+<TGConnectingPoint num="6" id="1158" />
+<TGConnectingPoint num="7" id="1159" />
+<TGConnectingPoint num="8" id="1160" />
+<TGConnectingPoint num="9" id="1161" />
+<TGConnectingPoint num="10" id="1162" />
+<TGConnectingPoint num="11" id="1163" />
+<TGConnectingPoint num="12" id="1164" />
+<TGConnectingPoint num="13" id="1165" />
+<TGConnectingPoint num="14" id="1166" />
+<TGConnectingPoint num="15" id="1167" />
+<TGConnectingPoint num="16" id="1168" />
+<TGConnectingPoint num="17" id="1169" />
+<TGConnectingPoint num="18" id="1170" />
+<TGConnectingPoint num="19" id="1171" />
+<TGConnectingPoint num="20" id="1172" />
+<TGConnectingPoint num="21" id="1173" />
+<TGConnectingPoint num="22" id="1174" />
+<TGConnectingPoint num="23" id="1175" />
+<TGConnectingPoint num="24" id="1176" />
+<TGConnectingPoint num="25" id="1177" />
+<TGConnectingPoint num="26" id="1178" />
+<TGConnectingPoint num="27" id="1179" />
+<TGConnectingPoint num="28" id="1180" />
+<TGConnectingPoint num="29" id="1181" />
+<TGConnectingPoint num="30" id="1182" />
+<TGConnectingPoint num="31" id="1183" />
+<TGConnectingPoint num="32" id="1184" />
+<TGConnectingPoint num="33" id="1185" />
+<TGConnectingPoint num="34" id="1186" />
+<TGConnectingPoint num="35" id="1187" />
+<TGConnectingPoint num="36" id="1188" />
+<TGConnectingPoint num="37" id="1189" />
+<TGConnectingPoint num="38" id="1190" />
+<TGConnectingPoint num="39" id="1191" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1203" >
+<cdparam x="363" y="661" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="1283" />
-<TGConnectingPoint num="1" id="1284" />
-<TGConnectingPoint num="2" id="1285" />
-<TGConnectingPoint num="3" id="1286" />
-<TGConnectingPoint num="4" id="1287" />
-<TGConnectingPoint num="5" id="1288" />
-<TGConnectingPoint num="6" id="1289" />
-<TGConnectingPoint num="7" id="1290" />
-<TGConnectingPoint num="8" id="1291" />
-<TGConnectingPoint num="9" id="1292" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1304" >
-<cdparam x="495" y="516" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1193" />
+<TGConnectingPoint num="1" id="1194" />
+<TGConnectingPoint num="2" id="1195" />
+<TGConnectingPoint num="3" id="1196" />
+<TGConnectingPoint num="4" id="1197" />
+<TGConnectingPoint num="5" id="1198" />
+<TGConnectingPoint num="6" id="1199" />
+<TGConnectingPoint num="7" id="1200" />
+<TGConnectingPoint num="8" id="1201" />
+<TGConnectingPoint num="9" id="1202" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1244" >
+<cdparam x="357" y="577" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="1294" />
-<TGConnectingPoint num="1" id="1295" />
-<TGConnectingPoint num="2" id="1296" />
-<TGConnectingPoint num="3" id="1297" />
-<TGConnectingPoint num="4" id="1298" />
-<TGConnectingPoint num="5" id="1299" />
-<TGConnectingPoint num="6" id="1300" />
-<TGConnectingPoint num="7" id="1301" />
-<TGConnectingPoint num="8" id="1302" />
-<TGConnectingPoint num="9" id="1303" />
-</COMPONENT>
-
-<COMPONENT type="5108" id="1307" >
-<cdparam x="454" y="346" />
-<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="receiveMsg" />
+<TGConnectingPoint num="0" id="1204" />
+<TGConnectingPoint num="1" id="1205" />
+<TGConnectingPoint num="2" id="1206" />
+<TGConnectingPoint num="3" id="1207" />
+<TGConnectingPoint num="4" id="1208" />
+<TGConnectingPoint num="5" id="1209" />
+<TGConnectingPoint num="6" id="1210" />
+<TGConnectingPoint num="7" id="1211" />
+<TGConnectingPoint num="8" id="1212" />
+<TGConnectingPoint num="9" id="1213" />
+<TGConnectingPoint num="10" id="1214" />
+<TGConnectingPoint num="11" id="1215" />
+<TGConnectingPoint num="12" id="1216" />
+<TGConnectingPoint num="13" id="1217" />
+<TGConnectingPoint num="14" id="1218" />
+<TGConnectingPoint num="15" id="1219" />
+<TGConnectingPoint num="16" id="1220" />
+<TGConnectingPoint num="17" id="1221" />
+<TGConnectingPoint num="18" id="1222" />
+<TGConnectingPoint num="19" id="1223" />
+<TGConnectingPoint num="20" id="1224" />
+<TGConnectingPoint num="21" id="1225" />
+<TGConnectingPoint num="22" id="1226" />
+<TGConnectingPoint num="23" id="1227" />
+<TGConnectingPoint num="24" id="1228" />
+<TGConnectingPoint num="25" id="1229" />
+<TGConnectingPoint num="26" id="1230" />
+<TGConnectingPoint num="27" id="1231" />
+<TGConnectingPoint num="28" id="1232" />
+<TGConnectingPoint num="29" id="1233" />
+<TGConnectingPoint num="30" id="1234" />
+<TGConnectingPoint num="31" id="1235" />
+<TGConnectingPoint num="32" id="1236" />
+<TGConnectingPoint num="33" id="1237" />
+<TGConnectingPoint num="34" id="1238" />
+<TGConnectingPoint num="35" id="1239" />
+<TGConnectingPoint num="36" id="1240" />
+<TGConnectingPoint num="37" id="1241" />
+<TGConnectingPoint num="38" id="1242" />
+<TGConnectingPoint num="39" id="1243" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1285" >
+<cdparam x="357" y="365" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1305" />
-<TGConnectingPoint num="1" id="1306" />
-<extraparam>
-<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1348" >
-<cdparam x="142" y="465" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="SendingMS" />
+<TGConnectingPoint num="0" id="1245" />
+<TGConnectingPoint num="1" id="1246" />
+<TGConnectingPoint num="2" id="1247" />
+<TGConnectingPoint num="3" id="1248" />
+<TGConnectingPoint num="4" id="1249" />
+<TGConnectingPoint num="5" id="1250" />
+<TGConnectingPoint num="6" id="1251" />
+<TGConnectingPoint num="7" id="1252" />
+<TGConnectingPoint num="8" id="1253" />
+<TGConnectingPoint num="9" id="1254" />
+<TGConnectingPoint num="10" id="1255" />
+<TGConnectingPoint num="11" id="1256" />
+<TGConnectingPoint num="12" id="1257" />
+<TGConnectingPoint num="13" id="1258" />
+<TGConnectingPoint num="14" id="1259" />
+<TGConnectingPoint num="15" id="1260" />
+<TGConnectingPoint num="16" id="1261" />
+<TGConnectingPoint num="17" id="1262" />
+<TGConnectingPoint num="18" id="1263" />
+<TGConnectingPoint num="19" id="1264" />
+<TGConnectingPoint num="20" id="1265" />
+<TGConnectingPoint num="21" id="1266" />
+<TGConnectingPoint num="22" id="1267" />
+<TGConnectingPoint num="23" id="1268" />
+<TGConnectingPoint num="24" id="1269" />
+<TGConnectingPoint num="25" id="1270" />
+<TGConnectingPoint num="26" id="1271" />
+<TGConnectingPoint num="27" id="1272" />
+<TGConnectingPoint num="28" id="1273" />
+<TGConnectingPoint num="29" id="1274" />
+<TGConnectingPoint num="30" id="1275" />
+<TGConnectingPoint num="31" id="1276" />
+<TGConnectingPoint num="32" id="1277" />
+<TGConnectingPoint num="33" id="1278" />
+<TGConnectingPoint num="34" id="1279" />
+<TGConnectingPoint num="35" id="1280" />
+<TGConnectingPoint num="36" id="1281" />
+<TGConnectingPoint num="37" id="1282" />
+<TGConnectingPoint num="38" id="1283" />
+<TGConnectingPoint num="39" id="1284" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1326" >
+<cdparam x="860" y="841" />
+<sizeparam width="165" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="error" />
-<TGConnectingPoint num="0" id="1308" />
-<TGConnectingPoint num="1" id="1309" />
-<TGConnectingPoint num="2" id="1310" />
-<TGConnectingPoint num="3" id="1311" />
-<TGConnectingPoint num="4" id="1312" />
-<TGConnectingPoint num="5" id="1313" />
-<TGConnectingPoint num="6" id="1314" />
-<TGConnectingPoint num="7" id="1315" />
-<TGConnectingPoint num="8" id="1316" />
-<TGConnectingPoint num="9" id="1317" />
-<TGConnectingPoint num="10" id="1318" />
-<TGConnectingPoint num="11" id="1319" />
-<TGConnectingPoint num="12" id="1320" />
-<TGConnectingPoint num="13" id="1321" />
-<TGConnectingPoint num="14" id="1322" />
-<TGConnectingPoint num="15" id="1323" />
-<TGConnectingPoint num="16" id="1324" />
-<TGConnectingPoint num="17" id="1325" />
-<TGConnectingPoint num="18" id="1326" />
-<TGConnectingPoint num="19" id="1327" />
-<TGConnectingPoint num="20" id="1328" />
-<TGConnectingPoint num="21" id="1329" />
-<TGConnectingPoint num="22" id="1330" />
-<TGConnectingPoint num="23" id="1331" />
-<TGConnectingPoint num="24" id="1332" />
-<TGConnectingPoint num="25" id="1333" />
-<TGConnectingPoint num="26" id="1334" />
-<TGConnectingPoint num="27" id="1335" />
-<TGConnectingPoint num="28" id="1336" />
-<TGConnectingPoint num="29" id="1337" />
-<TGConnectingPoint num="30" id="1338" />
-<TGConnectingPoint num="31" id="1339" />
-<TGConnectingPoint num="32" id="1340" />
-<TGConnectingPoint num="33" id="1341" />
-<TGConnectingPoint num="34" id="1342" />
-<TGConnectingPoint num="35" id="1343" />
-<TGConnectingPoint num="36" id="1344" />
-<TGConnectingPoint num="37" id="1345" />
-<TGConnectingPoint num="38" id="1346" />
-<TGConnectingPoint num="39" id="1347" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1389" >
-<cdparam x="364" y="238" />
-<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="receiveMessage1" />
+<TGConnectingPoint num="0" id="1286" />
+<TGConnectingPoint num="1" id="1287" />
+<TGConnectingPoint num="2" id="1288" />
+<TGConnectingPoint num="3" id="1289" />
+<TGConnectingPoint num="4" id="1290" />
+<TGConnectingPoint num="5" id="1291" />
+<TGConnectingPoint num="6" id="1292" />
+<TGConnectingPoint num="7" id="1293" />
+<TGConnectingPoint num="8" id="1294" />
+<TGConnectingPoint num="9" id="1295" />
+<TGConnectingPoint num="10" id="1296" />
+<TGConnectingPoint num="11" id="1297" />
+<TGConnectingPoint num="12" id="1298" />
+<TGConnectingPoint num="13" id="1299" />
+<TGConnectingPoint num="14" id="1300" />
+<TGConnectingPoint num="15" id="1301" />
+<TGConnectingPoint num="16" id="1302" />
+<TGConnectingPoint num="17" id="1303" />
+<TGConnectingPoint num="18" id="1304" />
+<TGConnectingPoint num="19" id="1305" />
+<TGConnectingPoint num="20" id="1306" />
+<TGConnectingPoint num="21" id="1307" />
+<TGConnectingPoint num="22" id="1308" />
+<TGConnectingPoint num="23" id="1309" />
+<TGConnectingPoint num="24" id="1310" />
+<TGConnectingPoint num="25" id="1311" />
+<TGConnectingPoint num="26" id="1312" />
+<TGConnectingPoint num="27" id="1313" />
+<TGConnectingPoint num="28" id="1314" />
+<TGConnectingPoint num="29" id="1315" />
+<TGConnectingPoint num="30" id="1316" />
+<TGConnectingPoint num="31" id="1317" />
+<TGConnectingPoint num="32" id="1318" />
+<TGConnectingPoint num="33" id="1319" />
+<TGConnectingPoint num="34" id="1320" />
+<TGConnectingPoint num="35" id="1321" />
+<TGConnectingPoint num="36" id="1322" />
+<TGConnectingPoint num="37" id="1323" />
+<TGConnectingPoint num="38" id="1324" />
+<TGConnectingPoint num="39" id="1325" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="1337" >
+<cdparam x="362" y="517" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="VerifyServerCert" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="1327" />
+<TGConnectingPoint num="1" id="1328" />
+<TGConnectingPoint num="2" id="1329" />
+<TGConnectingPoint num="3" id="1330" />
+<TGConnectingPoint num="4" id="1331" />
+<TGConnectingPoint num="5" id="1332" />
+<TGConnectingPoint num="6" id="1333" />
+<TGConnectingPoint num="7" id="1334" />
+<TGConnectingPoint num="8" id="1335" />
+<TGConnectingPoint num="9" id="1336" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1348" >
+<cdparam x="363" y="293" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="4" id="1342" />
+<TGConnectingPoint num="5" id="1343" />
+<TGConnectingPoint num="6" id="1344" />
+<TGConnectingPoint num="7" id="1345" />
+<TGConnectingPoint num="8" id="1346" />
+<TGConnectingPoint num="9" id="1347" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1359" >
+<cdparam x="362" y="195" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
 <TGConnectingPoint num="0" id="1349" />
 <TGConnectingPoint num="1" id="1350" />
 <TGConnectingPoint num="2" id="1351" />
@@ -2939,83 +2939,83 @@
 <TGConnectingPoint num="7" id="1356" />
 <TGConnectingPoint num="8" id="1357" />
 <TGConnectingPoint num="9" id="1358" />
-<TGConnectingPoint num="10" id="1359" />
-<TGConnectingPoint num="11" id="1360" />
-<TGConnectingPoint num="12" id="1361" />
-<TGConnectingPoint num="13" id="1362" />
-<TGConnectingPoint num="14" id="1363" />
-<TGConnectingPoint num="15" id="1364" />
-<TGConnectingPoint num="16" id="1365" />
-<TGConnectingPoint num="17" id="1366" />
-<TGConnectingPoint num="18" id="1367" />
-<TGConnectingPoint num="19" id="1368" />
-<TGConnectingPoint num="20" id="1369" />
-<TGConnectingPoint num="21" id="1370" />
-<TGConnectingPoint num="22" id="1371" />
-<TGConnectingPoint num="23" id="1372" />
-<TGConnectingPoint num="24" id="1373" />
-<TGConnectingPoint num="25" id="1374" />
-<TGConnectingPoint num="26" id="1375" />
-<TGConnectingPoint num="27" id="1376" />
-<TGConnectingPoint num="28" id="1377" />
-<TGConnectingPoint num="29" id="1378" />
-<TGConnectingPoint num="30" id="1379" />
-<TGConnectingPoint num="31" id="1380" />
-<TGConnectingPoint num="32" id="1381" />
-<TGConnectingPoint num="33" id="1382" />
-<TGConnectingPoint num="34" id="1383" />
-<TGConnectingPoint num="35" id="1384" />
-<TGConnectingPoint num="36" id="1385" />
-<TGConnectingPoint num="37" id="1386" />
-<TGConnectingPoint num="38" id="1387" />
-<TGConnectingPoint num="39" id="1388" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1400" >
-<cdparam x="363" y="148" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="1390" />
-<TGConnectingPoint num="1" id="1391" />
-<TGConnectingPoint num="2" id="1392" />
-<TGConnectingPoint num="3" id="1393" />
-<TGConnectingPoint num="4" id="1394" />
-<TGConnectingPoint num="5" id="1395" />
-<TGConnectingPoint num="6" id="1396" />
-<TGConnectingPoint num="7" id="1397" />
-<TGConnectingPoint num="8" id="1398" />
-<TGConnectingPoint num="9" id="1399" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1411" >
-<cdparam x="346" y="86" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1370" >
+<cdparam x="348" y="129" />
+<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(clientHello)" />
-<TGConnectingPoint num="0" id="1401" />
-<TGConnectingPoint num="1" id="1402" />
-<TGConnectingPoint num="2" id="1403" />
-<TGConnectingPoint num="3" id="1404" />
-<TGConnectingPoint num="4" id="1405" />
-<TGConnectingPoint num="5" id="1406" />
-<TGConnectingPoint num="6" id="1407" />
-<TGConnectingPoint num="7" id="1408" />
-<TGConnectingPoint num="8" id="1409" />
-<TGConnectingPoint num="9" id="1410" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1413" >
-<cdparam x="400" y="15" />
+<infoparam name="Receive signal" value="chIn(clientHello)" />
+<TGConnectingPoint num="0" id="1360" />
+<TGConnectingPoint num="1" id="1361" />
+<TGConnectingPoint num="2" id="1362" />
+<TGConnectingPoint num="3" id="1363" />
+<TGConnectingPoint num="4" id="1364" />
+<TGConnectingPoint num="5" id="1365" />
+<TGConnectingPoint num="6" id="1366" />
+<TGConnectingPoint num="7" id="1367" />
+<TGConnectingPoint num="8" id="1368" />
+<TGConnectingPoint num="9" id="1369" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1372" >
+<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="1412" />
+<TGConnectingPoint num="0" id="1371" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1413" >
+<cdparam x="654" y="840" />
+<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="receiveMessage2" />
+<TGConnectingPoint num="0" id="1373" />
+<TGConnectingPoint num="1" id="1374" />
+<TGConnectingPoint num="2" id="1375" />
+<TGConnectingPoint num="3" id="1376" />
+<TGConnectingPoint num="4" id="1377" />
+<TGConnectingPoint num="5" id="1378" />
+<TGConnectingPoint num="6" id="1379" />
+<TGConnectingPoint num="7" id="1380" />
+<TGConnectingPoint num="8" id="1381" />
+<TGConnectingPoint num="9" id="1382" />
+<TGConnectingPoint num="10" id="1383" />
+<TGConnectingPoint num="11" id="1384" />
+<TGConnectingPoint num="12" id="1385" />
+<TGConnectingPoint num="13" id="1386" />
+<TGConnectingPoint num="14" id="1387" />
+<TGConnectingPoint num="15" id="1388" />
+<TGConnectingPoint num="16" id="1389" />
+<TGConnectingPoint num="17" id="1390" />
+<TGConnectingPoint num="18" id="1391" />
+<TGConnectingPoint num="19" id="1392" />
+<TGConnectingPoint num="20" id="1393" />
+<TGConnectingPoint num="21" id="1394" />
+<TGConnectingPoint num="22" id="1395" />
+<TGConnectingPoint num="23" id="1396" />
+<TGConnectingPoint num="24" id="1397" />
+<TGConnectingPoint num="25" id="1398" />
+<TGConnectingPoint num="26" id="1399" />
+<TGConnectingPoint num="27" id="1400" />
+<TGConnectingPoint num="28" id="1401" />
+<TGConnectingPoint num="29" id="1402" />
+<TGConnectingPoint num="30" id="1403" />
+<TGConnectingPoint num="31" id="1404" />
+<TGConnectingPoint num="32" id="1405" />
+<TGConnectingPoint num="33" id="1406" />
+<TGConnectingPoint num="34" id="1407" />
+<TGConnectingPoint num="35" id="1408" />
+<TGConnectingPoint num="36" id="1409" />
+<TGConnectingPoint num="37" id="1410" />
+<TGConnectingPoint num="38" id="1411" />
+<TGConnectingPoint num="39" id="1412" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 
@@ -3186,11 +3186,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="1479" >
 <father id="1529" num="0" />
-<cdparam x="422" y="145" />
+<cdparam x="143" y="142" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="346" minY="0" maxY="189" />
-<infoparam name="Block0" value="Server" />
+<infoparam name="Block0" value="Client" />
 <TGConnectingPoint num="0" id="1455" />
 <TGConnectingPoint num="1" id="1456" />
 <TGConnectingPoint num="2" id="1457" />
@@ -3217,24 +3217,21 @@
 <TGConnectingPoint num="23" id="1478" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="PMS" value="" type="8" typeOther="Message" />
 <Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
+<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientCert" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
-<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="signVerified" value="" type="4" typeOther="" />
-<Attribute access="0" id="signature" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="clientPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
 <Method value="Message aencrypt(Message msg, Key k)" />
 <Method value="Message adecrypt(Message msg, Key k)" />
@@ -3260,11 +3257,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="1504" >
 <father id="1529" num="1" />
-<cdparam x="143" y="142" />
+<cdparam x="422" y="145" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="346" minY="0" maxY="189" />
-<infoparam name="Block0" value="Client" />
+<infoparam name="Block0" value="Server" />
 <TGConnectingPoint num="0" id="1480" />
 <TGConnectingPoint num="1" id="1481" />
 <TGConnectingPoint num="2" id="1482" />
@@ -3291,21 +3288,24 @@
 <TGConnectingPoint num="23" id="1503" />
 <extraparam>
 <CryptoBlock value="true" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PMS" value="" type="8" typeOther="Message" />
+<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
-<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientCert" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
+<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="clientPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="clientPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="signVerified" value="" type="4" typeOther="" />
+<Attribute access="0" id="signature" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler3" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
 <Method value="Message aencrypt(Message msg, Key k)" />
 <Method value="Message adecrypt(Message msg, Key k)" />
@@ -3346,19 +3346,19 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
+<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
 <CONNECTOR type="5102" id="1538" >
-<cdparam x="407" y="35" />
+<cdparam x="338" y="605" />
 <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="1537" />
-<P1  x="407" y="35" id="1840" />
-<P2  x="407" y="91" id="1829" />
+<P1  x="338" y="605" id="1654" />
+<P2  x="161" y="744" id="1764" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1536" >
 <father id="1538" num="0" />
-<cdparam x="421" y="56" />
-<sizeparam width="220" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="225" y="652" />
+<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3367,28 +3367,26 @@
 <TGConnectingPoint num="2" id="1534" />
 <TGConnectingPoint num="3" id="1535" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sign(clientPubK, CAPrivK)" />
-<actions value="clientCert = cert(clientPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1545" >
-<cdparam x="528" y="626" />
+<cdparam x="407" y="266" />
 <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="1544" />
-<P1  x="528" y="714" id="1673" />
-<P2  x="242" y="496" id="1762" />
+<P1  x="407" y="266" id="1901" />
+<P2  x="407" y="344" id="1713" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1543" >
 <father id="1545" num="0" />
-<cdparam x="412" y="686" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="429" y="288" />
+<sizeparam width="256" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3397,26 +3395,29 @@
 <TGConnectingPoint num="2" id="1541" />
 <TGConnectingPoint num="3" id="1542" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(filler1,filler3,signature)" />
+<actions value="get3(filler3, clientCert, filler1, filler2)" />
+<actions value="certVerified = verifyCert(clientCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1552" >
-<cdparam x="407" y="288" />
+<cdparam x="353" y="714" />
 <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="1551" />
-<P1  x="407" y="288" id="1791" />
-<P2  x="217" y="465" id="1745" />
+<P1  x="337" y="772" id="1683" />
+<P2  x="161" y="757" id="1757" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1550" >
 <father id="1552" num="0" />
-<cdparam x="261" y="362" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="246" y="754" />
+<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3434,17 +3435,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1559" >
-<cdparam x="407" y="107" />
+<cdparam x="407" y="809" />
 <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="1558" />
-<P1  x="407" y="121" id="1830" />
-<P2  x="407" y="143" id="1818" />
+<P1  x="407" y="785" id="1677" />
+<P2  x="407" y="839" id="1795" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1557" >
 <father id="1559" num="0" />
-<cdparam x="407" y="147" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="430" y="818" />
+<sizeparam width="84" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3453,7 +3454,7 @@
 <TGConnectingPoint num="2" id="1555" />
 <TGConnectingPoint num="3" id="1556" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ signVerified ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -3462,17 +3463,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1566" >
-<cdparam x="407" y="198" />
+<cdparam x="356" 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="1565" />
-<P1  x="407" y="173" id="1819" />
-<P2  x="407" y="238" id="1785" />
+<P1  x="356" y="394" id="1740" />
+<P2  x="148" y="732" id="1772" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1564" >
 <father id="1566" num="0" />
-<cdparam x="417" y="193" />
-<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="202" y="563" />
+<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3481,28 +3482,26 @@
 <TGConnectingPoint num="2" id="1562" />
 <TGConnectingPoint num="3" id="1563" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(filler1, serverHello, serverCert) " />
-<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1573" >
-<cdparam x="514" y="288" />
+<cdparam x="407" y="903" />
 <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="1572" />
-<P1  x="514" y="288" id="1808" />
-<P2  x="540" y="341" id="1733" />
+<P1  x="407" y="889" id="1800" />
+<P2  x="407" y="946" id="1889" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1571" >
 <father id="1573" num="0" />
-<cdparam x="546" y="308" />
-<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="426" y="909" />
+<sizeparam width="271" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3511,27 +3510,29 @@
 <TGConnectingPoint num="2" id="1569" />
 <TGConnectingPoint num="3" id="1570" />
 <extraparam>
-<guard value="[ certVerified ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="serverPubK = getpk(serverCert)" />
+<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
+<actions value="MS = hash(filler1)" />
+<actions value="filler1 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1580" >
-<cdparam x="540" y="371" />
+<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="1579" />
-<P1  x="540" y="371" id="1734" />
-<P2  x="540" y="511" id="1722" />
+<P1  x="407" y="70" id="1933" />
+<P2  x="407" y="124" id="1922" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1578" >
 <father id="1580" num="0" />
-<cdparam x="566" y="394" />
-<sizeparam width="257" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="416" y="96" />
+<sizeparam width="215" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3545,28 +3546,23 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1.data = PMS" />
-<actions value="filler1 = aencrypt(filler1, serverPubK)" />
-<actions value="filler2 = concat2(clientHello, serverHello)" />
-<actions value="filler2 = sign(filler2, clientPrivK)" />
-<actions value="filler2 = concat3(clientCert, filler1, filler2)" />
-<actions value="filler1 = sign(filler2, clientPrivK)" />
-<actions value="filler2 = concat2(filler2,filler1)" />
+<actions value="filler1 = sign(serverPubK, CAPrivK)" />
+<actions value="serverCert = cert(serverPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1587" >
-<cdparam x="540" y="541" />
+<cdparam x="407" y="207" />
 <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="1586" />
-<P1  x="540" y="541" id="1723" />
-<P2  x="540" y="578" id="1711" />
+<P1  x="407" y="154" id="1923" />
+<P2  x="407" y="190" id="1911" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1585" >
 <father id="1587" num="0" />
-<cdparam x="540" y="581" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="420" y="178" />
+<sizeparam width="237" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3580,21 +3576,22 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1 = concat2(serverHello, serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1594" >
-<cdparam x="540" y="608" />
+<cdparam x="407" y="242" />
 <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="1593" />
-<P1  x="540" y="608" id="1712" />
-<P2  x="540" y="689" id="1686" />
+<P1  x="407" y="220" id="1912" />
+<P2  x="407" y="236" id="1900" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1592" >
 <father id="1594" num="0" />
-<cdparam x="556" y="635" />
-<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="315" y="335" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3608,24 +3605,21 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
-<actions value="MS = hash(filler2)" />
-<actions value="filler2 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1601" >
-<cdparam x="578" y="739" />
+<cdparam x="407" y="572" />
 <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="1600" />
-<P1  x="578" y="739" id="1676" />
-<P2  x="578" y="780" id="1630" />
+<P1  x="407" y="624" id="1636" />
+<P2  x="407" y="735" id="1672" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1599" >
 <father id="1601" num="0" />
-<cdparam x="591" y="766" />
-<sizeparam width="180" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="437" y="674" />
+<sizeparam width="294" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3634,26 +3628,27 @@
 <TGConnectingPoint num="2" id="1597" />
 <TGConnectingPoint num="3" id="1598" />
 <extraparam>
-<guard value="[ filler1.data == filler2.data ]" />
+<guard value="[ signVerified ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="signVerified = verifySign(filler1, filler2, clientPubK) " />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1608" >
-<cdparam x="565" y="830" />
+<cdparam x="407" y="973" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="1607" />
-<P1  x="565" y="830" id="1658" />
-<P2  x="565" y="876" id="1618" />
+<P1  x="407" y="976" id="1890" />
+<P2  x="407" y="995" id="1878" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1606" >
 <father id="1608" num="0" />
-<cdparam x="584" y="859" />
-<sizeparam width="242" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="407" y="1013" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3667,22 +3662,21 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sencrypt(secretMessage, MS) " />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="1615" >
-<cdparam x="565" y="891" />
+<cdparam x="407" y="1025" />
 <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="1614" />
-<P1  x="565" y="906" id="1619" />
-<P2  x="565" y="921" id="1616" />
+<P1  x="407" y="1025" id="1879" />
+<P2  x="407" y="1081" id="1845" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1613" >
 <father id="1615" num="0" />
-<cdparam x="565" y="931" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="427" y="1053" />
+<sizeparam width="218" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3696,412 +3690,531 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="secretMessage = sdecrypt(filler1, MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="1617" >
-<cdparam x="555" y="926" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1622" >
+<cdparam x="453" y="1131" />
+<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="1621" />
+<P1  x="453" y="1131" id="1867" />
+<P2  x="453" y="1184" id="1835" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1620" >
+<father id="1622" num="0" />
+<cdparam x="453" y="1171" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="1616" />
-</COMPONENT>
+<TGConnectingPoint num="1" id="1617" />
+<TGConnectingPoint num="2" id="1618" />
+<TGConnectingPoint num="3" id="1619" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1628" >
-<cdparam x="520" y="881" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1629" >
+<cdparam x="434" y="447" />
+<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="1628" />
+<P1  x="407" y="394" id="1718" />
+<P2  x="407" y="574" id="1631" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1627" >
+<father id="1629" num="0" />
+<cdparam x="436" y="440" />
+<sizeparam width="302" height="75" 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="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="1618" />
-<TGConnectingPoint num="1" id="1619" />
-<TGConnectingPoint num="2" id="1620" />
-<TGConnectingPoint num="3" id="1621" />
-<TGConnectingPoint num="4" id="1622" />
-<TGConnectingPoint num="5" id="1623" />
-<TGConnectingPoint num="6" id="1624" />
-<TGConnectingPoint num="7" id="1625" />
-<TGConnectingPoint num="8" id="1626" />
-<TGConnectingPoint num="9" id="1627" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1669" >
-<cdparam x="528" y="780" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1623" />
+<TGConnectingPoint num="1" id="1624" />
+<TGConnectingPoint num="2" id="1625" />
+<TGConnectingPoint num="3" id="1626" />
+<extraparam>
+<guard value="[ certVerified ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="PMS = adecrypt(filler1, serverPrivK)" />
+<actions value="filler1 = concat2(clientHello, serverHello)" />
+<actions value="clientPubK = getpk(clientCert)" />
+<actions value="signVerified = verifySign(filler3,signature,clientPubK)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="1670" >
+<cdparam x="338" y="574" />
+<sizeparam width="139" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="sendMessage" />
-<TGConnectingPoint num="0" id="1629" />
-<TGConnectingPoint num="1" id="1630" />
-<TGConnectingPoint num="2" id="1631" />
-<TGConnectingPoint num="3" id="1632" />
-<TGConnectingPoint num="4" id="1633" />
-<TGConnectingPoint num="5" id="1634" />
-<TGConnectingPoint num="6" id="1635" />
-<TGConnectingPoint num="7" id="1636" />
-<TGConnectingPoint num="8" id="1637" />
-<TGConnectingPoint num="9" id="1638" />
-<TGConnectingPoint num="10" id="1639" />
-<TGConnectingPoint num="11" id="1640" />
-<TGConnectingPoint num="12" id="1641" />
-<TGConnectingPoint num="13" id="1642" />
-<TGConnectingPoint num="14" id="1643" />
-<TGConnectingPoint num="15" id="1644" />
-<TGConnectingPoint num="16" id="1645" />
-<TGConnectingPoint num="17" id="1646" />
-<TGConnectingPoint num="18" id="1647" />
-<TGConnectingPoint num="19" id="1648" />
-<TGConnectingPoint num="20" id="1649" />
-<TGConnectingPoint num="21" id="1650" />
-<TGConnectingPoint num="22" id="1651" />
-<TGConnectingPoint num="23" id="1652" />
-<TGConnectingPoint num="24" id="1653" />
-<TGConnectingPoint num="25" id="1654" />
-<TGConnectingPoint num="26" id="1655" />
-<TGConnectingPoint num="27" id="1656" />
-<TGConnectingPoint num="28" id="1657" />
-<TGConnectingPoint num="29" id="1658" />
-<TGConnectingPoint num="30" id="1659" />
-<TGConnectingPoint num="31" id="1660" />
-<TGConnectingPoint num="32" id="1661" />
-<TGConnectingPoint num="33" id="1662" />
-<TGConnectingPoint num="34" id="1663" />
-<TGConnectingPoint num="35" id="1664" />
-<TGConnectingPoint num="36" id="1665" />
-<TGConnectingPoint num="37" id="1666" />
-<TGConnectingPoint num="38" id="1667" />
-<TGConnectingPoint num="39" id="1668" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1710" >
-<cdparam x="528" y="689" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="verifyFirstSign" />
+<TGConnectingPoint num="0" id="1630" />
+<TGConnectingPoint num="1" id="1631" />
+<TGConnectingPoint num="2" id="1632" />
+<TGConnectingPoint num="3" id="1633" />
+<TGConnectingPoint num="4" id="1634" />
+<TGConnectingPoint num="5" id="1635" />
+<TGConnectingPoint num="6" id="1636" />
+<TGConnectingPoint num="7" id="1637" />
+<TGConnectingPoint num="8" id="1638" />
+<TGConnectingPoint num="9" id="1639" />
+<TGConnectingPoint num="10" id="1640" />
+<TGConnectingPoint num="11" id="1641" />
+<TGConnectingPoint num="12" id="1642" />
+<TGConnectingPoint num="13" id="1643" />
+<TGConnectingPoint num="14" id="1644" />
+<TGConnectingPoint num="15" id="1645" />
+<TGConnectingPoint num="16" id="1646" />
+<TGConnectingPoint num="17" id="1647" />
+<TGConnectingPoint num="18" id="1648" />
+<TGConnectingPoint num="19" id="1649" />
+<TGConnectingPoint num="20" id="1650" />
+<TGConnectingPoint num="21" id="1651" />
+<TGConnectingPoint num="22" id="1652" />
+<TGConnectingPoint num="23" id="1653" />
+<TGConnectingPoint num="24" id="1654" />
+<TGConnectingPoint num="25" id="1655" />
+<TGConnectingPoint num="26" id="1656" />
+<TGConnectingPoint num="27" id="1657" />
+<TGConnectingPoint num="28" id="1658" />
+<TGConnectingPoint num="29" id="1659" />
+<TGConnectingPoint num="30" id="1660" />
+<TGConnectingPoint num="31" id="1661" />
+<TGConnectingPoint num="32" id="1662" />
+<TGConnectingPoint num="33" id="1663" />
+<TGConnectingPoint num="34" id="1664" />
+<TGConnectingPoint num="35" id="1665" />
+<TGConnectingPoint num="36" id="1666" />
+<TGConnectingPoint num="37" id="1667" />
+<TGConnectingPoint num="38" id="1668" />
+<TGConnectingPoint num="39" id="1669" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1711" >
+<cdparam x="337" y="735" />
+<sizeparam width="141" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="checkMS" />
-<TGConnectingPoint num="0" id="1670" />
-<TGConnectingPoint num="1" id="1671" />
-<TGConnectingPoint num="2" id="1672" />
-<TGConnectingPoint num="3" id="1673" />
-<TGConnectingPoint num="4" id="1674" />
-<TGConnectingPoint num="5" id="1675" />
-<TGConnectingPoint num="6" id="1676" />
-<TGConnectingPoint num="7" id="1677" />
-<TGConnectingPoint num="8" id="1678" />
-<TGConnectingPoint num="9" id="1679" />
-<TGConnectingPoint num="10" id="1680" />
-<TGConnectingPoint num="11" id="1681" />
-<TGConnectingPoint num="12" id="1682" />
-<TGConnectingPoint num="13" id="1683" />
-<TGConnectingPoint num="14" id="1684" />
-<TGConnectingPoint num="15" id="1685" />
-<TGConnectingPoint num="16" id="1686" />
-<TGConnectingPoint num="17" id="1687" />
-<TGConnectingPoint num="18" id="1688" />
-<TGConnectingPoint num="19" id="1689" />
-<TGConnectingPoint num="20" id="1690" />
-<TGConnectingPoint num="21" id="1691" />
-<TGConnectingPoint num="22" id="1692" />
-<TGConnectingPoint num="23" id="1693" />
-<TGConnectingPoint num="24" id="1694" />
-<TGConnectingPoint num="25" id="1695" />
-<TGConnectingPoint num="26" id="1696" />
-<TGConnectingPoint num="27" id="1697" />
-<TGConnectingPoint num="28" id="1698" />
-<TGConnectingPoint num="29" id="1699" />
-<TGConnectingPoint num="30" id="1700" />
-<TGConnectingPoint num="31" id="1701" />
-<TGConnectingPoint num="32" id="1702" />
-<TGConnectingPoint num="33" id="1703" />
-<TGConnectingPoint num="34" id="1704" />
-<TGConnectingPoint num="35" id="1705" />
-<TGConnectingPoint num="36" id="1706" />
-<TGConnectingPoint num="37" id="1707" />
-<TGConnectingPoint num="38" id="1708" />
-<TGConnectingPoint num="39" id="1709" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1721" >
-<cdparam x="496" y="583" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="verifyClientSign" />
+<TGConnectingPoint num="0" id="1671" />
+<TGConnectingPoint num="1" id="1672" />
+<TGConnectingPoint num="2" id="1673" />
+<TGConnectingPoint num="3" id="1674" />
+<TGConnectingPoint num="4" id="1675" />
+<TGConnectingPoint num="5" id="1676" />
+<TGConnectingPoint num="6" id="1677" />
+<TGConnectingPoint num="7" id="1678" />
+<TGConnectingPoint num="8" id="1679" />
+<TGConnectingPoint num="9" id="1680" />
+<TGConnectingPoint num="10" id="1681" />
+<TGConnectingPoint num="11" id="1682" />
+<TGConnectingPoint num="12" id="1683" />
+<TGConnectingPoint num="13" id="1684" />
+<TGConnectingPoint num="14" id="1685" />
+<TGConnectingPoint num="15" id="1686" />
+<TGConnectingPoint num="16" id="1687" />
+<TGConnectingPoint num="17" id="1688" />
+<TGConnectingPoint num="18" id="1689" />
+<TGConnectingPoint num="19" id="1690" />
+<TGConnectingPoint num="20" id="1691" />
+<TGConnectingPoint num="21" id="1692" />
+<TGConnectingPoint num="22" id="1693" />
+<TGConnectingPoint num="23" id="1694" />
+<TGConnectingPoint num="24" id="1695" />
+<TGConnectingPoint num="25" id="1696" />
+<TGConnectingPoint num="26" id="1697" />
+<TGConnectingPoint num="27" id="1698" />
+<TGConnectingPoint num="28" id="1699" />
+<TGConnectingPoint num="29" id="1700" />
+<TGConnectingPoint num="30" id="1701" />
+<TGConnectingPoint num="31" id="1702" />
+<TGConnectingPoint num="32" id="1703" />
+<TGConnectingPoint num="33" id="1704" />
+<TGConnectingPoint num="34" id="1705" />
+<TGConnectingPoint num="35" id="1706" />
+<TGConnectingPoint num="36" id="1707" />
+<TGConnectingPoint num="37" id="1708" />
+<TGConnectingPoint num="38" id="1709" />
+<TGConnectingPoint num="39" id="1710" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1752" >
+<cdparam x="341" y="344" />
+<sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="verifyClientCert" />
+<TGConnectingPoint num="0" id="1712" />
+<TGConnectingPoint num="1" id="1713" />
+<TGConnectingPoint num="2" id="1714" />
+<TGConnectingPoint num="3" id="1715" />
+<TGConnectingPoint num="4" id="1716" />
+<TGConnectingPoint num="5" id="1717" />
+<TGConnectingPoint num="6" id="1718" />
+<TGConnectingPoint num="7" id="1719" />
+<TGConnectingPoint num="8" id="1720" />
+<TGConnectingPoint num="9" id="1721" />
+<TGConnectingPoint num="10" id="1722" />
+<TGConnectingPoint num="11" id="1723" />
+<TGConnectingPoint num="12" id="1724" />
+<TGConnectingPoint num="13" id="1725" />
+<TGConnectingPoint num="14" id="1726" />
+<TGConnectingPoint num="15" id="1727" />
+<TGConnectingPoint num="16" id="1728" />
+<TGConnectingPoint num="17" id="1729" />
+<TGConnectingPoint num="18" id="1730" />
+<TGConnectingPoint num="19" id="1731" />
+<TGConnectingPoint num="20" id="1732" />
+<TGConnectingPoint num="21" id="1733" />
+<TGConnectingPoint num="22" id="1734" />
+<TGConnectingPoint num="23" id="1735" />
+<TGConnectingPoint num="24" id="1736" />
+<TGConnectingPoint num="25" id="1737" />
+<TGConnectingPoint num="26" id="1738" />
+<TGConnectingPoint num="27" id="1739" />
+<TGConnectingPoint num="28" id="1740" />
+<TGConnectingPoint num="29" id="1741" />
+<TGConnectingPoint num="30" id="1742" />
+<TGConnectingPoint num="31" id="1743" />
+<TGConnectingPoint num="32" id="1744" />
+<TGConnectingPoint num="33" id="1745" />
+<TGConnectingPoint num="34" id="1746" />
+<TGConnectingPoint num="35" id="1747" />
+<TGConnectingPoint num="36" id="1748" />
+<TGConnectingPoint num="37" id="1749" />
+<TGConnectingPoint num="38" id="1750" />
+<TGConnectingPoint num="39" id="1751" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1793" >
+<cdparam x="61" y="732" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="1711" />
-<TGConnectingPoint num="1" id="1712" />
-<TGConnectingPoint num="2" id="1713" />
-<TGConnectingPoint num="3" id="1714" />
-<TGConnectingPoint num="4" id="1715" />
-<TGConnectingPoint num="5" id="1716" />
-<TGConnectingPoint num="6" id="1717" />
-<TGConnectingPoint num="7" id="1718" />
-<TGConnectingPoint num="8" id="1719" />
-<TGConnectingPoint num="9" id="1720" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1732" >
-<cdparam x="495" y="516" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="error" />
+<TGConnectingPoint num="0" id="1753" />
+<TGConnectingPoint num="1" id="1754" />
+<TGConnectingPoint num="2" id="1755" />
+<TGConnectingPoint num="3" id="1756" />
+<TGConnectingPoint num="4" id="1757" />
+<TGConnectingPoint num="5" id="1758" />
+<TGConnectingPoint num="6" id="1759" />
+<TGConnectingPoint num="7" id="1760" />
+<TGConnectingPoint num="8" id="1761" />
+<TGConnectingPoint num="9" id="1762" />
+<TGConnectingPoint num="10" id="1763" />
+<TGConnectingPoint num="11" id="1764" />
+<TGConnectingPoint num="12" id="1765" />
+<TGConnectingPoint num="13" id="1766" />
+<TGConnectingPoint num="14" id="1767" />
+<TGConnectingPoint num="15" id="1768" />
+<TGConnectingPoint num="16" id="1769" />
+<TGConnectingPoint num="17" id="1770" />
+<TGConnectingPoint num="18" id="1771" />
+<TGConnectingPoint num="19" id="1772" />
+<TGConnectingPoint num="20" id="1773" />
+<TGConnectingPoint num="21" id="1774" />
+<TGConnectingPoint num="22" id="1775" />
+<TGConnectingPoint num="23" id="1776" />
+<TGConnectingPoint num="24" id="1777" />
+<TGConnectingPoint num="25" id="1778" />
+<TGConnectingPoint num="26" id="1779" />
+<TGConnectingPoint num="27" id="1780" />
+<TGConnectingPoint num="28" id="1781" />
+<TGConnectingPoint num="29" id="1782" />
+<TGConnectingPoint num="30" id="1783" />
+<TGConnectingPoint num="31" id="1784" />
+<TGConnectingPoint num="32" id="1785" />
+<TGConnectingPoint num="33" id="1786" />
+<TGConnectingPoint num="34" id="1787" />
+<TGConnectingPoint num="35" id="1788" />
+<TGConnectingPoint num="36" id="1789" />
+<TGConnectingPoint num="37" id="1790" />
+<TGConnectingPoint num="38" id="1791" />
+<TGConnectingPoint num="39" id="1792" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1834" >
+<cdparam x="357" y="839" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler2)" />
-<TGConnectingPoint num="0" id="1722" />
-<TGConnectingPoint num="1" id="1723" />
-<TGConnectingPoint num="2" id="1724" />
-<TGConnectingPoint num="3" id="1725" />
-<TGConnectingPoint num="4" id="1726" />
-<TGConnectingPoint num="5" id="1727" />
-<TGConnectingPoint num="6" id="1728" />
-<TGConnectingPoint num="7" id="1729" />
-<TGConnectingPoint num="8" id="1730" />
-<TGConnectingPoint num="9" id="1731" />
-</COMPONENT>
-
-<COMPONENT type="5108" id="1735" >
-<cdparam x="454" y="346" />
-<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="SendingMS" />
+<TGConnectingPoint num="0" id="1794" />
+<TGConnectingPoint num="1" id="1795" />
+<TGConnectingPoint num="2" id="1796" />
+<TGConnectingPoint num="3" id="1797" />
+<TGConnectingPoint num="4" id="1798" />
+<TGConnectingPoint num="5" id="1799" />
+<TGConnectingPoint num="6" id="1800" />
+<TGConnectingPoint num="7" id="1801" />
+<TGConnectingPoint num="8" id="1802" />
+<TGConnectingPoint num="9" id="1803" />
+<TGConnectingPoint num="10" id="1804" />
+<TGConnectingPoint num="11" id="1805" />
+<TGConnectingPoint num="12" id="1806" />
+<TGConnectingPoint num="13" id="1807" />
+<TGConnectingPoint num="14" id="1808" />
+<TGConnectingPoint num="15" id="1809" />
+<TGConnectingPoint num="16" id="1810" />
+<TGConnectingPoint num="17" id="1811" />
+<TGConnectingPoint num="18" id="1812" />
+<TGConnectingPoint num="19" id="1813" />
+<TGConnectingPoint num="20" id="1814" />
+<TGConnectingPoint num="21" id="1815" />
+<TGConnectingPoint num="22" id="1816" />
+<TGConnectingPoint num="23" id="1817" />
+<TGConnectingPoint num="24" id="1818" />
+<TGConnectingPoint num="25" id="1819" />
+<TGConnectingPoint num="26" id="1820" />
+<TGConnectingPoint num="27" id="1821" />
+<TGConnectingPoint num="28" id="1822" />
+<TGConnectingPoint num="29" id="1823" />
+<TGConnectingPoint num="30" id="1824" />
+<TGConnectingPoint num="31" id="1825" />
+<TGConnectingPoint num="32" id="1826" />
+<TGConnectingPoint num="33" id="1827" />
+<TGConnectingPoint num="34" id="1828" />
+<TGConnectingPoint num="35" id="1829" />
+<TGConnectingPoint num="36" id="1830" />
+<TGConnectingPoint num="37" id="1831" />
+<TGConnectingPoint num="38" id="1832" />
+<TGConnectingPoint num="39" id="1833" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="1836" >
+<cdparam x="443" y="1189" />
+<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="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1733" />
-<TGConnectingPoint num="1" id="1734" />
-<extraparam>
-<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1835" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1776" >
-<cdparam x="142" y="465" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1877" >
+<cdparam x="376" y="1081" />
+<sizeparam width="125" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="error" />
-<TGConnectingPoint num="0" id="1736" />
-<TGConnectingPoint num="1" id="1737" />
-<TGConnectingPoint num="2" id="1738" />
-<TGConnectingPoint num="3" id="1739" />
-<TGConnectingPoint num="4" id="1740" />
-<TGConnectingPoint num="5" id="1741" />
-<TGConnectingPoint num="6" id="1742" />
-<TGConnectingPoint num="7" id="1743" />
-<TGConnectingPoint num="8" id="1744" />
-<TGConnectingPoint num="9" id="1745" />
-<TGConnectingPoint num="10" id="1746" />
-<TGConnectingPoint num="11" id="1747" />
-<TGConnectingPoint num="12" id="1748" />
-<TGConnectingPoint num="13" id="1749" />
-<TGConnectingPoint num="14" id="1750" />
-<TGConnectingPoint num="15" id="1751" />
-<TGConnectingPoint num="16" id="1752" />
-<TGConnectingPoint num="17" id="1753" />
-<TGConnectingPoint num="18" id="1754" />
-<TGConnectingPoint num="19" id="1755" />
-<TGConnectingPoint num="20" id="1756" />
-<TGConnectingPoint num="21" id="1757" />
-<TGConnectingPoint num="22" id="1758" />
-<TGConnectingPoint num="23" id="1759" />
-<TGConnectingPoint num="24" id="1760" />
-<TGConnectingPoint num="25" id="1761" />
-<TGConnectingPoint num="26" id="1762" />
-<TGConnectingPoint num="27" id="1763" />
-<TGConnectingPoint num="28" id="1764" />
-<TGConnectingPoint num="29" id="1765" />
-<TGConnectingPoint num="30" id="1766" />
-<TGConnectingPoint num="31" id="1767" />
-<TGConnectingPoint num="32" id="1768" />
-<TGConnectingPoint num="33" id="1769" />
-<TGConnectingPoint num="34" id="1770" />
-<TGConnectingPoint num="35" id="1771" />
-<TGConnectingPoint num="36" id="1772" />
-<TGConnectingPoint num="37" id="1773" />
-<TGConnectingPoint num="38" id="1774" />
-<TGConnectingPoint num="39" id="1775" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1817" >
-<cdparam x="364" y="238" />
-<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="receiveMessage" />
+<TGConnectingPoint num="0" id="1837" />
+<TGConnectingPoint num="1" id="1838" />
+<TGConnectingPoint num="2" id="1839" />
+<TGConnectingPoint num="3" id="1840" />
+<TGConnectingPoint num="4" id="1841" />
+<TGConnectingPoint num="5" id="1842" />
+<TGConnectingPoint num="6" id="1843" />
+<TGConnectingPoint num="7" id="1844" />
+<TGConnectingPoint num="8" id="1845" />
+<TGConnectingPoint num="9" id="1846" />
+<TGConnectingPoint num="10" id="1847" />
+<TGConnectingPoint num="11" id="1848" />
+<TGConnectingPoint num="12" id="1849" />
+<TGConnectingPoint num="13" id="1850" />
+<TGConnectingPoint num="14" id="1851" />
+<TGConnectingPoint num="15" id="1852" />
+<TGConnectingPoint num="16" id="1853" />
+<TGConnectingPoint num="17" id="1854" />
+<TGConnectingPoint num="18" id="1855" />
+<TGConnectingPoint num="19" id="1856" />
+<TGConnectingPoint num="20" id="1857" />
+<TGConnectingPoint num="21" id="1858" />
+<TGConnectingPoint num="22" id="1859" />
+<TGConnectingPoint num="23" id="1860" />
+<TGConnectingPoint num="24" id="1861" />
+<TGConnectingPoint num="25" id="1862" />
+<TGConnectingPoint num="26" id="1863" />
+<TGConnectingPoint num="27" id="1864" />
+<TGConnectingPoint num="28" id="1865" />
+<TGConnectingPoint num="29" id="1866" />
+<TGConnectingPoint num="30" id="1867" />
+<TGConnectingPoint num="31" id="1868" />
+<TGConnectingPoint num="32" id="1869" />
+<TGConnectingPoint num="33" id="1870" />
+<TGConnectingPoint num="34" id="1871" />
+<TGConnectingPoint num="35" id="1872" />
+<TGConnectingPoint num="36" id="1873" />
+<TGConnectingPoint num="37" id="1874" />
+<TGConnectingPoint num="38" id="1875" />
+<TGConnectingPoint num="39" id="1876" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1888" >
+<cdparam x="366" y="1000" />
+<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="VerifyServerCert" />
-<TGConnectingPoint num="0" id="1777" />
-<TGConnectingPoint num="1" id="1778" />
-<TGConnectingPoint num="2" id="1779" />
-<TGConnectingPoint num="3" id="1780" />
-<TGConnectingPoint num="4" id="1781" />
-<TGConnectingPoint num="5" id="1782" />
-<TGConnectingPoint num="6" id="1783" />
-<TGConnectingPoint num="7" id="1784" />
-<TGConnectingPoint num="8" id="1785" />
-<TGConnectingPoint num="9" id="1786" />
-<TGConnectingPoint num="10" id="1787" />
-<TGConnectingPoint num="11" id="1788" />
-<TGConnectingPoint num="12" id="1789" />
-<TGConnectingPoint num="13" id="1790" />
-<TGConnectingPoint num="14" id="1791" />
-<TGConnectingPoint num="15" id="1792" />
-<TGConnectingPoint num="16" id="1793" />
-<TGConnectingPoint num="17" id="1794" />
-<TGConnectingPoint num="18" id="1795" />
-<TGConnectingPoint num="19" id="1796" />
-<TGConnectingPoint num="20" id="1797" />
-<TGConnectingPoint num="21" id="1798" />
-<TGConnectingPoint num="22" id="1799" />
-<TGConnectingPoint num="23" id="1800" />
-<TGConnectingPoint num="24" id="1801" />
-<TGConnectingPoint num="25" id="1802" />
-<TGConnectingPoint num="26" id="1803" />
-<TGConnectingPoint num="27" id="1804" />
-<TGConnectingPoint num="28" id="1805" />
-<TGConnectingPoint num="29" id="1806" />
-<TGConnectingPoint num="30" id="1807" />
-<TGConnectingPoint num="31" id="1808" />
-<TGConnectingPoint num="32" id="1809" />
-<TGConnectingPoint num="33" id="1810" />
-<TGConnectingPoint num="34" id="1811" />
-<TGConnectingPoint num="35" id="1812" />
-<TGConnectingPoint num="36" id="1813" />
-<TGConnectingPoint num="37" id="1814" />
-<TGConnectingPoint num="38" id="1815" />
-<TGConnectingPoint num="39" id="1816" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1828" >
-<cdparam x="363" y="148" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="1878" />
+<TGConnectingPoint num="1" id="1879" />
+<TGConnectingPoint num="2" id="1880" />
+<TGConnectingPoint num="3" id="1881" />
+<TGConnectingPoint num="4" id="1882" />
+<TGConnectingPoint num="5" id="1883" />
+<TGConnectingPoint num="6" id="1884" />
+<TGConnectingPoint num="7" id="1885" />
+<TGConnectingPoint num="8" id="1886" />
+<TGConnectingPoint num="9" id="1887" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1899" >
+<cdparam x="365" y="951" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="1889" />
+<TGConnectingPoint num="1" id="1890" />
+<TGConnectingPoint num="2" id="1891" />
+<TGConnectingPoint num="3" id="1892" />
+<TGConnectingPoint num="4" id="1893" />
+<TGConnectingPoint num="5" id="1894" />
+<TGConnectingPoint num="6" id="1895" />
+<TGConnectingPoint num="7" id="1896" />
+<TGConnectingPoint num="8" id="1897" />
+<TGConnectingPoint num="9" id="1898" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1910" >
+<cdparam x="366" y="241" />
+<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="1818" />
-<TGConnectingPoint num="1" id="1819" />
-<TGConnectingPoint num="2" id="1820" />
-<TGConnectingPoint num="3" id="1821" />
-<TGConnectingPoint num="4" id="1822" />
-<TGConnectingPoint num="5" id="1823" />
-<TGConnectingPoint num="6" id="1824" />
-<TGConnectingPoint num="7" id="1825" />
-<TGConnectingPoint num="8" id="1826" />
-<TGConnectingPoint num="9" id="1827" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1839" >
-<cdparam x="346" y="96" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1900" />
+<TGConnectingPoint num="1" id="1901" />
+<TGConnectingPoint num="2" id="1902" />
+<TGConnectingPoint num="3" id="1903" />
+<TGConnectingPoint num="4" id="1904" />
+<TGConnectingPoint num="5" id="1905" />
+<TGConnectingPoint num="6" id="1906" />
+<TGConnectingPoint num="7" id="1907" />
+<TGConnectingPoint num="8" id="1908" />
+<TGConnectingPoint num="9" id="1909" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1921" >
+<cdparam x="365" y="195" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(clientHello)" />
-<TGConnectingPoint num="0" id="1829" />
-<TGConnectingPoint num="1" id="1830" />
-<TGConnectingPoint num="2" id="1831" />
-<TGConnectingPoint num="3" id="1832" />
-<TGConnectingPoint num="4" id="1833" />
-<TGConnectingPoint num="5" id="1834" />
-<TGConnectingPoint num="6" id="1835" />
-<TGConnectingPoint num="7" id="1836" />
-<TGConnectingPoint num="8" id="1837" />
-<TGConnectingPoint num="9" id="1838" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1841" >
-<cdparam x="400" y="15" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="1911" />
+<TGConnectingPoint num="1" id="1912" />
+<TGConnectingPoint num="2" id="1913" />
+<TGConnectingPoint num="3" id="1914" />
+<TGConnectingPoint num="4" id="1915" />
+<TGConnectingPoint num="5" id="1916" />
+<TGConnectingPoint num="6" id="1917" />
+<TGConnectingPoint num="7" id="1918" />
+<TGConnectingPoint num="8" id="1919" />
+<TGConnectingPoint num="9" id="1920" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1932" >
+<cdparam x="353" y="129" />
+<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(clientHello)" />
+<TGConnectingPoint num="0" id="1922" />
+<TGConnectingPoint num="1" id="1923" />
+<TGConnectingPoint num="2" id="1924" />
+<TGConnectingPoint num="3" id="1925" />
+<TGConnectingPoint num="4" id="1926" />
+<TGConnectingPoint num="5" id="1927" />
+<TGConnectingPoint num="6" id="1928" />
+<TGConnectingPoint num="7" id="1929" />
+<TGConnectingPoint num="8" id="1930" />
+<TGConnectingPoint num="9" id="1931" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1934" >
+<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="1840" />
+<TGConnectingPoint num="0" id="1933" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="1848" >
-<cdparam x="338" y="605" />
-<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="1847" />
-<P1  x="338" y="605" id="1964" />
-<P2  x="161" y="744" id="2074" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1846" >
-<father id="1848" num="0" />
-<cdparam x="225" y="652" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1842" />
-<TGConnectingPoint num="1" id="1843" />
-<TGConnectingPoint num="2" id="1844" />
-<TGConnectingPoint num="3" id="1845" />
-<extraparam>
-<guard value="[ else ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1855" >
-<cdparam x="407" y="266" />
+<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="1941" >
+<cdparam x="407" y="35" />
 <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="1854" />
-<P1  x="407" y="266" id="2211" />
-<P2  x="407" y="344" id="2023" />
+<TGConnectingPoint num="0" id="1940" />
+<P1  x="407" y="35" id="2243" />
+<P2  x="407" y="91" id="2232" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1853" >
-<father id="1855" num="0" />
-<cdparam x="429" y="288" />
-<sizeparam width="256" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1939" >
+<father id="1941" num="0" />
+<cdparam x="421" y="56" />
+<sizeparam width="220" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1849" />
-<TGConnectingPoint num="1" id="1850" />
-<TGConnectingPoint num="2" id="1851" />
-<TGConnectingPoint num="3" id="1852" />
+<TGConnectingPoint num="0" id="1935" />
+<TGConnectingPoint num="1" id="1936" />
+<TGConnectingPoint num="2" id="1937" />
+<TGConnectingPoint num="3" id="1938" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(filler1,filler3,signature)" />
-<actions value="get3(filler3, clientCert, filler1, filler2)" />
-<actions value="certVerified = verifyCert(clientCert, CAPubK)" />
+<actions value="filler1 = sign(clientPubK, CAPrivK)" />
+<actions value="clientCert = cert(clientPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1862" >
-<cdparam x="353" y="714" />
+<CONNECTOR type="5102" id="1948" >
+<cdparam x="528" y="626" />
 <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="1861" />
-<P1  x="337" y="772" id="1993" />
-<P2  x="161" y="757" id="2067" />
+<TGConnectingPoint num="0" id="1947" />
+<P1  x="528" y="714" id="2076" />
+<P2  x="242" y="496" id="2165" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1860" >
-<father id="1862" num="0" />
-<cdparam x="246" y="754" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1946" >
+<father id="1948" num="0" />
+<cdparam x="412" y="686" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1856" />
-<TGConnectingPoint num="1" id="1857" />
-<TGConnectingPoint num="2" id="1858" />
-<TGConnectingPoint num="3" id="1859" />
+<TGConnectingPoint num="0" id="1942" />
+<TGConnectingPoint num="1" id="1943" />
+<TGConnectingPoint num="2" id="1944" />
+<TGConnectingPoint num="3" id="1945" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -4111,27 +4224,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1869" >
-<cdparam x="407" y="809" />
+<CONNECTOR type="5102" id="1955" >
+<cdparam x="407" y="288" />
 <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="1868" />
-<P1  x="407" y="785" id="1987" />
-<P2  x="407" y="839" id="2105" />
+<TGConnectingPoint num="0" id="1954" />
+<P1  x="407" y="288" id="2194" />
+<P2  x="217" y="465" id="2148" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1867" >
-<father id="1869" num="0" />
-<cdparam x="430" y="818" />
-<sizeparam width="84" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1953" >
+<father id="1955" num="0" />
+<cdparam x="261" y="362" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1863" />
-<TGConnectingPoint num="1" id="1864" />
-<TGConnectingPoint num="2" id="1865" />
-<TGConnectingPoint num="3" id="1866" />
+<TGConnectingPoint num="0" id="1949" />
+<TGConnectingPoint num="1" id="1950" />
+<TGConnectingPoint num="2" id="1951" />
+<TGConnectingPoint num="3" id="1952" />
 <extraparam>
-<guard value="[ signVerified ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4139,27 +4252,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1876" >
-<cdparam x="356" y="427" />
+<CONNECTOR type="5102" id="1962" >
+<cdparam x="407" y="107" />
 <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="1875" />
-<P1  x="356" y="394" id="2050" />
-<P2  x="148" y="732" id="2082" />
+<TGConnectingPoint num="0" id="1961" />
+<P1  x="407" y="121" id="2233" />
+<P2  x="407" y="143" id="2221" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1874" >
-<father id="1876" num="0" />
-<cdparam x="202" y="563" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1960" >
+<father id="1962" num="0" />
+<cdparam x="407" y="147" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1870" />
-<TGConnectingPoint num="1" id="1871" />
-<TGConnectingPoint num="2" id="1872" />
-<TGConnectingPoint num="3" id="1873" />
+<TGConnectingPoint num="0" id="1956" />
+<TGConnectingPoint num="1" id="1957" />
+<TGConnectingPoint num="2" id="1958" />
+<TGConnectingPoint num="3" id="1959" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4167,115 +4280,119 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1883" >
-<cdparam x="407" y="903" />
+<CONNECTOR type="5102" id="1969" >
+<cdparam x="407" y="198" />
 <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="1882" />
-<P1  x="407" y="889" id="2110" />
-<P2  x="407" y="946" id="2199" />
+<TGConnectingPoint num="0" id="1968" />
+<P1  x="407" y="173" id="2222" />
+<P2  x="407" y="238" id="2188" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1881" >
-<father id="1883" num="0" />
-<cdparam x="426" y="909" />
-<sizeparam width="271" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1967" >
+<father id="1969" num="0" />
+<cdparam x="417" y="193" />
+<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1877" />
-<TGConnectingPoint num="1" id="1878" />
-<TGConnectingPoint num="2" id="1879" />
-<TGConnectingPoint num="3" id="1880" />
+<TGConnectingPoint num="0" id="1963" />
+<TGConnectingPoint num="1" id="1964" />
+<TGConnectingPoint num="2" id="1965" />
+<TGConnectingPoint num="3" id="1966" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
-<actions value="MS = hash(filler1)" />
-<actions value="filler1 = hash(MS)" />
+<actions value="get2(filler1, serverHello, serverCert) " />
+<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1890" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="1976" >
+<cdparam x="514" y="288" />
 <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="1889" />
-<P1  x="407" y="70" id="2243" />
-<P2  x="407" y="124" id="2232" />
+<TGConnectingPoint num="0" id="1975" />
+<P1  x="514" y="288" id="2211" />
+<P2  x="540" y="341" id="2136" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1888" >
-<father id="1890" num="0" />
-<cdparam x="416" y="96" />
-<sizeparam width="215" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1974" >
+<father id="1976" num="0" />
+<cdparam x="546" y="308" />
+<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1884" />
-<TGConnectingPoint num="1" id="1885" />
-<TGConnectingPoint num="2" id="1886" />
-<TGConnectingPoint num="3" id="1887" />
+<TGConnectingPoint num="0" id="1970" />
+<TGConnectingPoint num="1" id="1971" />
+<TGConnectingPoint num="2" id="1972" />
+<TGConnectingPoint num="3" id="1973" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ certVerified ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sign(serverPubK, CAPrivK)" />
-<actions value="serverCert = cert(serverPubK, filler1)" />
+<actions value="serverPubK = getpk(serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1897" >
-<cdparam x="407" y="207" />
+<CONNECTOR type="5102" id="1983" >
+<cdparam x="540" y="371" />
 <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="1896" />
-<P1  x="407" y="154" id="2233" />
-<P2  x="407" y="190" id="2221" />
+<TGConnectingPoint num="0" id="1982" />
+<P1  x="540" y="371" id="2137" />
+<P2  x="540" y="511" id="2125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1895" >
-<father id="1897" num="0" />
-<cdparam x="420" y="178" />
-<sizeparam width="237" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1981" >
+<father id="1983" num="0" />
+<cdparam x="566" y="394" />
+<sizeparam width="257" height="105" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1891" />
-<TGConnectingPoint num="1" id="1892" />
-<TGConnectingPoint num="2" id="1893" />
-<TGConnectingPoint num="3" id="1894" />
+<TGConnectingPoint num="0" id="1977" />
+<TGConnectingPoint num="1" id="1978" />
+<TGConnectingPoint num="2" id="1979" />
+<TGConnectingPoint num="3" id="1980" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = concat2(serverHello, serverCert)" />
+<actions value="filler1.data = PMS" />
+<actions value="filler1 = aencrypt(filler1, serverPubK)" />
+<actions value="filler2 = concat2(clientHello, serverHello)" />
+<actions value="filler2 = sign(filler2, clientPrivK)" />
+<actions value="filler2 = concat3(clientCert, filler1, filler2)" />
+<actions value="filler1 = sign(filler2, clientPrivK)" />
+<actions value="filler2 = concat2(filler2,filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1904" >
-<cdparam x="407" y="242" />
+<CONNECTOR type="5102" id="1990" >
+<cdparam x="540" y="541" />
 <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="1903" />
-<P1  x="407" y="220" id="2222" />
-<P2  x="407" y="236" id="2210" />
+<TGConnectingPoint num="0" id="1989" />
+<P1  x="540" y="541" id="2126" />
+<P2  x="540" y="578" id="2114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1902" >
-<father id="1904" num="0" />
-<cdparam x="315" y="335" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1988" >
+<father id="1990" num="0" />
+<cdparam x="540" y="581" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1898" />
-<TGConnectingPoint num="1" id="1899" />
-<TGConnectingPoint num="2" id="1900" />
-<TGConnectingPoint num="3" id="1901" />
+<TGConnectingPoint num="0" id="1984" />
+<TGConnectingPoint num="1" id="1985" />
+<TGConnectingPoint num="2" id="1986" />
+<TGConnectingPoint num="3" id="1987" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4285,56 +4402,58 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1911" >
-<cdparam x="407" y="572" />
+<CONNECTOR type="5102" id="1997" >
+<cdparam x="540" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1910" />
-<P1  x="407" y="624" id="1946" />
-<P2  x="407" y="735" id="1982" />
+<TGConnectingPoint num="0" id="1996" />
+<P1  x="540" y="608" id="2115" />
+<P2  x="540" y="689" id="2089" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1909" >
-<father id="1911" num="0" />
-<cdparam x="437" y="674" />
-<sizeparam width="294" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1995" >
+<father id="1997" num="0" />
+<cdparam x="556" y="635" />
+<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1905" />
-<TGConnectingPoint num="1" id="1906" />
-<TGConnectingPoint num="2" id="1907" />
-<TGConnectingPoint num="3" id="1908" />
+<TGConnectingPoint num="0" id="1991" />
+<TGConnectingPoint num="1" id="1992" />
+<TGConnectingPoint num="2" id="1993" />
+<TGConnectingPoint num="3" id="1994" />
 <extraparam>
-<guard value="[ signVerified ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="signVerified = verifySign(filler1, filler2, clientPubK) " />
+<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
+<actions value="MS = hash(filler2)" />
+<actions value="filler2 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1918" >
-<cdparam x="407" y="973" />
+<CONNECTOR type="5102" id="2004" >
+<cdparam x="578" y="739" />
 <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="1917" />
-<P1  x="407" y="976" id="2200" />
-<P2  x="407" y="995" id="2188" />
+<TGConnectingPoint num="0" id="2003" />
+<P1  x="578" y="739" id="2079" />
+<P2  x="578" y="780" id="2033" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1916" >
-<father id="1918" num="0" />
-<cdparam x="407" y="1013" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2002" >
+<father id="2004" num="0" />
+<cdparam x="591" y="766" />
+<sizeparam width="180" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1912" />
-<TGConnectingPoint num="1" id="1913" />
-<TGConnectingPoint num="2" id="1914" />
-<TGConnectingPoint num="3" id="1915" />
+<TGConnectingPoint num="0" id="1998" />
+<TGConnectingPoint num="1" id="1999" />
+<TGConnectingPoint num="2" id="2000" />
+<TGConnectingPoint num="3" id="2001" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ filler1.data == filler2.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4342,54 +4461,54 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1925" >
-<cdparam x="407" y="1025" />
+<CONNECTOR type="5102" id="2011" >
+<cdparam x="565" y="830" />
 <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="1924" />
-<P1  x="407" y="1025" id="2189" />
-<P2  x="407" y="1081" id="2155" />
+<TGConnectingPoint num="0" id="2010" />
+<P1  x="565" y="830" id="2061" />
+<P2  x="565" y="876" id="2021" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1923" >
-<father id="1925" num="0" />
-<cdparam x="427" y="1053" />
-<sizeparam width="218" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2009" >
+<father id="2011" num="0" />
+<cdparam x="584" y="859" />
+<sizeparam width="242" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1919" />
-<TGConnectingPoint num="1" id="1920" />
-<TGConnectingPoint num="2" id="1921" />
-<TGConnectingPoint num="3" id="1922" />
+<TGConnectingPoint num="0" id="2005" />
+<TGConnectingPoint num="1" id="2006" />
+<TGConnectingPoint num="2" id="2007" />
+<TGConnectingPoint num="3" id="2008" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="secretMessage = sdecrypt(filler1, MS)" />
+<actions value="filler1 = sencrypt(secretMessage, MS) " />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1932" >
-<cdparam x="453" y="1131" />
+<CONNECTOR type="5102" id="2018" >
+<cdparam x="565" y="891" />
 <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="1931" />
-<P1  x="453" y="1131" id="2177" />
-<P2  x="453" y="1184" id="2145" />
+<TGConnectingPoint num="0" id="2017" />
+<P1  x="565" y="906" id="2022" />
+<P2  x="565" y="921" id="2019" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1930" >
-<father id="1932" num="0" />
-<cdparam x="453" y="1171" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2016" >
+<father id="2018" num="0" />
+<cdparam x="565" y="931" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1926" />
-<TGConnectingPoint num="1" id="1927" />
-<TGConnectingPoint num="2" id="1928" />
-<TGConnectingPoint num="3" id="1929" />
+<TGConnectingPoint num="0" id="2012" />
+<TGConnectingPoint num="1" id="2013" />
+<TGConnectingPoint num="2" id="2014" />
+<TGConnectingPoint num="3" id="2015" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4399,407 +4518,288 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1939" >
-<cdparam x="434" y="447" />
-<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="1938" />
-<P1  x="407" y="394" id="2028" />
-<P2  x="407" y="574" id="1941" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1937" >
-<father id="1939" num="0" />
-<cdparam x="436" y="440" />
-<sizeparam width="302" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="2020" >
+<cdparam x="555" y="926" />
+<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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1933" />
-<TGConnectingPoint num="1" id="1934" />
-<TGConnectingPoint num="2" id="1935" />
-<TGConnectingPoint num="3" id="1936" />
-<extraparam>
-<guard value="[ certVerified ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="PMS = adecrypt(filler1, serverPrivK)" />
-<actions value="filler1 = concat2(clientHello, serverHello)" />
-<actions value="clientPubK = getpk(clientCert)" />
-<actions value="signVerified = verifySign(filler3,signature,clientPubK)" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="2019" />
+</COMPONENT>
 
-<COMPONENT type="5106" id="1980" >
-<cdparam x="338" y="574" />
-<sizeparam width="139" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2031" >
+<cdparam x="520" y="881" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verifyFirstSign" />
-<TGConnectingPoint num="0" id="1940" />
-<TGConnectingPoint num="1" id="1941" />
-<TGConnectingPoint num="2" id="1942" />
-<TGConnectingPoint num="3" id="1943" />
-<TGConnectingPoint num="4" id="1944" />
-<TGConnectingPoint num="5" id="1945" />
-<TGConnectingPoint num="6" id="1946" />
-<TGConnectingPoint num="7" id="1947" />
-<TGConnectingPoint num="8" id="1948" />
-<TGConnectingPoint num="9" id="1949" />
-<TGConnectingPoint num="10" id="1950" />
-<TGConnectingPoint num="11" id="1951" />
-<TGConnectingPoint num="12" id="1952" />
-<TGConnectingPoint num="13" id="1953" />
-<TGConnectingPoint num="14" id="1954" />
-<TGConnectingPoint num="15" id="1955" />
-<TGConnectingPoint num="16" id="1956" />
-<TGConnectingPoint num="17" id="1957" />
-<TGConnectingPoint num="18" id="1958" />
-<TGConnectingPoint num="19" id="1959" />
-<TGConnectingPoint num="20" id="1960" />
-<TGConnectingPoint num="21" id="1961" />
-<TGConnectingPoint num="22" id="1962" />
-<TGConnectingPoint num="23" id="1963" />
-<TGConnectingPoint num="24" id="1964" />
-<TGConnectingPoint num="25" id="1965" />
-<TGConnectingPoint num="26" id="1966" />
-<TGConnectingPoint num="27" id="1967" />
-<TGConnectingPoint num="28" id="1968" />
-<TGConnectingPoint num="29" id="1969" />
-<TGConnectingPoint num="30" id="1970" />
-<TGConnectingPoint num="31" id="1971" />
-<TGConnectingPoint num="32" id="1972" />
-<TGConnectingPoint num="33" id="1973" />
-<TGConnectingPoint num="34" id="1974" />
-<TGConnectingPoint num="35" id="1975" />
-<TGConnectingPoint num="36" id="1976" />
-<TGConnectingPoint num="37" id="1977" />
-<TGConnectingPoint num="38" id="1978" />
-<TGConnectingPoint num="39" id="1979" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2021" >
-<cdparam x="337" y="735" />
-<sizeparam width="141" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="2021" />
+<TGConnectingPoint num="1" id="2022" />
+<TGConnectingPoint num="2" id="2023" />
+<TGConnectingPoint num="3" id="2024" />
+<TGConnectingPoint num="4" id="2025" />
+<TGConnectingPoint num="5" id="2026" />
+<TGConnectingPoint num="6" id="2027" />
+<TGConnectingPoint num="7" id="2028" />
+<TGConnectingPoint num="8" id="2029" />
+<TGConnectingPoint num="9" id="2030" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2072" >
+<cdparam x="528" y="780" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verifyClientSign" />
-<TGConnectingPoint num="0" id="1981" />
-<TGConnectingPoint num="1" id="1982" />
-<TGConnectingPoint num="2" id="1983" />
-<TGConnectingPoint num="3" id="1984" />
-<TGConnectingPoint num="4" id="1985" />
-<TGConnectingPoint num="5" id="1986" />
-<TGConnectingPoint num="6" id="1987" />
-<TGConnectingPoint num="7" id="1988" />
-<TGConnectingPoint num="8" id="1989" />
-<TGConnectingPoint num="9" id="1990" />
-<TGConnectingPoint num="10" id="1991" />
-<TGConnectingPoint num="11" id="1992" />
-<TGConnectingPoint num="12" id="1993" />
-<TGConnectingPoint num="13" id="1994" />
-<TGConnectingPoint num="14" id="1995" />
-<TGConnectingPoint num="15" id="1996" />
-<TGConnectingPoint num="16" id="1997" />
-<TGConnectingPoint num="17" id="1998" />
-<TGConnectingPoint num="18" id="1999" />
-<TGConnectingPoint num="19" id="2000" />
-<TGConnectingPoint num="20" id="2001" />
-<TGConnectingPoint num="21" id="2002" />
-<TGConnectingPoint num="22" id="2003" />
-<TGConnectingPoint num="23" id="2004" />
-<TGConnectingPoint num="24" id="2005" />
-<TGConnectingPoint num="25" id="2006" />
-<TGConnectingPoint num="26" id="2007" />
-<TGConnectingPoint num="27" id="2008" />
-<TGConnectingPoint num="28" id="2009" />
-<TGConnectingPoint num="29" id="2010" />
-<TGConnectingPoint num="30" id="2011" />
-<TGConnectingPoint num="31" id="2012" />
-<TGConnectingPoint num="32" id="2013" />
-<TGConnectingPoint num="33" id="2014" />
-<TGConnectingPoint num="34" id="2015" />
-<TGConnectingPoint num="35" id="2016" />
-<TGConnectingPoint num="36" id="2017" />
-<TGConnectingPoint num="37" id="2018" />
-<TGConnectingPoint num="38" id="2019" />
-<TGConnectingPoint num="39" id="2020" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2062" >
-<cdparam x="341" y="344" />
-<sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="sendMessage" />
+<TGConnectingPoint num="0" id="2032" />
+<TGConnectingPoint num="1" id="2033" />
+<TGConnectingPoint num="2" id="2034" />
+<TGConnectingPoint num="3" id="2035" />
+<TGConnectingPoint num="4" id="2036" />
+<TGConnectingPoint num="5" id="2037" />
+<TGConnectingPoint num="6" id="2038" />
+<TGConnectingPoint num="7" id="2039" />
+<TGConnectingPoint num="8" id="2040" />
+<TGConnectingPoint num="9" id="2041" />
+<TGConnectingPoint num="10" id="2042" />
+<TGConnectingPoint num="11" id="2043" />
+<TGConnectingPoint num="12" id="2044" />
+<TGConnectingPoint num="13" id="2045" />
+<TGConnectingPoint num="14" id="2046" />
+<TGConnectingPoint num="15" id="2047" />
+<TGConnectingPoint num="16" id="2048" />
+<TGConnectingPoint num="17" id="2049" />
+<TGConnectingPoint num="18" id="2050" />
+<TGConnectingPoint num="19" id="2051" />
+<TGConnectingPoint num="20" id="2052" />
+<TGConnectingPoint num="21" id="2053" />
+<TGConnectingPoint num="22" id="2054" />
+<TGConnectingPoint num="23" id="2055" />
+<TGConnectingPoint num="24" id="2056" />
+<TGConnectingPoint num="25" id="2057" />
+<TGConnectingPoint num="26" id="2058" />
+<TGConnectingPoint num="27" id="2059" />
+<TGConnectingPoint num="28" id="2060" />
+<TGConnectingPoint num="29" id="2061" />
+<TGConnectingPoint num="30" id="2062" />
+<TGConnectingPoint num="31" id="2063" />
+<TGConnectingPoint num="32" id="2064" />
+<TGConnectingPoint num="33" id="2065" />
+<TGConnectingPoint num="34" id="2066" />
+<TGConnectingPoint num="35" id="2067" />
+<TGConnectingPoint num="36" id="2068" />
+<TGConnectingPoint num="37" id="2069" />
+<TGConnectingPoint num="38" id="2070" />
+<TGConnectingPoint num="39" id="2071" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2113" >
+<cdparam x="528" y="689" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verifyClientCert" />
-<TGConnectingPoint num="0" id="2022" />
-<TGConnectingPoint num="1" id="2023" />
-<TGConnectingPoint num="2" id="2024" />
-<TGConnectingPoint num="3" id="2025" />
-<TGConnectingPoint num="4" id="2026" />
-<TGConnectingPoint num="5" id="2027" />
-<TGConnectingPoint num="6" id="2028" />
-<TGConnectingPoint num="7" id="2029" />
-<TGConnectingPoint num="8" id="2030" />
-<TGConnectingPoint num="9" id="2031" />
-<TGConnectingPoint num="10" id="2032" />
-<TGConnectingPoint num="11" id="2033" />
-<TGConnectingPoint num="12" id="2034" />
-<TGConnectingPoint num="13" id="2035" />
-<TGConnectingPoint num="14" id="2036" />
-<TGConnectingPoint num="15" id="2037" />
-<TGConnectingPoint num="16" id="2038" />
-<TGConnectingPoint num="17" id="2039" />
-<TGConnectingPoint num="18" id="2040" />
-<TGConnectingPoint num="19" id="2041" />
-<TGConnectingPoint num="20" id="2042" />
-<TGConnectingPoint num="21" id="2043" />
-<TGConnectingPoint num="22" id="2044" />
-<TGConnectingPoint num="23" id="2045" />
-<TGConnectingPoint num="24" id="2046" />
-<TGConnectingPoint num="25" id="2047" />
-<TGConnectingPoint num="26" id="2048" />
-<TGConnectingPoint num="27" id="2049" />
-<TGConnectingPoint num="28" id="2050" />
-<TGConnectingPoint num="29" id="2051" />
-<TGConnectingPoint num="30" id="2052" />
-<TGConnectingPoint num="31" id="2053" />
-<TGConnectingPoint num="32" id="2054" />
-<TGConnectingPoint num="33" id="2055" />
-<TGConnectingPoint num="34" id="2056" />
-<TGConnectingPoint num="35" id="2057" />
-<TGConnectingPoint num="36" id="2058" />
-<TGConnectingPoint num="37" id="2059" />
-<TGConnectingPoint num="38" id="2060" />
-<TGConnectingPoint num="39" id="2061" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2103" >
-<cdparam x="61" y="732" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="checkMS" />
+<TGConnectingPoint num="0" id="2073" />
+<TGConnectingPoint num="1" id="2074" />
+<TGConnectingPoint num="2" id="2075" />
+<TGConnectingPoint num="3" id="2076" />
+<TGConnectingPoint num="4" id="2077" />
+<TGConnectingPoint num="5" id="2078" />
+<TGConnectingPoint num="6" id="2079" />
+<TGConnectingPoint num="7" id="2080" />
+<TGConnectingPoint num="8" id="2081" />
+<TGConnectingPoint num="9" id="2082" />
+<TGConnectingPoint num="10" id="2083" />
+<TGConnectingPoint num="11" id="2084" />
+<TGConnectingPoint num="12" id="2085" />
+<TGConnectingPoint num="13" id="2086" />
+<TGConnectingPoint num="14" id="2087" />
+<TGConnectingPoint num="15" id="2088" />
+<TGConnectingPoint num="16" id="2089" />
+<TGConnectingPoint num="17" id="2090" />
+<TGConnectingPoint num="18" id="2091" />
+<TGConnectingPoint num="19" id="2092" />
+<TGConnectingPoint num="20" id="2093" />
+<TGConnectingPoint num="21" id="2094" />
+<TGConnectingPoint num="22" id="2095" />
+<TGConnectingPoint num="23" id="2096" />
+<TGConnectingPoint num="24" id="2097" />
+<TGConnectingPoint num="25" id="2098" />
+<TGConnectingPoint num="26" id="2099" />
+<TGConnectingPoint num="27" id="2100" />
+<TGConnectingPoint num="28" id="2101" />
+<TGConnectingPoint num="29" id="2102" />
+<TGConnectingPoint num="30" id="2103" />
+<TGConnectingPoint num="31" id="2104" />
+<TGConnectingPoint num="32" id="2105" />
+<TGConnectingPoint num="33" id="2106" />
+<TGConnectingPoint num="34" id="2107" />
+<TGConnectingPoint num="35" id="2108" />
+<TGConnectingPoint num="36" id="2109" />
+<TGConnectingPoint num="37" id="2110" />
+<TGConnectingPoint num="38" id="2111" />
+<TGConnectingPoint num="39" id="2112" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2124" >
+<cdparam x="496" y="583" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="error" />
-<TGConnectingPoint num="0" id="2063" />
-<TGConnectingPoint num="1" id="2064" />
-<TGConnectingPoint num="2" id="2065" />
-<TGConnectingPoint num="3" id="2066" />
-<TGConnectingPoint num="4" id="2067" />
-<TGConnectingPoint num="5" id="2068" />
-<TGConnectingPoint num="6" id="2069" />
-<TGConnectingPoint num="7" id="2070" />
-<TGConnectingPoint num="8" id="2071" />
-<TGConnectingPoint num="9" id="2072" />
-<TGConnectingPoint num="10" id="2073" />
-<TGConnectingPoint num="11" id="2074" />
-<TGConnectingPoint num="12" id="2075" />
-<TGConnectingPoint num="13" id="2076" />
-<TGConnectingPoint num="14" id="2077" />
-<TGConnectingPoint num="15" id="2078" />
-<TGConnectingPoint num="16" id="2079" />
-<TGConnectingPoint num="17" id="2080" />
-<TGConnectingPoint num="18" id="2081" />
-<TGConnectingPoint num="19" id="2082" />
-<TGConnectingPoint num="20" id="2083" />
-<TGConnectingPoint num="21" id="2084" />
-<TGConnectingPoint num="22" id="2085" />
-<TGConnectingPoint num="23" id="2086" />
-<TGConnectingPoint num="24" id="2087" />
-<TGConnectingPoint num="25" id="2088" />
-<TGConnectingPoint num="26" id="2089" />
-<TGConnectingPoint num="27" id="2090" />
-<TGConnectingPoint num="28" id="2091" />
-<TGConnectingPoint num="29" id="2092" />
-<TGConnectingPoint num="30" id="2093" />
-<TGConnectingPoint num="31" id="2094" />
-<TGConnectingPoint num="32" id="2095" />
-<TGConnectingPoint num="33" id="2096" />
-<TGConnectingPoint num="34" id="2097" />
-<TGConnectingPoint num="35" id="2098" />
-<TGConnectingPoint num="36" id="2099" />
-<TGConnectingPoint num="37" id="2100" />
-<TGConnectingPoint num="38" id="2101" />
-<TGConnectingPoint num="39" id="2102" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2144" >
-<cdparam x="357" y="839" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="2114" />
+<TGConnectingPoint num="1" id="2115" />
+<TGConnectingPoint num="2" id="2116" />
+<TGConnectingPoint num="3" id="2117" />
+<TGConnectingPoint num="4" id="2118" />
+<TGConnectingPoint num="5" id="2119" />
+<TGConnectingPoint num="6" id="2120" />
+<TGConnectingPoint num="7" id="2121" />
+<TGConnectingPoint num="8" id="2122" />
+<TGConnectingPoint num="9" id="2123" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="2135" >
+<cdparam x="495" y="516" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="SendingMS" />
-<TGConnectingPoint num="0" id="2104" />
-<TGConnectingPoint num="1" id="2105" />
-<TGConnectingPoint num="2" id="2106" />
-<TGConnectingPoint num="3" id="2107" />
-<TGConnectingPoint num="4" id="2108" />
-<TGConnectingPoint num="5" id="2109" />
-<TGConnectingPoint num="6" id="2110" />
-<TGConnectingPoint num="7" id="2111" />
-<TGConnectingPoint num="8" id="2112" />
-<TGConnectingPoint num="9" id="2113" />
-<TGConnectingPoint num="10" id="2114" />
-<TGConnectingPoint num="11" id="2115" />
-<TGConnectingPoint num="12" id="2116" />
-<TGConnectingPoint num="13" id="2117" />
-<TGConnectingPoint num="14" id="2118" />
-<TGConnectingPoint num="15" id="2119" />
-<TGConnectingPoint num="16" id="2120" />
-<TGConnectingPoint num="17" id="2121" />
-<TGConnectingPoint num="18" id="2122" />
-<TGConnectingPoint num="19" id="2123" />
-<TGConnectingPoint num="20" id="2124" />
-<TGConnectingPoint num="21" id="2125" />
-<TGConnectingPoint num="22" id="2126" />
-<TGConnectingPoint num="23" id="2127" />
-<TGConnectingPoint num="24" id="2128" />
-<TGConnectingPoint num="25" id="2129" />
-<TGConnectingPoint num="26" id="2130" />
-<TGConnectingPoint num="27" id="2131" />
-<TGConnectingPoint num="28" id="2132" />
-<TGConnectingPoint num="29" id="2133" />
-<TGConnectingPoint num="30" id="2134" />
-<TGConnectingPoint num="31" id="2135" />
-<TGConnectingPoint num="32" id="2136" />
-<TGConnectingPoint num="33" id="2137" />
-<TGConnectingPoint num="34" id="2138" />
-<TGConnectingPoint num="35" id="2139" />
-<TGConnectingPoint num="36" id="2140" />
-<TGConnectingPoint num="37" id="2141" />
-<TGConnectingPoint num="38" id="2142" />
-<TGConnectingPoint num="39" id="2143" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="2146" >
-<cdparam x="443" y="1189" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="chOut(filler2)" />
+<TGConnectingPoint num="0" id="2125" />
+<TGConnectingPoint num="1" id="2126" />
+<TGConnectingPoint num="2" id="2127" />
+<TGConnectingPoint num="3" id="2128" />
+<TGConnectingPoint num="4" id="2129" />
+<TGConnectingPoint num="5" id="2130" />
+<TGConnectingPoint num="6" id="2131" />
+<TGConnectingPoint num="7" id="2132" />
+<TGConnectingPoint num="8" id="2133" />
+<TGConnectingPoint num="9" id="2134" />
+</COMPONENT>
+
+<COMPONENT type="5108" id="2138" >
+<cdparam x="454" y="346" />
+<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2145" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="2136" />
+<TGConnectingPoint num="1" id="2137" />
+<extraparam>
+<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2187" >
-<cdparam x="376" y="1081" />
-<sizeparam width="125" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="receiveMessage" />
-<TGConnectingPoint num="0" id="2147" />
-<TGConnectingPoint num="1" id="2148" />
-<TGConnectingPoint num="2" id="2149" />
-<TGConnectingPoint num="3" id="2150" />
-<TGConnectingPoint num="4" id="2151" />
-<TGConnectingPoint num="5" id="2152" />
-<TGConnectingPoint num="6" id="2153" />
-<TGConnectingPoint num="7" id="2154" />
-<TGConnectingPoint num="8" id="2155" />
-<TGConnectingPoint num="9" id="2156" />
-<TGConnectingPoint num="10" id="2157" />
-<TGConnectingPoint num="11" id="2158" />
-<TGConnectingPoint num="12" id="2159" />
-<TGConnectingPoint num="13" id="2160" />
-<TGConnectingPoint num="14" id="2161" />
-<TGConnectingPoint num="15" id="2162" />
-<TGConnectingPoint num="16" id="2163" />
-<TGConnectingPoint num="17" id="2164" />
-<TGConnectingPoint num="18" id="2165" />
-<TGConnectingPoint num="19" id="2166" />
-<TGConnectingPoint num="20" id="2167" />
-<TGConnectingPoint num="21" id="2168" />
-<TGConnectingPoint num="22" id="2169" />
-<TGConnectingPoint num="23" id="2170" />
-<TGConnectingPoint num="24" id="2171" />
-<TGConnectingPoint num="25" id="2172" />
-<TGConnectingPoint num="26" id="2173" />
-<TGConnectingPoint num="27" id="2174" />
-<TGConnectingPoint num="28" id="2175" />
-<TGConnectingPoint num="29" id="2176" />
-<TGConnectingPoint num="30" id="2177" />
-<TGConnectingPoint num="31" id="2178" />
-<TGConnectingPoint num="32" id="2179" />
-<TGConnectingPoint num="33" id="2180" />
-<TGConnectingPoint num="34" id="2181" />
-<TGConnectingPoint num="35" id="2182" />
-<TGConnectingPoint num="36" id="2183" />
-<TGConnectingPoint num="37" id="2184" />
-<TGConnectingPoint num="38" id="2185" />
-<TGConnectingPoint num="39" id="2186" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="2198" >
-<cdparam x="366" y="1000" />
-<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2179" >
+<cdparam x="142" y="465" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="2188" />
-<TGConnectingPoint num="1" id="2189" />
-<TGConnectingPoint num="2" id="2190" />
-<TGConnectingPoint num="3" id="2191" />
-<TGConnectingPoint num="4" id="2192" />
-<TGConnectingPoint num="5" id="2193" />
-<TGConnectingPoint num="6" id="2194" />
-<TGConnectingPoint num="7" id="2195" />
-<TGConnectingPoint num="8" id="2196" />
-<TGConnectingPoint num="9" id="2197" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="2209" >
-<cdparam x="365" y="951" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="error" />
+<TGConnectingPoint num="0" id="2139" />
+<TGConnectingPoint num="1" id="2140" />
+<TGConnectingPoint num="2" id="2141" />
+<TGConnectingPoint num="3" id="2142" />
+<TGConnectingPoint num="4" id="2143" />
+<TGConnectingPoint num="5" id="2144" />
+<TGConnectingPoint num="6" id="2145" />
+<TGConnectingPoint num="7" id="2146" />
+<TGConnectingPoint num="8" id="2147" />
+<TGConnectingPoint num="9" id="2148" />
+<TGConnectingPoint num="10" id="2149" />
+<TGConnectingPoint num="11" id="2150" />
+<TGConnectingPoint num="12" id="2151" />
+<TGConnectingPoint num="13" id="2152" />
+<TGConnectingPoint num="14" id="2153" />
+<TGConnectingPoint num="15" id="2154" />
+<TGConnectingPoint num="16" id="2155" />
+<TGConnectingPoint num="17" id="2156" />
+<TGConnectingPoint num="18" id="2157" />
+<TGConnectingPoint num="19" id="2158" />
+<TGConnectingPoint num="20" id="2159" />
+<TGConnectingPoint num="21" id="2160" />
+<TGConnectingPoint num="22" id="2161" />
+<TGConnectingPoint num="23" id="2162" />
+<TGConnectingPoint num="24" id="2163" />
+<TGConnectingPoint num="25" id="2164" />
+<TGConnectingPoint num="26" id="2165" />
+<TGConnectingPoint num="27" id="2166" />
+<TGConnectingPoint num="28" id="2167" />
+<TGConnectingPoint num="29" id="2168" />
+<TGConnectingPoint num="30" id="2169" />
+<TGConnectingPoint num="31" id="2170" />
+<TGConnectingPoint num="32" id="2171" />
+<TGConnectingPoint num="33" id="2172" />
+<TGConnectingPoint num="34" id="2173" />
+<TGConnectingPoint num="35" id="2174" />
+<TGConnectingPoint num="36" id="2175" />
+<TGConnectingPoint num="37" id="2176" />
+<TGConnectingPoint num="38" id="2177" />
+<TGConnectingPoint num="39" id="2178" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2220" >
+<cdparam x="364" y="238" />
+<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<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="5104" id="2220" >
-<cdparam x="366" y="241" />
-<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="VerifyServerCert" />
+<TGConnectingPoint num="0" id="2180" />
+<TGConnectingPoint num="1" id="2181" />
+<TGConnectingPoint num="2" id="2182" />
+<TGConnectingPoint num="3" id="2183" />
+<TGConnectingPoint num="4" id="2184" />
+<TGConnectingPoint num="5" id="2185" />
+<TGConnectingPoint num="6" id="2186" />
+<TGConnectingPoint num="7" id="2187" />
+<TGConnectingPoint num="8" id="2188" />
+<TGConnectingPoint num="9" id="2189" />
+<TGConnectingPoint num="10" id="2190" />
+<TGConnectingPoint num="11" id="2191" />
+<TGConnectingPoint num="12" id="2192" />
+<TGConnectingPoint num="13" id="2193" />
+<TGConnectingPoint num="14" id="2194" />
+<TGConnectingPoint num="15" id="2195" />
+<TGConnectingPoint num="16" id="2196" />
+<TGConnectingPoint num="17" id="2197" />
+<TGConnectingPoint num="18" id="2198" />
+<TGConnectingPoint num="19" id="2199" />
+<TGConnectingPoint num="20" id="2200" />
+<TGConnectingPoint num="21" id="2201" />
+<TGConnectingPoint num="22" id="2202" />
+<TGConnectingPoint num="23" id="2203" />
+<TGConnectingPoint num="24" id="2204" />
+<TGConnectingPoint num="25" id="2205" />
+<TGConnectingPoint num="26" id="2206" />
+<TGConnectingPoint num="27" id="2207" />
+<TGConnectingPoint num="28" id="2208" />
+<TGConnectingPoint num="29" id="2209" />
+<TGConnectingPoint num="30" id="2210" />
+<TGConnectingPoint num="31" id="2211" />
+<TGConnectingPoint num="32" id="2212" />
+<TGConnectingPoint num="33" id="2213" />
+<TGConnectingPoint num="34" id="2214" />
+<TGConnectingPoint num="35" id="2215" />
+<TGConnectingPoint num="36" id="2216" />
+<TGConnectingPoint num="37" id="2217" />
+<TGConnectingPoint num="38" id="2218" />
+<TGConnectingPoint num="39" id="2219" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2231" >
+<cdparam x="363" y="148" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="chIn(filler1)" />
-<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" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="2231" >
-<cdparam x="365" y="195" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
 <TGConnectingPoint num="0" id="2221" />
 <TGConnectingPoint num="1" id="2222" />
 <TGConnectingPoint num="2" id="2223" />
@@ -4812,12 +4812,12 @@
 <TGConnectingPoint num="9" id="2230" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="2242" >
-<cdparam x="353" y="129" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2242" >
+<cdparam x="346" y="96" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(clientHello)" />
+<infoparam name="Send signal" value="chOut(clientHello)" />
 <TGConnectingPoint num="0" id="2232" />
 <TGConnectingPoint num="1" id="2233" />
 <TGConnectingPoint num="2" id="2234" />
@@ -4831,7 +4831,7 @@
 </COMPONENT>
 
 <COMPONENT type="5100" id="2244" >
-<cdparam x="400" y="50" />
+<cdparam x="400" y="15" />
 <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" />
@@ -4891,7 +4891,7 @@
 
 <COMPONENT type="302" id="2267" >
 <cdparam x="690" y="39" />
-<sizeparam width="442" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="487" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Proverif Pragma" value="#PrivatePublicKeys Server serverPrivK serverPubK
@@ -5003,11 +5003,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="2310" >
 <father id="2360" num="0" />
-<cdparam x="403" y="145" />
-<sizeparam width="250" height="269" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="124" y="142" />
+<sizeparam width="250" height="189" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="346" minY="0" maxY="120" />
-<infoparam name="Block0" value="Server" />
+<cdrectangleparam minX="0" maxX="346" minY="0" maxY="200" />
+<infoparam name="Block0" value="Client" />
 <TGConnectingPoint num="0" id="2286" />
 <TGConnectingPoint num="1" id="2287" />
 <TGConnectingPoint num="2" id="2288" />
@@ -5034,13 +5034,8 @@
 <TGConnectingPoint num="23" id="2309" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
 <Method value="Message aencrypt(Message msg, Key k)" />
@@ -5067,11 +5062,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2335" >
 <father id="2360" num="1" />
-<cdparam x="124" y="142" />
-<sizeparam width="250" height="189" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="403" y="145" />
+<sizeparam width="250" height="269" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="346" minY="0" maxY="200" />
-<infoparam name="Block0" value="Client" />
+<cdrectangleparam minX="0" maxX="346" minY="0" maxY="120" />
+<infoparam name="Block0" value="Server" />
 <TGConnectingPoint num="0" id="2311" />
 <TGConnectingPoint num="1" id="2312" />
 <TGConnectingPoint num="2" id="2313" />
@@ -5098,8 +5093,13 @@
 <TGConnectingPoint num="23" id="2334" />
 <extraparam>
 <CryptoBlock value="true" />
-<Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="MS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="secretMessage" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="sid" value="0" type="8" typeOther="" />
 <Method value="Message aencrypt(Message msg, Key k)" />
@@ -5161,11 +5161,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5005" id="2369" >
 <father id="2421" num="0" />
-<cdparam x="731" y="239" />
-<sizeparam width="338" height="138" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="744" y="657" />
+<sizeparam width="308" height="128" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="56" minY="0" maxY="481" />
-<infoparam name="Client_Handshake" value="Client_Handshake" />
+<cdrectangleparam minX="0" maxX="234" minY="0" maxY="519" />
+<infoparam name="Receive_Message" value="Receive_Message" />
 <TGConnectingPoint num="0" id="2361" />
 <TGConnectingPoint num="1" id="2362" />
 <TGConnectingPoint num="2" id="2363" />
@@ -5176,19 +5176,13 @@
 <TGConnectingPoint num="7" id="2368" />
 <extraparam>
 <CryptoLibraryFunction value="true" />
-<Parameter access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Parameter access="0" id="MS" value="" type="5" typeOther="Message" />
+<Parameter access="0" id="sid" value="" type="8" typeOther="" />
 <Signal value="in chIn(Message m)" />
-<Signal value="out chOut(Message m)" />
-<ReturnAttribute access="0" id="MS" value="" type="5" typeOther="Message" />
-<ReturnAttribute access="0" id="sid" value="" type="8" typeOther="" />
-<Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
+<ReturnAttribute access="0" id="newSid" value="" type="8" typeOther="" />
+<ReturnAttribute access="0" id="msg" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
-<Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="PMS" value="" type="8" typeOther="" />
+<Attribute access="0" id="receivedSID" 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)" />
@@ -5213,11 +5207,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5005" id="2378" >
 <father id="2421" num="1" />
-<cdparam x="740" y="393" />
-<sizeparam width="312" height="136" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="725" y="540" />
+<sizeparam width="345" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="82" minY="0" maxY="483" />
-<infoparam name="Send_Message" value="Send_Message" />
+<cdrectangleparam minX="0" maxX="49" minY="0" maxY="519" />
+<infoparam name="Server_Handshake" value="Server_Handshake" />
 <TGConnectingPoint num="0" id="2370" />
 <TGConnectingPoint num="1" id="2371" />
 <TGConnectingPoint num="2" id="2372" />
@@ -5228,12 +5222,16 @@
 <TGConnectingPoint num="7" id="2377" />
 <extraparam>
 <CryptoLibraryFunction value="true" />
-<Parameter access="0" id="sid" value="" type="8" typeOther="" />
-<Parameter access="0" id="MS" value="" type="5" typeOther="Message" />
-<Parameter access="0" id="msg" value="" type="5" typeOther="Message" />
+<Parameter access="0" id="serverCert" value="" type="5" typeOther="Message" />
+<Parameter access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
+<Signal value="in chIn(Message m)" />
 <Signal value="out chOut(Message m)" />
-<ReturnAttribute access="0" id="newSid" value="" type="8" typeOther="" />
+<ReturnAttribute access="0" id="MS" value="" type="5" typeOther="Message" />
+<ReturnAttribute access="0" id="sid" value="" type="8" typeOther="" />
 <Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="clientHello" 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)" />
@@ -5258,11 +5256,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5005" id="2387" >
 <father id="2421" num="2" />
-<cdparam x="725" y="540" />
-<sizeparam width="345" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="740" y="393" />
+<sizeparam width="312" height="136" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="49" minY="0" maxY="519" />
-<infoparam name="Server_Handshake" value="Server_Handshake" />
+<cdrectangleparam minX="0" maxX="82" minY="0" maxY="483" />
+<infoparam name="Send_Message" value="Send_Message" />
 <TGConnectingPoint num="0" id="2379" />
 <TGConnectingPoint num="1" id="2380" />
 <TGConnectingPoint num="2" id="2381" />
@@ -5273,16 +5271,12 @@
 <TGConnectingPoint num="7" id="2386" />
 <extraparam>
 <CryptoLibraryFunction value="true" />
-<Parameter access="0" id="serverCert" value="" type="5" typeOther="Message" />
-<Parameter access="0" id="serverPrivK" value="" type="5" typeOther="Key" />
-<Signal value="in chIn(Message m)" />
+<Parameter access="0" id="sid" value="" type="8" typeOther="" />
+<Parameter access="0" id="MS" value="" type="5" typeOther="Message" />
+<Parameter access="0" id="msg" value="" type="5" typeOther="Message" />
 <Signal value="out chOut(Message m)" />
-<ReturnAttribute access="0" id="MS" value="" type="5" typeOther="Message" />
-<ReturnAttribute access="0" id="sid" value="" type="8" typeOther="" />
+<ReturnAttribute access="0" id="newSid" value="" type="8" typeOther="" />
 <Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="PMS" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="clientHello" 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)" />
@@ -5307,11 +5301,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5005" id="2396" >
 <father id="2421" num="3" />
-<cdparam x="744" y="657" />
-<sizeparam width="308" height="128" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="731" y="239" />
+<sizeparam width="338" height="138" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="234" minY="0" maxY="519" />
-<infoparam name="Receive_Message" value="Receive_Message" />
+<cdrectangleparam minX="0" maxX="56" minY="0" maxY="481" />
+<infoparam name="Client_Handshake" value="Client_Handshake" />
 <TGConnectingPoint num="0" id="2388" />
 <TGConnectingPoint num="1" id="2389" />
 <TGConnectingPoint num="2" id="2390" />
@@ -5322,13 +5316,19 @@
 <TGConnectingPoint num="7" id="2395" />
 <extraparam>
 <CryptoLibraryFunction value="true" />
-<Parameter access="0" id="MS" value="" type="5" typeOther="Message" />
-<Parameter access="0" id="sid" value="" type="8" typeOther="" />
+<Parameter access="0" id="CAPubK" value="" type="5" typeOther="Key" />
 <Signal value="in chIn(Message m)" />
-<ReturnAttribute access="0" id="newSid" value="" type="8" typeOther="" />
-<ReturnAttribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Signal value="out chOut(Message m)" />
+<ReturnAttribute access="0" id="MS" value="" type="5" typeOther="Message" />
+<ReturnAttribute access="0" id="sid" value="" type="8" typeOther="" />
+<Attribute access="0" id="clientHello" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="filler1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="receivedSID" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certVerified" value="" type="4" typeOther="" />
+<Attribute access="0" id="serverCert" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="serverPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="serverHello" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="PMS" value="" type="8" typeOther="" />
 <Method value="Message aencrypt(Message msg, Key k)" />
 <Method value="Message adecrypt(Message msg, Key k)" />
 <Method value="Key pk(Key k)" />
@@ -5381,18 +5381,18 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
+<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
 <CONNECTOR type="5102" id="2432" >
-<cdparam x="648" y="1235" />
+<cdparam x="407" y="196" />
 <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="2431" />
-<P1  x="412" y="412" id="2489" />
-<P2  x="412" y="454" id="2524" />
+<P1  x="407" y="196" id="2461" />
+<P2  x="407" y="242" id="2449" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2430" >
 <father id="2432" num="0" />
-<cdparam x="648" y="1275" />
+<cdparam x="406" y="219" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -5411,17 +5411,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2439" >
-<cdparam x="424" y="233" />
+<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="2438" />
-<P1  x="424" y="233" id="2556" />
-<P2  x="424" y="281" id="2472" />
+<P1  x="407" y="70" id="2471" />
+<P2  x="407" y="161" id="2460" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2437" >
 <father id="2439" num="0" />
-<cdparam x="421" y="260" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="427" y="107" />
+<sizeparam width="215" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5435,20 +5435,22 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1 = sign(serverPubK, CAPrivK)" />
+<actions value="serverCert = cert(serverPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2446" >
-<cdparam x="419" y="323" />
+<cdparam x="407" y="282" />
 <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="2445" />
-<P1  x="424" y="316" id="2473" />
-<P2  x="424" y="362" id="2501" />
+<P1  x="407" y="282" id="2450" />
+<P2  x="407" y="331" id="2447" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2444" >
 <father id="2446" num="0" />
-<cdparam x="416" y="369" />
+<cdparam x="411" y="313" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -5466,81 +5468,61 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2453" >
-<cdparam x="412" y="43" />
-<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="2452" />
-<P1  x="399" y="53" id="2567" />
-<P2  x="399" y="106" id="2461" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2451" >
-<father id="2453" num="0" />
-<cdparam x="403" y="71" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="2448" >
+<cdparam x="397" y="336" />
+<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="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="stop state" value="null" />
 <TGConnectingPoint num="0" id="2447" />
-<TGConnectingPoint num="1" id="2448" />
-<TGConnectingPoint num="2" id="2449" />
-<TGConnectingPoint num="3" id="2450" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2460" >
-<cdparam x="394" y="135" />
-<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="2459" />
-<P1  x="399" y="141" id="2462" />
-<P2  x="399" y="183" id="2543" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2458" >
-<father id="2460" num="0" />
-<cdparam x="396" y="159" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5112" id="2459" >
+<cdparam x="238" y="247" />
+<sizeparam width="338" height="30" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2454" />
-<TGConnectingPoint num="1" id="2455" />
-<TGConnectingPoint num="2" id="2456" />
-<TGConnectingPoint num="3" id="2457" />
+<infoparam name="Library function call" value="sid, secretMessage = TLS.Receive_Message (MS, sid)" />
+<TGConnectingPoint num="0" id="2449" />
+<TGConnectingPoint num="1" id="2450" />
+<TGConnectingPoint num="2" id="2451" />
+<TGConnectingPoint num="3" id="2452" />
+<TGConnectingPoint num="4" id="2453" />
+<TGConnectingPoint num="5" id="2454" />
+<TGConnectingPoint num="6" id="2455" />
+<TGConnectingPoint num="7" id="2456" />
+<TGConnectingPoint num="8" id="2457" />
+<TGConnectingPoint num="9" id="2458" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<LibraryFunction name="TLS.Receive_Message" />
+<Parameter id="MS" />
+<Parameter id="sid" />
+<Signal value="in chIn(Message m)" />
+<ReturnAttribute id="sid" />
+<ReturnAttribute id="secretMessage" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<COMPONENT type="5112" id="2471" >
-<cdparam x="192" y="111" />
-<sizeparam width="414" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5112" id="2470" >
+<cdparam x="198" y="166" />
+<sizeparam width="419" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Library function call" value="MS, sid = TLS.Client_Handshake (CAPubK)" />
-<TGConnectingPoint num="0" id="2461" />
-<TGConnectingPoint num="1" id="2462" />
-<TGConnectingPoint num="2" id="2463" />
-<TGConnectingPoint num="3" id="2464" />
-<TGConnectingPoint num="4" id="2465" />
-<TGConnectingPoint num="5" id="2466" />
-<TGConnectingPoint num="6" id="2467" />
-<TGConnectingPoint num="7" id="2468" />
-<TGConnectingPoint num="8" id="2469" />
-<TGConnectingPoint num="9" id="2470" />
+<infoparam name="Library function call" value="MS, sid = TLS.Server_Handshake (serverCert, serverPrivK)" />
+<TGConnectingPoint num="0" id="2460" />
+<TGConnectingPoint num="1" id="2461" />
+<TGConnectingPoint num="2" id="2462" />
+<TGConnectingPoint num="3" id="2463" />
+<TGConnectingPoint num="4" id="2464" />
+<TGConnectingPoint num="5" id="2465" />
+<TGConnectingPoint num="6" id="2466" />
+<TGConnectingPoint num="7" id="2467" />
+<TGConnectingPoint num="8" id="2468" />
+<TGConnectingPoint num="9" id="2469" />
 <extraparam>
-<LibraryFunction name="TLS.Client_Handshake" />
-<Parameter id="CAPubK" />
+<LibraryFunction name="TLS.Server_Handshake" />
+<Parameter id="serverCert" />
+<Parameter id="serverPrivK" />
 <Signal value="in chIn(Message m)" />
 <Signal value="out chOut(Message m)" />
 <ReturnAttribute id="MS" />
@@ -5548,173 +5530,94 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5112" id="2482" >
-<cdparam x="237" y="286" />
-<sizeparam width="375" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="2472" >
+<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="Library function call" value="sid = TLS.Send_Message (sid, MS, secretMessage)" />
-<TGConnectingPoint num="0" id="2472" />
-<TGConnectingPoint num="1" id="2473" />
-<TGConnectingPoint num="2" id="2474" />
-<TGConnectingPoint num="3" id="2475" />
-<TGConnectingPoint num="4" id="2476" />
-<TGConnectingPoint num="5" id="2477" />
-<TGConnectingPoint num="6" id="2478" />
-<TGConnectingPoint num="7" id="2479" />
-<TGConnectingPoint num="8" id="2480" />
-<TGConnectingPoint num="9" id="2481" />
-<extraparam>
-<LibraryFunction name="TLS.Send_Message" />
-<Parameter id="sid" />
-<Parameter id="MS" />
-<Parameter id="secretMessage" />
-<Signal value="out chOut(Message m)" />
-<ReturnAttribute id="sid" />
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2471" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2523" >
-<cdparam x="362" y="362" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="verif" />
-<TGConnectingPoint num="0" id="2483" />
-<TGConnectingPoint num="1" id="2484" />
-<TGConnectingPoint num="2" id="2485" />
-<TGConnectingPoint num="3" id="2486" />
-<TGConnectingPoint num="4" id="2487" />
-<TGConnectingPoint num="5" id="2488" />
-<TGConnectingPoint num="6" id="2489" />
-<TGConnectingPoint num="7" id="2490" />
-<TGConnectingPoint num="8" id="2491" />
-<TGConnectingPoint num="9" id="2492" />
-<TGConnectingPoint num="10" id="2493" />
-<TGConnectingPoint num="11" id="2494" />
-<TGConnectingPoint num="12" id="2495" />
-<TGConnectingPoint num="13" id="2496" />
-<TGConnectingPoint num="14" id="2497" />
-<TGConnectingPoint num="15" id="2498" />
-<TGConnectingPoint num="16" id="2499" />
-<TGConnectingPoint num="17" id="2500" />
-<TGConnectingPoint num="18" id="2501" />
-<TGConnectingPoint num="19" id="2502" />
-<TGConnectingPoint num="20" id="2503" />
-<TGConnectingPoint num="21" id="2504" />
-<TGConnectingPoint num="22" id="2505" />
-<TGConnectingPoint num="23" id="2506" />
-<TGConnectingPoint num="24" id="2507" />
-<TGConnectingPoint num="25" id="2508" />
-<TGConnectingPoint num="26" id="2509" />
-<TGConnectingPoint num="27" id="2510" />
-<TGConnectingPoint num="28" id="2511" />
-<TGConnectingPoint num="29" id="2512" />
-<TGConnectingPoint num="30" id="2513" />
-<TGConnectingPoint num="31" id="2514" />
-<TGConnectingPoint num="32" id="2515" />
-<TGConnectingPoint num="33" id="2516" />
-<TGConnectingPoint num="34" id="2517" />
-<TGConnectingPoint num="35" id="2518" />
-<TGConnectingPoint num="36" id="2519" />
-<TGConnectingPoint num="37" id="2520" />
-<TGConnectingPoint num="38" id="2521" />
-<TGConnectingPoint num="39" id="2522" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="2525" >
-<cdparam x="402" y="459" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Client" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="2479" >
+<cdparam x="648" y="1235" />
+<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="2478" />
+<P1  x="412" y="412" id="2536" />
+<P2  x="412" y="454" id="2571" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2477" >
+<father id="2479" num="0" />
+<cdparam x="648" y="1275" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2524" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2473" />
+<TGConnectingPoint num="1" id="2474" />
+<TGConnectingPoint num="2" id="2475" />
+<TGConnectingPoint num="3" id="2476" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2566" >
-<cdparam x="362" y="183" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="sendMessage" />
-<TGConnectingPoint num="0" id="2526" />
-<TGConnectingPoint num="1" id="2527" />
-<TGConnectingPoint num="2" id="2528" />
-<TGConnectingPoint num="3" id="2529" />
-<TGConnectingPoint num="4" id="2530" />
-<TGConnectingPoint num="5" id="2531" />
-<TGConnectingPoint num="6" id="2532" />
-<TGConnectingPoint num="7" id="2533" />
-<TGConnectingPoint num="8" id="2534" />
-<TGConnectingPoint num="9" id="2535" />
-<TGConnectingPoint num="10" id="2536" />
-<TGConnectingPoint num="11" id="2537" />
-<TGConnectingPoint num="12" id="2538" />
-<TGConnectingPoint num="13" id="2539" />
-<TGConnectingPoint num="14" id="2540" />
-<TGConnectingPoint num="15" id="2541" />
-<TGConnectingPoint num="16" id="2542" />
-<TGConnectingPoint num="17" id="2543" />
-<TGConnectingPoint num="18" id="2544" />
-<TGConnectingPoint num="19" id="2545" />
-<TGConnectingPoint num="20" id="2546" />
-<TGConnectingPoint num="21" id="2547" />
-<TGConnectingPoint num="22" id="2548" />
-<TGConnectingPoint num="23" id="2549" />
-<TGConnectingPoint num="24" id="2550" />
-<TGConnectingPoint num="25" id="2551" />
-<TGConnectingPoint num="26" id="2552" />
-<TGConnectingPoint num="27" id="2553" />
-<TGConnectingPoint num="28" id="2554" />
-<TGConnectingPoint num="29" id="2555" />
-<TGConnectingPoint num="30" id="2556" />
-<TGConnectingPoint num="31" id="2557" />
-<TGConnectingPoint num="32" id="2558" />
-<TGConnectingPoint num="33" id="2559" />
-<TGConnectingPoint num="34" id="2560" />
-<TGConnectingPoint num="35" id="2561" />
-<TGConnectingPoint num="36" id="2562" />
-<TGConnectingPoint num="37" id="2563" />
-<TGConnectingPoint num="38" id="2564" />
-<TGConnectingPoint num="39" id="2565" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2568" >
-<cdparam x="392" y="33" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2486" >
+<cdparam x="424" y="233" />
+<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="2485" />
+<P1  x="424" y="233" id="2603" />
+<P2  x="424" y="281" id="2519" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2484" >
+<father id="2486" num="0" />
+<cdparam x="421" y="260" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2567" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2480" />
+<TGConnectingPoint num="1" id="2481" />
+<TGConnectingPoint num="2" id="2482" />
+<TGConnectingPoint num="3" id="2483" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="2575" >
-<cdparam x="407" y="196" />
+<CONNECTOR type="5102" id="2493" >
+<cdparam x="419" y="323" />
 <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="2574" />
-<P1  x="407" y="196" id="2604" />
-<P2  x="407" y="242" id="2592" />
+<TGConnectingPoint num="0" id="2492" />
+<P1  x="424" y="316" id="2520" />
+<P2  x="424" y="362" id="2548" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2573" >
-<father id="2575" num="0" />
-<cdparam x="406" y="219" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2491" >
+<father id="2493" num="0" />
+<cdparam x="416" y="369" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2569" />
-<TGConnectingPoint num="1" id="2570" />
-<TGConnectingPoint num="2" id="2571" />
-<TGConnectingPoint num="3" id="2572" />
+<TGConnectingPoint num="0" id="2487" />
+<TGConnectingPoint num="1" id="2488" />
+<TGConnectingPoint num="2" id="2489" />
+<TGConnectingPoint num="3" id="2490" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5724,55 +5627,53 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2582" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="2500" >
+<cdparam x="412" y="43" />
 <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="2581" />
-<P1  x="407" y="70" id="2614" />
-<P2  x="407" y="161" id="2603" />
+<TGConnectingPoint num="0" id="2499" />
+<P1  x="399" y="53" id="2614" />
+<P2  x="399" y="106" id="2508" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2580" >
-<father id="2582" num="0" />
-<cdparam x="427" y="107" />
-<sizeparam width="215" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2498" >
+<father id="2500" num="0" />
+<cdparam x="403" y="71" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2576" />
-<TGConnectingPoint num="1" id="2577" />
-<TGConnectingPoint num="2" id="2578" />
-<TGConnectingPoint num="3" id="2579" />
+<TGConnectingPoint num="0" id="2494" />
+<TGConnectingPoint num="1" id="2495" />
+<TGConnectingPoint num="2" id="2496" />
+<TGConnectingPoint num="3" id="2497" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sign(serverPubK, CAPrivK)" />
-<actions value="serverCert = cert(serverPubK, filler1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2589" >
-<cdparam x="407" y="282" />
+<CONNECTOR type="5102" id="2507" >
+<cdparam x="394" y="135" />
 <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="2588" />
-<P1  x="407" y="282" id="2593" />
-<P2  x="407" y="331" id="2590" />
+<TGConnectingPoint num="0" id="2506" />
+<P1  x="399" y="141" id="2509" />
+<P2  x="399" y="183" id="2590" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2587" >
-<father id="2589" num="0" />
-<cdparam x="411" y="313" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2505" >
+<father id="2507" num="0" />
+<cdparam x="396" y="159" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2583" />
-<TGConnectingPoint num="1" id="2584" />
-<TGConnectingPoint num="2" id="2585" />
-<TGConnectingPoint num="3" id="2586" />
+<TGConnectingPoint num="0" id="2501" />
+<TGConnectingPoint num="1" id="2502" />
+<TGConnectingPoint num="2" id="2503" />
+<TGConnectingPoint num="3" id="2504" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -5782,70 +5683,169 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="2591" >
-<cdparam x="397" y="336" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5112" id="2518" >
+<cdparam x="192" y="111" />
+<sizeparam width="414" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2590" />
+<infoparam name="Library function call" value="MS, sid = TLS.Client_Handshake (CAPubK)" />
+<TGConnectingPoint num="0" id="2508" />
+<TGConnectingPoint num="1" id="2509" />
+<TGConnectingPoint num="2" id="2510" />
+<TGConnectingPoint num="3" id="2511" />
+<TGConnectingPoint num="4" id="2512" />
+<TGConnectingPoint num="5" id="2513" />
+<TGConnectingPoint num="6" id="2514" />
+<TGConnectingPoint num="7" id="2515" />
+<TGConnectingPoint num="8" id="2516" />
+<TGConnectingPoint num="9" id="2517" />
+<extraparam>
+<LibraryFunction name="TLS.Client_Handshake" />
+<Parameter id="CAPubK" />
+<Signal value="in chIn(Message m)" />
+<Signal value="out chOut(Message m)" />
+<ReturnAttribute id="MS" />
+<ReturnAttribute id="sid" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5112" id="2602" >
-<cdparam x="238" y="247" />
-<sizeparam width="338" height="30" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5112" id="2529" >
+<cdparam x="237" y="286" />
+<sizeparam width="375" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Library function call" value="sid, secretMessage = TLS.Receive_Message (MS, sid)" />
-<TGConnectingPoint num="0" id="2592" />
-<TGConnectingPoint num="1" id="2593" />
-<TGConnectingPoint num="2" id="2594" />
-<TGConnectingPoint num="3" id="2595" />
-<TGConnectingPoint num="4" id="2596" />
-<TGConnectingPoint num="5" id="2597" />
-<TGConnectingPoint num="6" id="2598" />
-<TGConnectingPoint num="7" id="2599" />
-<TGConnectingPoint num="8" id="2600" />
-<TGConnectingPoint num="9" id="2601" />
+<infoparam name="Library function call" value="sid = TLS.Send_Message (sid, MS, secretMessage)" />
+<TGConnectingPoint num="0" id="2519" />
+<TGConnectingPoint num="1" id="2520" />
+<TGConnectingPoint num="2" id="2521" />
+<TGConnectingPoint num="3" id="2522" />
+<TGConnectingPoint num="4" id="2523" />
+<TGConnectingPoint num="5" id="2524" />
+<TGConnectingPoint num="6" id="2525" />
+<TGConnectingPoint num="7" id="2526" />
+<TGConnectingPoint num="8" id="2527" />
+<TGConnectingPoint num="9" id="2528" />
 <extraparam>
-<LibraryFunction name="TLS.Receive_Message" />
-<Parameter id="MS" />
+<LibraryFunction name="TLS.Send_Message" />
 <Parameter id="sid" />
-<Signal value="in chIn(Message m)" />
+<Parameter id="MS" />
+<Parameter id="secretMessage" />
+<Signal value="out chOut(Message m)" />
 <ReturnAttribute id="sid" />
-<ReturnAttribute id="secretMessage" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5112" id="2613" >
-<cdparam x="198" y="166" />
-<sizeparam width="419" height="25" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2570" >
+<cdparam x="362" y="362" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Library function call" value="MS, sid = TLS.Server_Handshake (serverCert, serverPrivK)" />
-<TGConnectingPoint num="0" id="2603" />
-<TGConnectingPoint num="1" id="2604" />
-<TGConnectingPoint num="2" id="2605" />
-<TGConnectingPoint num="3" id="2606" />
-<TGConnectingPoint num="4" id="2607" />
-<TGConnectingPoint num="5" id="2608" />
-<TGConnectingPoint num="6" id="2609" />
-<TGConnectingPoint num="7" id="2610" />
-<TGConnectingPoint num="8" id="2611" />
-<TGConnectingPoint num="9" id="2612" />
+<infoparam name="State" value="verif" />
+<TGConnectingPoint num="0" id="2530" />
+<TGConnectingPoint num="1" id="2531" />
+<TGConnectingPoint num="2" id="2532" />
+<TGConnectingPoint num="3" id="2533" />
+<TGConnectingPoint num="4" id="2534" />
+<TGConnectingPoint num="5" id="2535" />
+<TGConnectingPoint num="6" id="2536" />
+<TGConnectingPoint num="7" id="2537" />
+<TGConnectingPoint num="8" id="2538" />
+<TGConnectingPoint num="9" id="2539" />
+<TGConnectingPoint num="10" id="2540" />
+<TGConnectingPoint num="11" id="2541" />
+<TGConnectingPoint num="12" id="2542" />
+<TGConnectingPoint num="13" id="2543" />
+<TGConnectingPoint num="14" id="2544" />
+<TGConnectingPoint num="15" id="2545" />
+<TGConnectingPoint num="16" id="2546" />
+<TGConnectingPoint num="17" id="2547" />
+<TGConnectingPoint num="18" id="2548" />
+<TGConnectingPoint num="19" id="2549" />
+<TGConnectingPoint num="20" id="2550" />
+<TGConnectingPoint num="21" id="2551" />
+<TGConnectingPoint num="22" id="2552" />
+<TGConnectingPoint num="23" id="2553" />
+<TGConnectingPoint num="24" id="2554" />
+<TGConnectingPoint num="25" id="2555" />
+<TGConnectingPoint num="26" id="2556" />
+<TGConnectingPoint num="27" id="2557" />
+<TGConnectingPoint num="28" id="2558" />
+<TGConnectingPoint num="29" id="2559" />
+<TGConnectingPoint num="30" id="2560" />
+<TGConnectingPoint num="31" id="2561" />
+<TGConnectingPoint num="32" id="2562" />
+<TGConnectingPoint num="33" id="2563" />
+<TGConnectingPoint num="34" id="2564" />
+<TGConnectingPoint num="35" id="2565" />
+<TGConnectingPoint num="36" id="2566" />
+<TGConnectingPoint num="37" id="2567" />
+<TGConnectingPoint num="38" id="2568" />
+<TGConnectingPoint num="39" id="2569" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="2572" >
+<cdparam x="402" y="459" />
+<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="2571" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2613" >
+<cdparam x="362" y="183" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="sendMessage" />
+<TGConnectingPoint num="0" id="2573" />
+<TGConnectingPoint num="1" id="2574" />
+<TGConnectingPoint num="2" id="2575" />
+<TGConnectingPoint num="3" id="2576" />
+<TGConnectingPoint num="4" id="2577" />
+<TGConnectingPoint num="5" id="2578" />
+<TGConnectingPoint num="6" id="2579" />
+<TGConnectingPoint num="7" id="2580" />
+<TGConnectingPoint num="8" id="2581" />
+<TGConnectingPoint num="9" id="2582" />
+<TGConnectingPoint num="10" id="2583" />
+<TGConnectingPoint num="11" id="2584" />
+<TGConnectingPoint num="12" id="2585" />
+<TGConnectingPoint num="13" id="2586" />
+<TGConnectingPoint num="14" id="2587" />
+<TGConnectingPoint num="15" id="2588" />
+<TGConnectingPoint num="16" id="2589" />
+<TGConnectingPoint num="17" id="2590" />
+<TGConnectingPoint num="18" id="2591" />
+<TGConnectingPoint num="19" id="2592" />
+<TGConnectingPoint num="20" id="2593" />
+<TGConnectingPoint num="21" id="2594" />
+<TGConnectingPoint num="22" id="2595" />
+<TGConnectingPoint num="23" id="2596" />
+<TGConnectingPoint num="24" id="2597" />
+<TGConnectingPoint num="25" id="2598" />
+<TGConnectingPoint num="26" id="2599" />
+<TGConnectingPoint num="27" id="2600" />
+<TGConnectingPoint num="28" id="2601" />
+<TGConnectingPoint num="29" id="2602" />
+<TGConnectingPoint num="30" id="2603" />
+<TGConnectingPoint num="31" id="2604" />
+<TGConnectingPoint num="32" id="2605" />
+<TGConnectingPoint num="33" id="2606" />
+<TGConnectingPoint num="34" id="2607" />
+<TGConnectingPoint num="35" id="2608" />
+<TGConnectingPoint num="36" id="2609" />
+<TGConnectingPoint num="37" id="2610" />
+<TGConnectingPoint num="38" id="2611" />
+<TGConnectingPoint num="39" id="2612" />
 <extraparam>
-<LibraryFunction name="TLS.Server_Handshake" />
-<Parameter id="serverCert" />
-<Parameter id="serverPrivK" />
-<Signal value="in chIn(Message m)" />
-<Signal value="out chOut(Message m)" />
-<ReturnAttribute id="MS" />
-<ReturnAttribute id="sid" />
 </extraparam>
 </COMPONENT>
 
 <COMPONENT type="5100" id="2615" >
-<cdparam x="400" y="50" />
+<cdparam x="392" y="33" />
 <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" />
@@ -5856,19 +5856,19 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Receive_Message" minX="10" maxX="2500" minY="10" maxY="1500" >
+<AVATARStateMachineDiagramPanel name="Client_Handshake" minX="10" maxX="2500" minY="10" maxY="1500" >
 <CONNECTOR type="5102" id="2622" >
-<cdparam x="369" y="226" />
+<cdparam x="818" y="521" />
 <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="2621" />
-<P1  x="369" y="226" id="2765" />
-<P2  x="345" y="294" id="2670" />
+<P1  x="818" y="521" id="2696" />
+<P2  x="818" y="586" id="2897" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2620" >
 <father id="2622" num="0" />
-<cdparam x="293" y="260" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="818" y="553" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5877,7 +5877,7 @@
 <TGConnectingPoint num="2" id="2618" />
 <TGConnectingPoint num="3" id="2619" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5886,17 +5886,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2629" >
-<cdparam x="444" y="226" />
+<cdparam x="856" y="812" />
 <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="2628" />
-<P1  x="444" y="226" id="2768" />
-<P2  x="444" y="294" id="2695" />
+<P1  x="856" y="747" id="2862" />
+<P2  x="856" y="819" id="2816" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2627" >
 <father id="2629" num="0" />
-<cdparam x="455" y="258" />
-<sizeparam width="170" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="880" y="782" />
+<sizeparam width="180" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5905,7 +5905,7 @@
 <TGConnectingPoint num="2" id="2625" />
 <TGConnectingPoint num="3" id="2626" />
 <extraparam>
-<guard value="[ receivedSID.data == sid ]" />
+<guard value="[ filler1.data == filler2.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -5914,17 +5914,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2636" >
-<cdparam x="407" y="70" />
+<cdparam x="818" y="681" />
 <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="2635" />
-<P1  x="407" y="70" id="2735" />
-<P2  x="407" y="96" id="2778" />
+<P1  x="818" y="616" id="2898" />
+<P2  x="818" y="697" id="2872" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2634" >
 <father id="2636" num="0" />
-<cdparam x="408" y="82" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="838" y="642" />
+<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5938,21 +5938,24 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
+<actions value="MS = hash(filler2)" />
+<actions value="filler2 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2643" >
-<cdparam x="407" y="126" />
+<cdparam x="806" y="699" />
 <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="2642" />
-<P1  x="407" y="126" id="2779" />
-<P2  x="407" y="176" id="2738" />
+<P1  x="806" y="722" id="2859" />
+<P2  x="520" y="535" id="2713" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2641" >
 <father id="2643" num="0" />
-<cdparam x="429" y="144" />
-<sizeparam width="188" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="660" y="685" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5961,28 +5964,26 @@
 <TGConnectingPoint num="2" id="2639" />
 <TGConnectingPoint num="3" id="2640" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = sdecrypt(filler1, MS)" />
-<actions value="get2(filler1, receivedSID, msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="2650" >
-<cdparam x="456" y="344" />
+<cdparam x="818" y="416" />
 <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="2649" />
-<P1  x="456" y="344" id="2724" />
-<P2  x="456" y="411" id="2692" />
+<P1  x="818" y="416" id="2707" />
+<P2  x="818" y="491" id="2695" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2648" >
 <father id="2650" num="0" />
-<cdparam x="483" y="383" />
-<sizeparam width="106" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="834" y="448" />
+<sizeparam width="229" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -5996,276 +5997,89 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="newSid = sid + 1" />
+<actions value="filler1.data = PMS" />
+<actions value="filler1 = aencrypt(filler1, serverPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2691" >
-<cdparam x="258" y="294" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="refused" />
-<TGConnectingPoint num="0" id="2651" />
-<TGConnectingPoint num="1" id="2652" />
-<TGConnectingPoint num="2" id="2653" />
-<TGConnectingPoint num="3" id="2654" />
-<TGConnectingPoint num="4" id="2655" />
-<TGConnectingPoint num="5" id="2656" />
-<TGConnectingPoint num="6" id="2657" />
-<TGConnectingPoint num="7" id="2658" />
-<TGConnectingPoint num="8" id="2659" />
-<TGConnectingPoint num="9" id="2660" />
-<TGConnectingPoint num="10" id="2661" />
-<TGConnectingPoint num="11" id="2662" />
-<TGConnectingPoint num="12" id="2663" />
-<TGConnectingPoint num="13" id="2664" />
-<TGConnectingPoint num="14" id="2665" />
-<TGConnectingPoint num="15" id="2666" />
-<TGConnectingPoint num="16" id="2667" />
-<TGConnectingPoint num="17" id="2668" />
-<TGConnectingPoint num="18" id="2669" />
-<TGConnectingPoint num="19" id="2670" />
-<TGConnectingPoint num="20" id="2671" />
-<TGConnectingPoint num="21" id="2672" />
-<TGConnectingPoint num="22" id="2673" />
-<TGConnectingPoint num="23" id="2674" />
-<TGConnectingPoint num="24" id="2675" />
-<TGConnectingPoint num="25" id="2676" />
-<TGConnectingPoint num="26" id="2677" />
-<TGConnectingPoint num="27" id="2678" />
-<TGConnectingPoint num="28" id="2679" />
-<TGConnectingPoint num="29" id="2680" />
-<TGConnectingPoint num="30" id="2681" />
-<TGConnectingPoint num="31" id="2682" />
-<TGConnectingPoint num="32" id="2683" />
-<TGConnectingPoint num="33" id="2684" />
-<TGConnectingPoint num="34" id="2685" />
-<TGConnectingPoint num="35" id="2686" />
-<TGConnectingPoint num="36" id="2687" />
-<TGConnectingPoint num="37" id="2688" />
-<TGConnectingPoint num="38" id="2689" />
-<TGConnectingPoint num="39" id="2690" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="2693" >
-<cdparam x="446" y="416" />
-<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="2692" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2734" >
-<cdparam x="394" y="294" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="accepted" />
-<TGConnectingPoint num="0" id="2694" />
-<TGConnectingPoint num="1" id="2695" />
-<TGConnectingPoint num="2" id="2696" />
-<TGConnectingPoint num="3" id="2697" />
-<TGConnectingPoint num="4" id="2698" />
-<TGConnectingPoint num="5" id="2699" />
-<TGConnectingPoint num="6" id="2700" />
-<TGConnectingPoint num="7" id="2701" />
-<TGConnectingPoint num="8" id="2702" />
-<TGConnectingPoint num="9" id="2703" />
-<TGConnectingPoint num="10" id="2704" />
-<TGConnectingPoint num="11" id="2705" />
-<TGConnectingPoint num="12" id="2706" />
-<TGConnectingPoint num="13" id="2707" />
-<TGConnectingPoint num="14" id="2708" />
-<TGConnectingPoint num="15" id="2709" />
-<TGConnectingPoint num="16" id="2710" />
-<TGConnectingPoint num="17" id="2711" />
-<TGConnectingPoint num="18" id="2712" />
-<TGConnectingPoint num="19" id="2713" />
-<TGConnectingPoint num="20" id="2714" />
-<TGConnectingPoint num="21" id="2715" />
-<TGConnectingPoint num="22" id="2716" />
-<TGConnectingPoint num="23" id="2717" />
-<TGConnectingPoint num="24" id="2718" />
-<TGConnectingPoint num="25" id="2719" />
-<TGConnectingPoint num="26" id="2720" />
-<TGConnectingPoint num="27" id="2721" />
-<TGConnectingPoint num="28" id="2722" />
-<TGConnectingPoint num="29" id="2723" />
-<TGConnectingPoint num="30" id="2724" />
-<TGConnectingPoint num="31" id="2725" />
-<TGConnectingPoint num="32" id="2726" />
-<TGConnectingPoint num="33" id="2727" />
-<TGConnectingPoint num="34" id="2728" />
-<TGConnectingPoint num="35" id="2729" />
-<TGConnectingPoint num="36" id="2730" />
-<TGConnectingPoint num="37" id="2731" />
-<TGConnectingPoint num="38" id="2732" />
-<TGConnectingPoint num="39" id="2733" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2736" >
-<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="2735" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2777" >
-<cdparam x="357" y="176" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="checkSID" />
-<TGConnectingPoint num="0" id="2737" />
-<TGConnectingPoint num="1" id="2738" />
-<TGConnectingPoint num="2" id="2739" />
-<TGConnectingPoint num="3" id="2740" />
-<TGConnectingPoint num="4" id="2741" />
-<TGConnectingPoint num="5" id="2742" />
-<TGConnectingPoint num="6" id="2743" />
-<TGConnectingPoint num="7" id="2744" />
-<TGConnectingPoint num="8" id="2745" />
-<TGConnectingPoint num="9" id="2746" />
-<TGConnectingPoint num="10" id="2747" />
-<TGConnectingPoint num="11" id="2748" />
-<TGConnectingPoint num="12" id="2749" />
-<TGConnectingPoint num="13" id="2750" />
-<TGConnectingPoint num="14" id="2751" />
-<TGConnectingPoint num="15" id="2752" />
-<TGConnectingPoint num="16" id="2753" />
-<TGConnectingPoint num="17" id="2754" />
-<TGConnectingPoint num="18" id="2755" />
-<TGConnectingPoint num="19" id="2756" />
-<TGConnectingPoint num="20" id="2757" />
-<TGConnectingPoint num="21" id="2758" />
-<TGConnectingPoint num="22" id="2759" />
-<TGConnectingPoint num="23" id="2760" />
-<TGConnectingPoint num="24" id="2761" />
-<TGConnectingPoint num="25" id="2762" />
-<TGConnectingPoint num="26" id="2763" />
-<TGConnectingPoint num="27" id="2764" />
-<TGConnectingPoint num="28" id="2765" />
-<TGConnectingPoint num="29" id="2766" />
-<TGConnectingPoint num="30" id="2767" />
-<TGConnectingPoint num="31" id="2768" />
-<TGConnectingPoint num="32" id="2769" />
-<TGConnectingPoint num="33" id="2770" />
-<TGConnectingPoint num="34" id="2771" />
-<TGConnectingPoint num="35" id="2772" />
-<TGConnectingPoint num="36" id="2773" />
-<TGConnectingPoint num="37" id="2774" />
-<TGConnectingPoint num="38" id="2775" />
-<TGConnectingPoint num="39" id="2776" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="2788" >
-<cdparam x="363" y="101" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="2778" />
-<TGConnectingPoint num="1" id="2779" />
-<TGConnectingPoint num="2" id="2780" />
-<TGConnectingPoint num="3" id="2781" />
-<TGConnectingPoint num="4" id="2782" />
-<TGConnectingPoint num="5" id="2783" />
-<TGConnectingPoint num="6" id="2784" />
-<TGConnectingPoint num="7" id="2785" />
-<TGConnectingPoint num="8" id="2786" />
-<TGConnectingPoint num="9" id="2787" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Server_Handshake" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="2795" >
-<cdparam x="256" y="293" />
+<CONNECTOR type="5102" id="2657" >
+<cdparam x="792" y="333" />
 <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="2794" />
-<P1  x="256" y="271" id="2897" />
-<P2  x="256" y="339" id="2885" />
+<TGConnectingPoint num="0" id="2656" />
+<P1  x="792" y="333" id="2781" />
+<P2  x="818" y="386" id="2706" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2793" >
-<father id="2795" num="0" />
-<cdparam x="164" y="386" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2655" >
+<father id="2657" num="0" />
+<cdparam x="824" y="353" />
+<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2789" />
-<TGConnectingPoint num="1" id="2790" />
-<TGConnectingPoint num="2" id="2791" />
-<TGConnectingPoint num="3" id="2792" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
+<TGConnectingPoint num="2" id="2653" />
+<TGConnectingPoint num="3" id="2654" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ certVerified ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="serverPubK = getpk(serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2802" >
-<cdparam x="256" y="258" />
+<CONNECTOR type="5102" id="2664" >
+<cdparam x="685" y="243" />
 <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="2801" />
-<P1  x="256" y="205" id="2908" />
-<P2  x="256" y="241" id="2896" />
+<TGConnectingPoint num="0" id="2663" />
+<P1  x="685" y="218" id="2792" />
+<P2  x="685" y="283" id="2758" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2800" >
-<father id="2802" num="0" />
-<cdparam x="269" y="229" />
-<sizeparam width="256" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2662" >
+<father id="2664" num="0" />
+<cdparam x="699" y="245" />
+<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2796" />
-<TGConnectingPoint num="1" id="2797" />
-<TGConnectingPoint num="2" id="2798" />
-<TGConnectingPoint num="3" id="2799" />
+<TGConnectingPoint num="0" id="2658" />
+<TGConnectingPoint num="1" id="2659" />
+<TGConnectingPoint num="2" id="2660" />
+<TGConnectingPoint num="3" id="2661" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1 = concat2(serverHello, serverCert)" />
+<actions value="get2(filler1, serverHello, serverCert) " />
+<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2809" >
-<cdparam x="256" y="121" />
+<CONNECTOR type="5102" id="2671" >
+<cdparam x="685" y="152" />
 <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="2808" />
-<P1  x="256" y="121" id="2918" />
-<P2  x="256" y="175" id="2907" />
+<TGConnectingPoint num="0" id="2670" />
+<P1  x="685" y="156" id="2803" />
+<P2  x="685" y="188" id="2791" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2807" >
-<father id="2809" num="0" />
-<cdparam x="265" y="147" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2669" >
+<father id="2671" num="0" />
+<cdparam x="685" y="192" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2803" />
-<TGConnectingPoint num="1" id="2804" />
-<TGConnectingPoint num="2" id="2805" />
-<TGConnectingPoint num="3" id="2806" />
+<TGConnectingPoint num="0" id="2665" />
+<TGConnectingPoint num="1" id="2666" />
+<TGConnectingPoint num="2" id="2667" />
+<TGConnectingPoint num="3" id="2668" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6275,57 +6089,53 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2816" >
-<cdparam x="256" y="520" />
+<CONNECTOR type="5102" id="2678" >
+<cdparam x="685" y="333" />
 <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="2815" />
-<P1  x="256" y="466" id="2839" />
-<P2  x="256" y="563" id="2874" />
+<TGConnectingPoint num="0" id="2677" />
+<P1  x="685" y="333" id="2764" />
+<P2  x="495" y="510" id="2718" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2814" >
-<father id="2816" num="0" />
-<cdparam x="288" y="490" />
-<sizeparam width="294" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2676" >
+<father id="2678" num="0" />
+<cdparam x="539" y="407" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2810" />
-<TGConnectingPoint num="1" id="2811" />
-<TGConnectingPoint num="2" id="2812" />
-<TGConnectingPoint num="3" id="2813" />
+<TGConnectingPoint num="0" id="2672" />
+<TGConnectingPoint num="1" id="2673" />
+<TGConnectingPoint num="2" id="2674" />
+<TGConnectingPoint num="3" id="2675" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="PMS = adecrypt(filler1, serverPrivK)" />
-<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
-<actions value="MS = hash(filler1)" />
-<actions value="filler1 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2823" >
-<cdparam x="256" y="403" />
+<CONNECTOR type="5102" id="2685" >
+<cdparam x="685" y="80" />
 <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="2822" />
-<P1  x="256" y="369" id="2886" />
-<P2  x="256" y="416" id="2834" />
+<TGConnectingPoint num="0" id="2684" />
+<P1  x="685" y="74" id="2813" />
+<P2  x="685" y="126" id="2802" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2821" >
-<father id="2823" num="0" />
-<cdparam x="256" y="443" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2683" >
+<father id="2685" num="0" />
+<cdparam x="699" y="101" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2817" />
-<TGConnectingPoint num="1" id="2818" />
-<TGConnectingPoint num="2" id="2819" />
-<TGConnectingPoint num="3" id="2820" />
+<TGConnectingPoint num="0" id="2679" />
+<TGConnectingPoint num="1" id="2680" />
+<TGConnectingPoint num="2" id="2681" />
+<TGConnectingPoint num="3" id="2682" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6335,25 +6145,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2830" >
-<cdparam x="256" y="593" />
+<CONNECTOR type="5102" id="2692" >
+<cdparam x="868" 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="2829" />
-<P1  x="256" y="593" id="2875" />
-<P2  x="256" y="650" id="2831" />
+<TGConnectingPoint num="0" id="2691" />
+<P1  x="877" y="869" id="2845" />
+<P2  x="877" y="921" id="2693" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2828" >
-<father id="2830" num="0" />
-<cdparam x="289" y="624" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2690" >
+<father id="2692" num="0" />
+<cdparam x="896" y="902" />
 <sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2824" />
-<TGConnectingPoint num="1" id="2825" />
-<TGConnectingPoint num="2" id="2826" />
-<TGConnectingPoint num="3" id="2827" />
+<TGConnectingPoint num="0" id="2686" />
+<TGConnectingPoint num="1" id="2687" />
+<TGConnectingPoint num="2" id="2688" />
+<TGConnectingPoint num="3" id="2689" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6364,169 +6174,332 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="2832" >
-<cdparam x="246" y="655" />
+<COMPONENT type="5101" id="2694" >
+<cdparam x="867" y="926" />
 <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="2831" />
+<TGConnectingPoint num="0" id="2693" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2873" >
-<cdparam x="206" y="416" />
+<COMPONENT type="5103" id="2705" >
+<cdparam x="773" y="496" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="2695" />
+<TGConnectingPoint num="1" id="2696" />
+<TGConnectingPoint num="2" id="2697" />
+<TGConnectingPoint num="3" id="2698" />
+<TGConnectingPoint num="4" id="2699" />
+<TGConnectingPoint num="5" id="2700" />
+<TGConnectingPoint num="6" id="2701" />
+<TGConnectingPoint num="7" id="2702" />
+<TGConnectingPoint num="8" id="2703" />
+<TGConnectingPoint num="9" id="2704" />
+</COMPONENT>
+
+<COMPONENT type="5108" id="2708" >
+<cdparam x="732" y="391" />
+<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="2706" />
+<TGConnectingPoint num="1" id="2707" />
+<extraparam>
+<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2749" >
+<cdparam x="420" y="510" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="SendingMS" />
-<TGConnectingPoint num="0" id="2833" />
-<TGConnectingPoint num="1" id="2834" />
-<TGConnectingPoint num="2" id="2835" />
-<TGConnectingPoint num="3" id="2836" />
-<TGConnectingPoint num="4" id="2837" />
-<TGConnectingPoint num="5" id="2838" />
-<TGConnectingPoint num="6" id="2839" />
-<TGConnectingPoint num="7" id="2840" />
-<TGConnectingPoint num="8" id="2841" />
-<TGConnectingPoint num="9" id="2842" />
-<TGConnectingPoint num="10" id="2843" />
-<TGConnectingPoint num="11" id="2844" />
-<TGConnectingPoint num="12" id="2845" />
-<TGConnectingPoint num="13" id="2846" />
-<TGConnectingPoint num="14" id="2847" />
-<TGConnectingPoint num="15" id="2848" />
-<TGConnectingPoint num="16" id="2849" />
-<TGConnectingPoint num="17" id="2850" />
-<TGConnectingPoint num="18" id="2851" />
-<TGConnectingPoint num="19" id="2852" />
-<TGConnectingPoint num="20" id="2853" />
-<TGConnectingPoint num="21" id="2854" />
-<TGConnectingPoint num="22" id="2855" />
-<TGConnectingPoint num="23" id="2856" />
-<TGConnectingPoint num="24" id="2857" />
-<TGConnectingPoint num="25" id="2858" />
-<TGConnectingPoint num="26" id="2859" />
-<TGConnectingPoint num="27" id="2860" />
-<TGConnectingPoint num="28" id="2861" />
-<TGConnectingPoint num="29" id="2862" />
-<TGConnectingPoint num="30" id="2863" />
-<TGConnectingPoint num="31" id="2864" />
-<TGConnectingPoint num="32" id="2865" />
-<TGConnectingPoint num="33" id="2866" />
-<TGConnectingPoint num="34" id="2867" />
-<TGConnectingPoint num="35" id="2868" />
-<TGConnectingPoint num="36" id="2869" />
-<TGConnectingPoint num="37" id="2870" />
-<TGConnectingPoint num="38" id="2871" />
-<TGConnectingPoint num="39" id="2872" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2884" >
-<cdparam x="211" y="568" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="error" />
+<TGConnectingPoint num="0" id="2709" />
+<TGConnectingPoint num="1" id="2710" />
+<TGConnectingPoint num="2" id="2711" />
+<TGConnectingPoint num="3" id="2712" />
+<TGConnectingPoint num="4" id="2713" />
+<TGConnectingPoint num="5" id="2714" />
+<TGConnectingPoint num="6" id="2715" />
+<TGConnectingPoint num="7" id="2716" />
+<TGConnectingPoint num="8" id="2717" />
+<TGConnectingPoint num="9" id="2718" />
+<TGConnectingPoint num="10" id="2719" />
+<TGConnectingPoint num="11" id="2720" />
+<TGConnectingPoint num="12" id="2721" />
+<TGConnectingPoint num="13" id="2722" />
+<TGConnectingPoint num="14" id="2723" />
+<TGConnectingPoint num="15" id="2724" />
+<TGConnectingPoint num="16" id="2725" />
+<TGConnectingPoint num="17" id="2726" />
+<TGConnectingPoint num="18" id="2727" />
+<TGConnectingPoint num="19" id="2728" />
+<TGConnectingPoint num="20" id="2729" />
+<TGConnectingPoint num="21" id="2730" />
+<TGConnectingPoint num="22" id="2731" />
+<TGConnectingPoint num="23" id="2732" />
+<TGConnectingPoint num="24" id="2733" />
+<TGConnectingPoint num="25" id="2734" />
+<TGConnectingPoint num="26" id="2735" />
+<TGConnectingPoint num="27" id="2736" />
+<TGConnectingPoint num="28" id="2737" />
+<TGConnectingPoint num="29" id="2738" />
+<TGConnectingPoint num="30" id="2739" />
+<TGConnectingPoint num="31" id="2740" />
+<TGConnectingPoint num="32" id="2741" />
+<TGConnectingPoint num="33" id="2742" />
+<TGConnectingPoint num="34" id="2743" />
+<TGConnectingPoint num="35" id="2744" />
+<TGConnectingPoint num="36" id="2745" />
+<TGConnectingPoint num="37" id="2746" />
+<TGConnectingPoint num="38" id="2747" />
+<TGConnectingPoint num="39" id="2748" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2790" >
+<cdparam x="642" y="283" />
+<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="2874" />
-<TGConnectingPoint num="1" id="2875" />
-<TGConnectingPoint num="2" id="2876" />
-<TGConnectingPoint num="3" id="2877" />
-<TGConnectingPoint num="4" id="2878" />
-<TGConnectingPoint num="5" id="2879" />
-<TGConnectingPoint num="6" id="2880" />
-<TGConnectingPoint num="7" id="2881" />
-<TGConnectingPoint num="8" id="2882" />
-<TGConnectingPoint num="9" id="2883" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2895" >
-<cdparam x="212" y="344" />
+<infoparam name="State" value="VerifyServerCert" />
+<TGConnectingPoint num="0" id="2750" />
+<TGConnectingPoint num="1" id="2751" />
+<TGConnectingPoint num="2" id="2752" />
+<TGConnectingPoint num="3" id="2753" />
+<TGConnectingPoint num="4" id="2754" />
+<TGConnectingPoint num="5" id="2755" />
+<TGConnectingPoint num="6" id="2756" />
+<TGConnectingPoint num="7" id="2757" />
+<TGConnectingPoint num="8" id="2758" />
+<TGConnectingPoint num="9" id="2759" />
+<TGConnectingPoint num="10" id="2760" />
+<TGConnectingPoint num="11" id="2761" />
+<TGConnectingPoint num="12" id="2762" />
+<TGConnectingPoint num="13" id="2763" />
+<TGConnectingPoint num="14" id="2764" />
+<TGConnectingPoint num="15" id="2765" />
+<TGConnectingPoint num="16" id="2766" />
+<TGConnectingPoint num="17" id="2767" />
+<TGConnectingPoint num="18" id="2768" />
+<TGConnectingPoint num="19" id="2769" />
+<TGConnectingPoint num="20" id="2770" />
+<TGConnectingPoint num="21" id="2771" />
+<TGConnectingPoint num="22" id="2772" />
+<TGConnectingPoint num="23" id="2773" />
+<TGConnectingPoint num="24" id="2774" />
+<TGConnectingPoint num="25" id="2775" />
+<TGConnectingPoint num="26" id="2776" />
+<TGConnectingPoint num="27" id="2777" />
+<TGConnectingPoint num="28" id="2778" />
+<TGConnectingPoint num="29" id="2779" />
+<TGConnectingPoint num="30" id="2780" />
+<TGConnectingPoint num="31" id="2781" />
+<TGConnectingPoint num="32" id="2782" />
+<TGConnectingPoint num="33" id="2783" />
+<TGConnectingPoint num="34" id="2784" />
+<TGConnectingPoint num="35" id="2785" />
+<TGConnectingPoint num="36" id="2786" />
+<TGConnectingPoint num="37" id="2787" />
+<TGConnectingPoint num="38" id="2788" />
+<TGConnectingPoint num="39" id="2789" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2801" >
+<cdparam x="641" y="193" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="2885" />
-<TGConnectingPoint num="1" id="2886" />
-<TGConnectingPoint num="2" id="2887" />
-<TGConnectingPoint num="3" id="2888" />
-<TGConnectingPoint num="4" id="2889" />
-<TGConnectingPoint num="5" id="2890" />
-<TGConnectingPoint num="6" id="2891" />
-<TGConnectingPoint num="7" id="2892" />
-<TGConnectingPoint num="8" id="2893" />
-<TGConnectingPoint num="9" id="2894" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="2906" >
-<cdparam x="211" y="246" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="2896" />
-<TGConnectingPoint num="1" id="2897" />
-<TGConnectingPoint num="2" id="2898" />
-<TGConnectingPoint num="3" id="2899" />
-<TGConnectingPoint num="4" id="2900" />
-<TGConnectingPoint num="5" id="2901" />
-<TGConnectingPoint num="6" id="2902" />
-<TGConnectingPoint num="7" id="2903" />
-<TGConnectingPoint num="8" id="2904" />
-<TGConnectingPoint num="9" id="2905" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2917" >
-<cdparam x="197" y="180" />
-<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="2791" />
+<TGConnectingPoint num="1" id="2792" />
+<TGConnectingPoint num="2" id="2793" />
+<TGConnectingPoint num="3" id="2794" />
+<TGConnectingPoint num="4" id="2795" />
+<TGConnectingPoint num="5" id="2796" />
+<TGConnectingPoint num="6" id="2797" />
+<TGConnectingPoint num="7" id="2798" />
+<TGConnectingPoint num="8" id="2799" />
+<TGConnectingPoint num="9" id="2800" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="2812" >
+<cdparam x="624" y="131" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(clientHello)" />
-<TGConnectingPoint num="0" id="2907" />
-<TGConnectingPoint num="1" id="2908" />
-<TGConnectingPoint num="2" id="2909" />
-<TGConnectingPoint num="3" id="2910" />
-<TGConnectingPoint num="4" id="2911" />
-<TGConnectingPoint num="5" id="2912" />
-<TGConnectingPoint num="6" id="2913" />
-<TGConnectingPoint num="7" id="2914" />
-<TGConnectingPoint num="8" id="2915" />
-<TGConnectingPoint num="9" id="2916" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="2919" >
-<cdparam x="249" y="101" />
+<infoparam name="Send signal" value="chOut(clientHello)" />
+<TGConnectingPoint num="0" id="2802" />
+<TGConnectingPoint num="1" id="2803" />
+<TGConnectingPoint num="2" id="2804" />
+<TGConnectingPoint num="3" id="2805" />
+<TGConnectingPoint num="4" id="2806" />
+<TGConnectingPoint num="5" id="2807" />
+<TGConnectingPoint num="6" id="2808" />
+<TGConnectingPoint num="7" id="2809" />
+<TGConnectingPoint num="8" id="2810" />
+<TGConnectingPoint num="9" id="2811" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="2814" >
+<cdparam x="678" y="54" />
 <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="2918" />
+<TGConnectingPoint num="0" id="2813" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2855" >
+<cdparam x="769" y="819" />
+<sizeparam width="175" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="HandshakedComplete" />
+<TGConnectingPoint num="0" id="2815" />
+<TGConnectingPoint num="1" id="2816" />
+<TGConnectingPoint num="2" id="2817" />
+<TGConnectingPoint num="3" id="2818" />
+<TGConnectingPoint num="4" id="2819" />
+<TGConnectingPoint num="5" id="2820" />
+<TGConnectingPoint num="6" id="2821" />
+<TGConnectingPoint num="7" id="2822" />
+<TGConnectingPoint num="8" id="2823" />
+<TGConnectingPoint num="9" id="2824" />
+<TGConnectingPoint num="10" id="2825" />
+<TGConnectingPoint num="11" id="2826" />
+<TGConnectingPoint num="12" id="2827" />
+<TGConnectingPoint num="13" id="2828" />
+<TGConnectingPoint num="14" id="2829" />
+<TGConnectingPoint num="15" id="2830" />
+<TGConnectingPoint num="16" id="2831" />
+<TGConnectingPoint num="17" id="2832" />
+<TGConnectingPoint num="18" id="2833" />
+<TGConnectingPoint num="19" id="2834" />
+<TGConnectingPoint num="20" id="2835" />
+<TGConnectingPoint num="21" id="2836" />
+<TGConnectingPoint num="22" id="2837" />
+<TGConnectingPoint num="23" id="2838" />
+<TGConnectingPoint num="24" id="2839" />
+<TGConnectingPoint num="25" id="2840" />
+<TGConnectingPoint num="26" id="2841" />
+<TGConnectingPoint num="27" id="2842" />
+<TGConnectingPoint num="28" id="2843" />
+<TGConnectingPoint num="29" id="2844" />
+<TGConnectingPoint num="30" id="2845" />
+<TGConnectingPoint num="31" id="2846" />
+<TGConnectingPoint num="32" id="2847" />
+<TGConnectingPoint num="33" id="2848" />
+<TGConnectingPoint num="34" id="2849" />
+<TGConnectingPoint num="35" id="2850" />
+<TGConnectingPoint num="36" id="2851" />
+<TGConnectingPoint num="37" id="2852" />
+<TGConnectingPoint num="38" id="2853" />
+<TGConnectingPoint num="39" id="2854" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2896" >
+<cdparam x="806" y="697" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="checkMS" />
+<TGConnectingPoint num="0" id="2856" />
+<TGConnectingPoint num="1" id="2857" />
+<TGConnectingPoint num="2" id="2858" />
+<TGConnectingPoint num="3" id="2859" />
+<TGConnectingPoint num="4" id="2860" />
+<TGConnectingPoint num="5" id="2861" />
+<TGConnectingPoint num="6" id="2862" />
+<TGConnectingPoint num="7" id="2863" />
+<TGConnectingPoint num="8" id="2864" />
+<TGConnectingPoint num="9" id="2865" />
+<TGConnectingPoint num="10" id="2866" />
+<TGConnectingPoint num="11" id="2867" />
+<TGConnectingPoint num="12" id="2868" />
+<TGConnectingPoint num="13" id="2869" />
+<TGConnectingPoint num="14" id="2870" />
+<TGConnectingPoint num="15" id="2871" />
+<TGConnectingPoint num="16" id="2872" />
+<TGConnectingPoint num="17" id="2873" />
+<TGConnectingPoint num="18" id="2874" />
+<TGConnectingPoint num="19" id="2875" />
+<TGConnectingPoint num="20" id="2876" />
+<TGConnectingPoint num="21" id="2877" />
+<TGConnectingPoint num="22" id="2878" />
+<TGConnectingPoint num="23" id="2879" />
+<TGConnectingPoint num="24" id="2880" />
+<TGConnectingPoint num="25" id="2881" />
+<TGConnectingPoint num="26" id="2882" />
+<TGConnectingPoint num="27" id="2883" />
+<TGConnectingPoint num="28" id="2884" />
+<TGConnectingPoint num="29" id="2885" />
+<TGConnectingPoint num="30" id="2886" />
+<TGConnectingPoint num="31" id="2887" />
+<TGConnectingPoint num="32" id="2888" />
+<TGConnectingPoint num="33" id="2889" />
+<TGConnectingPoint num="34" id="2890" />
+<TGConnectingPoint num="35" id="2891" />
+<TGConnectingPoint num="36" id="2892" />
+<TGConnectingPoint num="37" id="2893" />
+<TGConnectingPoint num="38" id="2894" />
+<TGConnectingPoint num="39" id="2895" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="2907" >
+<cdparam x="774" y="591" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="2897" />
+<TGConnectingPoint num="1" id="2898" />
+<TGConnectingPoint num="2" id="2899" />
+<TGConnectingPoint num="3" id="2900" />
+<TGConnectingPoint num="4" id="2901" />
+<TGConnectingPoint num="5" id="2902" />
+<TGConnectingPoint num="6" id="2903" />
+<TGConnectingPoint num="7" id="2904" />
+<TGConnectingPoint num="8" id="2905" />
+<TGConnectingPoint num="9" id="2906" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Send_Message" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="2926" >
+<CONNECTOR type="5102" id="2914" >
 <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="2925" />
-<P1  x="409" y="70" id="2991" />
-<P2  x="409" y="113" id="3005" />
+<TGConnectingPoint num="0" id="2913" />
+<P1  x="409" y="70" id="2979" />
+<P2  x="409" y="113" id="2993" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2924" >
-<father id="2926" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2912" >
+<father id="2914" num="0" />
 <cdparam x="408" y="91" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2920" />
-<TGConnectingPoint num="1" id="2921" />
-<TGConnectingPoint num="2" id="2922" />
-<TGConnectingPoint num="3" id="2923" />
+<TGConnectingPoint num="0" id="2908" />
+<TGConnectingPoint num="1" id="2909" />
+<TGConnectingPoint num="2" id="2910" />
+<TGConnectingPoint num="3" id="2911" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6536,25 +6509,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2933" >
+<CONNECTOR type="5102" id="2921" >
 <cdparam x="401" y="161" />
 <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="2932" />
-<P1  x="409" y="163" id="3010" />
-<P2  x="409" y="221" id="2993" />
+<TGConnectingPoint num="0" id="2920" />
+<P1  x="409" y="163" id="2998" />
+<P2  x="409" y="221" id="2981" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2931" >
-<father id="2933" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2919" >
+<father id="2921" num="0" />
 <cdparam x="437" y="182" />
 <sizeparam width="181" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2927" />
-<TGConnectingPoint num="1" id="2928" />
-<TGConnectingPoint num="2" id="2929" />
-<TGConnectingPoint num="3" id="2930" />
+<TGConnectingPoint num="0" id="2915" />
+<TGConnectingPoint num="1" id="2916" />
+<TGConnectingPoint num="2" id="2917" />
+<TGConnectingPoint num="3" id="2918" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6567,25 +6540,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2940" >
+<CONNECTOR type="5102" id="2928" >
 <cdparam x="409" y="251" />
 <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="2939" />
-<P1  x="409" y="251" id="2994" />
-<P2  x="409" y="288" id="2951" />
+<TGConnectingPoint num="0" id="2927" />
+<P1  x="409" y="251" id="2982" />
+<P2  x="409" y="288" id="2939" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2938" >
-<father id="2940" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2926" >
+<father id="2928" num="0" />
 <cdparam x="440" y="270" />
 <sizeparam width="106" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2934" />
-<TGConnectingPoint num="1" id="2935" />
-<TGConnectingPoint num="2" id="2936" />
-<TGConnectingPoint num="3" id="2937" />
+<TGConnectingPoint num="0" id="2922" />
+<TGConnectingPoint num="1" id="2923" />
+<TGConnectingPoint num="2" id="2924" />
+<TGConnectingPoint num="3" id="2925" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6596,25 +6569,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2947" >
+<CONNECTOR type="5102" id="2935" >
 <cdparam x="421" y="338" />
 <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="2946" />
-<P1  x="409" y="338" id="2956" />
-<P2  x="409" y="381" id="2948" />
+<TGConnectingPoint num="0" id="2934" />
+<P1  x="409" y="338" id="2944" />
+<P2  x="409" y="381" id="2936" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2945" >
-<father id="2947" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2933" >
+<father id="2935" num="0" />
 <cdparam x="443" y="364" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2941" />
-<TGConnectingPoint num="1" id="2942" />
-<TGConnectingPoint num="2" id="2943" />
-<TGConnectingPoint num="3" id="2944" />
+<TGConnectingPoint num="0" id="2929" />
+<TGConnectingPoint num="1" id="2930" />
+<TGConnectingPoint num="2" id="2931" />
+<TGConnectingPoint num="3" id="2932" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6624,138 +6597,138 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="2949" >
+<COMPONENT type="5101" id="2937" >
 <cdparam x="399" y="386" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2948" />
+<TGConnectingPoint num="0" id="2936" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2990" >
+<COMPONENT type="5106" id="2978" >
 <cdparam x="359" y="288" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="MessageSent" />
-<TGConnectingPoint num="0" id="2950" />
-<TGConnectingPoint num="1" id="2951" />
-<TGConnectingPoint num="2" id="2952" />
-<TGConnectingPoint num="3" id="2953" />
-<TGConnectingPoint num="4" id="2954" />
-<TGConnectingPoint num="5" id="2955" />
-<TGConnectingPoint num="6" id="2956" />
-<TGConnectingPoint num="7" id="2957" />
-<TGConnectingPoint num="8" id="2958" />
-<TGConnectingPoint num="9" id="2959" />
-<TGConnectingPoint num="10" id="2960" />
-<TGConnectingPoint num="11" id="2961" />
-<TGConnectingPoint num="12" id="2962" />
-<TGConnectingPoint num="13" id="2963" />
-<TGConnectingPoint num="14" id="2964" />
-<TGConnectingPoint num="15" id="2965" />
-<TGConnectingPoint num="16" id="2966" />
-<TGConnectingPoint num="17" id="2967" />
-<TGConnectingPoint num="18" id="2968" />
-<TGConnectingPoint num="19" id="2969" />
-<TGConnectingPoint num="20" id="2970" />
-<TGConnectingPoint num="21" id="2971" />
-<TGConnectingPoint num="22" id="2972" />
-<TGConnectingPoint num="23" id="2973" />
-<TGConnectingPoint num="24" id="2974" />
-<TGConnectingPoint num="25" id="2975" />
-<TGConnectingPoint num="26" id="2976" />
-<TGConnectingPoint num="27" id="2977" />
-<TGConnectingPoint num="28" id="2978" />
-<TGConnectingPoint num="29" id="2979" />
-<TGConnectingPoint num="30" id="2980" />
-<TGConnectingPoint num="31" id="2981" />
-<TGConnectingPoint num="32" id="2982" />
-<TGConnectingPoint num="33" id="2983" />
-<TGConnectingPoint num="34" id="2984" />
-<TGConnectingPoint num="35" id="2985" />
-<TGConnectingPoint num="36" id="2986" />
-<TGConnectingPoint num="37" id="2987" />
-<TGConnectingPoint num="38" id="2988" />
-<TGConnectingPoint num="39" id="2989" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2992" >
+<TGConnectingPoint num="0" id="2938" />
+<TGConnectingPoint num="1" id="2939" />
+<TGConnectingPoint num="2" id="2940" />
+<TGConnectingPoint num="3" id="2941" />
+<TGConnectingPoint num="4" id="2942" />
+<TGConnectingPoint num="5" id="2943" />
+<TGConnectingPoint num="6" id="2944" />
+<TGConnectingPoint num="7" id="2945" />
+<TGConnectingPoint num="8" id="2946" />
+<TGConnectingPoint num="9" id="2947" />
+<TGConnectingPoint num="10" id="2948" />
+<TGConnectingPoint num="11" id="2949" />
+<TGConnectingPoint num="12" id="2950" />
+<TGConnectingPoint num="13" id="2951" />
+<TGConnectingPoint num="14" id="2952" />
+<TGConnectingPoint num="15" id="2953" />
+<TGConnectingPoint num="16" id="2954" />
+<TGConnectingPoint num="17" id="2955" />
+<TGConnectingPoint num="18" id="2956" />
+<TGConnectingPoint num="19" id="2957" />
+<TGConnectingPoint num="20" id="2958" />
+<TGConnectingPoint num="21" id="2959" />
+<TGConnectingPoint num="22" id="2960" />
+<TGConnectingPoint num="23" id="2961" />
+<TGConnectingPoint num="24" id="2962" />
+<TGConnectingPoint num="25" id="2963" />
+<TGConnectingPoint num="26" id="2964" />
+<TGConnectingPoint num="27" id="2965" />
+<TGConnectingPoint num="28" id="2966" />
+<TGConnectingPoint num="29" id="2967" />
+<TGConnectingPoint num="30" id="2968" />
+<TGConnectingPoint num="31" id="2969" />
+<TGConnectingPoint num="32" id="2970" />
+<TGConnectingPoint num="33" id="2971" />
+<TGConnectingPoint num="34" id="2972" />
+<TGConnectingPoint num="35" id="2973" />
+<TGConnectingPoint num="36" id="2974" />
+<TGConnectingPoint num="37" id="2975" />
+<TGConnectingPoint num="38" id="2976" />
+<TGConnectingPoint num="39" id="2977" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="2980" >
 <cdparam x="402" 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="2991" />
+<TGConnectingPoint num="0" id="2979" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="3003" >
+<COMPONENT type="5103" id="2991" >
 <cdparam x="364" y="226" />
 <sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="2993" />
-<TGConnectingPoint num="1" id="2994" />
-<TGConnectingPoint num="2" id="2995" />
-<TGConnectingPoint num="3" id="2996" />
-<TGConnectingPoint num="4" id="2997" />
-<TGConnectingPoint num="5" id="2998" />
-<TGConnectingPoint num="6" id="2999" />
-<TGConnectingPoint num="7" id="3000" />
-<TGConnectingPoint num="8" id="3001" />
-<TGConnectingPoint num="9" id="3002" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3044" >
+<TGConnectingPoint num="0" id="2981" />
+<TGConnectingPoint num="1" id="2982" />
+<TGConnectingPoint num="2" id="2983" />
+<TGConnectingPoint num="3" id="2984" />
+<TGConnectingPoint num="4" id="2985" />
+<TGConnectingPoint num="5" id="2986" />
+<TGConnectingPoint num="6" id="2987" />
+<TGConnectingPoint num="7" id="2988" />
+<TGConnectingPoint num="8" id="2989" />
+<TGConnectingPoint num="9" id="2990" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3032" >
 <cdparam x="359" y="113" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="sendMessage" />
-<TGConnectingPoint num="0" id="3004" />
-<TGConnectingPoint num="1" id="3005" />
-<TGConnectingPoint num="2" id="3006" />
-<TGConnectingPoint num="3" id="3007" />
-<TGConnectingPoint num="4" id="3008" />
-<TGConnectingPoint num="5" id="3009" />
-<TGConnectingPoint num="6" id="3010" />
-<TGConnectingPoint num="7" id="3011" />
-<TGConnectingPoint num="8" id="3012" />
-<TGConnectingPoint num="9" id="3013" />
-<TGConnectingPoint num="10" id="3014" />
-<TGConnectingPoint num="11" id="3015" />
-<TGConnectingPoint num="12" id="3016" />
-<TGConnectingPoint num="13" id="3017" />
-<TGConnectingPoint num="14" id="3018" />
-<TGConnectingPoint num="15" id="3019" />
-<TGConnectingPoint num="16" id="3020" />
-<TGConnectingPoint num="17" id="3021" />
-<TGConnectingPoint num="18" id="3022" />
-<TGConnectingPoint num="19" id="3023" />
-<TGConnectingPoint num="20" id="3024" />
-<TGConnectingPoint num="21" id="3025" />
-<TGConnectingPoint num="22" id="3026" />
-<TGConnectingPoint num="23" id="3027" />
-<TGConnectingPoint num="24" id="3028" />
-<TGConnectingPoint num="25" id="3029" />
-<TGConnectingPoint num="26" id="3030" />
-<TGConnectingPoint num="27" id="3031" />
-<TGConnectingPoint num="28" id="3032" />
-<TGConnectingPoint num="29" id="3033" />
-<TGConnectingPoint num="30" id="3034" />
-<TGConnectingPoint num="31" id="3035" />
-<TGConnectingPoint num="32" id="3036" />
-<TGConnectingPoint num="33" id="3037" />
-<TGConnectingPoint num="34" id="3038" />
-<TGConnectingPoint num="35" id="3039" />
-<TGConnectingPoint num="36" id="3040" />
-<TGConnectingPoint num="37" id="3041" />
-<TGConnectingPoint num="38" id="3042" />
-<TGConnectingPoint num="39" id="3043" />
+<TGConnectingPoint num="0" id="2992" />
+<TGConnectingPoint num="1" id="2993" />
+<TGConnectingPoint num="2" id="2994" />
+<TGConnectingPoint num="3" id="2995" />
+<TGConnectingPoint num="4" id="2996" />
+<TGConnectingPoint num="5" id="2997" />
+<TGConnectingPoint num="6" id="2998" />
+<TGConnectingPoint num="7" id="2999" />
+<TGConnectingPoint num="8" id="3000" />
+<TGConnectingPoint num="9" id="3001" />
+<TGConnectingPoint num="10" id="3002" />
+<TGConnectingPoint num="11" id="3003" />
+<TGConnectingPoint num="12" id="3004" />
+<TGConnectingPoint num="13" id="3005" />
+<TGConnectingPoint num="14" id="3006" />
+<TGConnectingPoint num="15" id="3007" />
+<TGConnectingPoint num="16" id="3008" />
+<TGConnectingPoint num="17" id="3009" />
+<TGConnectingPoint num="18" id="3010" />
+<TGConnectingPoint num="19" id="3011" />
+<TGConnectingPoint num="20" id="3012" />
+<TGConnectingPoint num="21" id="3013" />
+<TGConnectingPoint num="22" id="3014" />
+<TGConnectingPoint num="23" id="3015" />
+<TGConnectingPoint num="24" id="3016" />
+<TGConnectingPoint num="25" id="3017" />
+<TGConnectingPoint num="26" id="3018" />
+<TGConnectingPoint num="27" id="3019" />
+<TGConnectingPoint num="28" id="3020" />
+<TGConnectingPoint num="29" id="3021" />
+<TGConnectingPoint num="30" id="3022" />
+<TGConnectingPoint num="31" id="3023" />
+<TGConnectingPoint num="32" id="3024" />
+<TGConnectingPoint num="33" id="3025" />
+<TGConnectingPoint num="34" id="3026" />
+<TGConnectingPoint num="35" id="3027" />
+<TGConnectingPoint num="36" id="3028" />
+<TGConnectingPoint num="37" id="3029" />
+<TGConnectingPoint num="38" id="3030" />
+<TGConnectingPoint num="39" id="3031" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -6763,26 +6736,26 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Client_Handshake" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="3051" >
-<cdparam x="818" y="521" />
+<AVATARStateMachineDiagramPanel name="Server_Handshake" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="3039" >
+<cdparam x="256" y="293" />
 <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="3050" />
-<P1  x="818" y="521" id="3125" />
-<P2  x="818" y="586" id="3326" />
+<TGConnectingPoint num="0" id="3038" />
+<P1  x="256" y="271" id="3141" />
+<P2  x="256" y="339" id="3129" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3049" >
-<father id="3051" num="0" />
-<cdparam x="818" y="553" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3037" >
+<father id="3039" num="0" />
+<cdparam x="164" y="386" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3045" />
-<TGConnectingPoint num="1" id="3046" />
-<TGConnectingPoint num="2" id="3047" />
-<TGConnectingPoint num="3" id="3048" />
+<TGConnectingPoint num="0" id="3033" />
+<TGConnectingPoint num="1" id="3034" />
+<TGConnectingPoint num="2" id="3035" />
+<TGConnectingPoint num="3" id="3036" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6792,203 +6765,345 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3058" >
-<cdparam x="856" y="812" />
+<CONNECTOR type="5102" id="3046" >
+<cdparam x="256" y="258" />
 <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="3057" />
-<P1  x="856" y="747" id="3291" />
-<P2  x="856" y="819" id="3245" />
+<TGConnectingPoint num="0" id="3045" />
+<P1  x="256" y="205" id="3152" />
+<P2  x="256" y="241" id="3140" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3056" >
-<father id="3058" num="0" />
-<cdparam x="880" y="782" />
-<sizeparam width="180" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3044" >
+<father id="3046" num="0" />
+<cdparam x="269" y="229" />
+<sizeparam width="256" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3052" />
-<TGConnectingPoint num="1" id="3053" />
-<TGConnectingPoint num="2" id="3054" />
-<TGConnectingPoint num="3" id="3055" />
+<TGConnectingPoint num="0" id="3040" />
+<TGConnectingPoint num="1" id="3041" />
+<TGConnectingPoint num="2" id="3042" />
+<TGConnectingPoint num="3" id="3043" />
 <extraparam>
-<guard value="[ filler1.data == filler2.data ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1 = concat2(serverHello, serverCert)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3065" >
-<cdparam x="818" y="681" />
+<CONNECTOR type="5102" id="3053" >
+<cdparam x="256" y="121" />
 <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="3064" />
-<P1  x="818" y="616" id="3327" />
-<P2  x="818" y="697" id="3301" />
+<TGConnectingPoint num="0" id="3052" />
+<P1  x="256" y="121" id="3162" />
+<P2  x="256" y="175" id="3151" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3063" >
-<father id="3065" num="0" />
-<cdparam x="838" y="642" />
-<sizeparam width="290" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3051" >
+<father id="3053" num="0" />
+<cdparam x="265" y="147" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3059" />
-<TGConnectingPoint num="1" id="3060" />
-<TGConnectingPoint num="2" id="3061" />
-<TGConnectingPoint num="3" id="3062" />
+<TGConnectingPoint num="0" id="3047" />
+<TGConnectingPoint num="1" id="3048" />
+<TGConnectingPoint num="2" id="3049" />
+<TGConnectingPoint num="3" id="3050" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler2 = concat3(PMS, clientHello, serverHello)" />
-<actions value="MS = hash(filler2)" />
-<actions value="filler2 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3072" >
-<cdparam x="806" y="699" />
+<CONNECTOR type="5102" id="3060" >
+<cdparam x="256" y="520" />
 <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="3071" />
-<P1  x="806" y="722" id="3288" />
-<P2  x="520" y="535" id="3142" />
+<TGConnectingPoint num="0" id="3059" />
+<P1  x="256" y="466" id="3083" />
+<P2  x="256" y="563" id="3118" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3070" >
-<father id="3072" num="0" />
-<cdparam x="660" y="685" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3058" >
+<father id="3060" num="0" />
+<cdparam x="288" y="490" />
+<sizeparam width="294" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3066" />
-<TGConnectingPoint num="1" id="3067" />
-<TGConnectingPoint num="2" id="3068" />
-<TGConnectingPoint num="3" id="3069" />
+<TGConnectingPoint num="0" id="3054" />
+<TGConnectingPoint num="1" id="3055" />
+<TGConnectingPoint num="2" id="3056" />
+<TGConnectingPoint num="3" id="3057" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="PMS = adecrypt(filler1, serverPrivK)" />
+<actions value="filler1 = concat3(PMS, clientHello, serverHello) " />
+<actions value="MS = hash(filler1)" />
+<actions value="filler1 = hash(MS)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3079" >
-<cdparam x="818" y="416" />
+<CONNECTOR type="5102" id="3067" >
+<cdparam x="256" y="403" />
 <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="3078" />
-<P1  x="818" y="416" id="3136" />
-<P2  x="818" y="491" id="3124" />
+<TGConnectingPoint num="0" id="3066" />
+<P1  x="256" y="369" id="3130" />
+<P2  x="256" y="416" id="3078" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3077" >
-<father id="3079" num="0" />
-<cdparam x="834" y="448" />
-<sizeparam width="229" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3065" >
+<father id="3067" num="0" />
+<cdparam x="256" y="443" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3073" />
-<TGConnectingPoint num="1" id="3074" />
-<TGConnectingPoint num="2" id="3075" />
-<TGConnectingPoint num="3" id="3076" />
+<TGConnectingPoint num="0" id="3061" />
+<TGConnectingPoint num="1" id="3062" />
+<TGConnectingPoint num="2" id="3063" />
+<TGConnectingPoint num="3" id="3064" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="filler1.data = PMS" />
-<actions value="filler1 = aencrypt(filler1, serverPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3086" >
-<cdparam x="792" y="333" />
+<CONNECTOR type="5102" id="3074" >
+<cdparam x="256" y="593" />
 <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="3085" />
-<P1  x="792" y="333" id="3210" />
-<P2  x="818" y="386" id="3135" />
+<TGConnectingPoint num="0" id="3073" />
+<P1  x="256" y="593" id="3119" />
+<P2  x="256" y="650" id="3075" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3084" >
-<father id="3086" num="0" />
-<cdparam x="824" y="353" />
-<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3072" >
+<father id="3074" num="0" />
+<cdparam x="289" y="624" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3080" />
-<TGConnectingPoint num="1" id="3081" />
-<TGConnectingPoint num="2" id="3082" />
-<TGConnectingPoint num="3" id="3083" />
+<TGConnectingPoint num="0" id="3068" />
+<TGConnectingPoint num="1" id="3069" />
+<TGConnectingPoint num="2" id="3070" />
+<TGConnectingPoint num="3" id="3071" />
 <extraparam>
-<guard value="[ certVerified ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="serverPubK = getpk(serverCert)" />
+<actions value="sid = 0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3093" >
-<cdparam x="685" y="243" />
+<COMPONENT type="5101" id="3076" >
+<cdparam x="246" y="655" />
+<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="3075" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3117" >
+<cdparam x="206" y="416" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="SendingMS" />
+<TGConnectingPoint num="0" id="3077" />
+<TGConnectingPoint num="1" id="3078" />
+<TGConnectingPoint num="2" id="3079" />
+<TGConnectingPoint num="3" id="3080" />
+<TGConnectingPoint num="4" id="3081" />
+<TGConnectingPoint num="5" id="3082" />
+<TGConnectingPoint num="6" id="3083" />
+<TGConnectingPoint num="7" id="3084" />
+<TGConnectingPoint num="8" id="3085" />
+<TGConnectingPoint num="9" id="3086" />
+<TGConnectingPoint num="10" id="3087" />
+<TGConnectingPoint num="11" id="3088" />
+<TGConnectingPoint num="12" id="3089" />
+<TGConnectingPoint num="13" id="3090" />
+<TGConnectingPoint num="14" id="3091" />
+<TGConnectingPoint num="15" id="3092" />
+<TGConnectingPoint num="16" id="3093" />
+<TGConnectingPoint num="17" id="3094" />
+<TGConnectingPoint num="18" id="3095" />
+<TGConnectingPoint num="19" id="3096" />
+<TGConnectingPoint num="20" id="3097" />
+<TGConnectingPoint num="21" id="3098" />
+<TGConnectingPoint num="22" id="3099" />
+<TGConnectingPoint num="23" id="3100" />
+<TGConnectingPoint num="24" id="3101" />
+<TGConnectingPoint num="25" id="3102" />
+<TGConnectingPoint num="26" id="3103" />
+<TGConnectingPoint num="27" id="3104" />
+<TGConnectingPoint num="28" id="3105" />
+<TGConnectingPoint num="29" id="3106" />
+<TGConnectingPoint num="30" id="3107" />
+<TGConnectingPoint num="31" id="3108" />
+<TGConnectingPoint num="32" id="3109" />
+<TGConnectingPoint num="33" id="3110" />
+<TGConnectingPoint num="34" id="3111" />
+<TGConnectingPoint num="35" id="3112" />
+<TGConnectingPoint num="36" id="3113" />
+<TGConnectingPoint num="37" id="3114" />
+<TGConnectingPoint num="38" id="3115" />
+<TGConnectingPoint num="39" id="3116" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3128" >
+<cdparam x="211" y="568" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="3118" />
+<TGConnectingPoint num="1" id="3119" />
+<TGConnectingPoint num="2" id="3120" />
+<TGConnectingPoint num="3" id="3121" />
+<TGConnectingPoint num="4" id="3122" />
+<TGConnectingPoint num="5" id="3123" />
+<TGConnectingPoint num="6" id="3124" />
+<TGConnectingPoint num="7" id="3125" />
+<TGConnectingPoint num="8" id="3126" />
+<TGConnectingPoint num="9" id="3127" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3139" >
+<cdparam x="212" y="344" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(filler1)" />
+<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="1" id="3130" />
+<TGConnectingPoint num="2" id="3131" />
+<TGConnectingPoint num="3" id="3132" />
+<TGConnectingPoint num="4" id="3133" />
+<TGConnectingPoint num="5" id="3134" />
+<TGConnectingPoint num="6" id="3135" />
+<TGConnectingPoint num="7" id="3136" />
+<TGConnectingPoint num="8" id="3137" />
+<TGConnectingPoint num="9" id="3138" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3150" >
+<cdparam x="211" y="246" />
+<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chOut(filler1)" />
+<TGConnectingPoint num="0" id="3140" />
+<TGConnectingPoint num="1" id="3141" />
+<TGConnectingPoint num="2" id="3142" />
+<TGConnectingPoint num="3" id="3143" />
+<TGConnectingPoint num="4" id="3144" />
+<TGConnectingPoint num="5" id="3145" />
+<TGConnectingPoint num="6" id="3146" />
+<TGConnectingPoint num="7" id="3147" />
+<TGConnectingPoint num="8" id="3148" />
+<TGConnectingPoint num="9" id="3149" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3161" >
+<cdparam x="197" y="180" />
+<sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chIn(clientHello)" />
+<TGConnectingPoint num="0" id="3151" />
+<TGConnectingPoint num="1" id="3152" />
+<TGConnectingPoint num="2" id="3153" />
+<TGConnectingPoint num="3" id="3154" />
+<TGConnectingPoint num="4" id="3155" />
+<TGConnectingPoint num="5" id="3156" />
+<TGConnectingPoint num="6" id="3157" />
+<TGConnectingPoint num="7" id="3158" />
+<TGConnectingPoint num="8" id="3159" />
+<TGConnectingPoint num="9" id="3160" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3163" >
+<cdparam x="249" y="101" />
+<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="3162" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Receive_Message" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="3170" >
+<cdparam x="369" 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="3092" />
-<P1  x="685" y="218" id="3221" />
-<P2  x="685" y="283" id="3187" />
+<TGConnectingPoint num="0" id="3169" />
+<P1  x="369" y="226" id="3313" />
+<P2  x="345" y="294" id="3218" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3091" >
-<father id="3093" num="0" />
-<cdparam x="699" y="245" />
-<sizeparam width="278" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3168" >
+<father id="3170" num="0" />
+<cdparam x="293" y="260" />
+<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3087" />
-<TGConnectingPoint num="1" id="3088" />
-<TGConnectingPoint num="2" id="3089" />
-<TGConnectingPoint num="3" id="3090" />
+<TGConnectingPoint num="0" id="3164" />
+<TGConnectingPoint num="1" id="3165" />
+<TGConnectingPoint num="2" id="3166" />
+<TGConnectingPoint num="3" id="3167" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ else ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(filler1, serverHello, serverCert) " />
-<actions value="certVerified = verifyCert(serverCert, CAPubK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3100" >
-<cdparam x="685" y="152" />
+<CONNECTOR type="5102" id="3177" >
+<cdparam x="444" 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="3099" />
-<P1  x="685" y="156" id="3232" />
-<P2  x="685" y="188" id="3220" />
+<TGConnectingPoint num="0" id="3176" />
+<P1  x="444" y="226" id="3316" />
+<P2  x="444" y="294" id="3243" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3098" >
-<father id="3100" num="0" />
-<cdparam x="685" y="192" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3175" >
+<father id="3177" num="0" />
+<cdparam x="455" y="258" />
+<sizeparam width="170" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3094" />
-<TGConnectingPoint num="1" id="3095" />
-<TGConnectingPoint num="2" id="3096" />
-<TGConnectingPoint num="3" id="3097" />
+<TGConnectingPoint num="0" id="3171" />
+<TGConnectingPoint num="1" id="3172" />
+<TGConnectingPoint num="2" id="3173" />
+<TGConnectingPoint num="3" id="3174" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ receivedSID.data == sid ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -6996,27 +7111,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3107" >
-<cdparam x="685" y="333" />
+<CONNECTOR type="5102" id="3184" >
+<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="3106" />
-<P1  x="685" y="333" id="3193" />
-<P2  x="495" y="510" id="3147" />
+<TGConnectingPoint num="0" id="3183" />
+<P1  x="407" y="70" id="3283" />
+<P2  x="407" y="96" id="3326" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3105" >
-<father id="3107" num="0" />
-<cdparam x="539" y="407" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3182" >
+<father id="3184" num="0" />
+<cdparam x="408" y="82" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3101" />
-<TGConnectingPoint num="1" id="3102" />
-<TGConnectingPoint num="2" id="3103" />
-<TGConnectingPoint num="3" id="3104" />
+<TGConnectingPoint num="0" id="3178" />
+<TGConnectingPoint num="1" id="3179" />
+<TGConnectingPoint num="2" id="3180" />
+<TGConnectingPoint num="3" id="3181" />
 <extraparam>
-<guard value="[ else ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -7024,304 +7139,189 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3114" >
-<cdparam x="685" y="80" />
+<CONNECTOR type="5102" id="3191" >
+<cdparam x="407" y="126" />
 <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="3113" />
-<P1  x="685" y="74" id="3242" />
-<P2  x="685" y="126" id="3231" />
+<TGConnectingPoint num="0" id="3190" />
+<P1  x="407" y="126" id="3327" />
+<P2  x="407" y="176" id="3286" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3112" >
-<father id="3114" num="0" />
-<cdparam x="699" y="101" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3189" >
+<father id="3191" num="0" />
+<cdparam x="429" y="144" />
+<sizeparam width="188" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3108" />
-<TGConnectingPoint num="1" id="3109" />
-<TGConnectingPoint num="2" id="3110" />
-<TGConnectingPoint num="3" id="3111" />
+<TGConnectingPoint num="0" id="3185" />
+<TGConnectingPoint num="1" id="3186" />
+<TGConnectingPoint num="2" id="3187" />
+<TGConnectingPoint num="3" id="3188" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="filler1 = sdecrypt(filler1, MS)" />
+<actions value="get2(filler1, receivedSID, msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3121" >
-<cdparam x="868" y="868" />
+<CONNECTOR type="5102" id="3198" >
+<cdparam x="456" y="344" />
 <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="3120" />
-<P1  x="877" y="869" id="3274" />
-<P2  x="877" y="921" id="3122" />
+<TGConnectingPoint num="0" id="3197" />
+<P1  x="456" y="344" id="3272" />
+<P2  x="456" y="411" id="3240" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3119" >
-<father id="3121" num="0" />
-<cdparam x="896" y="902" />
-<sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3196" >
+<father id="3198" num="0" />
+<cdparam x="483" y="383" />
+<sizeparam width="106" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3115" />
-<TGConnectingPoint num="1" id="3116" />
-<TGConnectingPoint num="2" id="3117" />
-<TGConnectingPoint num="3" id="3118" />
+<TGConnectingPoint num="0" id="3192" />
+<TGConnectingPoint num="1" id="3193" />
+<TGConnectingPoint num="2" id="3194" />
+<TGConnectingPoint num="3" id="3195" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sid = 0" />
+<actions value="newSid = sid + 1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="3123" >
-<cdparam x="867" y="926" />
-<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="3122" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3134" >
-<cdparam x="773" y="496" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3239" >
+<cdparam x="258" y="294" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(filler1)" />
-<TGConnectingPoint num="0" id="3124" />
-<TGConnectingPoint num="1" id="3125" />
-<TGConnectingPoint num="2" id="3126" />
-<TGConnectingPoint num="3" id="3127" />
-<TGConnectingPoint num="4" id="3128" />
-<TGConnectingPoint num="5" id="3129" />
-<TGConnectingPoint num="6" id="3130" />
-<TGConnectingPoint num="7" id="3131" />
-<TGConnectingPoint num="8" id="3132" />
-<TGConnectingPoint num="9" id="3133" />
-</COMPONENT>
-
-<COMPONENT type="5108" id="3137" >
-<cdparam x="732" y="391" />
-<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="State" value="refused" />
+<TGConnectingPoint num="0" id="3199" />
+<TGConnectingPoint num="1" id="3200" />
+<TGConnectingPoint num="2" id="3201" />
+<TGConnectingPoint num="3" id="3202" />
+<TGConnectingPoint num="4" id="3203" />
+<TGConnectingPoint num="5" id="3204" />
+<TGConnectingPoint num="6" id="3205" />
+<TGConnectingPoint num="7" id="3206" />
+<TGConnectingPoint num="8" id="3207" />
+<TGConnectingPoint num="9" id="3208" />
+<TGConnectingPoint num="10" id="3209" />
+<TGConnectingPoint num="11" id="3210" />
+<TGConnectingPoint num="12" id="3211" />
+<TGConnectingPoint num="13" id="3212" />
+<TGConnectingPoint num="14" id="3213" />
+<TGConnectingPoint num="15" id="3214" />
+<TGConnectingPoint num="16" id="3215" />
+<TGConnectingPoint num="17" id="3216" />
+<TGConnectingPoint num="18" id="3217" />
+<TGConnectingPoint num="19" id="3218" />
+<TGConnectingPoint num="20" id="3219" />
+<TGConnectingPoint num="21" id="3220" />
+<TGConnectingPoint num="22" id="3221" />
+<TGConnectingPoint num="23" id="3222" />
+<TGConnectingPoint num="24" id="3223" />
+<TGConnectingPoint num="25" id="3224" />
+<TGConnectingPoint num="26" id="3225" />
+<TGConnectingPoint num="27" id="3226" />
+<TGConnectingPoint num="28" id="3227" />
+<TGConnectingPoint num="29" id="3228" />
+<TGConnectingPoint num="30" id="3229" />
+<TGConnectingPoint num="31" id="3230" />
+<TGConnectingPoint num="32" id="3231" />
+<TGConnectingPoint num="33" id="3232" />
+<TGConnectingPoint num="34" id="3233" />
+<TGConnectingPoint num="35" id="3234" />
+<TGConnectingPoint num="36" id="3235" />
+<TGConnectingPoint num="37" id="3236" />
+<TGConnectingPoint num="38" id="3237" />
+<TGConnectingPoint num="39" id="3238" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="3241" >
+<cdparam x="446" y="416" />
+<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="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3135" />
-<TGConnectingPoint num="1" id="3136" />
-<extraparam>
-<Data variable="PMS" minValue="0" maxValue="1000" functionId="0" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="3240" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3178" >
-<cdparam x="420" y="510" />
+<COMPONENT type="5106" id="3282" >
+<cdparam x="394" y="294" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="error" />
-<TGConnectingPoint num="0" id="3138" />
-<TGConnectingPoint num="1" id="3139" />
-<TGConnectingPoint num="2" id="3140" />
-<TGConnectingPoint num="3" id="3141" />
-<TGConnectingPoint num="4" id="3142" />
-<TGConnectingPoint num="5" id="3143" />
-<TGConnectingPoint num="6" id="3144" />
-<TGConnectingPoint num="7" id="3145" />
-<TGConnectingPoint num="8" id="3146" />
-<TGConnectingPoint num="9" id="3147" />
-<TGConnectingPoint num="10" id="3148" />
-<TGConnectingPoint num="11" id="3149" />
-<TGConnectingPoint num="12" id="3150" />
-<TGConnectingPoint num="13" id="3151" />
-<TGConnectingPoint num="14" id="3152" />
-<TGConnectingPoint num="15" id="3153" />
-<TGConnectingPoint num="16" id="3154" />
-<TGConnectingPoint num="17" id="3155" />
-<TGConnectingPoint num="18" id="3156" />
-<TGConnectingPoint num="19" id="3157" />
-<TGConnectingPoint num="20" id="3158" />
-<TGConnectingPoint num="21" id="3159" />
-<TGConnectingPoint num="22" id="3160" />
-<TGConnectingPoint num="23" id="3161" />
-<TGConnectingPoint num="24" id="3162" />
-<TGConnectingPoint num="25" id="3163" />
-<TGConnectingPoint num="26" id="3164" />
-<TGConnectingPoint num="27" id="3165" />
-<TGConnectingPoint num="28" id="3166" />
-<TGConnectingPoint num="29" id="3167" />
-<TGConnectingPoint num="30" id="3168" />
-<TGConnectingPoint num="31" id="3169" />
-<TGConnectingPoint num="32" id="3170" />
-<TGConnectingPoint num="33" id="3171" />
-<TGConnectingPoint num="34" id="3172" />
-<TGConnectingPoint num="35" id="3173" />
-<TGConnectingPoint num="36" id="3174" />
-<TGConnectingPoint num="37" id="3175" />
-<TGConnectingPoint num="38" id="3176" />
-<TGConnectingPoint num="39" id="3177" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3219" >
-<cdparam x="642" y="283" />
-<sizeparam width="173" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="VerifyServerCert" />
-<TGConnectingPoint num="0" id="3179" />
-<TGConnectingPoint num="1" id="3180" />
-<TGConnectingPoint num="2" id="3181" />
-<TGConnectingPoint num="3" id="3182" />
-<TGConnectingPoint num="4" id="3183" />
-<TGConnectingPoint num="5" id="3184" />
-<TGConnectingPoint num="6" id="3185" />
-<TGConnectingPoint num="7" id="3186" />
-<TGConnectingPoint num="8" id="3187" />
-<TGConnectingPoint num="9" id="3188" />
-<TGConnectingPoint num="10" id="3189" />
-<TGConnectingPoint num="11" id="3190" />
-<TGConnectingPoint num="12" id="3191" />
-<TGConnectingPoint num="13" id="3192" />
-<TGConnectingPoint num="14" id="3193" />
-<TGConnectingPoint num="15" id="3194" />
-<TGConnectingPoint num="16" id="3195" />
-<TGConnectingPoint num="17" id="3196" />
-<TGConnectingPoint num="18" id="3197" />
-<TGConnectingPoint num="19" id="3198" />
-<TGConnectingPoint num="20" id="3199" />
-<TGConnectingPoint num="21" id="3200" />
-<TGConnectingPoint num="22" id="3201" />
-<TGConnectingPoint num="23" id="3202" />
-<TGConnectingPoint num="24" id="3203" />
-<TGConnectingPoint num="25" id="3204" />
-<TGConnectingPoint num="26" id="3205" />
-<TGConnectingPoint num="27" id="3206" />
-<TGConnectingPoint num="28" id="3207" />
-<TGConnectingPoint num="29" id="3208" />
-<TGConnectingPoint num="30" id="3209" />
-<TGConnectingPoint num="31" id="3210" />
-<TGConnectingPoint num="32" id="3211" />
-<TGConnectingPoint num="33" id="3212" />
-<TGConnectingPoint num="34" id="3213" />
-<TGConnectingPoint num="35" id="3214" />
-<TGConnectingPoint num="36" id="3215" />
-<TGConnectingPoint num="37" id="3216" />
-<TGConnectingPoint num="38" id="3217" />
-<TGConnectingPoint num="39" id="3218" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="3230" >
-<cdparam x="641" y="193" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Receive signal" value="chIn(filler1)" />
-<TGConnectingPoint num="0" id="3220" />
-<TGConnectingPoint num="1" id="3221" />
-<TGConnectingPoint num="2" id="3222" />
-<TGConnectingPoint num="3" id="3223" />
-<TGConnectingPoint num="4" id="3224" />
-<TGConnectingPoint num="5" id="3225" />
-<TGConnectingPoint num="6" id="3226" />
-<TGConnectingPoint num="7" id="3227" />
-<TGConnectingPoint num="8" id="3228" />
-<TGConnectingPoint num="9" id="3229" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3241" >
-<cdparam x="624" y="131" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Send signal" value="chOut(clientHello)" />
-<TGConnectingPoint num="0" id="3231" />
-<TGConnectingPoint num="1" id="3232" />
-<TGConnectingPoint num="2" id="3233" />
-<TGConnectingPoint num="3" id="3234" />
-<TGConnectingPoint num="4" id="3235" />
-<TGConnectingPoint num="5" id="3236" />
-<TGConnectingPoint num="6" id="3237" />
-<TGConnectingPoint num="7" id="3238" />
-<TGConnectingPoint num="8" id="3239" />
-<TGConnectingPoint num="9" id="3240" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3243" >
-<cdparam x="678" y="54" />
+<infoparam name="State" value="accepted" />
+<TGConnectingPoint num="0" id="3242" />
+<TGConnectingPoint num="1" id="3243" />
+<TGConnectingPoint num="2" id="3244" />
+<TGConnectingPoint num="3" id="3245" />
+<TGConnectingPoint num="4" id="3246" />
+<TGConnectingPoint num="5" id="3247" />
+<TGConnectingPoint num="6" id="3248" />
+<TGConnectingPoint num="7" id="3249" />
+<TGConnectingPoint num="8" id="3250" />
+<TGConnectingPoint num="9" id="3251" />
+<TGConnectingPoint num="10" id="3252" />
+<TGConnectingPoint num="11" id="3253" />
+<TGConnectingPoint num="12" id="3254" />
+<TGConnectingPoint num="13" id="3255" />
+<TGConnectingPoint num="14" id="3256" />
+<TGConnectingPoint num="15" id="3257" />
+<TGConnectingPoint num="16" id="3258" />
+<TGConnectingPoint num="17" id="3259" />
+<TGConnectingPoint num="18" id="3260" />
+<TGConnectingPoint num="19" id="3261" />
+<TGConnectingPoint num="20" id="3262" />
+<TGConnectingPoint num="21" id="3263" />
+<TGConnectingPoint num="22" id="3264" />
+<TGConnectingPoint num="23" id="3265" />
+<TGConnectingPoint num="24" id="3266" />
+<TGConnectingPoint num="25" id="3267" />
+<TGConnectingPoint num="26" id="3268" />
+<TGConnectingPoint num="27" id="3269" />
+<TGConnectingPoint num="28" id="3270" />
+<TGConnectingPoint num="29" id="3271" />
+<TGConnectingPoint num="30" id="3272" />
+<TGConnectingPoint num="31" id="3273" />
+<TGConnectingPoint num="32" id="3274" />
+<TGConnectingPoint num="33" id="3275" />
+<TGConnectingPoint num="34" id="3276" />
+<TGConnectingPoint num="35" id="3277" />
+<TGConnectingPoint num="36" id="3278" />
+<TGConnectingPoint num="37" id="3279" />
+<TGConnectingPoint num="38" id="3280" />
+<TGConnectingPoint num="39" id="3281" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3284" >
+<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="3242" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3284" >
-<cdparam x="769" y="819" />
-<sizeparam width="175" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="HandshakedComplete" />
-<TGConnectingPoint num="0" id="3244" />
-<TGConnectingPoint num="1" id="3245" />
-<TGConnectingPoint num="2" id="3246" />
-<TGConnectingPoint num="3" id="3247" />
-<TGConnectingPoint num="4" id="3248" />
-<TGConnectingPoint num="5" id="3249" />
-<TGConnectingPoint num="6" id="3250" />
-<TGConnectingPoint num="7" id="3251" />
-<TGConnectingPoint num="8" id="3252" />
-<TGConnectingPoint num="9" id="3253" />
-<TGConnectingPoint num="10" id="3254" />
-<TGConnectingPoint num="11" id="3255" />
-<TGConnectingPoint num="12" id="3256" />
-<TGConnectingPoint num="13" id="3257" />
-<TGConnectingPoint num="14" id="3258" />
-<TGConnectingPoint num="15" id="3259" />
-<TGConnectingPoint num="16" id="3260" />
-<TGConnectingPoint num="17" id="3261" />
-<TGConnectingPoint num="18" id="3262" />
-<TGConnectingPoint num="19" id="3263" />
-<TGConnectingPoint num="20" id="3264" />
-<TGConnectingPoint num="21" id="3265" />
-<TGConnectingPoint num="22" id="3266" />
-<TGConnectingPoint num="23" id="3267" />
-<TGConnectingPoint num="24" id="3268" />
-<TGConnectingPoint num="25" id="3269" />
-<TGConnectingPoint num="26" id="3270" />
-<TGConnectingPoint num="27" id="3271" />
-<TGConnectingPoint num="28" id="3272" />
-<TGConnectingPoint num="29" id="3273" />
-<TGConnectingPoint num="30" id="3274" />
-<TGConnectingPoint num="31" id="3275" />
-<TGConnectingPoint num="32" id="3276" />
-<TGConnectingPoint num="33" id="3277" />
-<TGConnectingPoint num="34" id="3278" />
-<TGConnectingPoint num="35" id="3279" />
-<TGConnectingPoint num="36" id="3280" />
-<TGConnectingPoint num="37" id="3281" />
-<TGConnectingPoint num="38" id="3282" />
-<TGConnectingPoint num="39" id="3283" />
-<extraparam>
-</extraparam>
+<TGConnectingPoint num="0" id="3283" />
 </COMPONENT>
 
 <COMPONENT type="5106" id="3325" >
-<cdparam x="806" y="697" />
+<cdparam x="357" y="176" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="State" value="checkMS" />
+<infoparam name="State" value="checkSID" />
 <TGConnectingPoint num="0" id="3285" />
 <TGConnectingPoint num="1" id="3286" />
 <TGConnectingPoint num="2" id="3287" />
@@ -7367,7 +7367,7 @@
 </COMPONENT>
 
 <COMPONENT type="5104" id="3336" >
-<cdparam x="774" y="591" />
+<cdparam x="363" y="101" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
diff --git a/modeling/banquecourtois/model2.xml b/modeling/banquecourtois/model2.xml
index 6af38fdfb1b6574ae3d634e7fb8156569a3db032..04bbf847b1f363b5f021a19fb4f6f7fc1bfcec8c 100644
--- a/modeling/banquecourtois/model2.xml
+++ b/modeling/banquecourtois/model2.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="Avatar Analysis" nameTab="Analysis" >
 <SequenceDiagramPanel name="MyScenario0" minX="10" maxX="2500" minY="10" maxY="1500" >
 <COMPONENT type="301" id="17" >
 <cdparam x="668" y="566" />
-<sizeparam width="260" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="286" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="We create an overall statement based
@@ -40,7 +40,7 @@ This &quot;creation&quot; is a a dynamic webpage
 
 <COMPONENT type="301" id="34" >
 <cdparam x="904" y="315" />
-<sizeparam width="192" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="209" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="Creation of a token specific to
@@ -130,7 +130,7 @@ the Banque Courtois
 <SUBCOMPONENT type="602" id="43" >
 <father id="93" num="0" />
 <cdparam x="807" y="319" />
-<sizeparam width="131" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
 <infoparam name="action state" value="m = {Id_BC}_BCpubK" />
@@ -206,7 +206,7 @@ the Banque Courtois
 <SUBCOMPONENT type="602" id="102" >
 <father id="152" num="0" />
 <cdparam x="476" y="555" />
-<sizeparam width="226" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="245" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
 <infoparam name="action state" value="m1 = s1 + statementBanqueCourtois" />
@@ -382,7 +382,7 @@ the Banque Courtois
 <SequenceDiagramPanel name="MyScenario1" minX="10" maxX="2500" minY="10" maxY="1500" >
 <COMPONENT type="301" id="231" >
 <cdparam x="186" y="591" />
-<sizeparam width="300" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="335" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="The statement of the other bank is unciphered
@@ -416,7 +416,7 @@ Banque courtois has no access to this statement.
 
 <COMPONENT type="301" id="248" >
 <cdparam x="889" y="478" />
-<sizeparam width="198" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="214" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="The statement is ciphered with
@@ -446,7 +446,7 @@ the public key of the client
 
 <COMPONENT type="301" id="265" >
 <cdparam x="966" y="281" />
-<sizeparam width="192" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="209" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="Creation of a token specific to
@@ -536,7 +536,7 @@ the Banque Courtois
 <SUBCOMPONENT type="602" id="274" >
 <father id="324" num="0" />
 <cdparam x="869" y="285" />
-<sizeparam width="131" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
 <infoparam name="action state" value="m = {Id_BC}_BCpubK" />
@@ -612,7 +612,7 @@ the Banque Courtois
 <SUBCOMPONENT type="602" id="333" >
 <father id="383" num="0" />
 <cdparam x="538" y="521" />
-<sizeparam width="216" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="235" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
 <infoparam name="action state" value="m1 = s1, statementBanqueCourtois" />
diff --git a/plugins/howto b/plugins/howto
new file mode 100644
index 0000000000000000000000000000000000000000..b0ab6141ec0907daf331fc5bd63b11155a8e6c09
--- /dev/null
+++ b/plugins/howto
@@ -0,0 +1,21 @@
+# To test plugins:
+If you want to test plugins:
+$cd testPluginCodeGeneration
+$make
+
+Then, edit the configuration file of TTool (default: TTool/bin/config.xml) and add:
+<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
+
+Then, start TTool, and generate Java code from an avatar design model.
+
+
+# To create a new plugin
+1) Create your plugin and put it in this directory (preferably) under a jar file
+
+2) Add the plugin reference in config.xml
+For example:
+<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
+
+3) Load the configuration information in ConfigurationTTool.java
+
+4) Use the plugin facility located in myutil/Plugin and myutil/PluginManager. An example on how to use the PluginManager is shown in src/avatartranslator/toexecutable/MainFile.java
diff --git a/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java b/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java
new file mode 100644
index 0000000000000000000000000000000000000000..5fd697433d3d5031c81c2ff9ef7a014f3a9024d9
--- /dev/null
+++ b/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java
@@ -0,0 +1,53 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class CustomizerAvatarJavaCodeGeneration
+ * Creation: 23/05/2017
+ * @version 1.0 23/05/2017
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+public class CustomizerAvatarJavaCodeGeneration {
+    public static String getMainDeclaration() {
+        return ("/* This is the main */\nint main(int argc, char *argv[]) {\n");
+    }
+
+    public static void main(String[] args) {
+    }
+}
diff --git a/plugins/testPluginCodeGeneration/Makefile b/plugins/testPluginCodeGeneration/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..0f0a835cd731cd12e6be4579a00658de9cbfdde1
--- /dev/null
+++ b/plugins/testPluginCodeGeneration/Makefile
@@ -0,0 +1,8 @@
+JAVAC  = javac
+JAR    = jar
+JAR_TXT = customizer.txt
+JAR_TARGET = ../CustomizerAvatarCodeGeneration.jar
+
+all:
+	javac *.java
+	$(JAR) cmf $(JAR_TXT) $(JAR_TARGET) CustomizerAvatarJavaCodeGeneration.class
diff --git a/plugins/testPluginCodeGeneration/customizer.txt b/plugins/testPluginCodeGeneration/customizer.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ebd88443e7fc664c8d31c07fb060f3ee71b68917
--- /dev/null
+++ b/plugins/testPluginCodeGeneration/customizer.txt
@@ -0,0 +1 @@
+Main-Class: CustomizerAvatarJavaCodeGeneration
diff --git a/src/GraphMinimize.java b/src/GraphMinimize.java
index 8b3ee5a2fb8deb5f5c7651697efff8d98a7855cf..8c61c4b701c5c8c82fd1f502128dfb6e8767c2af 100755
--- a/src/GraphMinimize.java
+++ b/src/GraphMinimize.java
@@ -46,9 +46,11 @@
    * @see
    */
 
+import myutil.FileUtils;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+
 import java.io.File;
-import myutil.*;
-import ui.graph.*; 
 
 public class GraphMinimize {
 
diff --git a/src/GraphShow.java b/src/GraphShow.java
index d7756cebb0fa0ddd61865b9f4a45547ddb4fd804..00f0ac371a6553eed9d4bd27ef4739c3b949fd2e 100755
--- a/src/GraphShow.java
+++ b/src/GraphShow.java
@@ -46,11 +46,11 @@
    * @see
    */
 
-import java.io.File;
-
 import myutil.FileUtils;
 import myutil.TraceManager;
-import ui.graph.AUTGraph; 
+import ui.graph.AUTGraph;
+
+import java.io.File;
 
 public class GraphShow  {
 
diff --git a/src/Main.java b/src/Main.java
index 6670539987a13b15fd0d426d3f15d9d009f9f4e2..19abff561bed08e5730c6108072a5d76da4dda46 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -44,17 +44,19 @@
    * @see
    */
 
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.*;
+import ui.window.JStartingWindow;
+
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.Locale;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.net.URL;
-//import java.io.*;
-import javax.swing.ImageIcon;
-import javax.swing.*;
+import java.util.Locale;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.io.*;
 
 public class Main implements ActionListener {
     public boolean finish = false;
diff --git a/src/RTLLauncher.java b/src/RTLLauncher.java
index e880c2a0aaca9751f6b99a3b8677aef0aa966388..5f38c872c045d3887234e1ee9320347cc341045a 100755
--- a/src/RTLLauncher.java
+++ b/src/RTLLauncher.java
@@ -45,10 +45,8 @@
    */
 
 
-
-import launcher.*;
-
-import myutil.*;
+import launcher.RshServer;
+import myutil.TraceManager;
 
 public class RTLLauncher implements Runnable {
 
diff --git a/src/RemoteSimulationControl.java b/src/RemoteSimulationControl.java
index 8a9adc328806739718900af20f8e6bdf5e67d954..61ad988541da884be5ffa417961fdf7a7af55599 100755
--- a/src/RemoteSimulationControl.java
+++ b/src/RemoteSimulationControl.java
@@ -44,14 +44,14 @@ knowledge of the CeCILL license and that you accept its terms.
 * @see
 */
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 import remotesimulation.CommandParser;
 import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 public class RemoteSimulationControl extends Thread  {
 	
     public static int port = 3490; 
diff --git a/src/TIFTranslator.java b/src/TIFTranslator.java
index 6074f2a2d79c53f7b4cc3929e2167202a4f13b2b..58ab255ad05e6965082b1d68bf05ece2fb74b59b 100755
--- a/src/TIFTranslator.java
+++ b/src/TIFTranslator.java
@@ -44,12 +44,15 @@ knowledge of the CeCILL license and that you accept its terms.
  * @see
  */
 
-import java.io.*;
- 
-import translator.*;
-import translator.touppaal.*;
-import myutil.*;
-import uppaaldesc.*;
+import myutil.FileUtils;
+import translator.TIFExchange;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
+import translator.touppaal.TURTLE2UPPAAL;
+import uppaaldesc.UPPAALSpec;
+
+import java.io.File;
+import java.io.FileOutputStream;
 
 public class TIFTranslator  {
 	// 0 -> RT-LOTOS
diff --git a/src/TMLTranslator.java b/src/TMLTranslator.java
index e1a90b6b9815f45fd9440fbd19297c1af8c72f30..47a203dc5ee2416d40ea50573861a7ce4754b6fa 100755
--- a/src/TMLTranslator.java
+++ b/src/TMLTranslator.java
@@ -45,25 +45,20 @@
    * @see
    */
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
 import myutil.FileUtils;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLSyntaxChecking;
-import tmltranslator.TMLTextSpecification;
-import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import tmltranslator.*;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.toturtle.Mapping2TIF;
 import tmltranslator.toturtle.TML2TURTLE;
 import tmltranslator.touppaal.TML2UPPAAL;
 import translator.TURTLEModeling;
 import translator.TURTLETranslator;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+
 public class TMLTranslator  {
     // 0 -> LOTOS
     // 1 -> UPPAAL
diff --git a/src/Test.java b/src/Test.java
index f51502d8efbdf98f97c12b0a8c561dccf62ba630..2549c54175426bc981a6e010b74f814f2eae0779 100755
--- a/src/Test.java
+++ b/src/Test.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 
-
-import myutil.*;
-import ui.graph.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
 
 
 public class Test  {
@@ -108,7 +109,7 @@ public class Test  {
 	nbOfPb += evalBoolInt("3==1+2", true, false);
     	nbOfPb += evalBoolInt("1+2==3", true, false);
 	nbOfPb += evalBoolInt("1+2+3+4+5==3+7", false, false);
-	nbOfPb += evalBoolInt("(1+2==3)==(8==4+5)", false, false);
+	nbOfPb += evalBoolInt("(1+2==3)==(5==4)", false, false);
 	nbOfPb += evalBoolInt("2*3==6", true, false);
 	nbOfPb += evalBoolInt("1*4+2==6", true, false);
 	nbOfPb += evalBoolInt("2+1*4==6", true, false);
@@ -120,8 +121,15 @@ public class Test  {
 
 	nbOfPb += evalBoolInt("(3==3) or (3==4)", true, false);
 
-	nbOfPb += evalBoolInt("1<3", true, false);
 	nbOfPb += evalBoolInt("not(((1)==(3)))", true, false);
+
+	nbOfPb += evalBoolInt("1<3", true, false);
+	nbOfPb += evalBoolInt("not(1<3)", false, false);
+	nbOfPb += evalBoolInt("not(1<3<2)", false, true);
+	nbOfPb += evalBoolInt("(1+2)==4", false, false);
+	nbOfPb += evalBoolInt("(5>=4)==true", true, false);
+	nbOfPb += evalBoolInt("(5<=4)==true", false, false);
+	nbOfPb += evalBoolInt("(1+2==3)==(5>4)", true, false);
 	
 	//nbOfPb += evalBoolInt("not(1==1)", false, false);
 	
diff --git a/src/android/src/copyfromJAVAsource/AvatarSignal.java b/src/android/src/copyfromJAVAsource/AvatarSignal.java
index 242966471dc92f23a3e0dff96ae044b816899a0d..2e82534f61ebb776483fb4962dde64ab23cf8fbc 100644
--- a/src/android/src/copyfromJAVAsource/AvatarSignal.java
+++ b/src/android/src/copyfromJAVAsource/AvatarSignal.java
@@ -49,8 +49,6 @@ package copyfromJAVAsource;
 
 //import translator.*;
 //import translator.tojava.*;
-import java.util.*;
-
 //import myutil.*;
 
 public class AvatarSignal extends AvatarMethod {
diff --git a/src/android/src/copyfromJAVAsource/Conversion.java b/src/android/src/copyfromJAVAsource/Conversion.java
index 381c9654e210b57986a0b17a1bd754fe9126609d..9fdb96104e2337d12081b994db396cf57c014fcd 100644
--- a/src/android/src/copyfromJAVAsource/Conversion.java
+++ b/src/android/src/copyfromJAVAsource/Conversion.java
@@ -45,7 +45,8 @@
 
 package copyfromJAVAsource;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class Conversion {
diff --git a/src/android/src/copyfromJAVAsource/TAttribute.java b/src/android/src/copyfromJAVAsource/TAttribute.java
index 619e8ceea71be3ae1f3778be71dc7d224acd9a80..b7f591bdd9b8e3c6889c168324b96c9255f51d52 100644
--- a/src/android/src/copyfromJAVAsource/TAttribute.java
+++ b/src/android/src/copyfromJAVAsource/TAttribute.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package copyfromJAVAsource;
 
-import java.util.*;
-
-
 import android.util.Log;
 
+import java.util.Vector;
+
 
 //import myutil.*;
 //import translator.*;
diff --git a/src/android/src/copyfromJAVAsource/TraceManager.java b/src/android/src/copyfromJAVAsource/TraceManager.java
index 4b5b4d8c258f06506892af2c214461c0623d5304..d45428e7ed11e24621a70a0ac5faabc4280fb385 100644
--- a/src/android/src/copyfromJAVAsource/TraceManager.java
+++ b/src/android/src/copyfromJAVAsource/TraceManager.java
@@ -45,9 +45,6 @@
 
 package copyfromJAVAsource;
 
-import java.io.*;
-
-
 public class TraceManager {
 	public final static int TO_CONSOLE = 0;
 	public final static int TO_FILE = 1;
diff --git a/src/android/src/project/alwaystry/AlwaystryActivity.java b/src/android/src/project/alwaystry/AlwaystryActivity.java
index 5cc97811379da7ffac3b5a5defa631b2274c3dcb..73aa8c069b0f459e8491e8ff2f1ccc9505b58462 100644
--- a/src/android/src/project/alwaystry/AlwaystryActivity.java
+++ b/src/android/src/project/alwaystry/AlwaystryActivity.java
@@ -1,29 +1,18 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.app.TabActivity;
 import android.content.Intent;
-import android.gesture.Gesture;
-import android.gesture.GestureLibraries;
-import android.gesture.GestureLibrary;
-import android.gesture.GestureOverlayView;
+import android.gesture.*;
 import android.gesture.GestureOverlayView.OnGesturePerformedListener;
-import android.gesture.Prediction;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnTouchListener;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TabHost;
 import android.widget.Toast;
 
+import java.util.ArrayList;
+
 public class AlwaystryActivity extends TabActivity implements OnGesturePerformedListener{//implements OnTouchListener{//implements OnLongClickListener,OnTouchListener{
 	
 	int clickaction = 0;
diff --git a/src/android/src/project/alwaystry/AnotherTagActivity.java b/src/android/src/project/alwaystry/AnotherTagActivity.java
index 46049e0c5ec5218c88b44733bef869a459c23384..66b208f1e40146cc44ea2f4d8b8ff7be97461da4 100644
--- a/src/android/src/project/alwaystry/AnotherTagActivity.java
+++ b/src/android/src/project/alwaystry/AnotherTagActivity.java
@@ -1,19 +1,7 @@
 package project.alwaystry;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
 
 public class AnotherTagActivity extends Activity {
     /** Called when the activity is first created. */
diff --git a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
index 5f0b43a13f27a32cc00ca4140859fc764f2e7ebe..ccf62c00a83a22e60918b471f066b84b23ba3a05 100644
--- a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
@@ -1,31 +1,24 @@
 package project.alwaystry;
 
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
 import android.os.Bundle;
 import android.text.TextPaint;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
 
 public class AvatarBDBlockAndroid extends TGComponentAndroid{
 
diff --git a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
index 65faff57ed9c9ed13f9cbda01240414e75a7dc80..faba6e688413c492be52526b43bd5510838f97ff 100644
--- a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
@@ -1,14 +1,10 @@
 package project.alwaystry;
 
-import java.util.LinkedList;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Point;
+import android.graphics.*;
 import android.view.View;
 
+import java.util.LinkedList;
+
 public class AvatarBDCompositionConnectorAndroid extends TGConnectorAndroid{
 
 	private Paint paint;
diff --git a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
index 4aab33af6337868b8d91599c81f8c7670a011013..5668d54c741676b35050ef649b918f1eec74d272 100644
--- a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
@@ -1,21 +1,11 @@
 package project.alwaystry;
 
-import java.util.Vector;
-
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
 import android.os.Bundle;
 import android.text.TextPaint;
 import android.util.Log;
@@ -24,6 +14,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
 
 
 public class AvatarBDDataTypeAndroid extends TGComponentAndroid{
diff --git a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
index 3526e5d1f15bc266c522ed35db026627121ec21f..a29a384489ce9696b405d730f4ab4d75fbb7965d 100644
--- a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
@@ -1,11 +1,5 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Vector;
-
-import myutilandroid.GraphicLibAndroid;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -16,6 +10,12 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import copyfromJAVAsource.AvatarSignal;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPanelAndroid extends View {
 	
diff --git a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
index 8493426b9e601f530a4deeda7bda9e37f3b26627..ff04d2282b0db3042413023d8598d6edc9cdd443 100644
--- a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
@@ -1,22 +1,18 @@
 package project.alwaystry;
 
-import java.util.LinkedList;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Point;
 import android.os.Bundle;
 import android.text.TextPaint;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPortConnectorAndroid extends TGConnectorAndroid{
 
diff --git a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
index 8b492dd959357083f60dda31e3e4d87f55a30ea5..5d92f9c46a5e39f9494ccdc323a64cfbafc74b98 100644
--- a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
@@ -3,9 +3,7 @@ package project.alwaystry;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 public class AvatarbdToolbarAndroid extends LinearLayout {
diff --git a/src/android/src/project/alwaystry/EditAttributesActivity.java b/src/android/src/project/alwaystry/EditAttributesActivity.java
index ba2cb075e32cec5bd4ce74922a1cff73e22aea44..724c1364dff9ad111622e3c70bfa17783650e1b3 100644
--- a/src/android/src/project/alwaystry/EditAttributesActivity.java
+++ b/src/android/src/project/alwaystry/EditAttributesActivity.java
@@ -1,28 +1,19 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
 import android.app.TabActivity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.TabHost;
-import android.widget.Toast;
+import android.widget.*;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class EditAttributesActivity extends TabActivity {
 	
diff --git a/src/android/src/project/alwaystry/PanelWithTitledBorder.java b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
index 69f69f135c9aa860de5a15fcd10b55ba87324f48..4897f7b6ccf18b747202cb21d0b36694d2a48b32 100644
--- a/src/android/src/project/alwaystry/PanelWithTitledBorder.java
+++ b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
@@ -6,8 +6,6 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 public class PanelWithTitledBorder extends RelativeLayout{
diff --git a/src/android/src/project/alwaystry/SignalAssociationActivity.java b/src/android/src/project/alwaystry/SignalAssociationActivity.java
index cba95640c77b71184167baad368289a36025547f..f6c9f5b22fa618938133c5a338c6107bb4ebbc86 100644
--- a/src/android/src/project/alwaystry/SignalAssociationActivity.java
+++ b/src/android/src/project/alwaystry/SignalAssociationActivity.java
@@ -1,29 +1,18 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.RadioGroup;
+import android.widget.*;
 import android.widget.RadioGroup.OnCheckedChangeListener;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class SignalAssociationActivity extends Activity{
 	
diff --git a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
index b87b3b64c7f2b7822d929cb43f881dd7033ed49f..f86552a50c90f3dd24bc86c22d35f065f7f28c7f 100644
--- a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
+++ b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
@@ -1,11 +1,11 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
+import myutilandroid.GraphicLibAndroid;
 
 public class TDiagramTouchManagerAndroid implements OnTouchListener{
 
diff --git a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
index 3b33749794ece3df501b7f3ce8570158e741212e..8dccfc0983d3df052947800d19c5f4652f100fc4 100644
--- a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
@@ -1,10 +1,10 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.Log;
+import myutilandroid.GraphicLibAndroid;
 
 
 
diff --git a/src/android/src/project/alwaystry/TGConnectorAndroid.java b/src/android/src/project/alwaystry/TGConnectorAndroid.java
index c17ef288a11db5f2f40d08790676dbf9c11dc39a..fc7feb05222af0eda26682debd45e33487a1a7b5 100644
--- a/src/android/src/project/alwaystry/TGConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectorAndroid.java
@@ -1,8 +1,8 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.graphics.Canvas;
 import android.view.View;
+import myutilandroid.GraphicLibAndroid;
 
 public abstract class TGConnectorAndroid extends TGComponentAndroid{
 	
diff --git a/src/android/src/project/alwaystry/TwoDScrollView.java b/src/android/src/project/alwaystry/TwoDScrollView.java
index f47d81ed0ee385098982f05e80dd6a9dbc29cdeb..a8e9edd6bd6e4862cf592b9dde4600453054b9c2 100644
--- a/src/android/src/project/alwaystry/TwoDScrollView.java
+++ b/src/android/src/project/alwaystry/TwoDScrollView.java
@@ -1,24 +1,13 @@
 package project.alwaystry;
- 
-import java.util.List;
- 
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.view.FocusFinder;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
+import android.view.*;
 import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Scroller;
-import android.widget.TextView;
+import android.widget.*;
+
+import java.util.List;
  
 /**
  * Layout container for a view hierarchy that can be scrolled by the user,
diff --git a/src/attacktrees/ANDNode.java b/src/attacktrees/ANDNode.java
index b6aa05551ff26c8a0b62a519b4f7248a43fa5a47..26bd2a9bac546424f8e46531d37c46dbc7c4ee44 100755
--- a/src/attacktrees/ANDNode.java
+++ b/src/attacktrees/ANDNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class ANDNode extends BooleanNode { 
+public class ANDNode extends BooleanNode {
     
     public ANDNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/Attack.java b/src/attacktrees/Attack.java
index 73bc2d2591a9822f8589d4a11e9a590fe8c624d3..ebd8fda098ff55a282a916660cf6543836d748a4 100755
--- a/src/attacktrees/Attack.java
+++ b/src/attacktrees/Attack.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class Attack { 
diff --git a/src/attacktrees/AttackNode.java b/src/attacktrees/AttackNode.java
index f66a93ea5918482693cc36cb34c7a244a0334bdc..436e386cebf44fe4690082c160fcbf7c25f66e61 100755
--- a/src/attacktrees/AttackNode.java
+++ b/src/attacktrees/AttackNode.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
 
 
 public abstract class AttackNode { 
diff --git a/src/attacktrees/AttackTree.java b/src/attacktrees/AttackTree.java
index 6e8fcf0f56ac74f2821805bd9e8639a0be9bf9fe..09647dac9e1730963a4be67189dc403b9d617a85 100755
--- a/src/attacktrees/AttackTree.java
+++ b/src/attacktrees/AttackTree.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class AttackTree {
diff --git a/src/attacktrees/BeforeNode.java b/src/attacktrees/BeforeNode.java
index afc3ec40414c3a06e76b162c07868d0944d35bf9..34218bab543b4092fa86e251495eb25e948346f0 100755
--- a/src/attacktrees/BeforeNode.java
+++ b/src/attacktrees/BeforeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class BeforeNode extends TimeNode { 
+public class BeforeNode extends TimeNode {
 
     public BeforeNode(String _name, Object _referenceObject, int _time) {
 	super(_name, _referenceObject, _time);
diff --git a/src/attacktrees/BooleanNode.java b/src/attacktrees/BooleanNode.java
index f68908b787d18537d174e60be538bbb4ee7f5b14..5bbe833d505715ddb3e0d55bbb58e7d2e8583161 100755
--- a/src/attacktrees/BooleanNode.java
+++ b/src/attacktrees/BooleanNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public abstract class BooleanNode extends AttackNode{ 
+public abstract class BooleanNode extends AttackNode{
     
     public BooleanNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/ORNode.java b/src/attacktrees/ORNode.java
index 31b673e298eb16fe82cd73c598e5b46d0d29477f..5d9194f2737f69cab7595a2cc674a22546506c0d 100755
--- a/src/attacktrees/ORNode.java
+++ b/src/attacktrees/ORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class ORNode extends BooleanNode { 
+public class ORNode extends BooleanNode {
     
     public ORNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/SequenceNode.java b/src/attacktrees/SequenceNode.java
index eb52b701c9dce413276d8aeaeb2abe4a99c58f8c..0695feff85fba73daab4fc59bae70f4c27b287d7 100755
--- a/src/attacktrees/SequenceNode.java
+++ b/src/attacktrees/SequenceNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class SequenceNode extends AttackNode { 
+public class SequenceNode extends AttackNode {
     
     public SequenceNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/TimeNode.java b/src/attacktrees/TimeNode.java
index 4095ab4920d731369ef948acca81c14fbec528c5..de513b7d8fe7f8fdeff0fef7b5405f28efb7b6a1 100755
--- a/src/attacktrees/TimeNode.java
+++ b/src/attacktrees/TimeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public abstract class TimeNode extends AttackNode{ 
+public abstract class TimeNode extends AttackNode{
     protected int time;
 
     public TimeNode(String _name, Object _objectReference, int _time) {
diff --git a/src/attacktrees/XORNode.java b/src/attacktrees/XORNode.java
index 9d5ea37529c2c93556b64c4b5914598d986c6f8b..c720d046ae4c4c466c8f760ca7464ad23cc053ef 100755
--- a/src/attacktrees/XORNode.java
+++ b/src/attacktrees/XORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class XORNode extends BooleanNode { 
+public class XORNode extends BooleanNode {
     
     public XORNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/automata/Automata.java b/src/automata/Automata.java
index ed20c7bb35ec7d1324e1d05383a071b600108418..b9308529a65071fc1cbf917cfb903ca544289c82 100755
--- a/src/automata/Automata.java
+++ b/src/automata/Automata.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package automata;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class Automata {
diff --git a/src/automata/State.java b/src/automata/State.java
index 360adb52c0fbdadc10489affafbcf1160034ed20..6a636257c0b03311b9a83cbc2b72343862ad2451 100755
--- a/src/automata/State.java
+++ b/src/automata/State.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package automata;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class State {
diff --git a/src/avatartranslator/AvatarAction.java b/src/avatartranslator/AvatarAction.java
index 9d86f16b499a3794a9f65a84cf9f1330dfc0fa98..f4ae258965dd0bfdaa2ec4157c3c443f6ca8cae8 100644
--- a/src/avatartranslator/AvatarAction.java
+++ b/src/avatartranslator/AvatarAction.java
@@ -47,8 +47,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-
 public interface AvatarAction {
     public boolean isAMethodCall ();
     public boolean isAVariableSetting ();
diff --git a/src/avatartranslator/AvatarActionOnSignal.java b/src/avatartranslator/AvatarActionOnSignal.java
index 825c85d4c579f291e61158b398e07329e76693f6..822036c2ac67ddb2ee38742ecb57bc00edbefd90 100644
--- a/src/avatartranslator/AvatarActionOnSignal.java
+++ b/src/avatartranslator/AvatarActionOnSignal.java
@@ -45,9 +45,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarActionOnSignal extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarArithmeticOp.java b/src/avatartranslator/AvatarArithmeticOp.java
index 1f8232bee03579a3aca35541a6229fc203c9b7c0..b9874677e463e09fb9cf26510abaaf1257f18231 100644
--- a/src/avatartranslator/AvatarArithmeticOp.java
+++ b/src/avatartranslator/AvatarArithmeticOp.java
@@ -47,8 +47,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-
 public class AvatarArithmeticOp extends AvatarTerm {
     AvatarTerm term1;
     AvatarTerm term2;
diff --git a/src/avatartranslator/AvatarAttribute.java b/src/avatartranslator/AvatarAttribute.java
index e3648c00d6632c29a4a4f65e98bbb9e4731462be..c6bfc32b37e495dd8624e325a20d4f9fed4d340e 100644
--- a/src/avatartranslator/AvatarAttribute.java
+++ b/src/avatartranslator/AvatarAttribute.java
@@ -47,11 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
+import java.util.HashMap;
 
 public class AvatarAttribute extends AvatarLeftHand {
 
diff --git a/src/avatartranslator/AvatarAttributeState.java b/src/avatartranslator/AvatarAttributeState.java
index 2729e49974a225d3427cfd15813833d63d280dad..45f50b33e9b6449573f7b8b5e3fbb48fb666f609 100644
--- a/src/avatartranslator/AvatarAttributeState.java
+++ b/src/avatartranslator/AvatarAttributeState.java
@@ -45,11 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-import ui.avatarbd.*;
-import myutil.*;
-import ui.*;
-
 public class AvatarAttributeState extends AvatarElement {
     private AvatarAttribute attribute;
     private AvatarState state;
@@ -74,4 +69,9 @@ public class AvatarAttributeState extends AvatarElement {
         this.cloneLinkToReferenceObjects (result);
         return result;
     }
+
+    public String toString()
+    {
+        return this.attribute.getBlock().getName().replaceAll("__", ".") + "." + this.state.getName() + "." + this.attribute.getName();
+    }
 }
diff --git a/src/avatartranslator/AvatarBinaryGuard.java b/src/avatartranslator/AvatarBinaryGuard.java
index a6a4b5a00a2fa2bae8f03247bd40aca18ecc109e..b7ad39a08073766623339a5577bd0f19fa5fe3cc 100644
--- a/src/avatartranslator/AvatarBinaryGuard.java
+++ b/src/avatartranslator/AvatarBinaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 public class AvatarBinaryGuard extends AvatarComposedGuard {
     AvatarComposedGuard guardA;
     AvatarComposedGuard guardB;
diff --git a/src/avatartranslator/AvatarBlock.java b/src/avatartranslator/AvatarBlock.java
index 136a53db8b61349f76cb3ed33e365236abced30a..1c9e11d86c35cee93355f74e770b70ece9bfe73a 100644
--- a/src/avatartranslator/AvatarBlock.java
+++ b/src/avatartranslator/AvatarBlock.java
@@ -45,9 +45,8 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 
 public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner {
diff --git a/src/avatartranslator/AvatarBlockTemplate.java b/src/avatartranslator/AvatarBlockTemplate.java
index 24d7428405e19e81ff855e53f6db9ab971a08e06..9623f385e4c0a9ee1577be496ac9f530348f2100 100644
--- a/src/avatartranslator/AvatarBlockTemplate.java
+++ b/src/avatartranslator/AvatarBlockTemplate.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.TraceManager;
 
 public class AvatarBlockTemplate  {
 
diff --git a/src/avatartranslator/AvatarBroadcast.java b/src/avatartranslator/AvatarBroadcast.java
index 86191e49d7b854508419ba880424ead26903d302..7e6740396c60339df8d3a61fd6e744f4384214d5 100644
--- a/src/avatartranslator/AvatarBroadcast.java
+++ b/src/avatartranslator/AvatarBroadcast.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 public class AvatarBroadcast extends AvatarElement {
     
diff --git a/src/avatartranslator/AvatarComposedGuard.java b/src/avatartranslator/AvatarComposedGuard.java
index 7ecb5bc56d14c24034f60c1205f5271910812085..590b1507b2cc68b457a10b727277385b2fe5b464 100644
--- a/src/avatartranslator/AvatarComposedGuard.java
+++ b/src/avatartranslator/AvatarComposedGuard.java
@@ -46,8 +46,6 @@
 
 package avatartranslator;
 
-import myutil.Conversion;
-
 public abstract class AvatarComposedGuard extends AvatarGuard {
     public AvatarComposedGuard getOpposite () {
         return new AvatarUnaryGuard ("not", "(", ")", this);
diff --git a/src/avatartranslator/AvatarConstant.java b/src/avatartranslator/AvatarConstant.java
index 0122ce4412ba5097e48f480423ea91c37434b2e1..2e8b16abd20c78faab917541668f0bb8b30bda42 100644
--- a/src/avatartranslator/AvatarConstant.java
+++ b/src/avatartranslator/AvatarConstant.java
@@ -48,10 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-import translator.RTLOTOSKeyword;
-import translator.tojava.JKeyword;
-
 public class AvatarConstant extends AvatarTerm {
 
     public static final AvatarConstant TRUE = new AvatarConstant ("true", null);
diff --git a/src/avatartranslator/AvatarConstantGuard.java b/src/avatartranslator/AvatarConstantGuard.java
index e6c6eb076f983e65d87ae954e0614b4ff23fc014..be13be20433b3817d906559cbc9b52a27edfdc18 100644
--- a/src/avatartranslator/AvatarConstantGuard.java
+++ b/src/avatartranslator/AvatarConstantGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarConstantGuard is an {@link AvatarSimpleGuard} that is of the form:
  * {@link AvatarConstant}
diff --git a/src/avatartranslator/AvatarElement.java b/src/avatartranslator/AvatarElement.java
index c1825b0cd0224aba91ed7a5098ee4efe735aca4f..eee5519362e97df18ca6a825e8cc383193b0200e 100644
--- a/src/avatartranslator/AvatarElement.java
+++ b/src/avatartranslator/AvatarElement.java
@@ -45,9 +45,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarElement {
 
diff --git a/src/avatartranslator/AvatarExpireTimer.java b/src/avatartranslator/AvatarExpireTimer.java
index 4db8a83abcbf8fc9b52431942c5020f6e35937b6..8a1f9175976cc0058eae281b27d80535a170ed05 100644
--- a/src/avatartranslator/AvatarExpireTimer.java
+++ b/src/avatartranslator/AvatarExpireTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarExpireTimer extends AvatarTimerOperator {
 	
     public AvatarExpireTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarGuard.java b/src/avatartranslator/AvatarGuard.java
index 34da46a4d1799ec03f3abac31c834cb22c79a327..ab830d187f8a8253f2de2ef7949c9c8bcc9e6e1c 100644
--- a/src/avatartranslator/AvatarGuard.java
+++ b/src/avatartranslator/AvatarGuard.java
@@ -46,10 +46,10 @@
 
 package avatartranslator;
 
-import java.util.HashMap;
-
-import myutil.TraceManager;
 import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.util.HashMap;
 
 public abstract class AvatarGuard {
 
diff --git a/src/avatartranslator/AvatarGuardElse.java b/src/avatartranslator/AvatarGuardElse.java
index d25a5637b28351ed8fcba72d582480a46c7254b7..988efcb0c25806536c367eea35abdfdcfcb458cc 100644
--- a/src/avatartranslator/AvatarGuardElse.java
+++ b/src/avatartranslator/AvatarGuardElse.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarGuardElse is an {@link AvatarGuard} that is of the form:
  * else
diff --git a/src/avatartranslator/AvatarGuardEmpty.java b/src/avatartranslator/AvatarGuardEmpty.java
index 8d69c45c79677b6968062f504dfb78a31c32bac3..b00425eaa80025b9c6190ef97f74dc244e9f5bd8 100644
--- a/src/avatartranslator/AvatarGuardEmpty.java
+++ b/src/avatartranslator/AvatarGuardEmpty.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarGuardEmpty is an empty {@link AvatarGuard}
  */
diff --git a/src/avatartranslator/AvatarLibraryFunction.java b/src/avatartranslator/AvatarLibraryFunction.java
index 8b5c8e72a18c98492d86b656b6aef88f2802e06c..599252bddf33162f08adad2bfab081e595be30be 100644
--- a/src/avatartranslator/AvatarLibraryFunction.java
+++ b/src/avatartranslator/AvatarLibraryFunction.java
@@ -38,11 +38,9 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
 import java.util.Iterator;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
 
 /**
  * AvatarLibraryFunction is used to represent a library function that can be further used in state machine diagrams.
diff --git a/src/avatartranslator/AvatarLibraryFunctionCall.java b/src/avatartranslator/AvatarLibraryFunctionCall.java
index e6299dad822b1cb6ab5707edc778e7b887e915a5..0c76a102c7d29c7a836260bf4a68df37f6ac11fb 100644
--- a/src/avatartranslator/AvatarLibraryFunctionCall.java
+++ b/src/avatartranslator/AvatarLibraryFunctionCall.java
@@ -38,8 +38,8 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
+import java.util.LinkedList;
 
 /**
  * AvatarLibraryFunctionCall represent a call to a library function. It is part of an {@link AvatarStateMachine}.
diff --git a/src/avatartranslator/AvatarMethod.java b/src/avatartranslator/AvatarMethod.java
index 8f10c0e7603b629acd583090ea2adcd27db1c462..23992142f071b437010d1e269659593c8de33d41 100644
--- a/src/avatartranslator/AvatarMethod.java
+++ b/src/avatartranslator/AvatarMethod.java
@@ -47,9 +47,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 public class AvatarMethod extends AvatarElement {
 
diff --git a/src/avatartranslator/AvatarPragma.java b/src/avatartranslator/AvatarPragma.java
index 134916b8078fbb274f2a813378731fcfb19b7119..81258520b711992d47515f2d66ca46544ff61186 100644
--- a/src/avatartranslator/AvatarPragma.java
+++ b/src/avatartranslator/AvatarPragma.java
@@ -45,11 +45,12 @@
 
 package avatartranslator;
 
-import java.util.*;
-import myutil.*;
-import ui.*;
+import myutil.TraceManager;
+import ui.TAttribute;
 import ui.avatarbd.AvatarBDPragma;
 
+import java.util.*;
+
 public abstract class AvatarPragma extends AvatarElement {
     public static final String[] PRAGMAS =               {"Confidentiality", "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
     public static final String[] PRAGMAS_TRANSLATION =    {"Secret",          "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
@@ -352,10 +353,12 @@ public abstract class AvatarPragma extends AvatarElement {
             }
             switch(header){
                 case "Confidentiality":
-                    pragmas.add(new AvatarPragmaSecret(str, obj, attrs));
+                    for (AvatarAttribute attr: attrs)
+                        pragmas.add(new AvatarPragmaSecret(str, obj, attr));
                     break;
                 case "Secret":
-                    pragmas.add(new AvatarPragmaSecret(str, obj, attrs));
+                    for (AvatarAttribute attr: attrs)
+                        pragmas.add(new AvatarPragmaSecret(str, obj, attr));
                     break;
                 case "SecrecyAssumption":
                     pragmas.add(new AvatarPragmaSecrecyAssumption(str, obj, attrs));
diff --git a/src/avatartranslator/AvatarPragmaAuthenticity.java b/src/avatartranslator/AvatarPragmaAuthenticity.java
index c1b9204e9fdd17111bf89e132871ce8209f87004..1748f48b546e464aa3086f79114a3a223b171e78 100644
--- a/src/avatartranslator/AvatarPragmaAuthenticity.java
+++ b/src/avatartranslator/AvatarPragmaAuthenticity.java
@@ -45,7 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.List;
 
 public class AvatarPragmaAuthenticity extends AvatarPragma {
 
@@ -74,6 +74,15 @@ public class AvatarPragmaAuthenticity extends AvatarPragma {
 	return attrB;
     }
 
+    @Override
+    public String toString()
+    {
+        if (this.attrA == null || this.attrB == null)
+            return "<undefined>";
+
+        return this.attrA.toString() + " ==> " + this.attrB.toString();
+    }
+
     @Override
     public AvatarPragmaAuthenticity advancedClone (AvatarSpecification avspec) {
         AvatarPragmaAuthenticity result = new AvatarPragmaAuthenticity (this.name, this.referenceObject, this.attrA.advancedClone(avspec), this.attrB.advancedClone(avspec));
diff --git a/src/avatartranslator/AvatarPragmaConstant.java b/src/avatartranslator/AvatarPragmaConstant.java
index b2c746f0153241e189e971ca8774a9b7ffdeae6f..7a0a8734144a7fe3bd4ceebf543c65ee58a7990f 100644
--- a/src/avatartranslator/AvatarPragmaConstant.java
+++ b/src/avatartranslator/AvatarPragmaConstant.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaConstant extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaInitialKnowledge.java b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
index 6622210b2b9d883fb915cb4333a81a81f90bae7e..f7b8d599b9b1b0b31d11c58f9cb9ac17a72f8ce5 100644
--- a/src/avatartranslator/AvatarPragmaInitialKnowledge.java
+++ b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
@@ -45,7 +45,8 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
 public class AvatarPragmaInitialKnowledge extends AvatarPragma {
 
diff --git a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
index 74f833e6caf03aa30af9882aeab07c15c150cce5..15574bcd1445032b8d88cd462dc3d1c59c42f7cb 100644
--- a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
+++ b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaPrivatePublicKey extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaPublic.java b/src/avatartranslator/AvatarPragmaPublic.java
index 9c8c6a1485148c1498fc394cf5ec0a0061b44079..0244f1d479696690e99f64007b512ec6c00d7de3 100644
--- a/src/avatartranslator/AvatarPragmaPublic.java
+++ b/src/avatartranslator/AvatarPragmaPublic.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaPublic extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaReachability.java b/src/avatartranslator/AvatarPragmaReachability.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b1a70171be0a0947cb355d5175681fdeb0360
--- /dev/null
+++ b/src/avatartranslator/AvatarPragmaReachability.java
@@ -0,0 +1,80 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class AvatarPragmaReachability
+ * Creation: 19/05/2017
+ * @version 1.0 19/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package avatartranslator;
+
+public class AvatarPragmaReachability extends AvatarPragma {
+    private AvatarState state;
+    private AvatarBlock block;
+
+    public AvatarPragmaReachability(String _name, Object _referenceObject, AvatarBlock block, AvatarState state)
+    {
+        super(_name, _referenceObject);
+        this.block = block;
+        this.state = state;
+    }
+
+    public AvatarState getState()
+    {
+        return this.state;
+    }
+
+    public AvatarBlock getBlock()
+    {
+        return this.block;
+    }
+
+    public String toString()
+    {
+        return this.block.getName().replaceAll("__", ".") + "." + this.state.getName();
+    }
+
+    @Override
+    public AvatarPragmaReachability advancedClone(AvatarSpecification avspec)
+    {
+        // !!! Should never be called !!!
+        return null;
+    }
+}
diff --git a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
index 2efe6bfb7ca1146fb731f5667538aa810508ee32..0282f517e64b6a4938debb675c56a121f04791f6 100644
--- a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
+++ b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaSecrecyAssumption extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaSecret.java b/src/avatartranslator/AvatarPragmaSecret.java
index 2bc660ce9bbfc13f78afa2b0aaf86a36f47bb692..d51cdb0e42d5e4a31fe461556a8dc85b540c0cda 100644
--- a/src/avatartranslator/AvatarPragmaSecret.java
+++ b/src/avatartranslator/AvatarPragmaSecret.java
@@ -45,29 +45,26 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class AvatarPragmaSecret extends AvatarPragma {
 
-    private LinkedList<AvatarAttribute> arguments;
+    private AvatarAttribute argument;
 
-    public AvatarPragmaSecret(String _name, Object _referenceObject, LinkedList<AvatarAttribute> args) {
+    public AvatarPragmaSecret(String _name, Object _referenceObject, AvatarAttribute arg) {
         super(_name, _referenceObject);
-        arguments = args;
+        this.argument = arg;
     }
-    public LinkedList<AvatarAttribute> getArgs(){
-	return arguments;
+    public AvatarAttribute getArg(){
+	return this.argument;
+    }
+
+    public String toString()
+    {
+        return this.argument.getBlock().getName().replaceAll("__", ".") + "." + this.argument.getName();
     }
 
     @Override
     public AvatarPragmaSecret advancedClone (AvatarSpecification avspec) {
-        LinkedList<AvatarAttribute> l = new LinkedList<AvatarAttribute> ();
-        for (AvatarAttribute aa: this.arguments)
-            l.add (avspec.getMatchingAttribute(aa));
-        AvatarPragmaSecret result = new AvatarPragmaSecret (this.name, this.referenceObject, l);
+        AvatarPragmaSecret result = new AvatarPragmaSecret (this.name, this.referenceObject, avspec.getMatchingAttribute(this.argument));
         this.cloneLinkToReferenceObjects (result);
         return result;
     }
diff --git a/src/avatartranslator/AvatarRandom.java b/src/avatartranslator/AvatarRandom.java
index 04972ce13a55ba1ba15740b148eee230fa16d356..a0579efe66fa0c32fb1e296e3aca50e02e1b4ffa 100644
--- a/src/avatartranslator/AvatarRandom.java
+++ b/src/avatartranslator/AvatarRandom.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarRandom extends AvatarStateMachineElement {
     protected String variable;
     protected String minValue;
diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java
index 548f6d12753b10136c24e7abe7cba9d6ad755094..b6e2228d3328a747e13bec6b6e06b51715471915 100644
--- a/src/avatartranslator/AvatarRelation.java
+++ b/src/avatartranslator/AvatarRelation.java
@@ -47,7 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AvatarRelation extends AvatarElement {
 
@@ -151,6 +153,14 @@ public class AvatarRelation extends AvatarElement {
         return signals2.get(_index);
     }
 
+    public AvatarBlock getBlock1() {
+        return this.block1;
+    }
+
+    public AvatarBlock getBlock2() {
+        return this.block2;
+    }
+
     public AvatarSignal getInSignal(int _index) {
         AvatarSignal sig1 = signals1.get(_index);
         if (sig1.isIn()) {
diff --git a/src/avatartranslator/AvatarResetTimer.java b/src/avatartranslator/AvatarResetTimer.java
index d0cee4086be22b720503c89ffbd80d9209e151fa..ff72aba239f32830e73132eda21e9a4375efcbbc 100644
--- a/src/avatartranslator/AvatarResetTimer.java
+++ b/src/avatartranslator/AvatarResetTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarResetTimer extends AvatarTimerOperator {
 	
     public AvatarResetTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSetTimer.java b/src/avatartranslator/AvatarSetTimer.java
index ac600350d0cea813e563eddde3fee282c4c1b4e0..a76bebbc0b17a7887b71f88b19f3a57ba13ab8ea 100644
--- a/src/avatartranslator/AvatarSetTimer.java
+++ b/src/avatartranslator/AvatarSetTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarSetTimer extends AvatarTimerOperator {
 	protected String setValue;
 	
diff --git a/src/avatartranslator/AvatarSignal.java b/src/avatartranslator/AvatarSignal.java
index 1fa12f2c09cca625e1e5941e4a66a7a538a2b8e4..8effe45f0c0da4c5cee51691afc1c919a8e34ba2 100644
--- a/src/avatartranslator/AvatarSignal.java
+++ b/src/avatartranslator/AvatarSignal.java
@@ -47,10 +47,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
 public class AvatarSignal extends AvatarMethod {
 
     // Signa type
diff --git a/src/avatartranslator/AvatarSimpleGuard.java b/src/avatartranslator/AvatarSimpleGuard.java
index 982974c836379d63e2cfdef9aad3086d0ceedc3f..4b3a8d105f835073fd98eff164d38e63a84ac921 100644
--- a/src/avatartranslator/AvatarSimpleGuard.java
+++ b/src/avatartranslator/AvatarSimpleGuard.java
@@ -46,8 +46,6 @@
 
 package avatartranslator;
 
-import myutil.Conversion;
-
 /**
  * An AvatarSimpleGuard is an {@link AvatarGuard} that is of the form:
  * {@link AvatarTerm} binaryOp {@link AvatarTerm} or simply {@link AvatarTerm}, or else
diff --git a/src/avatartranslator/AvatarSimpleGuardDuo.java b/src/avatartranslator/AvatarSimpleGuardDuo.java
index 3b855b6f14ef0832d9832b8270f445e38a2aa5d5..13b2ab8dac20a0dc5841158b0922b35f5007de25 100644
--- a/src/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/avatartranslator/AvatarSimpleGuardDuo.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarSimpleGuardDuo is an {@link AvatarSimpleGuard} that is of the form:
  * {@link AvatarTerm} binaryOp {@link AvatarTerm}
diff --git a/src/avatartranslator/AvatarSimpleGuardMono.java b/src/avatartranslator/AvatarSimpleGuardMono.java
index dc9afdb9bb33f6c16e71864e0464f4e948ce1d4d..63644a4cd94d6394f263779e9e16834355f5d4c7 100644
--- a/src/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/avatartranslator/AvatarSimpleGuardMono.java
@@ -47,9 +47,6 @@
 package avatartranslator;
 
 import java.util.HashMap;
-import myutil.TraceManager;
-
-import myutil.Conversion;
 
 /**
  * An AvatarSimpleGuardMono is an {@link AvatarSimpleGuard} that is of the form:
diff --git a/src/avatartranslator/AvatarSpecification.java b/src/avatartranslator/AvatarSpecification.java
index 059c167392f1067b397959917453902a01d36344..ecad080b68385402efdd30ae1ca0754f5c69b280 100644
--- a/src/avatartranslator/AvatarSpecification.java
+++ b/src/avatartranslator/AvatarSpecification.java
@@ -47,9 +47,13 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AvatarSpecification extends AvatarElement {
     public static String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}", "|", "&"};
diff --git a/src/avatartranslator/AvatarStartState.java b/src/avatartranslator/AvatarStartState.java
index 0031449b67b031b464f674317d0551cd7ada1f8b..3089aa2e4614a3491f6968f2f2983d9c825d7c0d 100644
--- a/src/avatartranslator/AvatarStartState.java
+++ b/src/avatartranslator/AvatarStartState.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarStartState extends AvatarStateElement {
 
 
diff --git a/src/avatartranslator/AvatarState.java b/src/avatartranslator/AvatarState.java
index 877f844ecd06a9c34208b6b8a11713bf67816bbe..8f6918ddc4917ce55ce93a2322c5fafbd2404441 100644
--- a/src/avatartranslator/AvatarState.java
+++ b/src/avatartranslator/AvatarState.java
@@ -45,11 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class AvatarState extends AvatarStateElement {
     private String entryCode;
     private boolean hidden; // i.e, not present in the original state machine
diff --git a/src/avatartranslator/AvatarStateElement.java b/src/avatartranslator/AvatarStateElement.java
index 77a6441de73f75af0b0af4f890654a4691da4307..85104957037c7ffc830473756e163afa203dc3c7 100644
--- a/src/avatartranslator/AvatarStateElement.java
+++ b/src/avatartranslator/AvatarStateElement.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public abstract class AvatarStateElement extends AvatarStateMachineElement {
 
 
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index a959845bad6b2f90cc765d1fb79c9951ec742f1a..95bcbaf7408b5401d51ed097f348942d1ef00c1b 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -47,9 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.*;
 
 public class AvatarStateMachine extends AvatarElement {
     // to be used by code generator for fast access to states
diff --git a/src/avatartranslator/AvatarStateMachineElement.java b/src/avatartranslator/AvatarStateMachineElement.java
index ac3f7c72ad0f5ec6d37047674ea4c83831132bd3..ca357809b3e41f324acd8ae1453dbb5143dbee5b 100644
--- a/src/avatartranslator/AvatarStateMachineElement.java
+++ b/src/avatartranslator/AvatarStateMachineElement.java
@@ -45,11 +45,11 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
 import ui.TGComponent;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+
 
 public abstract class AvatarStateMachineElement extends AvatarElement {
 
diff --git a/src/avatartranslator/AvatarStopState.java b/src/avatartranslator/AvatarStopState.java
index 5e17cb3af233376186057f4afaba23eba72a2e74..ea2461440241320d89e7b78c03f0c77a05d3c682 100644
--- a/src/avatartranslator/AvatarStopState.java
+++ b/src/avatartranslator/AvatarStopState.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarStopState extends AvatarStateElement {
 
     public AvatarStopState(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSyntaxChecker.java b/src/avatartranslator/AvatarSyntaxChecker.java
index 93b1c28db386d17b51a2a18963074cc49469cded..2a01f05afa7f6770c6f91dfce3dc498aa2591e30 100644
--- a/src/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/avatartranslator/AvatarSyntaxChecker.java
@@ -45,11 +45,17 @@
 
 package avatartranslator;
 
-import java.io.*;
-import java.util.*;
-
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
 
 
 public class AvatarSyntaxChecker  {
diff --git a/src/avatartranslator/AvatarTerm.java b/src/avatartranslator/AvatarTerm.java
index 7d51ca75b821ff4777683720df8b8287a01c0d38..77ff991a84c40828a02c8c13b4e13914a12625ee 100644
--- a/src/avatartranslator/AvatarTerm.java
+++ b/src/avatartranslator/AvatarTerm.java
@@ -46,12 +46,12 @@
 
 package avatartranslator;
 
-import java.util.HashMap;
-
 import myutil.TraceManager;
 import translator.RTLOTOSKeyword;
 import translator.tojava.JKeyword;
 
+import java.util.HashMap;
+
 public abstract class AvatarTerm extends AvatarElement {
 
     public abstract boolean isLeftHand ();
diff --git a/src/avatartranslator/AvatarTermFunction.java b/src/avatartranslator/AvatarTermFunction.java
index 68579ba46a63ec703a88e4763510aa7ac5fb4067..f9517f4a6d6690aa1468a5feffc6832df936288a 100644
--- a/src/avatartranslator/AvatarTermFunction.java
+++ b/src/avatartranslator/AvatarTermFunction.java
@@ -46,9 +46,6 @@
 package avatartranslator;
 
 import java.util.HashMap;
-import java.util.LinkedList;
-
-import myutil.TraceManager;
 
 public class AvatarTermFunction extends AvatarTerm implements AvatarAction {
     AvatarTuple args;
diff --git a/src/avatartranslator/AvatarTimerOperator.java b/src/avatartranslator/AvatarTimerOperator.java
index d625ebbc523a97731a8af9c72c6b3828ef4fdf31..1c01efdfc885990b513c85540c0456333b28a7b7 100644
--- a/src/avatartranslator/AvatarTimerOperator.java
+++ b/src/avatartranslator/AvatarTimerOperator.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public abstract class AvatarTimerOperator extends AvatarStateMachineElement {
 	protected AvatarAttribute timer;
 	
diff --git a/src/avatartranslator/AvatarTransition.java b/src/avatartranslator/AvatarTransition.java
index 4fd97f331c49b7996ef6a003bf22c8731280d8c5..070fa9b89b59791bf803321386ea42e7cbde3cae 100644
--- a/src/avatartranslator/AvatarTransition.java
+++ b/src/avatartranslator/AvatarTransition.java
@@ -45,9 +45,10 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class AvatarTransition extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarTuple.java b/src/avatartranslator/AvatarTuple.java
index 75c3cc1e47155534f6ead5b9e7a9ecbf486ae4c6..4cd8299a38e3351772a6140971ff244b745da69b 100644
--- a/src/avatartranslator/AvatarTuple.java
+++ b/src/avatartranslator/AvatarTuple.java
@@ -46,10 +46,8 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
 
 public class AvatarTuple extends AvatarLeftHand {
     LinkedList<AvatarTerm> components;
diff --git a/src/avatartranslator/AvatarUnaryGuard.java b/src/avatartranslator/AvatarUnaryGuard.java
index 1b84757f71283801bd05b98048e5a4dcde3b8c0b..c18916a68194022aa2c5a54129da127031571c93 100644
--- a/src/avatartranslator/AvatarUnaryGuard.java
+++ b/src/avatartranslator/AvatarUnaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 public class AvatarUnaryGuard extends AvatarComposedGuard {
     AvatarComposedGuard guard;
 
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
index 17a2d5e0a7efc6ed6cf35ee0db2e5bb8e9aae887..2287c5b3b99802d2db3861c1ab271535feb31b68 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
@@ -47,10 +47,10 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarSignal;
 
-import avatartranslator.*;
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarSimulationAsynchronousTransaction  {
 
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
index 81aa2b618bcfa8a2fc856b2a6192ef9737d53668..3deb75691993e1066429d1b433b9f93dbd58e0f7 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -47,10 +47,13 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.Vector;
 
 public class AvatarSimulationBlock  {
     public final static int NOT_STARTED = 0;
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index 538cfb13ba707c7e2315658bb0ba211ce98d3054..4fff419ecf88b2a477d6f1ccf38fed654e1243d3 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -47,11 +47,11 @@
 
 package avatartranslator.directsimulation;
 
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarStateMachineElement;
+import myutil.TraceManager;
 
-import avatartranslator.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class AvatarSimulationPendingTransaction  {
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
index ea3e64b836703edcbc749fb07104fd26ba80b9e7..4a44a2f7772d528f2b534fef4375975403ea7340 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
@@ -47,10 +47,12 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
-import avatartranslator.*;
-import myutil.*;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarSimulationTransaction  {
 
diff --git a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
index 918fe274e5092cf92b97053048bdcaf5688c12ba..43dd9d788e24cd597f2b66354947495b0b265320 100644
--- a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
+++ b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
@@ -47,11 +47,12 @@
 
 package avatartranslator.directsimulation;
 
-import java.awt.*;
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.awt.*;
+import java.util.Vector;
 
 
 public class AvatarSpecificationSimulation  {
diff --git a/src/avatartranslator/modelchecker/AvatarModelChecker.java b/src/avatartranslator/modelchecker/AvatarModelChecker.java
index 01cea656aec12c186859d881e9d5310da8fd81cc..2ba2fbc3e044344d0f151db70cab0429f680a8a5 100644
--- a/src/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -47,10 +47,13 @@
 
 package avatartranslator.modelchecker;
 
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.*;
 
 public class AvatarModelChecker implements Runnable, myutil.Graph {
     private final static int DEFAULT_NB_OF_THREADS = 12;
diff --git a/src/avatartranslator/modelchecker/SpecificationBlock.java b/src/avatartranslator/modelchecker/SpecificationBlock.java
index 2736b0855b0f4f851cf372b2c4c1523e722c5b09..6e66a81730449f3769b07cd6b866bf49c40ee8a9 100644
--- a/src/avatartranslator/modelchecker/SpecificationBlock.java
+++ b/src/avatartranslator/modelchecker/SpecificationBlock.java
@@ -47,10 +47,11 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarBlock;
 
-import myutil.*;
+import java.util.Arrays;
+import java.util.LinkedList;
 
 public class SpecificationBlock  {
     
diff --git a/src/avatartranslator/modelchecker/SpecificationLink.java b/src/avatartranslator/modelchecker/SpecificationLink.java
index 1a64e27dbd152ceb46f912349a3f318711622d66..914df13fa03ddf6878ca041538577b5ae7260be3 100644
--- a/src/avatartranslator/modelchecker/SpecificationLink.java
+++ b/src/avatartranslator/modelchecker/SpecificationLink.java
@@ -47,10 +47,6 @@
 
 package avatartranslator.modelchecker;
 
-import java.util.*;
-
-import myutil.*;
-
 public class SpecificationLink  {
 
     public SpecificationState originState;
diff --git a/src/avatartranslator/modelchecker/SpecificationLiveness.java b/src/avatartranslator/modelchecker/SpecificationLiveness.java
index b5e7a83d8d980d43a91557f25abb1bd495a40f64..258e67538a3baf2c77c53ac2de928ae6fc4a4ae2 100644
--- a/src/avatartranslator/modelchecker/SpecificationLiveness.java
+++ b/src/avatartranslator/modelchecker/SpecificationLiveness.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
 public class SpecificationLiveness  {
     public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachability.java b/src/avatartranslator/modelchecker/SpecificationReachability.java
index 0a480406f57eca37bf1ca5fda83274cba3455a82..123a1aa8e88110a0da191035438d96b483c965fc 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachability.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachability.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
 public class SpecificationReachability  {
     public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
index d4e5dcf01a71c04bb2179b995828ff65747d3a9c..41fdd734b5b7278ba228449b9ab28712dbf38a08 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
@@ -47,11 +47,6 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
-
 public enum SpecificationReachabilityType  {
     NOTCOMPUTED, REACHABLE, NONREACHABLE
 }
diff --git a/src/avatartranslator/modelchecker/SpecificationState.java b/src/avatartranslator/modelchecker/SpecificationState.java
index 027f021e41f66bc2ea0242d9649876066ff8e85c..39d4e77ef14db3a642d0228b0a58854cb9bdd227 100644
--- a/src/avatartranslator/modelchecker/SpecificationState.java
+++ b/src/avatartranslator/modelchecker/SpecificationState.java
@@ -48,11 +48,12 @@
 package avatartranslator.modelchecker;
 
 
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
 
-import java.util.*;
-
-import avatartranslator.*;
-import myutil.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
 
 public class SpecificationState implements Comparable<SpecificationState>  {
 
diff --git a/src/avatartranslator/modelchecker/SpecificationTransition.java b/src/avatartranslator/modelchecker/SpecificationTransition.java
index 16b2558f05e944534777f52570bd882f09cf56a9..dc949c1154c2eb0ee2c352659570239142709c91 100644
--- a/src/avatartranslator/modelchecker/SpecificationTransition.java
+++ b/src/avatartranslator/modelchecker/SpecificationTransition.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarTransition;
 
 public class SpecificationTransition  {
     public int clockMin, clockMax;
diff --git a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index aae5bb85d3ae3a01a605c94a0ec4b99822d85a2d..31c119ac745464e4c450d97d06666a554e49b0bc 100755
--- a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -45,13 +45,15 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import java.io.*;
-
-import myutil.*;
 import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AVATAR2CPOSIX {
 
@@ -79,9 +81,12 @@ public class AVATAR2CPOSIX {
     private boolean tracing;
     private boolean includeUserCode = true;
 
+    private String plugin = "";
+
 
-    public AVATAR2CPOSIX(AvatarSpecification _avspec) {
+    public AVATAR2CPOSIX(AvatarSpecification _avspec, String _plugin) {
         avspec = _avspec;
+	plugin = _plugin;
     }
 
     public void setTimeUnit(int _timeUnit) {
@@ -132,7 +137,7 @@ public class AVATAR2CPOSIX {
         debug = _debug;
         tracing = _tracing;
 
-        mainFile = new MainFile("main");
+        mainFile = new MainFile("main", plugin);
         taskFiles = new Vector<TaskFile>();
 
         avspec.removeCompositeStates();
diff --git a/src/avatartranslator/toexecutable/MainFile.java b/src/avatartranslator/toexecutable/MainFile.java
index 89cdaaa143689bf56d5bd74332a5436a32230641..6ab354acc3613f9c8375042218df2f87dea0c751 100755
--- a/src/avatartranslator/toexecutable/MainFile.java
+++ b/src/avatartranslator/toexecutable/MainFile.java
@@ -1,111 +1,136 @@
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
-*
-* ludovic.apvrille AT enst.fr
-*
-* This software is a computer program whose purpose is to allow the
-* edition of TURTLE analysis, design and deployment diagrams, to
-* allow the generation of RT-LOTOS or Java code from this diagram,
-* and at last to allow the analysis of formal validation traces
-* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
-* from INRIA Rhone-Alpes.
-*
-* This software is governed by the CeCILL  license under French law and
-* abiding by the rules of distribution of free software.  You can  use,
-* modify and/ or redistribute the software under the terms of the CeCILL
-* license as circulated by CEA, CNRS and INRIA at the following URL
-* "http://www.cecill.info".
-*
-* As a counterpart to the access to the source code and  rights to copy,
-* modify and redistribute granted by the license, users are provided only
-* with a limited warranty  and the software's author,  the holder of the
-* economic rights,  and the successive licensors  have only  limited
-* liability.
-*
-* In this respect, the user's attention is drawn to the risks associated
-* with loading,  using,  modifying and/or developing or reproducing the
-* software by the user in light of its specific status of free software,
-* that may mean  that it is complicated to manipulate,  and  that  also
-* therefore means  that it is reserved for developers  and  experienced
-* professionals having in-depth computer knowledge. Users are therefore
-* encouraged to load and test the software's suitability as regards their
-* requirements in conditions enabling the security of their systems and/or
-* data to be ensured and,  more generally, to use and operate it in the
-* same conditions as regards security.
-*
-* The fact that you are presently reading this means that you have had
-* knowledge of the CeCILL license and that you accept its terms.
-*
-* /**
-* Class MainFile
-* Creation: 29/03/2011
-* @version 1.1 29/03/2011
-* @author Ludovic APVRILLE
-* @see
-*/
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class MainFile
+ * Creation: 29/03/2011
+ * @version 1.1 29/03/2011
+ * @author Ludovic APVRILLE
+ * @see
+ */
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
+import myutil.PluginManager;
+import myutil.TraceManager;
 
 public class MainFile {
-	
-	private final static String H_DEF = "#ifndef MAIN_H\n#define MAIN_H\n";
-	private final static String H_END_DEF = "#endif\n";
 
-	private final static String INCLUDE_HEADER = "#include <stdio.h>\n#include <pthread.h>\n#include <unistd.h>\n#include <stdlib.h>\n";
-	private final static String LOCAL_INCLUDE_HEADER = "#include \"request.h\"\n#include \"syncchannel.h\"\n#include \"request_manager.h\"\n#include \"debug.h\"\n#include \"random.h\"\n#include \"tracemanager.h\""; 
-	
-	private final static String MAIN_DEC = "int main(int argc, char *argv[]) {\n";
-	private final static String DISABLE_BUFFERING = "/* disable buffering on stdout */\nsetvbuf(stdout, NULL, _IONBF, 0);\n";
-	
-	private final static String CR = "\n";
-	
-	private String name;
-	private String hCode;
-	private String beforeMainCode;
-	private String mainCode;
-	
-	
-	public MainFile(String _name) {
-		name = _name;
-		hCode = "";
-		mainCode = "";
-		beforeMainCode = "";
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public void appendToHCode(String _code) {
-		hCode += _code;
-	}
-	
-	public void appendToBeforeMainCode(String _code) {
-		beforeMainCode += _code;
-	}
-	
-	public void appendToMainCode(String _code) {
-		mainCode += _code;
-	}
-	
-	public String getHeaderCode() {
-		return H_DEF + hCode + H_END_DEF;
-	}
-	
-	public String getMainCode() {
-		String s = INCLUDE_HEADER + "\n" + LOCAL_INCLUDE_HEADER + CR + CR;
-		s += beforeMainCode + CR;
-		s += MAIN_DEC + CR;
-		s += DISABLE_BUFFERING;
-		s += CR + mainCode + CR + "}" + CR;
-		
-		return s;
-		
-	}
+    private final static String H_DEF = "#ifndef MAIN_H\n#define MAIN_H\n";
+    private final static String H_END_DEF = "#endif\n";
+
+    private final static String INCLUDE_HEADER = "#include <stdio.h>\n#include <pthread.h>\n#include <unistd.h>\n#include <stdlib.h>\n";
+    private final static String LOCAL_INCLUDE_HEADER = "#include \"request.h\"\n#include \"syncchannel.h\"\n#include \"request_manager.h\"\n#include \"debug.h\"\n#include \"random.h\"\n#include \"tracemanager.h\"";
+
+    private final static String MAIN_DEC = "int main(int argc, char *argv[]) {\n";
+    private final static String DISABLE_BUFFERING = "/* disable buffering on stdout */\nsetvbuf(stdout, NULL, _IONBF, 0);\n";
+
+    private final static String CR = "\n";
+
+    private String name;
+    private String hCode;
+    private String beforeMainCode;
+    private String mainCode;
+
+    private String plugin;
+
+
+    public MainFile(String _name, String _plugin) {
+        name = _name;
+        plugin = _plugin;
+        hCode = "";
+        mainCode = "";
+        beforeMainCode = "";
+
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void appendToHCode(String _code) {
+        hCode += _code;
+    }
+
+    public void appendToBeforeMainCode(String _code) {
+        beforeMainCode += _code;
+    }
+
+    public void appendToMainCode(String _code) {
+        mainCode += _code;
+    }
+
+    public String getHeaderCode() {
+        return H_DEF + hCode + H_END_DEF;
+    }
+
+    public String getMainCode() {
+
+        String mainDec = MAIN_DEC;
+
 	
-}
\ No newline at end of file
+
+        try {
+	    mainDec = PluginManager.pluginManager.executeString(plugin, "CustomizerAvatarJavaCodeGeneration", "getMainDeclaration");
+            /*File file = new File(plugin);
+            TraceManager.addDev("Loading plugin=" + plugin);
+            URL[] urls = new URL[] { file.toURI().toURL() };
+            ClassLoader loader = new URLClassLoader(urls);
+	    TraceManager.addDev("Loader created");
+            Class c = loader.loadClass("CustomizerAvatarJavaCodeGeneration");
+	    Method method = c.getMethod("getMainDeclaration");
+	    TraceManager.addDev("Method created");
+            Object ret = method.invoke(null);
+	    TraceManager.addDev("Method cinvoked");
+            mainDec = (String)ret;
+	    TraceManager.addDev("Conversion to String");
+            TraceManager.addDev("Customized main dec:" + mainDec);*/
+        } catch (Exception e) {
+            TraceManager.addDev("plugin exception: " + e.getMessage());
+        }
+
+        String s = INCLUDE_HEADER + "\n" + LOCAL_INCLUDE_HEADER + CR + CR;
+        s += beforeMainCode + CR;
+        s += mainDec + CR;
+        s += DISABLE_BUFFERING;
+        s += CR + mainCode + CR + "}" + CR;
+
+        return s;
+
+    }
+
+}
diff --git a/src/avatartranslator/toexecutable/TaskFile.java b/src/avatartranslator/toexecutable/TaskFile.java
index bff388ea1d7ed32c3cf2d9c3d5de4e6c76a35e89..a3b8cb56eb0ffd5b54847c2ad5f7163ef438f1b7 100755
--- a/src/avatartranslator/toexecutable/TaskFile.java
+++ b/src/avatartranslator/toexecutable/TaskFile.java
@@ -45,12 +45,6 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class TaskFile {
     /////////////////////RG
     //1) enlever pthread.h
diff --git a/src/avatartranslator/toexecutable/TaskFileSoclib.java b/src/avatartranslator/toexecutable/TaskFileSoclib.java
index 82939ca92462d51b1282ad20045b54ced4f66450..a0e1adbd6d9189280ae3ba998c40f90e7e21dfb6 100755
--- a/src/avatartranslator/toexecutable/TaskFileSoclib.java
+++ b/src/avatartranslator/toexecutable/TaskFileSoclib.java
@@ -45,12 +45,6 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class TaskFileSoclib {
 	/////////////////////RG
 	//1) enlever pthread.h
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index ed4cb9ff0b1a833f366673d07bf3a761e90d9e0e..4b7a86d315c7b73c6e070d40080281b0752573a2 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -45,25 +45,30 @@
 
 package avatartranslator.toproverif;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-import ui.ConfigurationTTool;
-import ui.CheckingError;
+import avatartranslator.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import proverifspec.*;
 import ui.AvatarDesignPanel;
-import ui.window.JDialogProVerifGeneration;
+import ui.CheckingError;
+import ui.ConfigurationTTool;
 import ui.TGComponent;
-import proverifspec.*;
-import myutil.*;
-import avatartranslator.*;
+import ui.window.JDialogProverifVerification;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 
 public class AVATAR2ProVerif implements AvatarTranslator {
 
-    private final static String ATTR_DELIM = "__";
+    public final static String ATTR_DELIM = "___";
 
     private final static String UNKNOWN = "UNKNOWN";
 
@@ -91,7 +96,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
     private final static String HASH_HASH = "hash";
 
     private final static String CH_MAINCH = "ch";
-    private final static String CH_ENCRYPT = "privChEnc__";
+    public final static String CH_ENCRYPT = "privChEnc__";
     private final static String CH_DECRYPT = "privChDec__";
 
     private final static String CHCTRL_CH = "chControl";
@@ -422,6 +427,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
 
     public void makeHeader() {
         TraceManager.addDev("\n\n=+=+=+ Making Headers +=+=+=");
+        this.spec.addDeclaration (new ProVerifProperty   ("abbreviateDerivation = false"));
         this.spec.addDeclaration (new ProVerifComment    ("Boolean return types"));
         this.spec.addDeclaration (new ProVerifConst      (TRUE, "bitstring"));
         this.spec.addDeclaration (new ProVerifConst      (FALSE, "bitstring"));
@@ -471,7 +477,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                 int nbOfSignals = ar.nbOfSignals ();
                 int i;
                 for (i=0; i<nbOfSignals; i++) {
-                    String name = ar.getSignal1 (i).getName () + ar.getSignal2 (i).getName ();
+                    String name = ar.getBlock1().getName() + ar.getSignal1 (i).getName () + "__" + ar.getBlock2().getName() + ar.getSignal2 (i).getName ();
                     this.spec.addDeclaration (new ProVerifFunc       (CH_ENCRYPT + name, new String[] {"bitstring"}, "bitstring", true));
                     this.spec.addDeclaration (new ProVerifReduc      (new ProVerifVar[] {new ProVerifVar ("x", "bitstring")}, CH_DECRYPT + name + " (" + CH_ENCRYPT + name + " (x)) = x", true));
                 }
@@ -486,7 +492,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         this.spec.addDeclaration (new ProVerifConst      (ZERO, "bitstring"));
         this.spec.addDeclaration (new ProVerifFunc       (PEANO_N, new String[] {"bitstring"}, "bitstring"));
 
-        /* Declare all the call__*** variables */
+        /* Declare all the call*** variables */
         List<AvatarBlock> blocks = this.avspec.getListOfBlocks();
       //  String action = "(";
         for(AvatarBlock block: blocks) {
@@ -495,7 +501,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                 simplifiedElements.put (block.getStateMachine ().getStartState (), new Integer (0));
 
             for (AvatarStateMachineElement asme: simplifiedElements.keySet ())
-                this.spec.addDeclaration (new ProVerifVar        ("call__" + block.getName() + "__" + simplifiedElements.get (asme), "bitstring", true));
+                this.spec.addDeclaration (new ProVerifVar        ("call" + ATTR_DELIM + block.getName() + ATTR_DELIM + simplifiedElements.get (asme), "bitstring", true));
         }
 
         this.spec.addDeclaration (new ProVerifComment    ("Constants"));
@@ -536,23 +542,24 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         TraceManager.addDev("Queries Secret"); 
         for (AvatarPragma pragma: this.avspec.getPragmas ())
             if (pragma instanceof AvatarPragmaSecret)
-                for (AvatarAttribute attribute: ((AvatarPragmaSecret) pragma).getArgs ()) {
-                    AvatarAttribute trueAttr = this.nameEquivalence.get (attribute);
-                    if (trueAttr == null)
-                        trueAttr = attribute;
-                    if (this.secrecyChecked.contains (trueAttr))
-                        continue;
-
-                    String varName = AVATAR2ProVerif.translateTerm (trueAttr, null);
-                    this.spec.addDeclaration (new ProVerifQueryAtt   (varName, true));
-                    TraceManager.addDev("|    attacker (" + varName + ")"); 
-
-                    this.secrecyChecked.add (trueAttr);
-                }
+            {
+                AvatarAttribute attribute = ((AvatarPragmaSecret) pragma).getArg ();
+                AvatarAttribute trueAttr = this.nameEquivalence.get (attribute);
+                if (trueAttr == null)
+                    trueAttr = attribute;
+                if (this.secrecyChecked.contains (trueAttr))
+                    continue;
+
+                String varName = AVATAR2ProVerif.translateTerm (trueAttr, null);
+                this.spec.addDeclaration (new ProVerifQueryAtt   (varName, true));
+                TraceManager.addDev("|    attacker (" + varName + ")"); 
+
+                this.secrecyChecked.add (trueAttr);
+            }
 
         // Queries for states
-        TraceManager.addDev ("Queries Event (" + (this.stateReachability == JDialogProVerifGeneration.REACHABILITY_ALL ? "ALL" : this.stateReachability == JDialogProVerifGeneration.REACHABILITY_SELECTED ? "SELECTED" : "NONE") + ")"); 
-        if (this.stateReachability != JDialogProVerifGeneration.REACHABILITY_NONE) {
+        TraceManager.addDev ("Queries Event (" + (this.stateReachability == JDialogProverifVerification.REACHABILITY_ALL ? "ALL" : this.stateReachability == JDialogProverifVerification.REACHABILITY_SELECTED ? "SELECTED" : "NONE") + ")"); 
+        if (this.stateReachability != JDialogProverifVerification.REACHABILITY_NONE) {
             this.spec.addDeclaration (new ProVerifComment    ("Queries Event"));
             for (AvatarBlock block: this.avspec.getListOfBlocks ()) {
                 HashSet<AvatarStateMachineElement> visited = new HashSet<AvatarStateMachineElement> ();
@@ -564,10 +571,10 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                         continue;
                     visited.add (asme);
 
-                    if (asme instanceof AvatarState && (this.stateReachability == JDialogProVerifGeneration.REACHABILITY_ALL || ((AvatarState) asme).isCheckable ())) {
-                        this.spec.addDeclaration (new ProVerifQueryEv    (new ProVerifVar[] {}, "enteringState__" + block.getName() + "__" + asme.getName()));
-                        this.spec.addDeclaration (new ProVerifEvDecl     ("enteringState__" + block.getName() + "__" + asme.getName(), new String[] {}));
-                        TraceManager.addDev("|    event (enteringState__" + block.getName() + "__" + asme.getName() + ")"); 
+                    if (asme instanceof AvatarState && (this.stateReachability == JDialogProverifVerification.REACHABILITY_ALL || ((AvatarState) asme).isCheckable ())) {
+                        this.spec.addDeclaration (new ProVerifQueryEv    (new ProVerifVar[] {}, "enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName()));
+                        this.spec.addDeclaration (new ProVerifEvDecl     ("enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName(), new String[] {}));
+                        TraceManager.addDev("|    event (enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName() + ")"); 
                     }
 
                     for (AvatarStateMachineElement _asme: asme.getNexts ())
@@ -587,16 +594,16 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                 if (attrA != null && attrB != null) {
                     String sA = AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), attrA.getState ().getName ());
                     String sB = AVATAR2ProVerif.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), attrB.getState ().getName ());
-                    TraceManager.addDev("|    authenticity__" + sB + " (dummyM) ==> authenticity__" + sA + " (dummyM)"); 
+                    TraceManager.addDev("|    authenticity" + ATTR_DELIM + sB + " (dummyM) ==> authenticity" + ATTR_DELIM + sA + " (dummyM)"); 
                     if (!authenticityEvents.contains (sA)) {
                         authenticityEvents.add (sA);
-                        spec.addDeclaration (new ProVerifEvDecl ("authenticity__" + sA, new String[] {"bitstring"}));
+                        spec.addDeclaration (new ProVerifEvDecl ("authenticity" + ATTR_DELIM + sA, new String[] {"bitstring"}));
                     }
                     if (!authenticityEvents.contains (sB)) {
                         authenticityEvents.add (sB);
-                        spec.addDeclaration (new ProVerifEvDecl ("authenticity__" + sB, new String[] {"bitstring"}));
+                        spec.addDeclaration (new ProVerifEvDecl ("authenticity" + ATTR_DELIM + sB, new String[] {"bitstring"}));
                     }
-                    spec.addDeclaration (new ProVerifQueryEvinj (new ProVerifVar[] {new ProVerifVar ("dummyM", "bitstring")}, "authenticity__" + sB + " (dummyM)", "authenticity__" + sA + " (dummyM)"));
+                    spec.addDeclaration (new ProVerifQueryEvinj (new ProVerifVar[] {new ProVerifVar ("dummyM", "bitstring")}, "authenticity" + ATTR_DELIM + sB + " (dummyM)", "authenticity" + ATTR_DELIM + sA + " (dummyM)"));
                 }
             }
     }
@@ -605,7 +612,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         TraceManager.addDev("\n\n=+=+=+ Making Starting Process +=+=+=");
 
         // Create starting process
-        ProVerifProcess p = new ProVerifProcess("starting__", new ProVerifVar[] {});
+        ProVerifProcess p = new ProVerifProcess("starting" + ATTR_DELIM, new ProVerifVar[] {});
         ProVerifProcInstr lastInstr = p;
 
         // Get all the blocks
@@ -724,12 +731,12 @@ public class AVATAR2ProVerif implements AvatarTranslator {
             HashMap<AvatarStateMachineElement, Integer> simplifiedElements = block.getStateMachine ().getSimplifiedElements ();
 
             if (simplifiedElements.get (block.getStateMachine ().getStartState ()) == null)
-                paral.addInstr (new ProVerifProcCall (block.getName () + "__0", new ProVerifVar[] {new ProVerifVar ("sessionID", "bitstring")}));
+                paral.addInstr (new ProVerifProcCall (block.getName () + ATTR_DELIM + "0", new ProVerifVar[] {new ProVerifVar ("sessionID", "bitstring")}));
 
             for (AvatarStateMachineElement asme: simplifiedElements.keySet ()) {
                 globing = new ProVerifProcRawGlobing ("!", "");
                 paral.addInstr (globing);
-                globing.getIntra ().setNextInstr (new ProVerifProcCall (block.getName () + "__" + simplifiedElements.get (asme), new ProVerifVar[] {new ProVerifVar ("sessionID", "bitstring")}));
+                globing.getIntra ().setNextInstr (new ProVerifProcCall (block.getName () + ATTR_DELIM + simplifiedElements.get (asme), new ProVerifVar[] {new ProVerifVar ("sessionID", "bitstring")}));
             }
         }
 
@@ -827,7 +834,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         TraceManager.addDev("Finding processes");
         paral = new ProVerifProcParallel ();
         for(AvatarBlock block: blocks)
-            paral.addInstr (new ProVerifProcCall (block.getName() + "__start", processArgs.toArray (new ProVerifVar[processArgs.size ()])));
+            paral.addInstr (new ProVerifProcCall (block.getName() + ATTR_DELIM + "start", processArgs.toArray (new ProVerifVar[processArgs.size ()])));
         lastInstr = lastInstr.setNextInstr (paral);
 
         // Set main process
@@ -878,7 +885,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         List<ProVerifVar> processArgs = new LinkedList<ProVerifVar>( knowledgeArray );//.clone ();
         processArgs.add (new ProVerifVar ("sessionID", "bitstring"));
 
-        ProVerifProcInstr lastInstr = new ProVerifProcess(ab.getName() + "__start", processArgs.toArray (new ProVerifVar[processArgs.size ()]));
+        ProVerifProcInstr lastInstr = new ProVerifProcess(ab.getName() + ATTR_DELIM + "start", processArgs.toArray (new ProVerifVar[processArgs.size ()]));
         spec.addDeclaration (lastInstr);
 
         // Create a ProVerif Variable corresponding to each attribute block
@@ -923,9 +930,9 @@ public class AVATAR2ProVerif implements AvatarTranslator {
 
         // Call the first "real" process
         this.dummyDataCounter ++;
-        String strong = "strong__" + AVATAR2ProVerif.makeAttrName (ab.getName (), "0") + this.dummyDataCounter;
+        String strong = "strong" + ATTR_DELIM + AVATAR2ProVerif.makeAttrName (ab.getName (), "0") + this.dummyDataCounter;
         lastInstr = lastInstr.setNextInstr (new ProVerifProcIn (CHCTRL_CH, new ProVerifVar[] {new ProVerifVar (strong, "bitstring")}));
-        String tmp = "out (" + CHCTRL_CH + ", " + CHCTRL_ENCRYPT + " ((sessionID, call__" + ab.getName () + "__0" + ", " + strong;
+        String tmp = "out (" + CHCTRL_CH + ", " + CHCTRL_ENCRYPT + " ((sessionID, call" + ATTR_DELIM + ab.getName () + ATTR_DELIM + "0" + ", " + strong;
         for(ProVerifVar aa: this.getAttributesFromBlock (ab))
             tmp += ", " + aa.getName ();
         lastInstr = lastInstr.setNextInstr (new ProVerifProcRaw (tmp + ")))"));
@@ -947,15 +954,15 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                 ProVerifProcInstr p = new ProVerifProcess(AVATAR2ProVerif.makeAttrName(ab.getName(), simplifiedElements.get (asme).toString ()), new ProVerifVar[] {new ProVerifVar ("sessionID", "bitstring")});
                 this.spec.addDeclaration (p);
 
-                // Read and decrypt control data: variables sent to the process and the call__num variable
+                // Read and decrypt control data: variables sent to the process and the call*** variable
                 this.dummyDataCounter ++;
-                strong = "strong__" + AVATAR2ProVerif.makeAttrName (ab.getName(), simplifiedElements.get (asme).toString ()) + this.dummyDataCounter;
+                strong = "strong" + ATTR_DELIM + AVATAR2ProVerif.makeAttrName (ab.getName(), simplifiedElements.get (asme).toString ()) + this.dummyDataCounter;
                 p = p.setNextInstr (new ProVerifProcNew (strong, "bitstring"));
                 p = p.setNextInstr (new ProVerifProcRaw ("out (" + CHCTRL_CH + ", " + strong + ");"));
                 p = p.setNextInstr (new ProVerifProcIn (CHCTRL_CH, new ProVerifVar[] {new ProVerifVar ("chControlData", "bitstring")}));
                 LinkedList<ProVerifVar> attributes = new LinkedList<ProVerifVar> ();
                 attributes.add (new ProVerifVar ("sessionID", "bitstring", false, true));
-                attributes.add (new ProVerifVar ("call__" + ab.getName () + "__" + simplifiedElements.get (asme), "bitstring", false, true));
+                attributes.add (new ProVerifVar ("call" + ATTR_DELIM + ab.getName () + ATTR_DELIM + simplifiedElements.get (asme), "bitstring", false, true));
                 attributes.add (new ProVerifVar (strong, "bitstring", false, true));
                 for (AvatarAttribute attr: ab.getAttributes ()) {
                     Integer c = attributeCmp.get (attr) + 1;
@@ -998,9 +1005,9 @@ public class AVATAR2ProVerif implements AvatarTranslator {
             if (n != null) {
                 // If next is the root of a process send the attributes on the control channel
                 this.dummyDataCounter ++;
-                String strong = "strong__" + AVATAR2ProVerif.makeAttrName (arg.block.getName (), n.toString ()) + this.dummyDataCounter;
+                String strong = "strong" + ATTR_DELIM + AVATAR2ProVerif.makeAttrName (arg.block.getName (), n.toString ()) + this.dummyDataCounter;
                 arg.lastInstr = arg.lastInstr.setNextInstr (new ProVerifProcIn (CHCTRL_CH, new ProVerifVar[] {new ProVerifVar (strong, "bitstring")}));
-                String tmp = "out (" + CHCTRL_CH + ", " + CHCTRL_ENCRYPT + " ((sessionID, call__" + arg.block.getName () + "__" + n + ", " + strong;
+                String tmp = "out (" + CHCTRL_CH + ", " + CHCTRL_ENCRYPT + " ((sessionID, call" + ATTR_DELIM + arg.block.getName () + ATTR_DELIM + n + ", " + strong;
                 for(AvatarAttribute aa: arg.block.getAttributes ())
                     tmp += ", " + AVATAR2ProVerif.translateTerm (aa, arg.attributeCmp);
 
@@ -1026,7 +1033,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         boolean isPrivate = false;
         AvatarRelation ar = this.avspec.getAvatarRelationWithSignal(as);
         int index = ar.getIndexOfSignal (as);
-        String name = ar.getSignal1 (index).getName () + ar.getSignal2 (index).getName ();
+        String name = ar.getBlock1().getName() + ar.getSignal1 (index).getName () + "__" + ar.getBlock2().getName() + ar.getSignal2 (index).getName ();
 
         if (ar != null)
             isPrivate = ar.isPrivate();
@@ -1037,7 +1044,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
             // Use a dummy name if no value is sent
             if (_asme.getNbOfValues() == 0) {
                 this.dummyDataCounter ++;
-                _lastInstr = _lastInstr.setNextInstr (new ProVerifProcNew ("data__" + this.dummyDataCounter, "bitstring"));
+                _lastInstr = _lastInstr.setNextInstr (new ProVerifProcNew ("data" + ATTR_DELIM + this.dummyDataCounter, "bitstring"));
             }
 
             String tmp = "out (" + CH_MAINCH + ", ";
@@ -1047,7 +1054,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
 		tmp +="(";
 	    }
             if (_asme.getNbOfValues() == 0)
-                tmp += "data__" + this.dummyDataCounter;
+                tmp += "data" + ATTR_DELIM + this.dummyDataCounter;
             else {
                 boolean first = true;
                 for(String value: _asme.getValues ()) {
@@ -1085,7 +1092,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
             LinkedList<ProVerifVar> vars = new LinkedList<ProVerifVar> ();
             if (_asme.getNbOfValues() == 0) {
                 this.dummyDataCounter ++;
-                vars.add (new ProVerifVar ("data__" + this.dummyDataCounter, "bitstring"));
+                vars.add (new ProVerifVar ("data" + ATTR_DELIM + this.dummyDataCounter, "bitstring"));
             } else
                 for(String value: _asme.getValues ()) {
                     AvatarTerm term = AvatarTerm.createFromString (arg.block, value);
@@ -1250,7 +1257,9 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                         if (! (args.get(i) instanceof AvatarAttribute)) {
                             CheckingError ce = new CheckingError(CheckingError.BEHAVIOR_ERROR, "'" + args.get(i).getName () + "' should be an attribute (ignored)");
                             ce.setAvatarBlock(arg.block);
-                            ce.setTDiagramPanel(((AvatarDesignPanel)(this.avspec.getReferenceObject())).getAvatarSMDPanel(arg.block.getName()));
+							if (this.avspec.getReferenceObject() instanceof AvatarDesignPanel){
+	                            ce.setTDiagramPanel(((AvatarDesignPanel)(this.avspec.getReferenceObject())).getAvatarSMDPanel(arg.block.getName()));
+							}
                             ce.setTGComponent((TGComponent)(_asme.getReferenceObject()));
                             this.warnings.add(ce);
                             ok = false;
@@ -1291,10 +1300,10 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         ProVerifTranslatorParameter arg = (ProVerifTranslatorParameter) _arg;
         ProVerifProcInstr _lastInstr = arg.lastInstr;
 
-        if (this.stateReachability == JDialogProVerifGeneration.REACHABILITY_ALL ||
-           (this.stateReachability == JDialogProVerifGeneration.REACHABILITY_SELECTED && _asme.isCheckable ()))
+        if (this.stateReachability == JDialogProverifVerification.REACHABILITY_ALL ||
+           (this.stateReachability == JDialogProverifVerification.REACHABILITY_SELECTED && _asme.isCheckable ()))
             // Adding an event for reachability of the state
-            _lastInstr = _lastInstr.setNextInstr (new ProVerifProcRaw ("event enteringState__" + arg.block.getName() + "__" + _asme.getName() + "()", true));
+            _lastInstr = _lastInstr.setNextInstr (new ProVerifProcRaw ("event enteringState" + ATTR_DELIM + arg.block.getName() + ATTR_DELIM + _asme.getName() + "()", true));
 
         // Adding an event if authenticity is concerned with that state
         HashSet<String> authenticityEvents = new HashSet<String> ();
@@ -1306,7 +1315,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                     TraceManager.addDev ("DEBUG: " + attrA.getAttribute ());
                     TraceManager.addDev ("DEBUG: " + attrA.getAttribute ().getBlock ());
                     TraceManager.addDev ("DEBUG: " + arg.attributeCmp.get (attrA.getAttribute()));
-                    String sp = "authenticity__" + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), _asme.getName ()) + " (" + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), arg.attributeCmp.get (attrA.getAttribute ()).toString ()) + ")";
+                    String sp = "authenticity" + ATTR_DELIM + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), _asme.getName ()) + " (" + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), arg.attributeCmp.get (attrA.getAttribute ()).toString ()) + ")";
                     if (!authenticityEvents.contains (sp)) {
                         authenticityEvents.add (sp);
                         TraceManager.addDev("|    |    authenticity event " + sp + "added");
@@ -1314,7 +1323,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
                     }
                 }
                 if (attrB.getAttribute ().getBlock () ==  arg.block && attrB.getState ().getName ().equals (_asme.getName ())) {
-                    String sp = "authenticity__" + AVATAR2ProVerif.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), _asme.getName ()) + " (" + AVATAR2ProVerif.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), arg.attributeCmp.get (attrB.getAttribute ()).toString ()) + ")";
+                    String sp = "authenticity" + ATTR_DELIM + AVATAR2ProVerif.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), _asme.getName ()) + " (" + AVATAR2ProVerif.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), arg.attributeCmp.get (attrB.getAttribute ()).toString ()) + ")";
                     if (!authenticityEvents.contains (sp)) {
                         authenticityEvents.add (sp);
                         TraceManager.addDev("|    |    authenticity event " + sp + "added");
@@ -1350,16 +1359,16 @@ public class AVATAR2ProVerif implements AvatarTranslator {
         } else {
             TraceManager.addDev("|    |    non deterministic next state");
             for (int i=0; i<nbOfNexts-1; i++) {
-                String choice = "choice__" + _asme.getName () + "__" + i;
+                String choice = "choice" + ATTR_DELIM + _asme.getName () + ATTR_DELIM + i;
                 _lastInstr = _lastInstr.setNextInstr (new ProVerifProcNew (choice, "bitstring"));
                 _lastInstr = _lastInstr.setNextInstr (new ProVerifProcRaw ("out (" + CH_MAINCH + ", " + choice + ");"));
             }
-            _lastInstr = _lastInstr.setNextInstr (new ProVerifProcIn (CH_MAINCH, new ProVerifVar[] {new ProVerifVar ("choice__" + _asme.getName (), "bitstring")}));
+            _lastInstr = _lastInstr.setNextInstr (new ProVerifProcIn (CH_MAINCH, new ProVerifVar[] {new ProVerifVar ("choice" + ATTR_DELIM + _asme.getName (), "bitstring")}));
 
             HashMap<AvatarAttribute, Integer> attributeCmp = arg.attributeCmp;
             for (int i=0; i<nbOfNexts-1; i++) {
-                String choice = "choice__" + _asme.getName () + "__" + i;
-                ProVerifProcITE ite = new ProVerifProcITE ("choice__" + _asme.getName () + " = " + choice);
+                String choice = "choice" + ATTR_DELIM + _asme.getName () + ATTR_DELIM + i;
+                ProVerifProcITE ite = new ProVerifProcITE ("choice" + ATTR_DELIM + _asme.getName () + " = " + choice);
 
                 arg.attributeCmp = new HashMap<AvatarAttribute, Integer> (attributeCmp);
                 arg.lastASME = _asme;
diff --git a/src/avatartranslator/totpn/AVATAR2TPN.java b/src/avatartranslator/totpn/AVATAR2TPN.java
index f73e774b283bb5ed5cedb2451cda1435ef3d9981..e3e616c0eea3ecada578e76e9054911e96cc2985 100755
--- a/src/avatartranslator/totpn/AVATAR2TPN.java
+++ b/src/avatartranslator/totpn/AVATAR2TPN.java
@@ -45,11 +45,16 @@
 
 package avatartranslator.totpn;
 
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
 import avatartranslator.*;
+import myutil.TraceManager;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
+
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AVATAR2TPN {
 
diff --git a/src/avatartranslator/toturtle/AVATAR2TURTLE.java b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
index 2209c39c926970848f343ae9a9490ea376017041..a10107e8a2f15e52987e3d2cb682589ea40fe2fc 100644
--- a/src/avatartranslator/toturtle/AVATAR2TURTLE.java
+++ b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
@@ -45,12 +45,13 @@
 
 package avatartranslator.toturtle;
 
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import translator.ActivityDiagram;
+import translator.TClass;
+import translator.TURTLEModeling;
 
-import avatartranslator.*;
-import myutil.*;
-import translator.*;
-import ui.*;
+import java.util.Vector;
 
 
 public class AVATAR2TURTLE {
diff --git a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
index 160038df26991d98eb3bdaa52de59117e2cf703f..5124289781ad1e4f83e26c6b8e0b83d400dea1c3 100755
--- a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -45,13 +45,21 @@
 
 package avatartranslator.touppaal;
 
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
 import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import ui.CheckingError;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AVATAR2UPPAAL {
 
diff --git a/src/compiler/tmlgrammar/SimpleNode.java b/src/compiler/tmlgrammar/SimpleNode.java
index 85718824457a17b18dfe1e031f2a3089c207921f..cc0880ca920ba83b50093d510bac2df4ab084933 100755
--- a/src/compiler/tmlgrammar/SimpleNode.java
+++ b/src/compiler/tmlgrammar/SimpleNode.java
@@ -1,38 +1,38 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
@@ -81,7 +81,7 @@ knowledge of the CeCILL license and that you accept its terms.
  /* Has been partially generated by: JJTree */
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class SimpleNode implements Node {
 	protected Node parent;
diff --git a/src/compiler/tmlparser/SimpleNode.java b/src/compiler/tmlparser/SimpleNode.java
index 6ab8c987b533762d83f1a34cb5446999ef896540..d50888a4f500f9a88b877afb2c11dd3fee53f565 100755
--- a/src/compiler/tmlparser/SimpleNode.java
+++ b/src/compiler/tmlparser/SimpleNode.java
@@ -1,74 +1,74 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-package compiler.tmlparser;
-
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+package compiler.tmlparser;
+
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
@@ -117,7 +117,7 @@ knowledge of the CeCILL license and that you accept its terms.
  /* Has been partially generated by: JJTree */
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class SimpleNode implements Node {
 	protected Node parent;
diff --git a/src/ddtranslator/DDStructLink.java b/src/ddtranslator/DDStructLink.java
index 6d00a089d84be8c9fe12c2016007dce4920dab2c..c9ac71032c78b68a18f490c7c3ee24d69d78ed10 100755
--- a/src/ddtranslator/DDStructLink.java
+++ b/src/ddtranslator/DDStructLink.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ddtranslator;
 
-import translator.*;
+import translator.Gate;
 
 public class DDStructLink  {
     public Gate lgate;
diff --git a/src/ddtranslator/DDStructSynchro.java b/src/ddtranslator/DDStructSynchro.java
index 46b6a9e875f6c00844e489ea64c7702a56ccadc0..57807f4519dd6229e496266738170af54c580f54 100755
--- a/src/ddtranslator/DDStructSynchro.java
+++ b/src/ddtranslator/DDStructSynchro.java
@@ -45,9 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ddtranslator;
 
-import java.util.*;
+import translator.Param;
+import translator.TClass;
 
-import translator.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class DDStructSynchro  {
     private List<String> list;
diff --git a/src/ddtranslator/DDTranslator.java b/src/ddtranslator/DDTranslator.java
index 70889f87c130025b5c3f4d9b2d2f9e036d9aec18..3011f6742155d4771644c0c5a31a28d554a511c1 100755
--- a/src/ddtranslator/DDTranslator.java
+++ b/src/ddtranslator/DDTranslator.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 package ddtranslator;
 
 
-import java.util.*;
-
-
 import translator.*;
 import ui.*;
-import ui.cd.*;
-import ui.dd.*;
+import ui.cd.TCDTClass;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class DDTranslator {
     
diff --git a/src/ddtranslator/TClassLinkNode.java b/src/ddtranslator/TClassLinkNode.java
index 449e31a4fdb74fa341d524fd8e1423e1ee3bf023..2a1ba221e0a6c79c8335e54e0e804ea908ddf724 100755
--- a/src/ddtranslator/TClassLinkNode.java
+++ b/src/ddtranslator/TClassLinkNode.java
@@ -44,10 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package ddtranslator;
- 
 
 
-import myutil.*;
+import myutil.Conversion;
 import translator.*;
 
 public class TClassLinkNode extends TClass {
diff --git a/src/ddtranslatorSoclib/AvatarBridge.java b/src/ddtranslatorSoclib/AvatarBridge.java
index ee7accf3824f0f02db7a8e38dd11acf2b522b5a5..76233bcbbc2ee6a3b37071255b0dc2f1116c4b21 100755
--- a/src/ddtranslatorSoclib/AvatarBridge.java
+++ b/src/ddtranslatorSoclib/AvatarBridge.java
@@ -43,7 +43,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarBridge extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarBus.java b/src/ddtranslatorSoclib/AvatarBus.java
index a24289e199eae98f41a10875a18a25c249252d17..2bf73566a4934fcbdec839fb147c19590e0531cc 100755
--- a/src/ddtranslatorSoclib/AvatarBus.java
+++ b/src/ddtranslatorSoclib/AvatarBus.java
@@ -42,7 +42,6 @@
     * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarBus extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarCPU.java b/src/ddtranslatorSoclib/AvatarCPU.java
index 35e7f98e6fa13e39882b49e7ab23cdf5373f76fb..0f6b2c8a16fbf29a9a0f74343bd8df895edcbd4e 100755
--- a/src/ddtranslatorSoclib/AvatarCPU.java
+++ b/src/ddtranslatorSoclib/AvatarCPU.java
@@ -4,7 +4,8 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
 
 public class AvatarCPU extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarConnectingPoint.java b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
index d6f17ba7004425a5a75b733746a734dc9c12aa16..bae722998dc6cce4e68fef21e29e898072ca8d01 100755
--- a/src/ddtranslatorSoclib/AvatarConnectingPoint.java
+++ b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
@@ -44,7 +44,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarConnectingPoint{
     
diff --git a/src/ddtranslatorSoclib/AvatarConnector.java b/src/ddtranslatorSoclib/AvatarConnector.java
index b8dc7664223f9f0199900e1d7b298af651a26519..dcddb1138a2c15c4e62be9f1907197e0f38d2bce 100755
--- a/src/ddtranslatorSoclib/AvatarConnector.java
+++ b/src/ddtranslatorSoclib/AvatarConnector.java
@@ -45,7 +45,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarConnector{
     
diff --git a/src/ddtranslatorSoclib/AvatarCoproMWMR.java b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
index d8c9b2cec5d58d9652c6655b6e09e448f79b9bea..940bc5b8b5bc23da0eb8488393729ac1e50cae8b 100755
--- a/src/ddtranslatorSoclib/AvatarCoproMWMR.java
+++ b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
@@ -44,7 +44,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarCoproMWMR extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarCrossbar.java b/src/ddtranslatorSoclib/AvatarCrossbar.java
index 21b710d5034eb2a4c5a28ad98532fa366c092444..a08e5e26719162f7d3fc0fb6acab36654471459b 100755
--- a/src/ddtranslatorSoclib/AvatarCrossbar.java
+++ b/src/ddtranslatorSoclib/AvatarCrossbar.java
@@ -44,7 +44,6 @@
    * @author  Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarCrossbar extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarICU.java b/src/ddtranslatorSoclib/AvatarICU.java
index 8b30b2102d1af841a75abddf240f6ba962ca755a..4f6698bbc3330c241ad994aba3cbf3bc08053204 100755
--- a/src/ddtranslatorSoclib/AvatarICU.java
+++ b/src/ddtranslatorSoclib/AvatarICU.java
@@ -46,7 +46,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarICU extends AvatarComponent{
  
diff --git a/src/ddtranslatorSoclib/AvatarRAM.java b/src/ddtranslatorSoclib/AvatarRAM.java
index b8bb4092fa90966c784584a1a4285ca9d16d2a84..92b118f6b711b2c68a4cff7a6481c06d7fbe641a 100755
--- a/src/ddtranslatorSoclib/AvatarRAM.java
+++ b/src/ddtranslatorSoclib/AvatarRAM.java
@@ -46,7 +46,8 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
 
 public class AvatarRAM extends AvatarComponent{
     
diff --git a/src/ddtranslatorSoclib/AvatarTTY.java b/src/ddtranslatorSoclib/AvatarTTY.java
index b6b0403e23958a6f2f28755fdaae2493df9f2e2c..433d4b0be65b4659d675dad0cea349236f352515 100755
--- a/src/ddtranslatorSoclib/AvatarTTY.java
+++ b/src/ddtranslatorSoclib/AvatarTTY.java
@@ -46,10 +46,8 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
-public class AvatarTTY extends AvatarComponent {	
+public class AvatarTTY extends AvatarComponent {
 
     private int index = 0;
     private String ttyName;
diff --git a/src/ddtranslatorSoclib/AvatarTask.java b/src/ddtranslatorSoclib/AvatarTask.java
index f8f8b2901e3cc39cd4cc6bae594a50ab562cf2cb..bd14c95369ddd8ba6ac20dc39a77c03b7dfa6de0 100755
--- a/src/ddtranslatorSoclib/AvatarTask.java
+++ b/src/ddtranslatorSoclib/AvatarTask.java
@@ -47,7 +47,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarTask extends AvatarMappedObject{
 
diff --git a/src/ddtranslatorSoclib/AvatarTimer.java b/src/ddtranslatorSoclib/AvatarTimer.java
index 60b0b613f2e94724bd6ce785c42f4b31d0e4b24a..86c0dee77584f5ef9183763b9c0319edf807a3bd 100755
--- a/src/ddtranslatorSoclib/AvatarTimer.java
+++ b/src/ddtranslatorSoclib/AvatarTimer.java
@@ -46,7 +46,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarTimer extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarVgmn.java b/src/ddtranslatorSoclib/AvatarVgmn.java
index a46d70240f95871620fd9e918259a593f42387f9..9d908f0dd41df590464951638f565276287e164d 100755
--- a/src/ddtranslatorSoclib/AvatarVgmn.java
+++ b/src/ddtranslatorSoclib/AvatarVgmn.java
@@ -45,7 +45,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarVgmn extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarddSpecification.java b/src/ddtranslatorSoclib/AvatarddSpecification.java
index 25532d2c8919760914d86cf6d8303208520e7e41..7bd2f8c8a8628979ce674f15299eadb6859b05c4 100755
--- a/src/ddtranslatorSoclib/AvatarddSpecification.java
+++ b/src/ddtranslatorSoclib/AvatarddSpecification.java
@@ -45,7 +45,9 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.List;
 
 public class AvatarddSpecification{
 	
diff --git a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
index 2d07738953305f6fb6772b1168a39f7a6a7a5528..867417f5fd5f16318a5b500b03f99f8a388f4165 100755
--- a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
+++ b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
@@ -3,12 +3,6 @@
 
 package ddtranslatorSoclib.toSoclib;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class MainFileSoclib {
 	
     private final static String H_DEF = "#ifndef MAIN_H\n#define MAIN_H\n";
diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 30508dc31f55f26b0393db8bb424f2eada544909..e135fc8a2d439745029f396d2243a25982f7a168 100755
--- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -47,37 +47,20 @@
 
 package ddtranslatorSoclib.toSoclib;
 
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import avatartranslator.AvatarAction;
-import avatartranslator.AvatarActionAssignment;
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarMethod;
-import avatartranslator.AvatarRandom;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSignal;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
+import ddtranslatorSoclib.AvatarRAM;
 import ddtranslatorSoclib.AvatarTask;
 import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
 import myutil.Conversion;
 import myutil.FileException;
 import myutil.FileUtils;
 import myutil.TraceManager;
-import ddtranslatorSoclib.toTopCell.TopCellGenerator;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarChannel;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class TasksAndMainGenerator {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Code.java b/src/ddtranslatorSoclib/toTopCell/Code.java
index 915da23d07bc03bce5905425bae2806ae69ff840..76193b9d917625e71ee26ddcf3dcfc62810985f3 100755
--- a/src/ddtranslatorSoclib/toTopCell/Code.java
+++ b/src/ddtranslatorSoclib/toTopCell/Code.java
@@ -44,15 +44,14 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
-import java.io.*;
-import myutil.FileException;
-import myutil.FileUtils;
-import ui.*;
-import ui.avatardd.*;
-import ui.window.*;
-import tmltranslator.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ui.ConfigurationTTool;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 //import ui.TGComponentManager;
 //import ui.TDiagramPanel;
 //import ui.TURTLEPanel;
diff --git a/src/ddtranslatorSoclib/toTopCell/Declaration.java b/src/ddtranslatorSoclib/toTopCell/Declaration.java
index f3325370cdd3e9496d852d4a8bc8004cb34ed182..f5e4a9db1bf644fa89482aec3cbace3c3c505d46 100755
--- a/src/ddtranslatorSoclib/toTopCell/Declaration.java
+++ b/src/ddtranslatorSoclib/toTopCell/Declaration.java
@@ -43,7 +43,7 @@
 	    v2.1 Daniela GENIUS, summer 2016*/
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
+
 import ddtranslatorSoclib.*;
 
 public class Declaration {
diff --git a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
index 0d9a71fe703a3c40164eebf4f1f735495ca7e060..5e7d179a8fab0cebcdeb1c8d112fd2ce711581b9 100755
--- a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
@@ -71,10 +71,10 @@
  */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
-import avatartranslator.AvatarRelation;
+
 import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarRAM;
 
 public class Deployinfo {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Header.java b/src/ddtranslatorSoclib/toTopCell/Header.java
index 4e1474949ce3f479b5e510ed1dc05093fbf39d1b..1c19c42a820e90b67cbf58616292d3e58123acd6 100755
--- a/src/ddtranslatorSoclib/toTopCell/Header.java
+++ b/src/ddtranslatorSoclib/toTopCell/Header.java
@@ -45,8 +45,6 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
 public class Header {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/Loader.java b/src/ddtranslatorSoclib/toTopCell/Loader.java
index d33bf23d058c8f324407382ec31cc7a289ae980e..ac50354fd021eb4051195c2949d362a768058662 100755
--- a/src/ddtranslatorSoclib/toTopCell/Loader.java
+++ b/src/ddtranslatorSoclib/toTopCell/Loader.java
@@ -42,8 +42,8 @@
 
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarChannel;
 
 public class Loader {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/MappingTable.java b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
index d0b5516f7911c4e1e000c84aeb5161ea743a175f..5b68e8d200ac82629e819f0103737ab8cf6f225d 100755
--- a/src/ddtranslatorSoclib/toTopCell/MappingTable.java
+++ b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
@@ -46,8 +46,9 @@
 
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class MappingTable {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/NetList.java b/src/ddtranslatorSoclib/toTopCell/NetList.java
index c6db44071d3e979e826c6b1753e9bbe4c442a284..146b0e733106c789e2136b0302230a6292025287 100755
--- a/src/ddtranslatorSoclib/toTopCell/NetList.java
+++ b/src/ddtranslatorSoclib/toTopCell/NetList.java
@@ -43,8 +43,11 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class NetList {
     public static final String NAME_CLK = "signal_clk";
diff --git a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
index 25a25e4857b879205cfee3061429809877816526..40abf1d34942d8c3e5a0eabb94a6c52d1349eb5d 100755
--- a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
@@ -45,8 +45,6 @@
 /* authors: v1.0 Daniela GENIUS august 2016 */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
 
 public class Platforminfo {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Signal.java b/src/ddtranslatorSoclib/toTopCell/Signal.java
index 0ef15361c19d59f2c6b60cb1db51f2249b4ebf18..0c915a8edc0b800afddc2816455203bc085d2eca 100755
--- a/src/ddtranslatorSoclib/toTopCell/Signal.java
+++ b/src/ddtranslatorSoclib/toTopCell/Signal.java
@@ -45,8 +45,10 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class Signal {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Simulation.java b/src/ddtranslatorSoclib/toTopCell/Simulation.java
index c7248f87a97f65f56a25ce1a8906e39232ce98ed..036677a24dcfdc5a9842850121919b6832a512c5 100755
--- a/src/ddtranslatorSoclib/toTopCell/Simulation.java
+++ b/src/ddtranslatorSoclib/toTopCell/Simulation.java
@@ -43,8 +43,6 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
 public class Simulation {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index a91224e760929d5c4bcff8980d84221318cd52f1..dc1cc1df17dfd84289666d5adaec05f8fab0b8c7 100755
--- a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -46,11 +46,11 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
+
 import ddtranslatorSoclib.*;
-import java.io.*;
-import java.io.Writer.*;
-import java.util.*;
 
+import java.io.*;
+import java.util.ArrayList;
 import java.util.List;
 
 public class TopCellGenerator
diff --git a/src/dseengine/BusContentionResult.java b/src/dseengine/BusContentionResult.java
index 9c3076b8b32992a786ef7457f229693524bb342e..3e896a4ff1e80819a843beec5685318e1f7cbd56 100755
--- a/src/dseengine/BusContentionResult.java
+++ b/src/dseengine/BusContentionResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusContentionResult  {
diff --git a/src/dseengine/BusContentionWholeResult.java b/src/dseengine/BusContentionWholeResult.java
index f547a5faddb84f8b902a2caab205f3dc173bd416..48b969e5a7e7494e42dfdd2d5f102724863899b4 100755
--- a/src/dseengine/BusContentionWholeResult.java
+++ b/src/dseengine/BusContentionWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusContentionWholeResult  {
diff --git a/src/dseengine/BusResult.java b/src/dseengine/BusResult.java
index eaaf8f49cd0d7e2a763a0223ca9034aa734ccc0a..6bc358386a30f4e1fc59974cd9e435beecf032fa 100755
--- a/src/dseengine/BusResult.java
+++ b/src/dseengine/BusResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusResult  {
diff --git a/src/dseengine/BusWholeResult.java b/src/dseengine/BusWholeResult.java
index ddd52e4427815c30969d0d05e54a2bb1f1f5492b..a90aa99e4bc6f6dfdeace12ed6cdb9a7ae2b053d 100755
--- a/src/dseengine/BusWholeResult.java
+++ b/src/dseengine/BusWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusWholeResult  {
diff --git a/src/dseengine/CPUResult.java b/src/dseengine/CPUResult.java
index 494d5712ec87ea2e426a7abc5f5eac0d0e5d220e..9fd55416ed9b2d670b4a0735cd34caa95d2fe915 100755
--- a/src/dseengine/CPUResult.java
+++ b/src/dseengine/CPUResult.java
@@ -46,11 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
+import java.util.Vector;
 
 
 //import uppaaldesc.*;
diff --git a/src/dseengine/CPUWholeResult.java b/src/dseengine/CPUWholeResult.java
index 877e6094106b7d95be18cd77041ce12865e7b2b5..82ae276b8d3d7f301f5066e4bd52bd9989d21673 100755
--- a/src/dseengine/CPUWholeResult.java
+++ b/src/dseengine/CPUWholeResult.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.TraceManager;
 
-
-import myutil.*;
+import java.util.Hashtable;
+import java.util.Vector;
 
 
 //import uppaaldesc.*;
diff --git a/src/dseengine/CPUWithTasks.java b/src/dseengine/CPUWithTasks.java
index d21d046c9726f1f296351f8bb54879fb42a8f8d3..2a300f6d623bb22d7d4826ae03eed01554e7b772 100755
--- a/src/dseengine/CPUWithTasks.java
+++ b/src/dseengine/CPUWithTasks.java
@@ -46,12 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import tmltranslator.TMLTask;
 
-
-import myutil.*;
-import tmltranslator.*;
+import java.util.Vector;
 
 
 public class CPUWithTasks  {
diff --git a/src/dseengine/DSEConfiguration.java b/src/dseengine/DSEConfiguration.java
index 3453722ac6185de3a60a9383e0a2c9c6109279a5..5bf60ceed13c46f11a759834c57566c41471a1d6 100755
--- a/src/dseengine/DSEConfiguration.java
+++ b/src/dseengine/DSEConfiguration.java
@@ -46,21 +46,29 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.awt.Point;
-import java.io.*;
+import myutil.Conversion;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import ui.GTMLModeling;
+import ui.MainGUI;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+import ui.tmldd.*;
+
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
 import java.util.*;
+import java.util.List;
 
-import tmltranslator.*;
 //import tmltranslator.touppaal.*;
 //import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
 //import tmltranslator.toturtle.*;
 
-import myutil.*;
-
-import ui.*;
-import ui.tmldd.*;
-
 //import uppaaldesc.*;
 
 public class DSEConfiguration implements Runnable  {
diff --git a/src/dseengine/DSEMappingSimulationResults.java b/src/dseengine/DSEMappingSimulationResults.java
index c10ea8fc97ea135b612351dd0a909d4643874389..1ac2dae16813692bea3dacd39dc4b84c45577e6d 100755
--- a/src/dseengine/DSEMappingSimulationResults.java
+++ b/src/dseengine/DSEMappingSimulationResults.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.Conversion;
+import tmltranslator.TMLMapping;
 
-import tmltranslator.*;
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.util.Vector;
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/DSEScriptReader.java b/src/dseengine/DSEScriptReader.java
index 41e607bf01df3b45bf7c711012a02dc36325552f..089c65aba482659f2983cb67905925827a824677 100755
--- a/src/dseengine/DSEScriptReader.java
+++ b/src/dseengine/DSEScriptReader.java
@@ -46,21 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
 
 //import tmltranslator.*;
 //import tmltranslator.touppaal.*;
-//import tmltranslator.tomappingsystemc.*; 
-import tmltranslator.tomappingsystemc2.*;
+//import tmltranslator.tomappingsystemc.*;
 //import tmltranslator.toturtle.*;
 
-import translator.*;
-
-import dseengine.*;
-
-import myutil.*;
-
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/DSESimulationResult.java b/src/dseengine/DSESimulationResult.java
index 6af9944a6e617147a6ac8a4af837730de9632bb2..056bda24bafa5085365d6e360a1d3f4d5e379755 100755
--- a/src/dseengine/DSESimulationResult.java
+++ b/src/dseengine/DSESimulationResult.java
@@ -46,16 +46,22 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/SimulationDurationWholeResult.java b/src/dseengine/SimulationDurationWholeResult.java
index 6205a28fdfe19f7ed1639dcd72afba5f5f23732a..9b33078d0c8e6f6d766b5019d568816b61a34208 100755
--- a/src/dseengine/SimulationDurationWholeResult.java
+++ b/src/dseengine/SimulationDurationWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class SimulationDurationWholeResult  {
diff --git a/src/dseengine/TaskResult.java b/src/dseengine/TaskResult.java
index 830dcd6129545b0f27769997c044fd9af2bc73ba..322d5d805898ce6ea6f2653748b9d1879050a5d6 100755
--- a/src/dseengine/TaskResult.java
+++ b/src/dseengine/TaskResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class TaskResult  {
diff --git a/src/dseengine/TaskWholeResult.java b/src/dseengine/TaskWholeResult.java
index d9808e60aa032212f30b2d06cca8c9f0ead0f1f1..191a6f9a6a8568d444d6b5355b3eb84a18953c67 100755
--- a/src/dseengine/TaskWholeResult.java
+++ b/src/dseengine/TaskWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class TaskWholeResult  {
diff --git a/src/launcher/ExecutionThread.java b/src/launcher/ExecutionThread.java
index a54b9cac40a09f2a84d0f5e2f44e0aff0945d7b9..0539ded983944d7eaedb12701256cdbc06a79039 100755
--- a/src/launcher/ExecutionThread.java
+++ b/src/launcher/ExecutionThread.java
@@ -46,10 +46,11 @@
 
 package launcher;
 
-import myutil.*;
+import myutil.TraceManager;
 
 import java.io.*;
-import java.net.*;
+import java.net.ServerSocket;
+import java.net.Socket;
 
 
 class ExecutionThread extends Thread {
diff --git a/src/launcher/RshClient.java b/src/launcher/RshClient.java
index 5204c7077a0a5c0e936fc0caadc164828f994096..940342710b258a3721945c128d7981ccf36e7b2e 100755
--- a/src/launcher/RshClient.java
+++ b/src/launcher/RshClient.java
@@ -46,10 +46,12 @@
 
 package launcher;
 
-import java.io.*;
-import java.net.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
 
 public class RshClient {
 
diff --git a/src/launcher/RshServer.java b/src/launcher/RshServer.java
index 318cf882c742c1189b02ed389d47b1827e1ee3ab..8ae21dd2fad3bc3b83d4f00a6917f3705ed5885f 100755
--- a/src/launcher/RshServer.java
+++ b/src/launcher/RshServer.java
@@ -47,20 +47,15 @@
 package launcher;
 
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
+import myutil.AESEncryptor;
+import myutil.TraceManager;
+
+import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Iterator;
 import java.util.Vector;
 
-import myutil.AESEncryptor;
-import myutil.TraceManager;
-
 public class RshServer {
     public static int PORT_NUMBER = 8375;
 
diff --git a/src/launcher/SocketComHelper.java b/src/launcher/SocketComHelper.java
index 548bf6c1057908536f1c4d40b99a0dffca2978ec..fd62083e08be13e19af71c2fd41fbca0f4e77178 100644
--- a/src/launcher/SocketComHelper.java
+++ b/src/launcher/SocketComHelper.java
@@ -1,15 +1,11 @@
 package launcher;
 
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 import myutil.AESEncryptor;
 import myutil.TraceManager;
 
+import java.io.PrintStream;
+import java.util.*;
+
 public class SocketComHelper {
 
 	private static final Comparator<Enum<?>> codeComparator = new Comparator<Enum<?>>() {
diff --git a/src/myutil/AESEncryptor.java b/src/myutil/AESEncryptor.java
index ead2c2073041d8c62b7c29b1bd673754baaba4fa..a058835e92c7d91a960dcc63bbbe232fa26a93b0 100644
--- a/src/myutil/AESEncryptor.java
+++ b/src/myutil/AESEncryptor.java
@@ -48,12 +48,12 @@
 
      package myutil;
 
+import org.apache.commons.codec.binary.Base64;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.commons.codec.binary.Base64;
-
 public class AESEncryptor {
     public static String encrypt(String key1, String key2, String value) {
         try {
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index 28dcf9d79922312856b2d9c46dbe67d2b0a3ce41..0cffb67bfaaf5cd199abc51f8fd087cb29543aa6 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -45,7 +45,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.StringTokenizer;
 
 public class BoolExpressionEvaluator {
 
@@ -95,6 +95,13 @@ public class BoolExpressionEvaluator {
             father = _father;
         }
 
+	public  IntBoolRes getTop() {
+	    if (father == null) {
+		return this;
+	    }
+	    else return father.getTop();
+	}
+
         public IntBoolRes addTerminalInt(int _value) {
             if (isFull()) {
                 return null;
@@ -412,21 +419,7 @@ public class BoolExpressionEvaluator {
                 return new Boolean((elt1 != 0) && (elt2 != 0));
             }
 
-	    if (op == LT_TOKEN) {
-		return new Boolean(elt1 < elt2);
-	    }
-
-	     if (op == GT_TOKEN) {
-		return new Boolean(elt1 > elt2);
-	    }
-
-	     if (op == LTEQ_TOKEN) {
-		return new Boolean(elt1 <= elt2);
-	    }
 
-	     if (op == GTEQ_TOKEN) {
-		return new Boolean(elt1 >= elt2);
-	    }
 
             return null;
         }
@@ -449,6 +442,26 @@ public class BoolExpressionEvaluator {
                 return new Integer(elt1 / elt2);
             }
 
+	    return null;
+	}
+
+	private Boolean makeIntegerToBooleanOp(int op, int elt1, int elt2) {
+
+	    if (op == LT_TOKEN) {
+		return new Boolean(elt1 < elt2);
+	    }
+
+	     if (op == GT_TOKEN) {
+		return new Boolean(elt1 > elt2);
+	    }
+
+	     if (op == LTEQ_TOKEN) {
+		return new Boolean(elt1 <= elt2);
+	    }
+
+	     if (op == GTEQ_TOKEN) {
+		return new Boolean(elt1 >= elt2);
+	    }
 
             return null;
         }
@@ -511,6 +524,11 @@ public class BoolExpressionEvaluator {
                     int elt1 = analysisArg(ob1);
                     int elt2 = analysisArg(ob2);
 
+		    if (isIntToBooleanOperator(op)) {
+			Boolean resB = makeIntegerToBooleanOp(op, elt1, elt2);
+			return resB;
+		    }
+
                     Integer result = makeIntegerOp(op, elt1, elt2);
                     TraceManager.addDev("Result int=" + result);
                     return result;
@@ -612,6 +630,10 @@ public class BoolExpressionEvaluator {
 
     public static final String [] VAL_S = {"true", "false", "nb", "bool", "==", "<", ">", "not", "or", "and", "=<", ">=", "eol", "(", ")", " ", "!=", "-", "/", "*", "+"};
 
+    public static final boolean isIntToBooleanOperator(int op) {
+	return ((op == LT_TOKEN) || (op == GT_TOKEN) || (op == LTEQ_TOKEN) || (op == GTEQ_TOKEN));
+    }
+
     public static String toStringAction(int val) {
         if (val >= 0) {
             return VAL_S[val];
@@ -689,8 +711,8 @@ public class BoolExpressionEvaluator {
         _expr = Conversion.replaceAllString(_expr, "and", "&").trim();
         _expr = Conversion.replaceAllString(_expr, "==", "=").trim();
         _expr = Conversion.replaceAllString(_expr, "!=", "$").trim();
-        _expr = Conversion.replaceAllString(_expr, ">=", ":").trim();
-        _expr = Conversion.replaceAllString(_expr, "<=", ";").trim();
+        //_expr = Conversion.replaceAllString(_expr, ">=", ":").trim();
+        //_expr = Conversion.replaceAllString(_expr, "<=", ";").trim();
 
         // For not() -> must find the closing bracket
 
@@ -1683,9 +1705,9 @@ public class BoolExpressionEvaluator {
     public IntBoolRes parseAndMakeTree(IntBoolRes current, String token) {
         ID = 0;
         IntBoolRes newElt;
-
-        TraceManager.addDev("<><><><><><> Dealing with token:" + token);
-
+	
+	//TraceManager.addDev(current.getTop().toString());
+        //TraceManager.addDev("<><><><><><> Dealing with token:" + token + " current=" + current);
 
         char c1 = token.charAt(0);
 
@@ -1766,6 +1788,42 @@ public class BoolExpressionEvaluator {
             return newElt;
         }
 
+	if (c1 == '>') {
+            newElt = current.addIntOperator(GT_TOKEN);
+            if (newElt == null) {
+                errorMessage = "Badly placed int operator:" + token;
+                return null;
+            }
+            return newElt;
+        }
+
+	if (c1 == '>') {
+            newElt = current.addIntOperator(GT_TOKEN);
+            if (newElt == null) {
+                errorMessage = "Badly placed int operator:" + token;
+                return null;
+            }
+            return newElt;
+        }
+
+	if (c1 == ';') {
+            newElt = current.addIntOperator(LTEQ_TOKEN);
+            if (newElt == null) {
+                errorMessage = "Badly placed int operator:" + token;
+                return null;
+            }
+            return newElt;
+        }
+
+	if (c1 == ':') {
+            newElt = current.addIntOperator(GTEQ_TOKEN);
+            if (newElt == null) {
+                errorMessage = "Badly placed int operator:" + token;
+                return null;
+            }
+            return newElt;
+        }
+
 	
 
         // BOOL BINARY OP
diff --git a/src/myutil/CallbackLoaderInterface.java b/src/myutil/CallbackLoaderInterface.java
new file mode 100755
index 0000000000000000000000000000000000000000..429013b133064570b2acdfb4ba884a80390a12b4
--- /dev/null
+++ b/src/myutil/CallbackLoaderInterface.java
@@ -0,0 +1,53 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class CallbackLoaderInterface
+   * Creation: 31/05/2017
+   * @version 1.1 31/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+public interface CallbackLoaderInterface {
+
+    public void loadDone();
+    public void loadFailed();
+
+}
diff --git a/src/myutil/CheckConnection.java b/src/myutil/CheckConnection.java
index 0ef70c9fdcf0533eae457a49ea5b6e8ea1fb4031..b0d1aff83adafae33969ae03188039324ad065ec 100644
--- a/src/myutil/CheckConnection.java
+++ b/src/myutil/CheckConnection.java
@@ -47,9 +47,11 @@
  */
 
 package myutil;
+
 import java.io.IOException;
-import java.net.*;
-import java.lang.Runtime;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 
 
 public final class CheckConnection {
diff --git a/src/myutil/Conversion.java b/src/myutil/Conversion.java
index 52c48e6a42815926d623e2b138125bc507cf0b11..3f40d57dd986a245abd8a26942f5f07df5cb18f5 100755
--- a/src/myutil/Conversion.java
+++ b/src/myutil/Conversion.java
@@ -45,8 +45,10 @@
 
 package myutil;
 
-import java.util.*;
-import java.util.regex.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class Conversion {
diff --git a/src/myutil/ErrorThread.java b/src/myutil/ErrorThread.java
index 35c1d2e1c2a8d5bb0ae05088ca1881ebb87110f8..c5c233dda24caf44789ec13b50a6f5d71630b66c 100755
--- a/src/myutil/ErrorThread.java
+++ b/src/myutil/ErrorThread.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
+import java.io.BufferedReader;
 
 
 public class ErrorThread extends Thread {
diff --git a/src/myutil/FileUtils.java b/src/myutil/FileUtils.java
index fbe24343a3bbf34b46abcc0e0dcc2558d8ea534b..974f75f7dd5e690afc2eeb56374919a9bf86af1c 100755
--- a/src/myutil/FileUtils.java
+++ b/src/myutil/FileUtils.java
@@ -45,8 +45,10 @@
 
 package myutil;
 
-import java.io.*;
-import java.nio.file.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 
 
 public class FileUtils {
diff --git a/src/myutil/GoogleSearch.java b/src/myutil/GoogleSearch.java
index acb74fc0f89e405c07a0ad36d0b6aa63a203604a..c9ca5a6628d5259790c2f8c2f7f447fc469cc4df 100644
--- a/src/myutil/GoogleSearch.java
+++ b/src/myutil/GoogleSearch.java
@@ -46,19 +46,17 @@
 package myutil;
 
 
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-import org.jsoup.nodes.Document;
-import myutil.TraceManager;
-
 public class GoogleSearch {
 
     public static final String charset = "UTF-8";
diff --git a/src/myutil/GraphAlgorithms.java b/src/myutil/GraphAlgorithms.java
index 16aa00c67c28e9565f957add7eee867051fe64ca..e1674c23ab1a3908882e81d9021bd0349422f3e0 100755
--- a/src/myutil/GraphAlgorithms.java
+++ b/src/myutil/GraphAlgorithms.java
@@ -46,7 +46,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class GraphAlgorithms {
diff --git a/src/myutil/GraphicLib.java b/src/myutil/GraphicLib.java
index dc3151d3ef1d0e0eecfc49ade52cce72b57aecb3..193b47422099eb15a0e3c7ca39a8bfe224394732 100755
--- a/src/myutil/GraphicLib.java
+++ b/src/myutil/GraphicLib.java
@@ -1,113 +1,119 @@
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
-ludovic.apvrille AT enst.fr
-
-This software is a computer program whose purpose is to allow the 
-edition of TURTLE analysis, design and deployment diagrams, to 
-allow the generation of RT-LOTOS or Java code from this diagram, 
-and at last to allow the analysis of formal validation traces 
-obtained from external tools, e.g. RTL from LAAS-CNRS and CADP 
-from INRIA Rhone-Alpes.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and  rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
-
-/**
- * Class GraphLib
- * Creation: 01/12/2003
- * @version 1.1 01/12/2003
- * @author Ludovic APVRILLE
- * @see
- */
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class GraphLib
+   * Creation: 01/12/2003
+   * @version 1.1 01/12/2003
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package myutil;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
 import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 
 public final class GraphicLib {
-    
+
     // EPSILON
     private static double EPSILON = 0.00001;
-	
-	public static final int NORTH = 0;
-	public static final int WEST = 1;
-	public static final int SOUTH = 2;
-	public static final int EAST = 3;
-	
-    
+
+    public static final int NORTH = 0;
+    public static final int WEST = 1;
+    public static final int SOUTH = 2;
+    public static final int EAST = 3;
+
+
     // Arrow
     // Arrow type
     // 0 : <-->
     // 1 : -->
     // 2 : <--
     // 3 : ---
-    
+
     // Arrow Head
     // 0 : |>
     // 1 : >
-    
+
     private static int xPoints[] = new int[3];
     private static int yPoints[] = new int[3];
     public static int longueur = 10;
     private static double angle = 0.523598775598;
-    
+
     public final static BasicStroke normalStroke = new BasicStroke(1.0f);
     public final static BasicStroke stroke = new BasicStroke(2.0f);
     public final static BasicStroke doubleStroke = new BasicStroke(4.0f);
     public final static BasicStroke wideStroke = new BasicStroke(8.0f);
-    
+
     public static float dash1[] = {5.0f};
     public static BasicStroke dashed = new BasicStroke(1.0f,
-    BasicStroke.CAP_BUTT,
-    BasicStroke.JOIN_MITER,
-    10.0f, dash1, 0.0f);
-    
+                                                       BasicStroke.CAP_BUTT,
+                                                       BasicStroke.JOIN_MITER,
+                                                       10.0f, dash1, 0.0f);
+
     public static void setNormalStroke(Graphics g) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.normalStroke);
     }
-    
+
     public static void setMediumStroke(Graphics g) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.stroke);
     }
-    
+
     public static void setHighStroke(Graphics g) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.doubleStroke);
     }
-    
+
+    public static void centerString(Graphics g, String s, int x, int y, int width) {
+	int w = g.getFontMetrics().stringWidth(s);
+	int posX = x + (width-w)/2;
+	g.drawString(s, posX, y); 
+    }
+
     public static void setDashed() {
-        
+
     }
-    
+
     public static void doubleColorRect(Graphics g, int x, int y, int width, int height, Color color1, Color color2) {
         g.setColor(color1);
         g.drawLine(x, y, x +width, y);
@@ -116,72 +122,72 @@ public final class GraphicLib {
         g.drawLine(x, y+height, x+width, y+height);
         g.drawLine(x+width, y, x+width, y+height);
     }
-    
+
     public static void dashedLine(Graphics g, int x1, int y1, int x2, int y2) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.dashed);
         g2.draw(new Line2D.Float(x1, y1, x2, y2));
         g2.setStroke(normalStroke);
     }
-    
+
     public static void dashedRect(Graphics g, int x1, int y1, int width, int height) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.dashed);
         g2.drawRect(x1, y1, width, height);
         g2.setStroke(normalStroke);
     }
-    
-    
-     public static void dashedArrowWithLine(Graphics g, int type, int head, int length, int x1, int y1, int x2, int y2, boolean full) {
+
+
+    public static void dashedArrowWithLine(Graphics g, int type, int head, int length, int x1, int y1, int x2, int y2, boolean full) {
         Graphics2D g2 = (Graphics2D) g;
         g2.setStroke(GraphicLib.dashed);
         g2.drawLine(x1, y1, x2, y2);
         g2.setStroke(normalStroke);
-        
+
         // extremite 1
         if ((type == 0) || (type == 2)) {
             drawArrow(g, x1, y1, x2, y2, head, length, full);
         }
-        
+
         // extremite 2
         if ((type == 0) || (type == 1)) {
             drawArrow(g, x2, y2, x1, y1, head, length, full);
         }
-        
+
     }
-    
-    
+
+
     public static void arrowWithLine(Graphics g, int type, int head, int length, int x1, int y1, int x2, int y2, boolean full) {
-     
+
         g.drawLine(x1, y1, x2, y2);
-   
+
         // extremite 1
         if ((type == 0) || (type == 2)) {
             drawArrow(g, x1, y1, x2, y2, head, length, full);
         }
-        
+
         // extremite 2
         if ((type == 0) || (type == 1)) {
             drawArrow(g, x2, y2, x1, y1, head, length, full);
         }
-        
+
     }
-    
-    
+
+
     private static void  drawArrow(Graphics g, int x1, int y1, int x2, int y2, int head, int length, boolean full) {
         // changement de repere
         int x = x2 - x1;
         int y = y2 - y1;
-        
-        
+
+
         if (length == 0) {
             length = longueur;
         }
-        
+
         // passage en cds polaires
-       // double ro = Conversion.ro(x, y);
+        // double ro = Conversion.ro(x, y);
         double alpha = Conversion.theta(x, y);
-        
+
         // tete de la fleche
         xPoints[0] = x1;
         yPoints[0] = y1;
@@ -189,10 +195,10 @@ public final class GraphicLib {
         yPoints[1] = (int)(length*Math.sin(alpha-angle) + y1);
         xPoints[2] = (int)(length*Math.cos(alpha+angle) + x1);
         yPoints[2] = (int)(length*Math.sin(alpha+angle) + y1);
-        
-        
+
+
         if (full) {
-             g.fillPolygon(xPoints, yPoints, 3);
+            g.fillPolygon(xPoints, yPoints, 3);
         } else if (head == 0) {
             // head must be filled in white
             Color c = g.getColor();
@@ -200,7 +206,7 @@ public final class GraphicLib {
             g.fillPolygon(xPoints, yPoints, 3);
             g.setColor(c);
         }
-        
+
         if (head == 0) {
             g.drawPolygon(xPoints, yPoints, 3);
         } else {
@@ -208,37 +214,37 @@ public final class GraphicLib {
             g.drawLine(x1, y1, xPoints[2], yPoints[2]);
         }
     }
-    
+
     public static boolean isSegmentInRectangle(int x1, int y1, int x2, int y2, int x, int y, int width, int height) {
         int x11 = Math.min(x1, x2);
         int y11 = Math.min(y1, y2);
-        
+
         int x22 = Math.max(x1, x2);
         int y22 = Math.max(y1, y2);
-        
+
         if ((x11 < x) || (x22 > x+width)) {
             return false;
         }
-        
+
         if ((y11 < y) || (y22 > y+height)) {
             return false;
         }
-        
+
         return true;
-        
+
     }
-    
-    
+
+
     // Says whether the point belongs to the segment
     // If no point can be found, return null
     // If lines are parallel, returns one of the point
     public static boolean pointBelongsToSegment(double x1, double y1, double x3, double y3, double x4, double y4) {
-        
+
         //System.out.println("Point on segment : x1=" + x1 + " y1=" + y1);
         //System.out.println("x3=" + x3 + " y3=" + y3 +" x4=" + x4 + " y4=" + y4);
         double y33 = Math.min(y3, y4);
         double y44 = Math.max(y3, y4);
-        
+
         if (x3 == x4) {
             // vertical line
             if (Math.abs(x1 - x3) < EPSILON) {
@@ -248,9 +254,9 @@ public final class GraphicLib {
             }
             return false;
         }
-        
+
         //System.out.println("Toto121");
-        
+
         double x33 = Math.min(x3, x4);
         double x44 = Math.max(x3, x4);
         if (((x1 >= x33) && (x44 >= x1)) || (Math.abs(x1-x44)<EPSILON) || (Math.abs(x1-y33)<EPSILON)) {
@@ -266,8 +272,8 @@ public final class GraphicLib {
         }
         return false;
     }
-    
-    
+
+
     // returns the Point intersection between two segments
     // If no point can be found, return null
     // If segments are parallel, returns one of the point
@@ -276,7 +282,7 @@ public final class GraphicLib {
         double x, y;
         //System.out.println("x1=" + x1 + " y1=" + y1 +" x2=" + x2 + " y2=" + y2);
         //System.out.println("x3=" + x3 + " y3=" + y3 +" x4=" + x4 + " y4=" + y4);
-        
+
         if (x1 == x2) {
             if (y1 == y2) {
                 // only one point is provided
@@ -289,8 +295,8 @@ public final class GraphicLib {
             // first line is vertical
             type1 = 1;
         }
-        
-        
+
+
         if (x3 == x4) {
             if (y3 == y4) {
                 // only one point is provided
@@ -303,12 +309,12 @@ public final class GraphicLib {
             // line is vertical
             type2 = 1;
         }
-        
+
         double y11 = Math.min(y1, y2);
         double y22 = Math.max(y1, y2);
         double y33 = Math.min(y3, y4);
         double y44 = Math.max(y3, y4);
-        
+
         if ((type1 == 1) && (type2 == 1)) {
             // Both are vertical
             //System.out.println("Toto11");
@@ -332,7 +338,7 @@ public final class GraphicLib {
                 return null;
             }
         }
-        
+
         // at least one of them is not vertical
         if ((type1 == 1)  || (type2 == 1)){
             //System.out.println("Toto21");
@@ -343,13 +349,13 @@ public final class GraphicLib {
                 x= x2; y = y2;
                 x2 = x4; y2 = y4; x4 = x; y4 = y;
             }
-            
+
             // we are now sure the second one is vertical and not the first one
             y33 = Math.min(y3, y4);
             y44 = Math.max(y3, y4);
-            
+
             // we calculate the point (x3, y) on the first segment
-            
+
             y = (((y1-y2)*(x3-x1))/(x1 - x2))+y1;
             if ((y >= y33) && (y44 >= y)) {
                 // the point belongs to the vertical segment
@@ -362,10 +368,10 @@ public final class GraphicLib {
             } else {
                 return null;
             }
-            
+
         }
-        
-        
+
+
         //System.out.println("Toto31");
         double den = ((y1-y2)/(x1-x2)) - ((y3-y4)/(x3-x4));
         if (Math.abs(den) < EPSILON) {
@@ -384,10 +390,10 @@ public final class GraphicLib {
             if (pointBelongsToSegment(x4, y4, x1, y1, x2, y2)) {
                 return new Point((int)x4, (int)y4);
             }
-            
+
         } else {
             //System.out.println("Toto34");
-            
+
             double num = y3 - y1 + (x1*(y1-y2)/(x1-x2)) - (x3*(y3-y4)/(x3-x4));
             x = num / den;
             double ya = ((y3-y4)*(x-x3))/(x3-x4) + y3;
@@ -401,28 +407,28 @@ public final class GraphicLib {
         }
         return null;
     }
-    
+
     public static Point intersectionRectangleSegment(int x1, int y1, int width, int height, int x3, int y3, int x4, int y4) {
         Point p;
-        
+
         // lelft
         //System.out.println("Left");
         p = intersectionTwoSegments(x1, y1, x1, y1 + height, x3, y3, x4, y4);
         if (p != null)
             return p;
-        
+
         // upper
         //System.out.println("Upper");
         p = intersectionTwoSegments(x1, y1, x1+width, y1, x3, y3, x4, y4);
         if (p != null)
             return p;
-        
+
         // right
         //System.out.println("Right");
         p = intersectionTwoSegments(x1+width, y1, x1+width, y1+height, x3, y3, x4, y4);
         if (p != null)
             return p;
-        
+
         // lower
         //System.out.println("Lower");
         p = intersectionTwoSegments(x1, y1+height, x1+width, y1+height, x3, y3, x4, y4);
@@ -430,117 +436,117 @@ public final class GraphicLib {
             return p;
         return null;
     }
-    
+
     public static boolean isInRectangle(int x1, int y1, int x, int y, int width, int height) {
         return  x1 >= x         &&
-                x + width >= x1 &&
-                y1 >= y         &&
-                y + height >= y1;
+            x + width >= x1 &&
+            y1 >= y         &&
+            y + height >= y1;
+    }
+
+    public static Point putPointOnRectangle(int x1, int y1, int x, int y, int width, int height) {
+        // Compute the four distances between the point and the four segments
+        // Find the closer segment
+        // Project the point on it
+        // First done on x, then on y
+
+        int d1, d2, d3, d4; // distance, nonclockwise, starting on the top
+        int d; // minimal distance
+        Point p = new Point(); // returned point
+
+        d1 = Math.abs(y-y1);
+        d2 = Math.abs(x-x1);
+        d3 = Math.abs(y+height-y1);
+        d4 = Math.abs(x+width-x1);
+
+        d = Math.min(Math.min(Math.min(d1, d2), d3), d4);
+
+
+        if (d == d1) {
+            p.x = x1;
+            p.y = y;
+        } else if (d == d2) {
+            p.x = x;
+            p.y = y1;
+        } else if (d == d3) {
+            p.x = x1;
+            p.y = y + height;
+        } else {
+            p.x = x + width;
+            p.y = y1;
+        }
+
+        return p;
+
     }
-	
-	public static Point putPointOnRectangle(int x1, int y1, int x, int y, int width, int height) {
-		// Compute the four distances between the point and the four segments
-		// Find the closer segment
-		// Project the point on it
-		// First done on x, then on y
-		
-		int d1, d2, d3, d4; // distance, nonclockwise, starting on the top 
-		int d; // minimal distance
-		Point p = new Point(); // returned point
-		
-		d1 = Math.abs(y-y1);
-		d2 = Math.abs(x-x1);
-		d3 = Math.abs(y+height-y1);
-		d4 = Math.abs(x+width-x1);
-		
-		d = Math.min(Math.min(Math.min(d1, d2), d3), d4);
-		
-
-		if (d == d1) {
-			p.x = x1;
-			p.y = y;
-		} else if (d == d2) {
-			p.x = x;
-			p.y = y1;
-		} else if (d == d3) {
-			p.x = x1;
-			p.y = y + height;
-		} else {
-			p.x = x + width;
-			p.y = y1;
-		}
-		
-		return p;
-		
-	}
-	
-	// Returns the closer segment of the rectangle, from a given point (x1, y1)
-	public static int getCloserOrientation (int x1, int y1, int x, int y, int width, int height) {
-		// Compute the four distances between the point and the four segments
-		// Find the closer segment
-		// Project the point on it
-		// First done on x, then on y
-		
-		int d1, d2, d3, d4; // distance, nonclockwise, starting on the top 
-		int d; // minimal distance
-		int ret; // returned orientation
-		
-		d1 = Math.abs(y-y1);
-		d2 = Math.abs(x-x1);
-		d3 = Math.abs(y+height-y1);
-		d4 = Math.abs(x+width-x1);
-		
-		d = Math.min(Math.min(Math.min(d1, d2), d3), d4);
-		
-		if (d == d1) {
-			ret = NORTH;
-		} else if (d == d2) {
-			ret = WEST;
-		} else if (d == d3) {
-			ret = SOUTH;
-		} else {
-			ret = EAST;
-		}
-		
-		return ret;
-	}
-	
-    
+
+    // Returns the closer segment of the rectangle, from a given point (x1, y1)
+    public static int getCloserOrientation (int x1, int y1, int x, int y, int width, int height) {
+        // Compute the four distances between the point and the four segments
+        // Find the closer segment
+        // Project the point on it
+        // First done on x, then on y
+
+        int d1, d2, d3, d4; // distance, nonclockwise, starting on the top
+        int d; // minimal distance
+        int ret; // returned orientation
+
+        d1 = Math.abs(y-y1);
+        d2 = Math.abs(x-x1);
+        d3 = Math.abs(y+height-y1);
+        d4 = Math.abs(x+width-x1);
+
+        d = Math.min(Math.min(Math.min(d1, d2), d3), d4);
+
+        if (d == d1) {
+            ret = NORTH;
+        } else if (d == d2) {
+            ret = WEST;
+        } else if (d == d3) {
+            ret = SOUTH;
+        } else {
+            ret = EAST;
+        }
+
+        return ret;
+    }
+
+
     public static void centerOnScreen(Window w) {
         Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
         w.setLocation((screen.width - w.getSize().width)/2,(screen.height - w.getSize().height)/2);
     }
-    
-    public static void centerOnParent(	final Window window ) {
-    	centerOnParent( window, -1, -1 );
+
+    public static void centerOnParent(  final Window window ) {
+        centerOnParent( window, -1, -1 );
     }
-    
-    public static void centerOnParent(	final Window w,
-    									final int width,
-    									final int heigth ) {
-    	if ( width > 0 && heigth > 0 ) {
-	        Dimension screenSize = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getSize();
-	        w.setSize( Math.min( width, screenSize.width ), Math.min( heigth, screenSize.height ) );
-    	}
-    	
+
+    public static void centerOnParent(  final Window w,
+                                        final int width,
+                                        final int heigth ) {
+        if ( width > 0 && heigth > 0 ) {
+            Dimension screenSize = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getSize();
+            w.setSize( Math.min( width, screenSize.width ), Math.min( heigth, screenSize.height ) );
+        }
+
         Window parent = w.getOwner();
         if (parent == null) {
             centerOnScreen(w);
             return;
         }
         Point p = parent.getLocation();
-        w.setLocation(((parent.getSize().width - w.getSize().width)/2) + p.x, ((parent.getSize().height - w.getSize().height)/2) + p.y); 
+        w.setLocation(((parent.getSize().width - w.getSize().width)/2) + p.x, ((parent.getSize().height - w.getSize().height)/2) + p.y);
     }
-    
+
     // Trivial sorting algorithm as there are only a few tabs
     // maxIndex is a non valid index
-    // Vector v contains elements that should be sorted the same way 
-    public static void sortJTabbedPane(JTabbedPane jtp, Vector v, int beginIndex, int maxIndex) {
+    // Vector v contains elements that should be sorted the same way
+    public static void sortJTabbedPane(JTabbedPane jtp, Vector<?> v, int beginIndex, int maxIndex) {
         //System.out.println("Sorting from " + beginIndex + " to " + maxIndex);
         if (beginIndex >= maxIndex) {
             return;
         }
-        
+
         String s = jtp.getTitleAt(beginIndex);
         int index = beginIndex;
         // Search for the one to move
@@ -550,17 +556,17 @@ public final class GraphicLib {
                 s = jtp.getTitleAt(i);
             }
         }
-        
+
         if (index != beginIndex) {
             moveTabFromTo(jtp, v, index, beginIndex);
         }
-        
+
         beginIndex ++;
         sortJTabbedPane(jtp, v, beginIndex, maxIndex);
     }
-    
+
     public static void moveTabFromTo(JTabbedPane jtp, Vector v, int src, int dst) {
-        
+
         // Get all the properties
         Component comp = jtp.getComponentAt(src);
         String label = jtp.getTitleAt(src);
@@ -572,13 +578,13 @@ public final class GraphicLib {
         int mnemonicLoc = jtp.getDisplayedMnemonicIndexAt(src);
         Color fg = jtp.getForegroundAt(src);
         Color bg = jtp.getBackgroundAt(src);
-        
+
         // Remove the tab
         jtp.remove(src);
-        
+
         // Add a new tab
         jtp.insertTab(label, icon, comp, tooltip, dst);
-        
+
         // Restore all properties
         jtp.setDisabledIconAt(dst, iconDis);
         jtp.setEnabledAt(dst, enabled);
@@ -586,38 +592,38 @@ public final class GraphicLib {
         jtp.setDisplayedMnemonicIndexAt(dst, mnemonicLoc);
         jtp.setForegroundAt(dst, fg);
         jtp.setBackgroundAt(dst, bg);
-        
+
         Object o = v.elementAt(src);
         v.removeElementAt(src);
         v.insertElementAt(o, dst);
     }
-	
-	public static void draw3DRoundRectangle(Graphics g, int x, int y, int width, int height, int arc, Color fillColor, Color borderColor) {
-		Color c = g.getColor();
-		
-		g.setColor(fillColor);
-		g.fillRoundRect(x, y, width, height, arc, arc);
-		g.setColor(fillColor.brighter());
-		g.drawLine(x+1, y+(arc/2), x+1, y+height-(arc/2));
-		g.drawLine(x+(arc/2), y+1, x+width-(arc/2), y+1);
-		g.drawArc(x+1, y+1, arc, arc, -180, -90);
-		g.drawArc(x+1, y+height-arc-1, arc, arc, 180, 45);
-		g.drawArc(x+width-1-arc, y+1, arc, arc, 90, -45);
-		g.setColor(fillColor.darker());
-		g.drawLine(x+width-1, y+(arc/2), x+width-1, y+height-(arc/2));
-		g.drawLine(x+(arc/2), y+height-1, x+width-(arc/2), y+height-1);
-		g.drawArc(x+width-1-arc, y+height-1-arc, arc, arc, -90, 90);
-		g.drawArc(x+1, y+height-arc-1, arc, arc, -135, 45);
-		g.drawArc(x+width-1-arc, y+1, arc, arc, 45, -45);
-		g.setColor(borderColor);
-		g.drawRoundRect(x, y, width, height, arc, arc);
-		
-		
-		
-		g.setColor(c);
-	}
-	
-	public static void enableComponents(Container container, boolean enable) {
+
+    public static void draw3DRoundRectangle(Graphics g, int x, int y, int width, int height, int arc, Color fillColor, Color borderColor) {
+        Color c = g.getColor();
+
+        g.setColor(fillColor);
+        g.fillRoundRect(x, y, width, height, arc, arc);
+        g.setColor(fillColor.brighter());
+        g.drawLine(x+1, y+(arc/2), x+1, y+height-(arc/2));
+        g.drawLine(x+(arc/2), y+1, x+width-(arc/2), y+1);
+        g.drawArc(x+1, y+1, arc, arc, -180, -90);
+        g.drawArc(x+1, y+height-arc-1, arc, arc, 180, 45);
+        g.drawArc(x+width-1-arc, y+1, arc, arc, 90, -45);
+        g.setColor(fillColor.darker());
+        g.drawLine(x+width-1, y+(arc/2), x+width-1, y+height-(arc/2));
+        g.drawLine(x+(arc/2), y+height-1, x+width-(arc/2), y+height-1);
+        g.drawArc(x+width-1-arc, y+height-1-arc, arc, arc, -90, 90);
+        g.drawArc(x+1, y+height-arc-1, arc, arc, -135, 45);
+        g.drawArc(x+width-1-arc, y+1, arc, arc, 45, -45);
+        g.setColor(borderColor);
+        g.drawRoundRect(x, y, width, height, arc, arc);
+
+
+
+        g.setColor(c);
+    }
+
+    public static void enableComponents(Container container, boolean enable) {
         Component[] components = container.getComponents();
         for (Component component : components) {
             component.setEnabled(enable);
@@ -626,14 +632,10 @@ public final class GraphicLib {
             }
         }
     }
-}
-
-
-
-
-
-
-
-
 
+    public static JTabbedPane createTabbedPane() {
+        final JTabbedPane pane = new JTabbedPane( JTabbedPane.TOP, JTabbedPane.SCROLL_TAB_LAYOUT );
 
+        return pane;
+    }
+}
diff --git a/src/myutil/HTMLCodeGeneratorForTables.java b/src/myutil/HTMLCodeGeneratorForTables.java
index b1bdb96991874d28366d5a7a238b41e027d747c0..62c59f9a98ca3f69e805825c607187b24772565b 100755
--- a/src/myutil/HTMLCodeGeneratorForTables.java
+++ b/src/myutil/HTMLCodeGeneratorForTables.java
@@ -46,12 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
-//import java.awt.*;
-import javax.swing.table.*;
-import java.text.*;
+import ui.DefaultText;
+
+import javax.swing.table.AbstractTableModel;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
 
-import ui.*;
+//import java.awt.*;
 
 public class HTMLCodeGeneratorForTables  {
 	
@@ -114,7 +118,7 @@ public class HTMLCodeGeneratorForTables  {
 
 	}
 	
-	public StringBuffer getHTMLCodeFromSorters(ArrayList<TableSorter> tss, ArrayList<String> titles, String mainTitle) {
+	public StringBuffer getHTMLCodeFromSorters( List<TableSorter> tss, List<String> titles, String mainTitle) {
 		StringBuffer sb = new StringBuffer();
 		int max = Math.min(tss.size(), titles.size());
 		
diff --git a/src/myutil/ImageManager.java b/src/myutil/ImageManager.java
new file mode 100755
index 0000000000000000000000000000000000000000..2b43afe2d15e3d1a82ae2f9017e7b9c01d52f0ef
--- /dev/null
+++ b/src/myutil/ImageManager.java
@@ -0,0 +1,82 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class ImageManager
+   * Creation: 31/05/2017
+   * @version 1.1 31/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+
+public final class ImageManager {
+
+    /**
+     * Resizes an image using a Graphics2D object backed by a BufferedImage.
+     * @param srcImg - source image to scale
+     * @param w - desired width
+     * @param h - desired height
+     * @return - the new resized image
+     */
+    public static BufferedImage getScaledImage(BufferedImage src, int w, int h){
+        int finalw = w;
+        int finalh = h;
+        double factor = 1.0d;
+        if(src.getWidth() > src.getHeight()){
+            factor = ((double)src.getHeight()/(double)src.getWidth());
+            finalh = (int)(finalw * factor);
+        }else{
+            factor = ((double)src.getWidth()/(double)src.getHeight());
+            finalw = (int)(finalh * factor);
+        }
+
+        BufferedImage resizedImg = new BufferedImage(finalw, finalh, BufferedImage.TRANSLUCENT);
+        Graphics2D g2 = resizedImg.createGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+        g2.drawImage(src, 0, 0, finalw, finalh, null);
+        g2.dispose();
+        return resizedImg;
+    }
+
+
+}
diff --git a/src/myutil/IntExpressionEvaluator.java b/src/myutil/IntExpressionEvaluator.java
index 3be20af812763b7fac1de84a67fbbc25a421b599..ea4f4dfb799b355fe871eb08933b5dfaa7c91f56 100755
--- a/src/myutil/IntExpressionEvaluator.java
+++ b/src/myutil/IntExpressionEvaluator.java
@@ -45,7 +45,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.StringTokenizer;
 
 public class IntExpressionEvaluator {
     public static final int NUMBER_TOKEN = -1;
diff --git a/src/myutil/IntLine.java b/src/myutil/IntLine.java
index b0a3116c6766b03134738f9226c407137cccd1e8..46e86b290c8975cd8eb02a142ad67546d4a06a88 100755
--- a/src/myutil/IntLine.java
+++ b/src/myutil/IntLine.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.BitSet;
 
 public class IntLine  {
    public int [] line;
diff --git a/src/myutil/IntMatrix.java b/src/myutil/IntMatrix.java
index 52e902ccd3c8ca06d5d7b11674efff339a4f097c..243d0ad628d676625cb077297c42bb784231c5f1 100755
--- a/src/myutil/IntMatrix.java
+++ b/src/myutil/IntMatrix.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.BitSet;
+import java.util.LinkedList;
 
 public class IntMatrix implements Runnable {
    public int [][] matrice;
diff --git a/src/myutil/LoaderFacilityInterface.java b/src/myutil/LoaderFacilityInterface.java
new file mode 100755
index 0000000000000000000000000000000000000000..9ddf2577c15b55c21b155e3cb8fe1f85501688d7
--- /dev/null
+++ b/src/myutil/LoaderFacilityInterface.java
@@ -0,0 +1,52 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class LoaderFacilityInterface
+   * Creation: 31/05/2017
+   * @version 1.1 31/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+public interface LoaderFacilityInterface {
+
+    public void load(int index);
+
+}
diff --git a/src/myutil/MyMath.java b/src/myutil/MyMath.java
index 87d573ed11f39bd5046173f3a9c53a23a59fe953..a0d86b52ba47271e3a64021b1803fbd9dcd6d976 100755
--- a/src/myutil/MyMath.java
+++ b/src/myutil/MyMath.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
-
 public class MyMath {
   
    
diff --git a/src/myutil/PeriodicBehavior.java b/src/myutil/PeriodicBehavior.java
index 14bf7fa1f8027f66cf60c14fc491a48711e24303..d91e75b7d82c5101e4fde5b98afd7a201aefecd6 100755
--- a/src/myutil/PeriodicBehavior.java
+++ b/src/myutil/PeriodicBehavior.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
-
-
 public interface PeriodicBehavior {
     
 	public void periodicAction();
diff --git a/src/myutil/PeriodicBehaviorThread.java b/src/myutil/PeriodicBehaviorThread.java
index 3f3350a31cb3bd7b11860c32d7d559ab41f33e10..9194386cfbb4f93c521cae89a35c6bfe0589a8cd 100755
--- a/src/myutil/PeriodicBehaviorThread.java
+++ b/src/myutil/PeriodicBehaviorThread.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
-
-
 public class PeriodicBehaviorThread extends Thread {
     
 	private PeriodicBehavior pb;
diff --git a/src/myutil/Plugin.java b/src/myutil/Plugin.java
new file mode 100755
index 0000000000000000000000000000000000000000..f286b059ff4b2790b265cfff23427bd10545afa0
--- /dev/null
+++ b/src/myutil/Plugin.java
@@ -0,0 +1,95 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class Plugin
+   * Creation: 24/05/2017
+   * Version 1.0 24/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
+
+public class Plugin {
+    private String name;
+    private File file;
+    private HashMap<String, Class> listOfClasses;
+
+    public Plugin(String _name) {
+        name = _name;
+        listOfClasses = new HashMap<String, Class>();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Method getMethod(String _className, String _methodName) {
+        Class c = listOfClasses.get(_className);
+
+        try {
+            if (c == null) {
+                file = new File(name);
+                TraceManager.addDev("Loading plugin=" + name);
+                URL[] urls = new URL[] { file.toURI().toURL() };
+                ClassLoader loader = new URLClassLoader(urls);
+                TraceManager.addDev("Loader created");
+                c = loader.loadClass(_className);
+                if (c == null) {
+                    return null;
+                }
+                listOfClasses.put(_className, c);
+            }
+
+            Method method = c.getMethod(_methodName);
+	    return method;
+        } catch (Exception e) {
+	    TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className + " and method " + _methodName);
+	    return null;
+        }
+
+    }
+
+
+}
diff --git a/src/myutil/PluginManager.java b/src/myutil/PluginManager.java
new file mode 100755
index 0000000000000000000000000000000000000000..632d77c8b7faa44f820d473b502aba8b1e48ece4
--- /dev/null
+++ b/src/myutil/PluginManager.java
@@ -0,0 +1,102 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class PluginManager
+   * Creation: 24/05/2017
+   * Version 1.0 24/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+public class PluginManager  {
+    public ArrayList<Plugin> plugins;
+    public static PluginManager pluginManager;
+
+    public PluginManager() {
+	plugins = new ArrayList<Plugin>();
+    }
+
+    public void addPlugin(Plugin _plugin) {
+	plugins.add(_plugin);
+    }
+
+    public Plugin getPlugin(String _name) {
+	for(Plugin plugin: plugins) {
+	    if (plugin.getName().compareTo(_name) == 0) {
+		return plugin;
+	    }
+	}
+	return null;
+    }
+
+    public Plugin createPlugin(String _name) {
+	Plugin plugin = new Plugin(_name);
+	addPlugin(plugin);
+	return plugin;
+    }
+    
+    public String executeString(String _pluginName, String _className, String _methodName) {
+	Plugin plugin = getPlugin(_pluginName);
+	if (plugin == null) {
+	    plugin = createPlugin(_pluginName);
+	    if (plugin == null) {
+		return null;
+	    }
+	}
+
+	// We have a valid plugin. We now need to get the Method
+	Method m = plugin.getMethod(_className, _methodName);
+	if (m == null) {
+	    return null;
+	}
+
+	try {
+	    return (String)(m.invoke(null));
+	} catch (Exception e) {
+	    TraceManager.addDev("Exception occured when executing method " + _methodName);
+	    return null;
+	}
+    }
+
+
+}
diff --git a/src/myutil/ProcessThread.java b/src/myutil/ProcessThread.java
index 92a2fda6bc396d636f7b2b990750f41d6b5ea9a1..3fa324e21cfbaa1e71e9b95cb0bee405851f4583 100755
--- a/src/myutil/ProcessThread.java
+++ b/src/myutil/ProcessThread.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 
 
 public class ProcessThread extends Thread {
diff --git a/src/myutil/SVGGraphics.java b/src/myutil/SVGGraphics.java
index 994253c24575a00a3385e53d08dfc03a707e50a8..cf773169a8f02e08519ece953e6dff822f4606d0 100755
--- a/src/myutil/SVGGraphics.java
+++ b/src/myutil/SVGGraphics.java
@@ -47,16 +47,16 @@
 package myutil;
 
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-import java.awt.image.renderable.*;
-
-import java.text.*;
-import java.util.*;
-
-import javax.swing.*;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
 
 
 
diff --git a/src/myutil/TableSorter.java b/src/myutil/TableSorter.java
index 91c84a55abee55c6703e1e96a02588276c58bb89..421555286ee4c218e8294e5e47e83759fd0135b9 100755
--- a/src/myutil/TableSorter.java
+++ b/src/myutil/TableSorter.java
@@ -2,15 +2,16 @@
 
 package myutil;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.List;
-
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.*;
+import java.util.List;
 
 /**
  * TableSorter is a decorator for TableModels; adding sorting
diff --git a/src/myutil/TreeCell.java b/src/myutil/TreeCell.java
index 71b0ca4df9bfff49cef044536a38569f80899aba..588cedc1a7ff2018f18cc33a595db2825a3dbb9e 100755
--- a/src/myutil/TreeCell.java
+++ b/src/myutil/TreeCell.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class TreeCell {
    private Object element;
diff --git a/src/myutil/URLManager.java b/src/myutil/URLManager.java
new file mode 100755
index 0000000000000000000000000000000000000000..89a29adde2fbb6a5e80db01acd82613864bbbcbf
--- /dev/null
+++ b/src/myutil/URLManager.java
@@ -0,0 +1,148 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+   ludovic.apvrille AT enst.fr
+
+   This software is a computer program whose purpose is to allow the
+   edition of TURTLE analysis, design and deployment diagrams, to
+   allow the generation of RT-LOTOS or Java code from this diagram,
+   and at last to allow the analysis of formal validation traces
+   obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+   from INRIA Rhone-Alpes.
+
+   This software is governed by the CeCILL  license under French law and
+   abiding by the rules of distribution of free software.  You can  use,
+   modify and/ or redistribute the software under the terms of the CeCILL
+   license as circulated by CEA, CNRS and INRIA at the following URL
+   "http://www.cecill.info".
+
+   As a counterpart to the access to the source code and  rights to copy,
+   modify and redistribute granted by the license, users are provided only
+   with a limited warranty  and the software's author,  the holder of the
+   economic rights,  and the successive licensors  have only  limited
+   liability.
+
+   In this respect, the user's attention is drawn to the risks associated
+   with loading,  using,  modifying and/or developing or reproducing the
+   software by the user in light of its specific status of free software,
+   that may mean  that it is complicated to manipulate,  and  that  also
+   therefore means  that it is reserved for developers  and  experienced
+   professionals having in-depth computer knowledge. Users are therefore
+   encouraged to load and test the software's suitability as regards their
+   requirements in conditions enabling the security of their systems and/or
+   data to be ensured and,  more generally, to use and operate it in the
+   same conditions as regards security.
+
+   The fact that you are presently reading this means that you have had
+   knowledge of the CeCILL license and that you accept its terms.
+
+   /**
+   * Class URLManager
+   * Creation: 31/05/2017
+   * @version 1.1 31/05/2017
+   * @author Ludovic APVRILLE
+   * @see
+   */
+
+package myutil;
+
+import org.apache.commons.io.FileUtils;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public final class URLManager implements Runnable {
+
+    private String url;
+    private boolean busy;
+    private String path;
+    private CallbackLoaderInterface callback;
+    
+    public URLManager() {
+    }
+
+    public synchronized boolean downloadFile(String _path, String _url, CallbackLoaderInterface _callback) {
+	if (busy) {
+	    return false;
+	}
+	busy = true;
+
+	path = _path;
+	url = _url;
+	callback = _callback;
+
+	Thread t = new Thread(this);
+        t.start();
+	return true;
+
+    }
+
+    public void run() {
+	try {
+	    String urlF = getRealURL(url);
+	    File f = new File(path);
+	    org.apache.commons.io.FileUtils.copyURLToFile(new URL(urlF), f);
+	    if (callback != null) {
+		callback.loadDone();
+	    }
+	} catch (Exception e) {
+	    if (callback != null) {
+		callback.loadFailed();
+	    }
+	}
+    }
+
+    public static String getRealURL(String url) {
+	try {
+	    HttpURLConnection connection;
+            URL file = new URL(url);
+            connection = (HttpURLConnection)(file.openConnection());
+            String redirect = connection.getHeaderField("Location");
+            if (redirect != null){
+		return redirect;
+            }
+	} catch (Exception e) {
+	     TraceManager.addDev("Exception in getRealURL =" + e.getMessage());
+	}
+	return url;
+	
+    }
+
+    public static String getBaseURL(String url) {
+	int index = url.lastIndexOf("/");
+	if (index == -1) {
+	    return url;
+	}
+	return url.substring(0, index+1);
+    }
+
+    public static BufferedReader getBufferedReader(String url) {
+	try {
+	    String urlR = getRealURL(url);
+	    HttpURLConnection connection;
+	    URL file = new URL(urlR);
+	    connection = (HttpURLConnection)(file.openConnection());
+	    return new BufferedReader(new InputStreamReader(connection.getInputStream()));
+	} catch (Exception e) {
+	     TraceManager.addDev("Exception in getBufferedReader =" + e.getMessage());
+	}
+	return null;
+    }
+
+    public static BufferedImage getBufferedImageFromURL(String url) {
+	TraceManager.addDev("getBufferedImageFromURL with url=" + url);
+        try {
+	    return (BufferedImage)(ImageIO.read(new URL(getRealURL(url))));
+        } catch (Exception e) {
+	    TraceManager.addDev("Exception in getBufferedImageFromURL =" + e.getMessage());
+            return null;
+        }
+
+    }
+
+
+}
diff --git a/src/myutil/externalSearch/Client.java b/src/myutil/externalSearch/Client.java
index ff7835aa61153759d5b35c3d41890ed277437452..2d8bdb230beabb79adcc95fa4ad15e489c007f9e 100644
--- a/src/myutil/externalSearch/Client.java
+++ b/src/myutil/externalSearch/Client.java
@@ -45,21 +45,18 @@
    */
 package myutil.externalSearch;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.net.*;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import myutil.TraceManager;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.jsoup.parser.Parser;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 
-import myutil.*;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
+import java.util.ArrayList;
 
 public class Client {
     public  Object parserAnswerMessage(Message answerMsg) {
diff --git a/src/myutil/externalSearch/Message.java b/src/myutil/externalSearch/Message.java
index 4fd15167ab7d7a6934d6c4c82f90739827267385..96d0bfcd68dcfd14a1db7ddfa6eee6a0b6cf2246 100644
--- a/src/myutil/externalSearch/Message.java
+++ b/src/myutil/externalSearch/Message.java
@@ -45,15 +45,10 @@
  */
 package myutil.externalSearch;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
 
 
 
diff --git a/src/nc/NCPath.java b/src/nc/NCPath.java
index a6daa363a3143745a6b128008ae5d9917495a016..376fe49933522f7df28061d029f1620eadd19a16 100755
--- a/src/nc/NCPath.java
+++ b/src/nc/NCPath.java
@@ -45,7 +45,7 @@
 
 package nc;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class NCPath extends NCElement {
 	public NCTraffic traffic;
diff --git a/src/nc/NCStructure.java b/src/nc/NCStructure.java
index edcf5f31a121b89f9ee5d26304e80eef0ec30240..84e061be256410e98f96124d05a4be759878c9ab 100755
--- a/src/nc/NCStructure.java
+++ b/src/nc/NCStructure.java
@@ -45,7 +45,7 @@
 
 package nc;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class NCStructure extends NCElement {
 	public ArrayList<NCEquipment> equipments;
diff --git a/src/proverifspec/ProVerifComment.java b/src/proverifspec/ProVerifComment.java
index be79bc1c9c902a523e978298d997e0df5a09ef24..b68cdea8bd28689fe26640118947a38fda63d903 100644
--- a/src/proverifspec/ProVerifComment.java
+++ b/src/proverifspec/ProVerifComment.java
@@ -45,7 +45,7 @@
 
 package proverifspec;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public class ProVerifComment implements ProVerifDeclaration {
     protected LinkedList<String> lines;
diff --git a/src/proverifspec/ProVerifFunction.java b/src/proverifspec/ProVerifFunction.java
index 33c0967de3d34c591ef949d79bc03adb2c4c65e9..ef6bbe4b770cb98e7b9c79db726fef9550dcc465 100755
--- a/src/proverifspec/ProVerifFunction.java
+++ b/src/proverifspec/ProVerifFunction.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifFunction {
 	public String functionName;
 	public int functionArity;
diff --git a/src/proverifspec/ProVerifOutputAnalyzer.java b/src/proverifspec/ProVerifOutputAnalyzer.java
index 05515fee9687b1dffa2f55e424907529c98ba394..70c0eb9dcd8c639c80c74c40ed21f274ec1f8327 100644
--- a/src/proverifspec/ProVerifOutputAnalyzer.java
+++ b/src/proverifspec/ProVerifOutputAnalyzer.java
@@ -45,242 +45,419 @@
 
 package proverifspec;
 
-import java.util.*;
-import java.util.regex.*;
-import myutil.*;
-import java.io.*;
-
+import avatartranslator.*;
 import avatartranslator.toproverif.AVATAR2ProVerif;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-
 
-public class ProVerifOutputAnalyzer {
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
-    private LinkedList<String> reachableEvents;
-    private LinkedList<String> nonReachableEvents;
-    private LinkedList<String> secretTerms;
-    private LinkedList<String> nonSecretTerms;
-    private LinkedList<String> satisfiedAuthenticity;
-    private LinkedList<String> satisfiedWeakAuthenticity;
-    private LinkedList<String> nonSatisfiedAuthenticity;
-    private LinkedList<String> errors;
-    private LinkedList<String> notproved;
-    private final static String typedEvent = "not event(";
-    private final static String untypedEvent = "not ev:";
+public class ProVerifOutputAnalyzer {
+    private final static String typedEvent = "not event(enteringState" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedEvent = "not ev:enteringState" + AVATAR2ProVerif.ATTR_DELIM;
     private final static String typedFalse = ") is false";
     private final static String typedTrue = ") is true";
+    private final static String typedCannotBeProved = ") cannot be proved";
+    private final static String untypedCannotBeProved = " cannot be proved";
     private final static String untypedFalse = " is false";
     private final static String untypedTrue = " is true";
     private final static String typedSecret = "not attacker(";
     private final static String untypedSecret = "not attacker:";
-    private final static String typedStrongAuth = "inj-event(authenticity__";
-    private final static String untypedStrongAuth = "evinj:authenticity__";
-    private final static String typedWeakAuth = "(but event(authenticity__";
-    private final static String untypedWeakAuth = "(but ev:authenticity__";
-    private final static String typedAuthSplit = "==> inj-event(authenticity__";
-    private final static String typedWeakAuthSplit = "==> event(authenticity__";
-    private final static String untypedAuthSplit = "==> evinj:authenticity__";
-    private final static String untypedWeakAuthSplit = "==> ev:authenticity__";
+    private final static String typedStrongAuth = "inj-event(authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedStrongAuth = "evinj:authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String typedWeakAuth = "(but event(authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedWeakAuth = "(but ev:authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String typedWeakNonAuth = "(even event(authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedWeakNonAuth = "(even ev:authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String typedAuthSplit = "==> inj-event(authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String typedWeakAuthSplit = "==> event(authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedAuthSplit = "==> evinj:authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+    private final static String untypedWeakAuthSplit = "==> ev:authenticity" + AVATAR2ProVerif.ATTR_DELIM;
+
+    private HashMap<AvatarPragma, ProVerifQueryResult> results;
+    private LinkedList<String> errors;
 
     private AVATAR2ProVerif avatar2proverif;
 
     public ProVerifOutputAnalyzer(AVATAR2ProVerif avatar2proverif) {
         this.avatar2proverif = avatar2proverif;
+        this.errors = null;
+        this.results = null;
+    }
 
-        reachableEvents = new LinkedList<String>();
-        nonReachableEvents = new LinkedList<String>();
-        secretTerms = new LinkedList<String>();
-        nonSecretTerms = new LinkedList<String>();
-        satisfiedAuthenticity = new LinkedList<String>();
-        satisfiedWeakAuthenticity = new LinkedList<String>();
-        nonSatisfiedAuthenticity = new LinkedList<String>();
+    public void analyzeOutput(String _s, boolean isTyped) {
+        BufferedReader reader = new BufferedReader(new StringReader(_s));
+        List<AvatarPragma> pragmas = this.avatar2proverif.getAvatarSpecification().getPragmas();
+        String previous = null;
+        String str;
+        ProVerifQueryAuthResult previousAuthPragma = null;
+        LinkedList<String> proverifProcess = new LinkedList<String> ();
+        ProVerifResultTrace resultTrace = new ProVerifResultTrace(proverifProcess);
+        boolean isInTrace = false;
 
-        errors = new LinkedList<String>();
-        notproved = new LinkedList<String>();
-    }
+        this.results = new HashMap<AvatarPragma, ProVerifQueryResult> ();
+        this.errors = new LinkedList<String>();
 
-    public void analyzeTypedOutput(String _s) {
-        String str, previous="";
-        int index0, index1;
+        Pattern procPattern = Pattern.compile(" *\\{\\d+\\}(.*)");
 
-        BufferedReader reader = new BufferedReader(new StringReader(_s));
         try {
-            while ((str = reader.readLine()) != null) {
-                if (str.contains("RESULT")){
-                    if (str.contains(typedEvent)){
-                        if (str.contains(typedTrue)){
-                            //Add string between tags
-                            //Pattern.quote converts string into regex adding escape characters
-                            nonReachableEvents.add(str.split(Pattern.quote(typedEvent))[1].split(Pattern.quote(typedTrue))[0]);
-                        }
-                        else if (str.contains(typedFalse)) {
-                            reachableEvents.add(str.split(Pattern.quote(typedEvent))[1].split(Pattern.quote(typedFalse))[0]);
+
+            // Loop through every line in the output
+            while ((str = reader.readLine()) != null)
+            {
+                if (str.isEmpty())
+                    continue;
+                
+                Matcher m = procPattern.matcher(str);
+
+                if (isInTrace && (str.startsWith("A more detailed") || str.startsWith("Could not find")))
+                {
+                    isInTrace = false;
+                    resultTrace.finalize();
+                    continue;
+                }
+                else if (!isInTrace && str.startsWith("1. "))
+                {
+                    isInTrace = true;
+                }
+
+                // Found a trace step
+                if (isInTrace)
+                {
+                    resultTrace.addTraceStep(str);
+                }
+
+                else if (m.matches())
+                {
+                    proverifProcess.add(m.group(1));
+                }
+
+                // Found a line with a RESULT
+                else if (str.startsWith("RESULT "))
+                {
+                    // Remove 'RESULT ' at the begining
+                    str = str.substring(7);
+                    ProVerifQueryResult result = new ProVerifQueryResult(true, true);
+
+                    // This concerns an enteringState event
+                    if (str.startsWith(isTyped ? typedEvent : untypedEvent))
+                    {
+                        str = str.substring((isTyped ? typedEvent : untypedEvent).length());
+                        String stateName = null;
+
+                        previousAuthPragma = null;
+
+                        if (isTyped)
+                        {
+                            if (str.contains(typedTrue))
+                            {
+                                result.setSatisfied(false);
+                                stateName = str.split(Pattern.quote(typedTrue))[0];
+                            }
+                            else if (str.contains(typedFalse))
+                            {
+                                result.setTrace(resultTrace);
+                                stateName = str.split(Pattern.quote(typedFalse))[0];
+                            }
+                            else if (str.contains(typedCannotBeProved))
+                            {
+                                result.setProved(false);
+                                result.setTrace(resultTrace);
+                                stateName = str.split(Pattern.quote(typedCannotBeProved))[0];
+                            }
                         }
-                    }
-                    else if (str.contains(typedSecret)){
-                        if (str.contains(typedTrue)){
-                            //Add string between tags
-                            secretTerms.add(str.split(Pattern.quote(typedSecret))[1].split("\\[")[0]);
+                        else
+                        {
+                            stateName = str.split("\\(")[0];
+                            if (str.contains(untypedTrue))
+                            {
+                                result.setSatisfied(false);
+                            }
+                            else if (str.contains(untypedFalse))
+                            {
+                                result.setTrace(resultTrace);
+                            }
+                            else if (str.contains(untypedCannotBeProved))
+                            {
+                                result.setTrace(resultTrace);
+                                result.setProved(false);
+                            }
                         }
-                        else if (str.contains(typedFalse)) {
-                            nonSecretTerms.add(str.split(Pattern.quote(typedSecret))[1].split("\\[")[0]);
+
+                        AvatarPragmaReachability reachabilityPragma = this.getAvatarPragmaReachabilityFromString(stateName);
+                        if (reachabilityPragma != null)
+                        {
+                            this.results.put(reachabilityPragma, result);
                         }
                     }
-                    else if (str.contains(typedStrongAuth)){
-                        if (str.contains(typedTrue)){
-                            //Add string between tags
-                            satisfiedAuthenticity.add(str.split(Pattern.quote(typedStrongAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(typedAuthSplit))[1].split("\\(")[0]);
+
+                    // This concerns a confidentiality check
+                    else if (str.contains(isTyped ? typedSecret : untypedSecret))
+                    {
+                        String attributeName = str.substring((isTyped ? typedSecret : untypedSecret).length()).split("\\[")[0];
+
+                        previousAuthPragma = null;
+
+                        if (str.contains(isTyped ? typedFalse : untypedFalse))
+                        {
+                            result.setTrace(resultTrace);
+                            result.setSatisfied(false);
                         }
-                        else if (str.contains(typedFalse)) {
-                            nonSatisfiedAuthenticity.add(str.split(Pattern.quote(typedStrongAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(typedAuthSplit))[1].split("\\(")[0]);
+                        else if (str.contains(isTyped ? typedCannotBeProved : untypedCannotBeProved))
+                        {
+                            result.setTrace(resultTrace);
+                            result.setProved(false);
                         }
-			else if (str.contains("cannot be proved")){
-			    notproved.add("Strong Authenticity "+ str.split(Pattern.quote(typedStrongAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(typedAuthSplit))[1].split("\\(")[0]);
-			}
-                    }
-                    else if (str.contains(typedWeakAuth)) {
-                        if (str.contains(typedTrue)){
-                            //Add string between tags
-                            satisfiedWeakAuthenticity.add(str.split(Pattern.quote(typedWeakAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(typedWeakAuthSplit))[1].split("\\(")[0]);
+
+                        AvatarAttribute attribute = this.getAvatarAttributeFromString(attributeName);
+                        if (attribute != null)
+                        {
+                            for (AvatarPragma pragma: pragmas)
+                            {
+                                if (pragma instanceof AvatarPragmaSecret)
+                                {
+                                    String trueName = this.avatar2proverif.getTrueName(((AvatarPragmaSecret) pragma).getArg());
+                                    if (trueName != null && trueName.equals(attributeName))
+                                    {
+                                        this.results.put(pragma, result);
+                                    }
+                                }
+                            }
                         }
-			else if (str.contains("cannot be proved")){
-			    notproved.add("Weak Authenticity "+ str.split(Pattern.quote(typedWeakAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(typedWeakAuthSplit))[1].split("\\(")[0]);
-			}    	
                     }
-                }
-                if (str.contains("Error:")){
-                    errors.add(str + ": " + previous);
-                }
-                else if (str.contains("cannot be proved")){
-                 //   notproved.add(str);
-                }    
-            previous = str;
-            }  
-        } catch(IOException e) {
-            e.printStackTrace();
-        }
-    }
 
-    public void analyzeOutput(String _s, boolean isTyped) {
-        String str, previous="";
-        int index0, index1;
-        if (isTyped) {
-            analyzeTypedOutput(_s);
-            return;
-        }
-        BufferedReader reader = new BufferedReader(new StringReader(_s));
-        try {
-            while ((str = reader.readLine()) != null) {
-                if (str.contains("RESULT")){
-                    if (str.contains(untypedEvent)){
-                        if (str.contains(untypedTrue)){
-                            //Add string between tags
-                            //Pattern.quote converts string into regex adding escape characters
-                            nonReachableEvents.add(str.split(Pattern.quote(untypedEvent))[1].split("\\(")[0]);
+                    // This concerns a strong authenticity check
+                    else if (str.contains(isTyped ? typedStrongAuth : untypedStrongAuth))
+                    {
+                        str = str.substring((isTyped ? typedStrongAuth : untypedStrongAuth).length());
+
+                        String attributeStateName1 = null;
+                        String attributeStateName2 = null;
+
+                        previousAuthPragma = new ProVerifQueryAuthResult(true, true);
+                        result = previousAuthPragma;
+
+                        if (isTyped)
+                        {
+                            attributeStateName1 = str.split("\\(")[0];
+                            attributeStateName2 = str.split(Pattern.quote(typedAuthSplit))[1].split("\\(")[0];
+                            if (str.contains(typedFalse))
+                            {
+                                result.setTrace(resultTrace);
+                                result.setSatisfied(false);
+                            }
+                            else if (str.contains(typedCannotBeProved))
+                            {
+                                result.setTrace(resultTrace);
+                                result.setProved(false);
+                            }
                         }
-                        else if (str.contains(untypedFalse)) {
-                            reachableEvents.add(str.split(Pattern.quote(untypedEvent))[1].split("\\(")[0]);
+                        else
+                        {
+                            attributeStateName1 = str.split("\\(")[0];
+                            attributeStateName2 = str.split(untypedAuthSplit)[1].split("\\(")[0];
+                            if (str.contains(untypedFalse))
+                            {
+                                result.setTrace(resultTrace);
+                                result.setSatisfied(false);
+                            }
+                            else if (str.contains(untypedCannotBeProved))
+                            {
+                                result.setTrace(resultTrace);
+                                result.setProved(false);
+                            }
                         }
-                    }
-                    else if (str.contains(untypedSecret)){
-                        if (str.contains(untypedTrue)){
-                            //Add string between tags
-                            secretTerms.add(str.split(Pattern.quote(untypedSecret))[1].split("\\[")[0]);
+
+                        AvatarAttribute attribute1 = null;
+                        AvatarAttribute attribute2 = null;
+                        AvatarState state1 = null;
+                        AvatarState state2 = null;
+
+                        String[] tmp = attributeStateName1.split(AVATAR2ProVerif.ATTR_DELIM);
+                        if (tmp.length == 3)
+                        {
+                            attribute1 = this.getAvatarAttributeFromString(tmp[0] + AVATAR2ProVerif.ATTR_DELIM + tmp[1]);
+                            state1 = this.getAvatarStateFromString(tmp[0] + AVATAR2ProVerif.ATTR_DELIM + tmp[2]);
                         }
-                        else if (str.contains(untypedFalse)) {
-                            nonSecretTerms.add(str.split(Pattern.quote(untypedSecret))[1].split("\\[")[0]);
+
+                        tmp = attributeStateName2.split(AVATAR2ProVerif.ATTR_DELIM);
+                        if (tmp.length == 3)
+                        {
+                            attribute2 = this.getAvatarAttributeFromString(tmp[0] + AVATAR2ProVerif.ATTR_DELIM + tmp[1]);
+                            state2 = this.getAvatarStateFromString(tmp[0] + AVATAR2ProVerif.ATTR_DELIM + tmp[2]);
                         }
-                    }
-                    else if (str.contains(untypedStrongAuth)){
-                        if (str.contains(untypedTrue)){
-                            //Add string between tags
-                            satisfiedAuthenticity.add(str.split(untypedStrongAuth)[1].split(untypedAuthSplit)[0].split("\\(")[0] + " ==> " + str.split(untypedAuthSplit)[1].split("\\(")[0]);
+
+                        if (attribute1 != null && attribute2 != null && state1 != null && state2 != null)
+                        {
+                            for (AvatarPragma pragma: pragmas)
+                            {
+                                if (pragma instanceof AvatarPragmaAuthenticity)
+                                {
+                                    AvatarPragmaAuthenticity pragmaAuth = (AvatarPragmaAuthenticity) pragma;
+                                    if (pragmaAuth.getAttrA().getState() == state2
+                                            && pragmaAuth.getAttrA().getAttribute() == attribute2
+                                            && pragmaAuth.getAttrB().getState() == state1
+                                            && pragmaAuth.getAttrB().getAttribute() == attribute1)
+                                    {
+                                        this.results.put(pragma, result);
+                                        break;
+                                    }
+                                }
+                            }
                         }
-                        else if (str.contains(untypedFalse)) {
-                            nonSatisfiedAuthenticity.add(str.split(Pattern.quote(untypedStrongAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(untypedAuthSplit))[1].split("\\(")[0]);
+                    }
+
+                    // This concerns a satsified weak authenticity check
+                    else if (str.contains(isTyped ? typedWeakAuth : untypedWeakAuth))
+                    {
+
+                        if (previousAuthPragma != null)
+                        {
+                            previousAuthPragma.setWeakSatisfied(true);
                         }
-			else if (str.contains("cannot be proved")){
-			    notproved.add("Strong Authenticity "+ str.split(Pattern.quote(untypedStrongAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(untypedAuthSplit))[1].split("\\(")[0]);
-			}
+                        previousAuthPragma = null;
                     }
-                    else if (str.contains(untypedWeakAuth)) {
-                        if (str.contains(untypedTrue)){
-                            //Add string between tags
-                            satisfiedWeakAuthenticity.add(str.split(Pattern.quote(untypedWeakAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(untypedWeakAuthSplit))[1].split("\\(")[0]);
-                        }    	
-			else if (str.contains("cannot be proved")){
-			    notproved.add("Weak Authenticity "+ str.split(Pattern.quote(untypedWeakAuth))[1].split("\\(")[0] + " ==> " + str.split(Pattern.quote(untypedWeakAuthSplit))[1].split("\\(")[0]);
-			}  
+
+                    // This concerns a failed weak authenticity check
+                    else if (str.contains(isTyped ? typedWeakNonAuth : untypedWeakNonAuth))
+                    {
+
+                        if (previousAuthPragma != null)
+                        {
+                            previousAuthPragma.setWeakSatisfied(false);
+                        }
+                        previousAuthPragma = null;
                     }
+
+                    resultTrace = new ProVerifResultTrace(proverifProcess);
                 }
-                if (str.contains("Error:")){
-                    errors.add(str + ": " + previous);
+
+                // Found an error
+                else if (str.contains("Error:"))
+                {
+                    this.errors.add(str + ": " + previous);
                 }
-                else if (str.contains("cannot be proved")){
-           //         notproved.add(str);
-                }    
-            previous = str;
+
+                previous = str;
             }
+
+
         } catch(IOException e) {
             e.printStackTrace();
         }
     }
 
-    public LinkedList<String> getReachableEvents() {
-        return reachableEvents;
+    private AvatarAttribute getAvatarAttributeFromString(String name)
+    {
+        String[] tmp = name.split(AVATAR2ProVerif.ATTR_DELIM);
+        if (tmp.length != 2)
+            return null;
+
+        AvatarBlock block = this.avatar2proverif.getAvatarSpecification().getBlockWithName(tmp[0]);
+        if (block == null)
+            return null;
+
+        return block.getAvatarAttributeWithName(tmp[1]);
+    }
+
+    private AvatarPragmaReachability getAvatarPragmaReachabilityFromString(String name)
+    {
+        String[] tmp = name.split(AVATAR2ProVerif.ATTR_DELIM);
+        if (tmp.length != 2)
+            return null;
+
+        AvatarBlock block = this.avatar2proverif.getAvatarSpecification().getBlockWithName(tmp[0]);
+        if (block == null)
+            return null;
+
+        AvatarState state = block.getStateMachine().getStateWithName(tmp[1]);
+        if (state == null)
+            return null;
+
+        return new AvatarPragmaReachability("reachability" + AVATAR2ProVerif.ATTR_DELIM + name, null, block, state);
+    }
+
+    private AvatarState getAvatarStateFromString(String name)
+    {
+        String[] tmp = name.split(AVATAR2ProVerif.ATTR_DELIM);
+        if (tmp.length != 2)
+            return null;
+
+        AvatarBlock block = this.avatar2proverif.getAvatarSpecification().getBlockWithName(tmp[0]);
+        if (block == null)
+            return null;
+
+        AvatarState state = block.getStateMachine().getStateWithName(tmp[1]);
+
+        return state;
     }
 
-    public LinkedList<String> getNonReachableEvents() {
-        return nonReachableEvents;
+    public HashMap<AvatarPragma, ProVerifQueryResult> getResults()
+    {
+        return this.results;
     }
 
-    public LinkedList<AvatarAttribute> getSecretTerms() {
-        LinkedList<AvatarAttribute> result = new LinkedList<AvatarAttribute> ();
-        for (AvatarBlock block: this.avatar2proverif.getAvatarSpecification ().getListOfBlocks ())
-            for (AvatarAttribute attr: block.getAttributes ()) {
-                String trueName = this.avatar2proverif.getTrueName (attr);
-                if (this.secretTerms.contains (trueName))
-                    result.add (attr);
+    public HashMap<AvatarPragmaSecret, ProVerifQueryResult> getConfidentialityResults()
+    {
+        if (this.results == null)
+            return null;
+
+        HashMap<AvatarPragmaSecret, ProVerifQueryResult> resultMap = new HashMap<AvatarPragmaSecret, ProVerifQueryResult> ();
+
+        for (AvatarPragma pragma: this.results.keySet())
+        {
+            if (pragma instanceof AvatarPragmaSecret)
+            {
+                resultMap.put((AvatarPragmaSecret) pragma, this.results.get(pragma));
             }
-        return result;
+        }
+
+        return resultMap;
     }
 
-    // FIXME what about cannot be proved ?
+    public HashMap<AvatarPragmaReachability, ProVerifQueryResult> getReachabilityResults()
+    {
+        if (this.results == null)
+            return null;
 
-	public LinkedList<String> getNonSecretStrings(){
-		return nonSecretTerms;
-	}
+        HashMap<AvatarPragmaReachability, ProVerifQueryResult> resultMap = new HashMap<AvatarPragmaReachability, ProVerifQueryResult> ();
 
-    public LinkedList<AvatarAttribute> getNonSecretTerms() {
-        LinkedList<AvatarAttribute> result = new LinkedList<AvatarAttribute> ();
-        for (AvatarBlock block: this.avatar2proverif.getAvatarSpecification ().getListOfBlocks ())
-            for (AvatarAttribute attr: block.getAttributes ()) {
-                String trueName = this.avatar2proverif.getTrueName (attr);
-                if (this.nonSecretTerms.contains (trueName))
-                    result.add (attr);
+        for (AvatarPragma pragma: this.results.keySet())
+        {
+            if (pragma instanceof AvatarPragmaReachability)
+            {
+                resultMap.put((AvatarPragmaReachability) pragma, this.results.get(pragma));
             }
-        return result;
-    }
+        }
 
-    public LinkedList<String> getSatisfiedAuthenticity() {
-        return satisfiedAuthenticity;
-    }
-    public LinkedList<String> getSatisfiedWeakAuthenticity() {
-        return satisfiedWeakAuthenticity;
+        return resultMap;
     }
 
-    public LinkedList<String> getNonSatisfiedAuthenticity() {
-        return nonSatisfiedAuthenticity;
+    public HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> getAuthenticityResults()
+    {
+        if (this.results == null)
+            return null;
+
+        HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> resultMap = new HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> ();
+
+        for (AvatarPragma pragma: this.results.keySet())
+        {
+            if (pragma instanceof AvatarPragmaAuthenticity)
+            {
+                resultMap.put((AvatarPragmaAuthenticity) pragma, (ProVerifQueryAuthResult) this.results.get(pragma));
+            }
+        }
+
+        return resultMap;
     }
 
     public LinkedList<String> getErrors() {
         return errors;
     }
-
-    public LinkedList<String> getNotProved() {
-        return notproved;
-    }
-
 }
diff --git a/src/proverifspec/ProVerifProcess.java b/src/proverifspec/ProVerifProcess.java
index 70e7613e68ffc578742603be3b8a1db2f2435e18..d8fec78a00e32b776e2ea6af679e613f3579d679 100755
--- a/src/proverifspec/ProVerifProcess.java
+++ b/src/proverifspec/ProVerifProcess.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifProcess extends ProVerifProcInstr {
     protected String name;
     protected ProVerifVar[] args;
diff --git a/src/proverifspec/ProVerifProperty.java b/src/proverifspec/ProVerifProperty.java
new file mode 100644
index 0000000000000000000000000000000000000000..441e4c8b2fb93bd8091f07a702bb04fcfcb89454
--- /dev/null
+++ b/src/proverifspec/ProVerifProperty.java
@@ -0,0 +1,58 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class ProVerifProperty
+ * Creation: 29/05/2017
+ * @version 1.0 29/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package proverifspec;
+
+public class ProVerifProperty implements ProVerifDeclaration {
+    protected String prop;
+
+    public ProVerifProperty (String _prop) {
+        this.prop = _prop;
+    }
+
+    public void translate (ProVerifSyntaxer _syntaxer, int _alinea) {
+        _syntaxer.translateProperty (this, _alinea);
+    }
+}
diff --git a/src/proverifspec/ProVerifQuery.java b/src/proverifspec/ProVerifQuery.java
index 63872723edf3769bb7a8dfbd0173c6e4e2deef79..fbee22ea1c7df72125c1a1ea1b39516d98d9ac0e 100755
--- a/src/proverifspec/ProVerifQuery.java
+++ b/src/proverifspec/ProVerifQuery.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifQuery {
 	public String query;
 
diff --git a/src/proverifspec/ProVerifQueryAuthResult.java b/src/proverifspec/ProVerifQueryAuthResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..63c037f4ef87ef448501cc84f4b545e75cc2e4ed
--- /dev/null
+++ b/src/proverifspec/ProVerifQueryAuthResult.java
@@ -0,0 +1,73 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class ProVerifQueryAuthResult
+ * Creation: 19/05/2017
+ * @version 1.0 19/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package proverifspec;
+
+public class ProVerifQueryAuthResult extends ProVerifQueryResult {
+    protected boolean weakSatisfied, weakProved;
+
+    public ProVerifQueryAuthResult(boolean proved, boolean satisfied)
+    {
+        super(proved, satisfied);
+        this.weakSatisfied = true;
+        this.weakProved = (proved && satisfied);
+    }
+
+    public boolean isWeakProved()
+    {
+        return this.weakProved;
+    }
+
+    public boolean isWeakSatisfied()
+    {
+        return this.weakSatisfied;
+    }
+
+    public void setWeakSatisfied(boolean satisfied)
+    {
+        this.weakProved = true;
+        this.weakSatisfied = satisfied;
+    }
+}
diff --git a/src/proverifspec/ProVerifQueryResult.java b/src/proverifspec/ProVerifQueryResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..c7a1e860418bbf8469578163b60d5bbc766351b2
--- /dev/null
+++ b/src/proverifspec/ProVerifQueryResult.java
@@ -0,0 +1,95 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class ProVerifQueryResult
+ * Creation: 17/05/2017
+ * @version 1.0 17/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package proverifspec;
+
+public class ProVerifQueryResult {
+    protected boolean satisfied, proved;
+    protected ProVerifResultTrace trace;
+
+    public ProVerifQueryResult(boolean proved, boolean satisfied)
+    {
+        this.satisfied = satisfied;
+        this.proved = proved;
+        this.trace = null;
+    }
+
+    public ProVerifQueryResult()
+    {
+        this.proved = true;
+        this.satisfied = true;
+        this.trace = null;
+    }
+
+    public boolean isProved()
+    {
+        return this.proved;
+    }
+
+    public boolean isSatisfied()
+    {
+        return this.satisfied;
+    }
+
+    public void setSatisfied(boolean satisfied)
+    {
+        this.satisfied = satisfied;
+    }
+
+    public void setProved(boolean proved)
+    {
+        this.proved = proved;
+    }
+
+    public void setTrace(ProVerifResultTrace trace)
+    {
+        this.trace = trace;
+    }
+
+    public ProVerifResultTrace getTrace()
+    {
+        return this.trace;
+    }
+}
diff --git a/src/proverifspec/ProVerifResultTrace.java b/src/proverifspec/ProVerifResultTrace.java
new file mode 100644
index 0000000000000000000000000000000000000000..52114fd8670c6385b3ee7b9501273730060d923c
--- /dev/null
+++ b/src/proverifspec/ProVerifResultTrace.java
@@ -0,0 +1,525 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class ProVerifResultTrace
+ * Creation: 22/05/2017
+ * @version 1.0 22/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package proverifspec;
+
+import avatartranslator.toproverif.AVATAR2ProVerif;
+import myutil.TraceManager;
+import ui.AvatarDesignPanel;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDBlock;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ProVerifResultTrace {
+    private static Pattern tracePattern;
+    private static Pattern blockNamePattern;
+    private static Pattern attrPattern;
+
+    private LinkedList<ProVerifResultTraceStep> trace;
+    private StringBuilder buffer;
+    private LinkedList<String> proverifProcess;
+    private HashMap<String, Integer> attackerNamesMap;
+
+
+    static
+    {
+        ProVerifResultTrace.attrPattern = Pattern.compile("\\b((\\w+?)" + AVATAR2ProVerif.ATTR_DELIM + ")?(\\w+?)(" + AVATAR2ProVerif.ATTR_DELIM + "[0-9_]+?)?(_\\d+)?\\b(\\[[^\\]]*\\])?");
+        ProVerifResultTrace.tracePattern = Pattern.compile("^\\d+\\. (.*)$");
+        ProVerifResultTrace.blockNamePattern = Pattern.compile("let \\(=sessionID,=call" + AVATAR2ProVerif.ATTR_DELIM + "(.+?)" + AVATAR2ProVerif.ATTR_DELIM + ".*");
+    }
+
+    private class OutStep implements ProVerifResultTraceStep {
+        private String from;
+        private String to;
+        private String message;
+        private String channel;
+
+        public OutStep(String from, String to, String message, String channel) {
+            this.from = from;
+            this.to = to;
+            this.message = message;
+            this.channel = channel;
+        }
+
+        public boolean messageEquals(String message)
+        {
+            return this.message.equals(message);
+        }
+
+        public void setTo(String to)
+        {
+            this.to = to;
+        }
+
+        public boolean isToAttacker()
+        {
+            return this.to.equals("Attacker");
+        }
+
+        @Override
+        public String describeAsString(AvatarDesignPanel adp)
+        {
+            return "MSG " + this.from + " -- " + this.channel + " --> " + this.to + " : " + ProVerifResultTrace.this.replaceAllAttributeNames(adp, this.message).replaceAll(",", ", ");
+        }
+
+        @Override
+        public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException
+        {
+            writer.write("#" + step + " time=0.000000000 block=" + this.from + " blockdestination=" + this.to + " type=synchro channel=" + this.channel + " params=\"" + ProVerifResultTrace.this.replaceAllAttributeNames(adp, this.message).replaceAll(",", ", ") + "\"");
+            writer.newLine();
+            writer.flush();
+        }
+    }
+
+    private class EventStep implements ProVerifResultTraceStep {
+        private String block;
+        private String name;
+
+        public EventStep (String block, String name)
+        {
+            this.block = block;
+            this.name = name;
+        }
+
+        @Override
+        public String describeAsString(AvatarDesignPanel adp)
+        {
+            return "EV  " + this.block + "." + this.name;
+        }
+
+        @Override
+        public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException
+        {
+            writer.write("#" + step + " time=0.000000000 block=" + this.block + " type=state_entering state="+ this.name);
+            writer.newLine();
+            writer.flush();
+        }
+    }
+
+    private class NewStep implements ProVerifResultTraceStep {
+        private String name;
+
+        public NewStep(String name)
+        {
+            this.name = name;
+        }
+
+        @Override
+        public String describeAsString(AvatarDesignPanel adp)
+        {
+            return "NEW " + ProVerifResultTrace.this.replaceAttributeName(adp, this.name);
+        }
+
+        @Override
+        public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException
+        {
+            writer.write("#" + step + " time=0.000000000 block=Attacker type=function_call func=new parameters=" + ProVerifResultTrace.this.replaceAttributeName(adp, this.name));
+            writer.newLine();
+            writer.flush();
+        }
+    }
+
+    public ProVerifResultTrace(LinkedList<String> proverifProcess)
+    {
+        this.proverifProcess = proverifProcess;
+        this.trace = new LinkedList<ProVerifResultTraceStep> ();
+        this.attackerNamesMap = new HashMap<String, Integer> ();
+        this.buffer = null;
+    }
+
+    public LinkedList<ProVerifResultTraceStep> getTrace()
+    {
+        return this.trace;
+    }
+
+    public void addTraceStep(String str)
+    {
+        Matcher m = this.tracePattern.matcher(str);
+        if (m.matches())
+        {
+            this.finalizeStep();
+            this.buffer = new StringBuilder();
+            str = m.group(1);
+        }
+
+        this.buffer.append(str);
+    }
+
+    private String replaceAttributeName(AvatarDesignPanel adp, String str)
+    {
+        Matcher m = ProVerifResultTrace.attrPattern.matcher(str);
+        if (m.matches())
+        {
+            String part1 = m.group(2);
+            String part2 = m.group(3);
+            Integer s;
+
+            if (part1 == null) {
+                part1 = "Attacker";
+                s = this.attackerNamesMap.get(part1 + AVATAR2ProVerif.ATTR_DELIM + str);
+                if (s == null)
+                    return str;
+            }
+            else
+            {
+                s = this.attackerNamesMap.get(str);
+                if (s != null)
+                {
+                    String [] spl = str.split(AVATAR2ProVerif.ATTR_DELIM, 3);
+                    part1 = spl[0];
+                    part2 = spl[1];
+                }
+            }
+
+            String blockPart = "Attacker";
+            String attrPart = part2;
+            if (!part1.equals("Attacker"))
+            {
+                // TODO: why is it just name and not FQN ?
+                AvatarBDBlock block = adp.getAvatarBDPanel().getBlockFromOwnerName(part1.replaceAll("__", "."));
+                if (block == null)
+                {
+                    TraceManager.addDev("[ERROR] Unknown block : " + part1);
+                    return null;
+                }
+
+                if (s == null)
+                    blockPart = block.getOwnerName();
+
+                String attrName[] = part2.split("__", 2);
+                if (attrName.length >= 2)
+                {
+                    TAttribute attr = block.getAttributeByName(attrName[0]);
+                    if (attr == null)
+                    {
+                        // TODO: can happen when library function ?
+                        TraceManager.addDev("[ERROR] Unknown attribute : " + part2 + " for block " + block.getOwnerName());
+                        attrPart = part2.replaceAll("__", ".");
+                    }
+                    else
+                    {
+                        // TODO: is it possible that subtype is itself composed ?
+                        LinkedList<TAttribute> types = adp.getAvatarBDPanel().getAttributesOfDataType(attr.getTypeOther());
+                        if (types.size() > 1)
+                            attrPart = attrName[0] + "." + attrName[1];
+                        else
+                            attrPart = attrName[0];
+                    }
+                }
+            }
+
+            if (s != null && s.intValue() > 0)
+                attrPart += "_" + s;
+
+            return blockPart + "." + attrPart;
+        }
+
+        return str;
+    }
+
+    private String replaceAllAttributeNames(AvatarDesignPanel adp, String str)
+    {
+        Matcher m = ProVerifResultTrace.attrPattern.matcher(str);
+        String result = "";
+
+        int lastEnd = 0;
+        while (m.find(lastEnd))
+        {
+            result += str.substring(lastEnd, m.start());
+            result += this.replaceAttributeName(adp, m.group(0));
+            lastEnd = m.end();
+        }
+        result += str.substring(lastEnd);
+
+        // Replace pk(...)
+        Pattern p = Pattern.compile("pk\\(([a-zA-Z0-9_.]+)\\)");
+        m = p.matcher(result);
+        lastEnd = 0;
+        str = "";
+        while (m.find(lastEnd))
+        {
+            String replaceBy = m.group(0);
+            for (String pragma: adp.getModelPragmas())
+            {
+                String parts[] = pragma.split("\\s+");
+                if (!parts[0].equals("#PrivatePublicKeys") || parts.length < 4)
+                    continue;
+
+                if (m.group(1).equals(parts[1] + "." + parts[2]))
+                {
+                    replaceBy = parts[1] + "." + parts[3];
+                    break;
+                }
+            }
+
+            str += result.substring(lastEnd, m.start());
+            str += replaceBy;
+            lastEnd = m.end();
+        }
+        str += result.substring(lastEnd);
+
+
+        return str;
+    }
+
+    private String getBlockNameFromLine(int line)
+    {
+        for (int i=line; i>=0; i--)
+        {
+            Matcher m = this.blockNamePattern.matcher(this.proverifProcess.get(i));
+            if (m.matches())
+            {
+                return m.group(1).replaceAll("__", ".");
+            }
+        }
+
+        // This can happen when out(pk(...)) in no process due to pragma PrivatePublicKey
+        return null;
+    }
+
+    private String consumePrecondition(String str)
+    {
+        try {
+            Pattern p = Pattern.compile("The message (.+?) that the attacker may have by (.+?) may be received at input \\{(.+?)\\}\\.(.*)");
+            Matcher m = p.matcher(str);
+            if (m.matches())
+            {
+                String msgName = m.group(1);
+
+                if (msgName.startsWith("chControlEnc")
+                        || msgName.startsWith("strong" + AVATAR2ProVerif.ATTR_DELIM)
+                        || msgName.startsWith("choice" + AVATAR2ProVerif.ATTR_DELIM))
+                    return m.group(4);
+
+                String channelName = "";
+                Matcher m2 = Pattern.compile(AVATAR2ProVerif.CH_ENCRYPT + ".+?__(.+?)\\((.*)\\)").matcher(msgName);
+                if (m2.matches())
+                {
+                    channelName = m2.group(1);
+                    msgName = m2.group(2);
+                }
+
+                boolean foundAStep = false;
+                for (ProVerifResultTraceStep step: this.trace)
+                {
+                    if (step instanceof OutStep)
+                    {
+                        OutStep out = (OutStep) step;
+                        if (out.messageEquals(msgName) && out.isToAttacker())
+                        {
+                            foundAStep = true;
+                            out.setTo(this.getBlockNameFromLine(Integer.parseInt(m.group(3))));
+                            break;
+                        }
+
+                        // TODO: ProVerif does not output twice the out in case of weak authenticity violation...
+                        // It can only be seen in the trace reconstruction phase.
+                    }
+                }
+
+                if (!foundAStep)
+                {
+                    this.trace.add(new OutStep("Attacker", this.getBlockNameFromLine(Integer.parseInt(m.group(3))), msgName, channelName));
+                }
+
+                return m.group(4);
+            }
+
+            p = Pattern.compile("We have (.+?)\\.(.*)");
+            m = p.matcher(str);
+            if (m.matches())
+            {
+                return m.group(2);
+            }
+
+            p = Pattern.compile("The event (.+?)( \\(with environment .+?)? may be executed at \\{(.+?)\\}\\.(.*)");
+            m = p.matcher(str);
+            if (m.matches())
+            {
+                return m.group(4);
+            }
+
+        } catch (NumberFormatException e) {
+            TraceManager.addDev("[ERROR] Parsing int");
+        }
+
+        return null;
+    }
+
+    private void finalizeStep()
+    {
+        if (this.buffer == null)
+            return;
+
+        String str = this.buffer.toString();
+        String newStr = str;
+        while (newStr != null)
+        {
+            str = newStr;
+            newStr = this.consumePrecondition(newStr);
+        }
+
+        if (str.startsWith("By "))
+        {
+
+            return;
+        }
+
+        try {
+            Pattern p = Pattern.compile("(So t|T)he message (.*) may be sent (.*) at output \\{(\\d+)\\}.*");
+            Matcher m = p.matcher(str);
+
+            if (m.matches())
+            {
+                String msgName = m.group(2);
+                if (msgName.startsWith("strong" + AVATAR2ProVerif.ATTR_DELIM)
+                        || msgName.startsWith("choice" + AVATAR2ProVerif.ATTR_DELIM)
+                        || msgName.startsWith("chControlEnc"))
+                    return;
+
+                String blockName = this.getBlockNameFromLine(Integer.parseInt(m.group(4)));
+
+                String channelName = "";
+                m = Pattern.compile(AVATAR2ProVerif.CH_ENCRYPT + ".+?__(.+?)\\((.*)\\)").matcher(msgName);
+                if (m.matches())
+                {
+                    channelName = m.group(1);
+                    msgName = m.group(2);
+                }
+
+                if (blockName != null)
+                    this.trace.add(new OutStep(blockName, "Attacker", msgName, channelName));
+
+                return;
+            }
+
+            p = Pattern.compile("So event (.*) may be executed at \\{(\\d+)\\}( in session .+)?\\..*");
+            m = p.matcher(str);
+            if (m.matches())
+            {
+                String line = m.group(2);
+                p = Pattern.compile("enteringState" + AVATAR2ProVerif.ATTR_DELIM + "[a-zA-Z0-9_]+" + AVATAR2ProVerif.ATTR_DELIM + "([a-zA-Z0-9_]+)");
+                m = p.matcher(m.group(1));
+
+                if (m.matches())
+                {
+                    this.trace.add(new EventStep(this.getBlockNameFromLine(Integer.parseInt(line)), m.group(1)));
+
+                    return;
+                }
+
+                return;
+            }
+
+            p = Pattern.compile("The attacker has some term (.*)\\.attacker\\(\\1\\)\\.");
+            m = p.matcher(str);
+            p = Pattern.compile("We assume as hypothesis thatattacker\\((\\w*)\\)\\.");
+            Matcher m2 = p.matcher(str);
+            if (m.matches() || m2.matches())
+            {
+                String attrName;
+                if (m.matches())
+                    attrName = m.group(1);
+                else
+                    attrName = m2.group(1);
+                String attrName2 = attrName;
+                if (attrName.startsWith("strong" + AVATAR2ProVerif.ATTR_DELIM)
+                        || attrName.startsWith("choice" + AVATAR2ProVerif.ATTR_DELIM))
+                    return;
+
+                m = ProVerifResultTrace.attrPattern.matcher(attrName);
+                if (m.matches())
+                {
+                    String newName = m.group(3);
+                    if (!attrName.contains(AVATAR2ProVerif.ATTR_DELIM))
+                        attrName = "Attacker" + AVATAR2ProVerif.ATTR_DELIM + attrName;
+                    int n = 0;
+                    for (String k: this.attackerNamesMap.keySet())
+                    {
+                        if (newName.equals(k.split(AVATAR2ProVerif.ATTR_DELIM, 3)[1]))
+                        {
+
+                            if (this.attackerNamesMap.get(k) == 0)
+                            {
+                                this.attackerNamesMap.remove(k);
+                                this.attackerNamesMap.put(k, new Integer("1"));
+                                n = 2;
+                                break;
+                            }
+                            else
+                            {
+                                int nn = this.attackerNamesMap.get(k).intValue();
+                                if (nn >= n)
+                                    n = nn+1;
+                            }
+                        }
+                    }
+
+                    this.attackerNamesMap.put(attrName, new Integer(n));
+                        
+                    this.trace.add(new NewStep(attrName2));
+                }
+
+                return;
+            }
+
+        } catch (NumberFormatException e) {
+            TraceManager.addDev("[ERROR] Parsing int");
+        }
+
+        TraceManager.addDev("[DEBUG] unmatch: " + str);
+    }
+
+    public void finalize()
+    {
+        this.finalizeStep();
+    }
+}
diff --git a/src/proverifspec/ProVerifResultTraceStep.java b/src/proverifspec/ProVerifResultTraceStep.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c7d264b177e183eb6a43e2aa8b2524ff031d234
--- /dev/null
+++ b/src/proverifspec/ProVerifResultTraceStep.java
@@ -0,0 +1,56 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class ProVerifResultTraceStep
+ * Creation: 24/05/2017
+ * @version 1.0 24/05/2017
+ * @author Florian LUGOU
+ * @see
+ */
+
+package proverifspec;
+
+import ui.AvatarDesignPanel;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+
+public interface ProVerifResultTraceStep {
+    public String describeAsString(AvatarDesignPanel adp);
+    public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException;
+}
diff --git a/src/proverifspec/ProVerifSpec.java b/src/proverifspec/ProVerifSpec.java
index 39939661bd18665be645b55846801f40286bbb11..fa0bf56badfc96f76c6f81aa4610c86076599a97 100755
--- a/src/proverifspec/ProVerifSpec.java
+++ b/src/proverifspec/ProVerifSpec.java
@@ -45,9 +45,7 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class ProVerifSpec implements ProVerifDeclaration {
diff --git a/src/proverifspec/ProVerifSyntaxer.java b/src/proverifspec/ProVerifSyntaxer.java
index 318cd20b1c2553b1f4d173f983900b77e9cfbc51..f0224b2dc5de683c5425006eb01c0c754abb2ae3 100644
--- a/src/proverifspec/ProVerifSyntaxer.java
+++ b/src/proverifspec/ProVerifSyntaxer.java
@@ -45,8 +45,6 @@
 
 package proverifspec;
 
-import myutil.*;
-
 public abstract class ProVerifSyntaxer {
 
     public static final String DEC = "\t";
@@ -106,6 +104,12 @@ public abstract class ProVerifSyntaxer {
         this.fullSpec +=  " *)";
     }
 
+    protected void translateProperty (ProVerifProperty _node, int _alinea) {
+        this.fullSpec += "\n";
+        this.fullSpec += this.printAlinea (_alinea);
+        this.fullSpec += "set " + _node.prop + ".";
+    }
+
     protected void translateSecrecyAssum (ProVerifSecrecyAssum _node, int _alinea) {
         this.fullSpec += "\n" + this.printAlinea (_alinea);
         this.fullSpec += "not " + _node.name + ".";
diff --git a/src/remotesimulation/CommandParser.java b/src/remotesimulation/CommandParser.java
index b7168efb187236fad11bd3a4625fb6034ef90ce6..fd72c7d98241fbe35edc82da53b04d9e064e9b0c 100755
--- a/src/remotesimulation/CommandParser.java
+++ b/src/remotesimulation/CommandParser.java
@@ -46,10 +46,7 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class CommandParser {
diff --git a/src/remotesimulation/SimulationCommand.java b/src/remotesimulation/SimulationCommand.java
index 4ad532d577bd63e58e756cd3b5c0f513b0f73035..53de6a1820755ae84700abad388c1dc7a2f1839d 100755
--- a/src/remotesimulation/SimulationCommand.java
+++ b/src/remotesimulation/SimulationCommand.java
@@ -46,11 +46,6 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
 public class SimulationCommand {
     public String userCommand;
     public String alias;
diff --git a/src/remotesimulation/SimulationCommandSaveState.java b/src/remotesimulation/SimulationCommandSaveState.java
index 319bd3909ef09a6e7430f721ca8d87af3d28fcee..c7fffc3ff4ae9b5c2e39fd5bc5264f9dacfacae0 100755
--- a/src/remotesimulation/SimulationCommandSaveState.java
+++ b/src/remotesimulation/SimulationCommandSaveState.java
@@ -46,11 +46,6 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
 public class SimulationCommandSaveState extends SimulationCommand {
 
     
diff --git a/src/req/ebrdd/EBRDD.java b/src/req/ebrdd/EBRDD.java
index ae5c55614e367332b2067ac7ec190f4776b05714..1c4787544660727b66439ec914afc532ddf3ee5f 100644
--- a/src/req/ebrdd/EBRDD.java
+++ b/src/req/ebrdd/EBRDD.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
 
 public class EBRDD extends ArrayList<EBRDDComponent> {
     private String name;
diff --git a/src/req/ebrdd/EBRDDAttribute.java b/src/req/ebrdd/EBRDDAttribute.java
index 91d7cea2d32b539a767c67935a54377a44dad2d6..a97d78e4f12b4c539f231667762fdf2250c52482 100755
--- a/src/req/ebrdd/EBRDDAttribute.java
+++ b/src/req/ebrdd/EBRDDAttribute.java
@@ -47,7 +47,8 @@
 
 package req.ebrdd;
 
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
+import tmltranslator.TMLType;
 
 
 public class EBRDDAttribute extends DIPLOElement {
diff --git a/src/req/ebrdd/EBRDDChoice.java b/src/req/ebrdd/EBRDDChoice.java
index 22d0912ec51ca1339fbb7b1d89a4bd79976899b6..d6d9a91404066f1fee9173dc72f0c4bb8c4a677d 100755
--- a/src/req/ebrdd/EBRDDChoice.java
+++ b/src/req/ebrdd/EBRDDChoice.java
@@ -45,9 +45,9 @@
 
 package req.ebrdd;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.ArrayList;
 
 public class EBRDDChoice extends EBRDDComponent {
     private ArrayList<String> guards;
diff --git a/src/req/ebrdd/EBRDDComponent.java b/src/req/ebrdd/EBRDDComponent.java
index 99f487464bb32b3b99dec3217b2b8401a8ca0ae6..f90a21437b99f65850b5c138a68deb789c6b44e5 100644
--- a/src/req/ebrdd/EBRDDComponent.java
+++ b/src/req/ebrdd/EBRDDComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public abstract class EBRDDComponent extends EBRDDGeneralComponent implements Cloneable {
 	protected int nbNext = 1; // -1 means more than 1
diff --git a/src/req/ebrdd/EBRDDERC.java b/src/req/ebrdd/EBRDDERC.java
index c746af2772f903d423c05753b51b5e5fb0fb398c..745c8858343a972649e17b65d71b0aff50b0524a 100644
--- a/src/req/ebrdd/EBRDDERC.java
+++ b/src/req/ebrdd/EBRDDERC.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class EBRDDERC extends EBRDDComponent {
diff --git a/src/req/ebrdd/EBRDDGeneralComponent.java b/src/req/ebrdd/EBRDDGeneralComponent.java
index 771806f57048969c09b18df5d9819ea32ea6e76f..f6296e753af1f4e7b9cfc1e5eaa5c04f91ea7393 100644
--- a/src/req/ebrdd/EBRDDGeneralComponent.java
+++ b/src/req/ebrdd/EBRDDGeneralComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
 
 public abstract class EBRDDGeneralComponent extends DIPLOElement  {
 	protected Object referenceObject;
diff --git a/src/req/ebrdd/EBRDDSequence.java b/src/req/ebrdd/EBRDDSequence.java
index ea81c08a5d7dc7b6b0ac29144bdbe40bb990aba6..a134c044e3d6aa749a4e0eaaad3a1bfcc4db2052 100644
--- a/src/req/ebrdd/EBRDDSequence.java
+++ b/src/req/ebrdd/EBRDDSequence.java
@@ -45,7 +45,8 @@
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class EBRDDSequence extends EBRDDComponent{
diff --git a/src/req/ebrdd/ERB.java b/src/req/ebrdd/ERB.java
index 8b667702ed3864217d392144974633d1e8eedcec..3d6cc4f0ddfa5a334233c3e1049b3752128f816e 100644
--- a/src/req/ebrdd/ERB.java
+++ b/src/req/ebrdd/ERB.java
@@ -46,8 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
 public class ERB extends ERCElement  {
 	
 	protected String evt, condition, action; 
diff --git a/src/req/ebrdd/ERCElement.java b/src/req/ebrdd/ERCElement.java
index 5334b68e99fec620dde989d835046b9c22421301..5ee82a8a918a23bf08fb57c20fec8f9020304bff 100644
--- a/src/req/ebrdd/ERCElement.java
+++ b/src/req/ebrdd/ERCElement.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
 public abstract class ERCElement extends EBRDDGeneralComponent implements Cloneable {
     protected boolean negated;
 	
diff --git a/src/req/ebrdd/ESO.java b/src/req/ebrdd/ESO.java
index 4ef1fd7700b406d7a4ee534b167c2f543a260e60..7659ca24aea7680a64feb0778d4de0c26de88dc6 100644
--- a/src/req/ebrdd/ESO.java
+++ b/src/req/ebrdd/ESO.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class ESO extends ERCElement {
 	public final static String [] ESOSTR = {"Conjunction", "Disjunction", "Sequence", "Strict sequence", "Simultaneous", "At least/At most"};
diff --git a/src/sddescription/HMSC.java b/src/sddescription/HMSC.java
index 309dfb85551ee5e84e3fe2e14a16ec1274a551e7..f59a6027142838f9ae544ff711819f8ff1c5f265 100755
--- a/src/sddescription/HMSC.java
+++ b/src/sddescription/HMSC.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class HMSC {
     private String name;
diff --git a/src/sddescription/HMSCNode.java b/src/sddescription/HMSCNode.java
index 83bdeaabeffe2fc2b913ead9eb8ac7d0e040c4b0..032f7c507f95f6b4c083b5e4a5614bed3fb80f16 100755
--- a/src/sddescription/HMSCNode.java
+++ b/src/sddescription/HMSCNode.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class HMSCNode extends HMSCElement {
     
diff --git a/src/sddescription/MSC.java b/src/sddescription/MSC.java
index 14c5b3526a038c618603ecd6e1485680971e1f35..c18b4c7b38aaedf9166bf39b74e2bb649bfc1e4d 100755
--- a/src/sddescription/MSC.java
+++ b/src/sddescription/MSC.java
@@ -45,7 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class MSC extends HMSCElement {
     private HMSCNode nextNode;
diff --git a/src/sddescription/SDExchange.java b/src/sddescription/SDExchange.java
index dbae83d6261ce1427ad2dd2d4f2ff06a792111a5..b95dac27152d0575afb08f3ef96d493f7231968b 100755
--- a/src/sddescription/SDExchange.java
+++ b/src/sddescription/SDExchange.java
@@ -45,13 +45,19 @@
 
 package sddescription;
 
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ListIterator;
 
 public class SDExchange {
 	private MSC msc;
diff --git a/src/sdtranslator/ActionEvt.java b/src/sdtranslator/ActionEvt.java
index 36023ffaa6339c0bf0caa232d4df277db7f0a991..3a0bbbe0800f3cf23f9213b5b864bbca64e27744 100755
--- a/src/sdtranslator/ActionEvt.java
+++ b/src/sdtranslator/ActionEvt.java
@@ -45,11 +45,11 @@
 
 package sdtranslator;
 
-import sddescription.*;
+import myutil.Conversion;
+import sddescription.Evt;
 import translator.*;
-import myutil.*;
 
-import java.util.*;
+import java.util.Vector;
 
 public class ActionEvt {
     
diff --git a/src/sdtranslator/ActionInstance.java b/src/sdtranslator/ActionInstance.java
index a8ef9860ae80ce578c66ad7fc3def1f2280d6b36..1e1e49103159351bca8e55095479be9952c5a987 100755
--- a/src/sdtranslator/ActionInstance.java
+++ b/src/sdtranslator/ActionInstance.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.Instance;
+import sddescription.MSC;
+import translator.ADComponent;
+import translator.TClass;
 
 
 
diff --git a/src/sdtranslator/EvtToLink.java b/src/sdtranslator/EvtToLink.java
index f5e8f9a2e65739a125eac82aff1db16baa5a075e..c73d55d66a3af048da1bc211205e4d2f1919a173 100755
--- a/src/sdtranslator/EvtToLink.java
+++ b/src/sdtranslator/EvtToLink.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.Evt;
+import translator.Gate;
+import translator.Param;
+import translator.TClass;
 
 public class EvtToLink {
     public static final int SYNC = 0;
diff --git a/src/sdtranslator/SDTranslator.java b/src/sdtranslator/SDTranslator.java
index 8cac6296390c82cea15718dcd73e195194623fe2..d4961a09b0910df14a421498f5ea576c73c852ca 100755
--- a/src/sdtranslator/SDTranslator.java
+++ b/src/sdtranslator/SDTranslator.java
@@ -48,7 +48,9 @@ package sdtranslator;
 import sddescription.*;
 import translator.*;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class SDTranslator {
diff --git a/src/sdtranslator/TimeConstraintLink.java b/src/sdtranslator/TimeConstraintLink.java
index e91486f3137afcad795923a421f0d5e6823dca30..39b64d935a8d6bb619f697b191c62d93779d48eb 100755
--- a/src/sdtranslator/TimeConstraintLink.java
+++ b/src/sdtranslator/TimeConstraintLink.java
@@ -45,8 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.MSC;
+import sddescription.TimeConstraint;
+import translator.AbsoluteTimeConstraintTClass;
+import translator.Gate;
+import translator.RelativeTimeConstraintTClass;
+import translator.TimeConstraintTClass;
 
 public class TimeConstraintLink {
     
diff --git a/src/tepe/TEPE.java b/src/tepe/TEPE.java
index 1e0625cf5c42b7d857e27bb9f61c31b2d6862e4b..37b66ad9ead2980fbffeb26396c7f2299410d4f4 100644
--- a/src/tepe/TEPE.java
+++ b/src/tepe/TEPE.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public class TEPE extends Vector<TEPEComponent> {
     private String name;
diff --git a/src/tepe/TEPEAliasComponent.java b/src/tepe/TEPEAliasComponent.java
index 63a73d3511a78ff5644f7301930280cac91fea34..c223285f4e987f8e975e9f8a2311ee4f184f7a3c 100644
--- a/src/tepe/TEPEAliasComponent.java
+++ b/src/tepe/TEPEAliasComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEAliasComponent extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEAttributeComponent.java b/src/tepe/TEPEAttributeComponent.java
index 74b0c4dbd6a3d7bab27c2920d511e39bd02ad2ed..8d78e3cabc0ab37b40c2d1023a8f0ced541d73c4 100644
--- a/src/tepe/TEPEAttributeComponent.java
+++ b/src/tepe/TEPEAttributeComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEAttributeComponent  extends TEPEComponent  {
 	protected String blockName;
diff --git a/src/tepe/TEPEComponent.java b/src/tepe/TEPEComponent.java
index 73de9b585e8e9ef47854c5dcea980c04d9da2889..3471ccfaa1b9ef6bf85a43d062c89bdc65043473 100644
--- a/src/tepe/TEPEComponent.java
+++ b/src/tepe/TEPEComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public abstract class TEPEComponent  {
 	private static int ID = 0;
diff --git a/src/tepe/TEPEEquationComponent.java b/src/tepe/TEPEEquationComponent.java
index 6d3be09dde9c5785eba88fd7606e55518ab4f94b..b1245f6891ba63b636da522d9544b04f46d301ed 100644
--- a/src/tepe/TEPEEquationComponent.java
+++ b/src/tepe/TEPEEquationComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEEquationComponent  extends TEPEComponent   {
 	
diff --git a/src/tepe/TEPELogicalConstraintComponent.java b/src/tepe/TEPELogicalConstraintComponent.java
index 5d9f9541797f3e7011393e72ca6418e025dccd64..70201c69120f25cf19bcea3989cc9e82bb03fec1 100644
--- a/src/tepe/TEPELogicalConstraintComponent.java
+++ b/src/tepe/TEPELogicalConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPELogicalConstraintComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEPropertyComponent.java b/src/tepe/TEPEPropertyComponent.java
index dc06b3904ce08c17360631965ecaf8d1a04ad81f..35cce0bf2d8dce2b6e0bc0a338a4de07eb9335bd 100644
--- a/src/tepe/TEPEPropertyComponent.java
+++ b/src/tepe/TEPEPropertyComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEPropertyComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEPropertyOperatorComponent.java b/src/tepe/TEPEPropertyOperatorComponent.java
index 3998ccf151e751ee6a44eece28f3445a65a7288d..54efa05d9a0b00e941b3327a17f59b081904d7d3 100644
--- a/src/tepe/TEPEPropertyOperatorComponent.java
+++ b/src/tepe/TEPEPropertyOperatorComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEPropertyOperatorComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPESettingComponent.java b/src/tepe/TEPESettingComponent.java
index 676277b20366d3a13529e71b517ced4589274676..f0d571629ee7f7f43679a8ddf90f295cfca48ac9 100644
--- a/src/tepe/TEPESettingComponent.java
+++ b/src/tepe/TEPESettingComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPESettingComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPESignalComponent.java b/src/tepe/TEPESignalComponent.java
index 251e88869815bbafb0898f3e1a7aab76ad393992..4dfe9147f59552a062210ea24252363c76b3d774 100644
--- a/src/tepe/TEPESignalComponent.java
+++ b/src/tepe/TEPESignalComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPESignalComponent  extends TEPEComponent  {
 	protected String blockName;
diff --git a/src/tepe/TEPETimeConstraintComponent.java b/src/tepe/TEPETimeConstraintComponent.java
index 470be3245c644883adda5890ea7437cf663b8735..48e1c0e353a81fab48ce3fd506d602509f56cc5a 100644
--- a/src/tepe/TEPETimeConstraintComponent.java
+++ b/src/tepe/TEPETimeConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPETimeConstraintComponent  extends TEPEComponent  {
 	
diff --git a/src/tmatrix/RequirementModeling.java b/src/tmatrix/RequirementModeling.java
index 2cb02d15a94809b262d95838fc7044e99847d2c4..814a1e9dfafcd7699abeaa8aace2f45b7fa0d5ab 100755
--- a/src/tmatrix/RequirementModeling.java
+++ b/src/tmatrix/RequirementModeling.java
@@ -47,14 +47,19 @@
 
 package tmatrix;
 
-import java.util.*;
-
-
+import sddescription.HMSC;
+import sdtranslator.SDTranslationException;
+import sdtranslator.SDTranslator;
 import translator.*;
 import ui.*;
-import ui.req.*;
-import sddescription.*;
-import sdtranslator.*;
+import ui.req.Requirement;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementObserver;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class RequirementModeling {
     protected static final String NOT_FORMAL = "Requirement is not a formal requirement";
diff --git a/src/tmatrix/Requirements.java b/src/tmatrix/Requirements.java
index 0259c5d30ed8ea5fc3d4a58abcd312922c62c0b9..c48a79ee06831b27cd2d58c7f4e0ee8a2886dc97 100755
--- a/src/tmatrix/Requirements.java
+++ b/src/tmatrix/Requirements.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmatrix;
 
-import translator.*;
-import ui.req.*;
-import ui.graph.*;
+import translator.TURTLEModeling;
+import ui.graph.AUTGraph;
+import ui.req.Requirement;
+import ui.req.RequirementObserver;
 
 public class Requirements {
     public Requirement req;
diff --git a/src/tmltranslator/DIPLOElement.java b/src/tmltranslator/DIPLOElement.java
index 06fe55e0bd6865809541778337ccfe150c6802d0..46ea4fc6e583dbdea0d9843042a28235d7cc2196 100755
--- a/src/tmltranslator/DIPLOElement.java
+++ b/src/tmltranslator/DIPLOElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import myutil.*;
+import myutil.TraceManager;
 
 public class DIPLOElement {
 	
diff --git a/src/tmltranslator/HwBridge.java b/src/tmltranslator/HwBridge.java
index 1a5a068290505116ec8dbb902db45df95e335567..ef8367a9fc52907026f16da0b1cd40bc292af109 100755
--- a/src/tmltranslator/HwBridge.java
+++ b/src/tmltranslator/HwBridge.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class HwBridge extends HwCommunicationNode  {
diff --git a/src/tmltranslator/HwCPU.java b/src/tmltranslator/HwCPU.java
index 35e63f80b39c2e26c26e369b6b52eee4948eb3c9..62bd7f6d6e8f7f47b9d92fdb1b2b55121d11d2df 100755
--- a/src/tmltranslator/HwCPU.java
+++ b/src/tmltranslator/HwCPU.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.modelcompiler.CpuMEC;
 
 
 public class HwCPU extends HwExecutionNode  {
diff --git a/src/tmltranslator/HwNode.java b/src/tmltranslator/HwNode.java
index 4f0be4994e5110c0c983c8ce8ae7fac138b7f24b..d8b39813abed559bf9f5e2b3d2ecbe8e80534b3d 100755
--- a/src/tmltranslator/HwNode.java
+++ b/src/tmltranslator/HwNode.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
 
 
 public abstract class HwNode extends DIPLOElement  {
diff --git a/src/tmltranslator/SecurityPattern.java b/src/tmltranslator/SecurityPattern.java
index 557d3f5fa0958bac4ce66725ce35c32e1b2d4e57..ca20a6c43dfbceb54600deeba048abcf41106aa6 100644
--- a/src/tmltranslator/SecurityPattern.java
+++ b/src/tmltranslator/SecurityPattern.java
@@ -1,5 +1,6 @@
 package tmltranslator;
-import avatartranslator.*;
+
+import avatartranslator.AvatarState;
 
 public class SecurityPattern {
 
diff --git a/src/tmltranslator/TMLActivity.java b/src/tmltranslator/TMLActivity.java
index bfd3952a74f36a04cd5e0183a0aa464d6e9d5b6f..d7bb885d971fdf8e30ea0453a9c712ee81b0d4f5 100755
--- a/src/tmltranslator/TMLActivity.java
+++ b/src/tmltranslator/TMLActivity.java
@@ -45,9 +45,10 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Vector;
 
 
 public class TMLActivity extends TMLElement {
diff --git a/src/tmltranslator/TMLActivityElement.java b/src/tmltranslator/TMLActivityElement.java
index f3fb5be3cc6b60b69dea42a9545b31eeb0406bfb..4e9ea23bfa23bd5c8909d397d35075e85e51d5a6 100755
--- a/src/tmltranslator/TMLActivityElement.java
+++ b/src/tmltranslator/TMLActivityElement.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLActivityElement extends TMLElement{
diff --git a/src/tmltranslator/TMLActivityElementChannel.java b/src/tmltranslator/TMLActivityElementChannel.java
index e8e466d5f9e878a28c6bf92c252c4ba2f22495e0..7f15af4949ffdfb7a3eb0282e41992cb9d412ce9 100755
--- a/src/tmltranslator/TMLActivityElementChannel.java
+++ b/src/tmltranslator/TMLActivityElementChannel.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class TMLActivityElementChannel extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLActivityElementEvent.java b/src/tmltranslator/TMLActivityElementEvent.java
index b79b454af4622c2f94a22149b93fca7c4b1b1aaa..02025e71e0af2fc48caab315d432230213ce3527 100755
--- a/src/tmltranslator/TMLActivityElementEvent.java
+++ b/src/tmltranslator/TMLActivityElementEvent.java
@@ -45,7 +45,8 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.List;
+import java.util.Vector;
 
 
 public abstract class TMLActivityElementEvent extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLArchiTextSpecification.java b/src/tmltranslator/TMLArchiTextSpecification.java
index 79aeffd9b0dca3def8cfd5b0c72fc42915a810ad..9207907484cfcdf77e387e68f44854f721d549ce 100755
--- a/src/tmltranslator/TMLArchiTextSpecification.java
+++ b/src/tmltranslator/TMLArchiTextSpecification.java
@@ -47,9 +47,14 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLArchiTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLArchitecture.java b/src/tmltranslator/TMLArchitecture.java
index fc058325bba1567ea363cad3072a8098c945f8a1..cbb1d9427c108c6f52dff36ce732bfd35a960d98 100755
--- a/src/tmltranslator/TMLArchitecture.java
+++ b/src/tmltranslator/TMLArchitecture.java
@@ -45,9 +45,10 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLArchitecture {
     private List<HwNode> hwnodes;
diff --git a/src/tmltranslator/TMLCP.java b/src/tmltranslator/TMLCP.java
index 81735f2db53ebe55d0dacbaa386bc02d70ee3fc9..0a4f468f879344423c79ad709ec5173baff40d69 100755
--- a/src/tmltranslator/TMLCP.java
+++ b/src/tmltranslator/TMLCP.java
@@ -46,9 +46,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import tmltranslator.tmlcp.*;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
 public class TMLCP extends TMLElement {
 
     private TMLCPActivityDiagram mainCP;
diff --git a/src/tmltranslator/TMLCPError.java b/src/tmltranslator/TMLCPError.java
index a7b8960dd00eb4fadfa812c59da4341c16070f6b..5332c40c7ff65298fd8b0803d0c38ac0f320e6b2 100755
--- a/src/tmltranslator/TMLCPError.java
+++ b/src/tmltranslator/TMLCPError.java
@@ -47,7 +47,7 @@
 
 package tmltranslator;
 
-import tmltranslator.tmlcp.*;
+import tmltranslator.tmlcp.TMLCPElement;
 
 public class TMLCPError {
     
diff --git a/src/tmltranslator/TMLCPLib.java b/src/tmltranslator/TMLCPLib.java
index 30e0f0db5169fd5f8ab1f2d08c992771bb03eb66..98a40299d7f2e4c492bd127cbe86d00f4d7db276 100755
--- a/src/tmltranslator/TMLCPLib.java
+++ b/src/tmltranslator/TMLCPLib.java
@@ -46,7 +46,9 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class TMLCPLib extends TMLElement {
 
diff --git a/src/tmltranslator/TMLCPLibArtifact.java b/src/tmltranslator/TMLCPLibArtifact.java
index e97961147c0a27dc2e5ad0d1b39d51498e0a823e..9e3dc6bf476ded371aaafedc9d23f7cc6a6b8866 100755
--- a/src/tmltranslator/TMLCPLibArtifact.java
+++ b/src/tmltranslator/TMLCPLibArtifact.java
@@ -46,7 +46,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.List;
 
 public class TMLCPLibArtifact extends TMLElement {
 
diff --git a/src/tmltranslator/TMLCPSyntaxChecking.java b/src/tmltranslator/TMLCPSyntaxChecking.java
index c07c83dc83dfd52a2cb59f160bf25b1faf10997b..8223a527083bf5d6173a1f62459df284bebbf150 100755
--- a/src/tmltranslator/TMLCPSyntaxChecking.java
+++ b/src/tmltranslator/TMLCPSyntaxChecking.java
@@ -48,11 +48,15 @@
 
 package tmltranslator;
 
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
 import tmltranslator.tmlcp.*;
 
+import java.io.StringReader;
+import java.util.*;
+
 
 public class TMLCPSyntaxChecking {
 
diff --git a/src/tmltranslator/TMLCPTextSpecification.java b/src/tmltranslator/TMLCPTextSpecification.java
index 0e69dc2f1873348e7ce6fbbfca688e943c4ceb31..f81eec7979d0ee8a42bcc5fd7cfdb7883f390e82 100755
--- a/src/tmltranslator/TMLCPTextSpecification.java
+++ b/src/tmltranslator/TMLCPTextSpecification.java
@@ -48,10 +48,13 @@
 
 package tmltranslator;
 
-import java.util.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.tmlcp.*;
 
+import java.util.*;
+
 public class TMLCPTextSpecification {
     public final static String CR = "\n";
     public final static String SP = " ";
diff --git a/src/tmltranslator/TMLChannel.java b/src/tmltranslator/TMLChannel.java
index 08c5561927e04b6e222dbc4c329553d016743759..885e9a27ec2fc030a403a717019f16eacae050e7 100755
--- a/src/tmltranslator/TMLChannel.java
+++ b/src/tmltranslator/TMLChannel.java
@@ -45,11 +45,12 @@
 
 package tmltranslator;
 
-import myutil.*;
-
-import java.util.*;
+import myutil.TraceManager;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TMLChannel extends TMLCommunicationElement {
 
     public static final int BRBW = 0;
diff --git a/src/tmltranslator/TMLChoice.java b/src/tmltranslator/TMLChoice.java
index ce2f4e58b3cfb60cd9715615d9bd1194fada5482..17b004bb1919e2e1a60aebd2f89c9bf459ebf921 100755
--- a/src/tmltranslator/TMLChoice.java
+++ b/src/tmltranslator/TMLChoice.java
@@ -45,9 +45,9 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.ArrayList;
 
 public class TMLChoice extends TMLActivityElement{
     private ArrayList<String> guards;
diff --git a/src/tmltranslator/TMLCommunicationElement.java b/src/tmltranslator/TMLCommunicationElement.java
index 79155b7557b6f24ad8b028a9aa219d765657f093..0d3656ff21e60197b67452323fa85b70c3c5c7c5 100755
--- a/src/tmltranslator/TMLCommunicationElement.java
+++ b/src/tmltranslator/TMLCommunicationElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import myutil.*;
+import myutil.TraceManager;
 
 public abstract class TMLCommunicationElement extends TMLElement {
    //private boolean infected;
diff --git a/src/tmltranslator/TMLEvent.java b/src/tmltranslator/TMLEvent.java
index df2d2d805381b27d7be759fb5622da51eade173f..b70648bdde5a8a2d4db6d3271a190deaa3ef9946 100755
--- a/src/tmltranslator/TMLEvent.java
+++ b/src/tmltranslator/TMLEvent.java
@@ -45,9 +45,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLEvent extends TMLCommunicationElement {
     // Options
     protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLMapping.java b/src/tmltranslator/TMLMapping.java
index 84d34aee0774ea207e553200c975fc14ab20c45a..b554cc71acc587db23c9e6e88d20aec730e5c00a 100755
--- a/src/tmltranslator/TMLMapping.java
+++ b/src/tmltranslator/TMLMapping.java
@@ -46,10 +46,13 @@
 
 package tmltranslator;
 
+import myutil.TraceManager;
+import tmltranslator.toproverif.TML2ProVerif;
+import ui.CorrespondanceTGElement;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+
 import java.util.*;
-import myutil.*;
-import tmltranslator.toproverif.*;
-import ui.*;
 
 public class TMLMapping {
 
diff --git a/src/tmltranslator/TMLMappingTextSpecification.java b/src/tmltranslator/TMLMappingTextSpecification.java
index 34467f6a47e567499fa788f71205a421e0c02f5f..ed288cd17472b2b8ce7bede6669c197c32d34d1e 100755
--- a/src/tmltranslator/TMLMappingTextSpecification.java
+++ b/src/tmltranslator/TMLMappingTextSpecification.java
@@ -47,9 +47,15 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLMappingTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLModeling.java b/src/tmltranslator/TMLModeling.java
index 281c13a28ff015a45d65540988a466ae30318281..68a5e362b256a528c06445bd8512a14bac459972 100755
--- a/src/tmltranslator/TMLModeling.java
+++ b/src/tmltranslator/TMLModeling.java
@@ -45,13 +45,20 @@
 
 package tmltranslator;
 
-import java.util.*;
-import myutil.*;
-import ui.TGComponent;
-import ui.tmlcompd.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.Conversion;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
 import ui.TAttribute;
-import avatartranslator.*;
-import proverifspec.*;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
 
 
 public class TMLModeling {
@@ -693,14 +700,21 @@ public class TMLModeling {
 
     public void backtrace(ProVerifOutputAnalyzer pvoa, String mappingName){
         //System.out.println("Backtracing Confidentiality");
-        LinkedList<AvatarAttribute> secretAttributes = pvoa.getSecretTerms ();
-        LinkedList<AvatarAttribute> nonSecretAttributes = pvoa.getNonSecretTerms ();
-        for (AvatarAttribute attr: secretAttributes){
+        HashMap<AvatarPragmaSecret, ProVerifQueryResult> confResults = pvoa.getConfidentialityResults();
+
+        for (AvatarPragmaSecret pragma: confResults.keySet()) {
+            ProVerifQueryResult result = confResults.get(pragma);
+            if (!result.isProved())
+                continue;
+            int r = result.isSatisfied() ? 2 : 3;
+
+            AvatarAttribute attr = pragma.getArg();
+
             TMLChannel channel = getChannelByShortName(attr.getName().replaceAll("_chData",""));
             if (channel!=null){
                 for (TMLCPrimitivePort port:channel.ports){
                     if (port.checkConf){
-                        port.checkConfStatus = 2;
+                        port.checkConfStatus = r;
                         port.mappingName= mappingName;
                     }
                 }
@@ -709,7 +723,7 @@ public class TMLModeling {
             if (req !=null){
                 for (TMLCPrimitivePort port: req.ports){
                     if (port.checkConf){
-                        port.checkConfStatus = 2;
+                        port.checkConfStatus = r;
                         port.mappingName= mappingName;
                     }
                 }
@@ -717,23 +731,24 @@ public class TMLModeling {
             TMLEvent ev = getEventByName(attr.getName().replaceAll("_eventData",""));
             if (ev !=null){
                 if (ev.port.checkConf){
-                    ev.port.checkConfStatus=2;
+                    ev.port.checkConfStatus=r;
                     ev.port.mappingName= mappingName;
                 }
                 if (ev.port2.checkConf){
-                    ev.port2.checkConfStatus=2;
+                    ev.port2.checkConfStatus=r;
                     ev.port2.mappingName=mappingName;
                 }
             }
             List<String> channels=secChannelMap.get(attr.getName());
-			for (String channelName: channels){
-      //      if (channelName!=null){
-                channel = getChannelByShortName(channelName);
-                if (channel!=null){
-                    for (TMLCPrimitivePort port:channel.ports){
-                        if (port.checkConf){
-                            port.checkSecConfStatus = 2;
-                            port.secName= attr.getName();
+            if (channels != null) {
+                for (String channelName: channels) {
+                    channel = getChannelByShortName(channelName);
+                    if (channel!=null){
+                        for (TMLCPrimitivePort port:channel.ports){
+                            if (port.checkConf){
+                                port.checkSecConfStatus = r;
+                                port.secName= attr.getName();
+                            }
                         }
                     }
                 }
@@ -747,365 +762,322 @@ public class TMLModeling {
                     comp.mappingName=mappingName;
                     for (TAttribute a: comp.getAttributes ())
                         if (a.getId().equals(attr.getName()))
-                            a.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_OK);
+                            a.setConfidentialityVerification(result.isSatisfied() ? TAttribute.CONFIDENTIALITY_OK : TAttribute.CONFIDENTIALITY_KO);
                 }
             }
         }
-        for (AvatarAttribute attr: nonSecretAttributes){
-            TMLChannel channel = getChannelByShortName(attr.getName().replaceAll("_chData",""));
-            if (channel!=null){
-                for (TMLCPrimitivePort port:channel.ports){
-                    if (port.checkConf){
-                        port.checkConfStatus = 3;
-                        port.mappingName= mappingName;
-                    }
-                }
-            }
-            TMLRequest req = getRequestByName(attr.getName().replaceAll("_reqData",""));
-            if (req !=null){
-                for (TMLCPrimitivePort port: req.ports){
-                    if (port.checkConf){
-                        port.checkConfStatus = 3;
-                        port.mappingName= mappingName;
-                    }
-                }
-            }
-            TMLEvent ev = getEventByName(attr.getName().replaceAll("_eventData",""));
-            if (ev !=null){
-                if (ev.port.checkConf){
-                    ev.port.checkConfStatus=3;
-                    ev.port.mappingName= mappingName;
-                }
-                if (ev.port2.checkConf){
-                    ev.port2.checkConfStatus=3;
-                    ev.port2.mappingName= mappingName;
-                }
-            }
-            List<String> channels=secChannelMap.get(attr.getName());
-			for (String channelName: channels){
-//            if (channelName!=null){
-                channel = getChannelByShortName(channelName);
+    }
+
+    public void backtraceAuthenticity(HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> authenticityResults, String mappingName) {
+        //      System.out.println("Backtracing Authenticity");
+        for (AvatarPragmaAuthenticity pragma: authenticityResults.keySet()) {
+            ProVerifQueryAuthResult result = authenticityResults.get(pragma);
+            // TODO: deal directly with pragma instead of s
+            String s = pragma.getAttrB().getAttribute().getBlock().getName()
+                + "__" + pragma.getAttrB().getAttribute().getName()
+                + "__" + pragma.getAttrB().getState().getName()
+                + " ==> "
+                + pragma.getAttrA().getAttribute().getBlock().getName()
+                + "__" + pragma.getAttrA().getAttribute().getName()
+                + "__" + pragma.getAttrA().getState().getName();
+
+            if (result.isProved() && result.isSatisfied())
+            {
+                String signalName = s.split("_chData")[0];
+                /*for (TMLTask t: getTasks()){
+                  if (signalName.contains(t.getName())){
+                  signalName = signalName.replace(t.getName()+"__","");
+                  }
+                  }*/
+                signalName = signalName.split("__")[1];
+                TMLChannel channel = getChannelByShortName(signalName);
                 if (channel!=null){
                     for (TMLCPrimitivePort port:channel.ports){
-                        if (port.checkConf){
-                            port.checkSecConfStatus = 3;
-                            port.secName= attr.getName();
+                        if (port.checkAuth){
+                            port.checkStrongAuthStatus = 2;
+                            port.mappingName= mappingName;
                         }
                     }
                 }
-            }
-            for (TMLTask t:getTasks()){
-                if (t.getReferenceObject() instanceof TMLCPrimitiveComponent){
-                    TMLCPrimitiveComponent comp = (TMLCPrimitiveComponent) t.getReferenceObject();
-                    comp.mappingName=mappingName;
-                    for (TAttribute a: comp.getAttributes ())
-                        if (a.getId().equals(attr.getName()) &&t.getName().equals(attr.getBlock().getName()))
-                            a.setConfidentialityVerification(TAttribute.CONFIDENTIALITY_KO);
-                }
-            }
-        }
-        return;
-    }
-    public void backtraceAuthenticity(LinkedList<String> satisfiedAuthenticity, LinkedList<String> satisfiedWeakAuthenticity,LinkedList<String> nonSatisfiedAuthenticity, String mappingName){
-		System.out.println("secchannelmap " + secChannelMap);
-        //      System.out.println("Backtracing Authenticity");
-        for (String s: satisfiedAuthenticity){
-            String signalName = s.split("_chData")[0];
-            /*for (TMLTask t: getTasks()){
-              if (signalName.contains(t.getName())){
-              signalName = signalName.replace(t.getName()+"__","");
-              }
-              }*/
-            signalName = signalName.split("__")[1];
-            TMLChannel channel = getChannelByShortName(signalName);
-            if (channel!=null){
-                for (TMLCPrimitivePort port:channel.ports){
-                    if (port.checkAuth){
-                        port.checkStrongAuthStatus = 2;
-                        port.mappingName= mappingName;
+                signalName = s.split("_reqData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
                     }
-                }
-            }
-            signalName = s.split("_reqData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
-                }
-            }
-            TMLRequest req = getRequestByName(signalName);
-            if (req !=null){
-                for (TMLCPrimitivePort port: req.ports){
-                    if (port.checkAuth){
-                        port.checkStrongAuthStatus = 2;
-                        port.mappingName= mappingName;
+                }     
+                TMLRequest req = getRequestByName(signalName);
+                if (req !=null){
+                    for (TMLCPrimitivePort port: req.ports){
+                        if (port.checkAuth){
+                            port.checkStrongAuthStatus = 2;
+                            port.mappingName= mappingName;
+                        }
                     }
                 }
-            }
-            signalName = s.split("_eventData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
+                signalName = s.split("_eventData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
+                    }
                 }
-            }
-            TMLEvent ev = getEventByName(signalName);
-            if (ev !=null){
-                if (ev.port.checkAuth){
-                    ev.port.checkStrongAuthStatus=2;
-                    ev.port2.mappingName= mappingName;
+                TMLEvent ev = getEventByName(signalName);
+                if (ev !=null){
+                    if (ev.port.checkAuth){
+                        ev.port.checkStrongAuthStatus=2;
+                        ev.port2.mappingName= mappingName;
+                    }
+                    if (ev.port2.checkAuth){
+                        ev.port2.checkStrongAuthStatus=2;
+                        ev.port2.mappingName= mappingName;
+                    }
                 }
-                if (ev.port2.checkAuth){
-                    ev.port2.checkStrongAuthStatus=2;
-                    ev.port2.mappingName= mappingName;
+
+                signalName = s.split("__decrypt")[0];
+                /*for (TMLTask t: getTasks()){
+                  if (signalName.contains(t.getName())){
+                  signalName = signalName.replace(t.getName()+"__","");
+                  }
+                  }*/
+                signalName=signalName.split("__")[1];
+                List<String> channels=secChannelMap.get(signalName);
+                if (channels!=null) {
+                    for (String channelName: channels) {
+                        channel = getChannelByShortName(channelName);
+                        if (channel!=null){
+                            for (TMLCPrimitivePort port:channel.ports){
+                                if (port.checkAuth){
+                                    port.checkStrongAuthStatus = 2;
+                                    port.secName= signalName;
+                                }
+                            }
+                        }
+                    }
                 }
+
+		//In case of HSM 
+                signalName = s.split("__decrypt")[0];
+                signalName = signalName.split("__")[1];
+                channels=secChannelMap.get(signalName);
+                if (channels!=null){
+                    for (String channelName: channels){
+                        if (channelName.contains("retData_") || channelName.contains("data_")){
+                            channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
+                            String header= channelName.split("__retData_")[0];
+                            for (TMLTask t: getTasks()){
+    	            		if (channelName.contains(t.getName().split("__")[1])){
+                                    channelName = channelName.replace("_"+t.getName().split("__")[1],"");
+    	            		}
+                            }
+                            channel = getChannelByShortName(channelName);
+                            if (channel!=null){
+                                for (TMLCPrimitivePort port:channel.ports){
+    		                    if (port.checkAuth){
+    		                        port.checkStrongAuthStatus = 2;
+    		                        port.secName= signalName;
+    		                    }
+    		                }
+    		            }
+			}
+                    }
+		}
             }
 
-            signalName = s.split("__decrypt")[0];
-            /*for (TMLTask t: getTasks()){
-              if (signalName.contains(t.getName())){
-              signalName = signalName.replace(t.getName()+"__","");
-              }
-              }*/
-            signalName=signalName.split("__")[1];
-            List<String> channels=secChannelMap.get(signalName);
-			for (String channelName: channels){
-		//  if (channelName!=null){
-                channel = getChannelByShortName(channelName);
+            if (result.isWeakProved() && result.isWeakSatisfied())
+            {
+                String signalName = s.split("_chData")[0];
+                signalName = signalName.split("__")[1];
+                TMLChannel channel = getChannelByShortName(signalName);
                 if (channel!=null){
                     for (TMLCPrimitivePort port:channel.ports){
                         if (port.checkAuth){
-                            port.checkStrongAuthStatus = 2;
-                            port.secName= signalName;
+                            port.checkWeakAuthStatus = 2;
+                            port.mappingName= mappingName;
                         }
                     }
                 }
-            }
-        }
-        for (String s: satisfiedWeakAuthenticity){
-            String signalName = s.split("_chData")[0];
-            signalName = signalName.split("__")[1];
-            TMLChannel channel = getChannelByShortName(signalName);
-            if (channel!=null){
-                for (TMLCPrimitivePort port:channel.ports){
-                    if (port.checkAuth){
-                        port.checkWeakAuthStatus = 2;
-                        port.mappingName= mappingName;
+                signalName = s.split("_reqData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
                     }
                 }
-            }
-            signalName = s.split("_reqData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
-                }
-            }
-            TMLRequest req = getRequestByName(signalName);
-            if (req !=null){
-                for (TMLCPrimitivePort port: req.ports){
-                    if (port.checkAuth){
-                        port.checkWeakAuthStatus = 2;
-                        port.mappingName= mappingName;
+                TMLRequest req = getRequestByName(signalName);
+                if (req !=null){
+                    for (TMLCPrimitivePort port: req.ports){
+                        if (port.checkAuth){
+                            port.checkWeakAuthStatus = 2;
+                            port.mappingName= mappingName;
+                        }
                     }
                 }
-            }
-            signalName = s.split("__eventData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
+                signalName = s.split("__eventData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
+                    }
                 }
-            }
-            TMLEvent ev = getEventByName(signalName);
-            if (ev !=null){
-                if (ev.port.checkAuth){
-                    ev.port.checkWeakAuthStatus=2;
-                    ev.port2.mappingName= mappingName;
+                TMLEvent ev = getEventByName(signalName);
+                if (ev !=null){
+                    if (ev.port.checkAuth){
+                        ev.port.checkWeakAuthStatus=2;
+                        ev.port2.mappingName= mappingName;
+                    }
+                    if (ev.port2.checkAuth){
+                        ev.port2.checkWeakAuthStatus=2;
+                        ev.port2.mappingName= mappingName;
+                    }
                 }
-                if (ev.port2.checkAuth){
-                    ev.port2.checkWeakAuthStatus=2;
-                    ev.port2.mappingName= mappingName;
+                signalName = s.toString().split("__decrypt")[0];
+                /*for (TMLTask t: getTasks()){
+                  if (signalName.contains(t.getName())){
+                  signalName = signalName.replace(t.getName()+"__","");
+                  }
+                  }*/
+                signalName = signalName.split("__")[1];
+                List<String> channels=secChannelMap.get(signalName);
+                if (channels!=null){
+                    for (String channelName:channels){
+                        channel = getChannelByShortName(channelName);
+                        if (channel!=null){
+                            for (TMLCPrimitivePort port:channel.ports){
+                                if (port.checkAuth){
+                                    port.checkWeakAuthStatus = 2;
+                                    port.secName= signalName;
+                                }
+                            }
+                        }
+                    }
                 }
+
+		//In case of HSM 
+                signalName = s.split("__decrypt")[0];
+                signalName = signalName.split("__")[1];
+                channels=secChannelMap.get(signalName);
+                if (channels!=null){
+                    for (String channelName: channels){
+                        if (channelName.contains("retData_") || channelName.contains("data_")){
+                            channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
+                            String header= channelName.split("__retData_")[0];
+                            for (TMLTask t: getTasks()){
+    	            		if (channelName.contains(t.getName().split("__")[1])){
+                                    channelName = channelName.replace("_"+t.getName().split("__")[1],"");
+    	            		}
+                            }
+                            channel = getChannelByShortName(channelName);
+                            if (channel!=null){
+                                for (TMLCPrimitivePort port:channel.ports){
+    		                    if (port.checkAuth){
+    		                        port.checkWeakAuthStatus = 2;
+    		                        port.secName= signalName;
+    		                    }
+    		                }
+    		            }
+			}
+                    }
+		}
             }
-            signalName = s.split("__decrypt")[0];
-            /*for (TMLTask t: getTasks()){
-              if (signalName.contains(t.getName())){
-              signalName = signalName.replace(t.getName()+"__","");
-              }
-              }*/
-            signalName = signalName.split("__")[1];
-            List<String> channels=secChannelMap.get(signalName);
-			for (String channelName:channels){
-//            if (channelName!=null){
-				System.out.println("original channel " + channelName);
-                channel = getChannelByShortName(channelName);
+
+            if (result.isProved() && !result.isSatisfied())
+            {
+                System.out.println(s.toString());
+                String signalName = s.toString().split("_chData")[0];
+                /*for (TMLTask t: getTasks()){
+                  System.out.println(t.getName());
+                  if (signalName.contains(t.getName().split("__")[1])){
+                  signalName = signalName.split(t.getName().split("__")[1]+"__")[0];
+                  }
+                  }*/
+                signalName = signalName.split("__")[1];
+                TMLChannel channel = getChannelByShortName(signalName);
                 if (channel!=null){
+                    System.out.println("adding auth results to channel " + channel.getName());
                     for (TMLCPrimitivePort port:channel.ports){
                         if (port.checkAuth){
-                            port.checkWeakAuthStatus = 2;
-                            port.secName= signalName;
+
+                            port.checkStrongAuthStatus = 3;
+                            port.mappingName= mappingName;
                         }
                     }
                 }
-            }
-        }
-        for (String s: nonSatisfiedAuthenticity){
-            System.out.println(s);
-            String signalName = s.split("_chData")[0];
-            /*for (TMLTask t: getTasks()){
-              System.out.println(t.getName());
-              if (signalName.contains(t.getName().split("__")[1])){
-              signalName = signalName.split(t.getName().split("__")[1]+"__")[0];
-              }
-              }*/
-            signalName = signalName.split("__")[1];
-      //      System.out.println("channels " + channels.get(0).getName());
-       //     System.out.println("signalName " + signalName);
-            TMLChannel channel = getChannelByShortName(signalName);
-            if (channel!=null){
-                System.out.println("adding auth results to channel " + channel.getName());
-                for (TMLCPrimitivePort port:channel.ports){
-                    if (port.checkAuth){
-
-                        port.checkStrongAuthStatus = 3;
-                        port.mappingName= mappingName;
+                signalName = s.toString().split("_reqData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
                     }
                 }
-            }
-            signalName = s.split("_reqData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
-                }
-            }
-            TMLRequest req = getRequestByName(signalName);
-            if (req !=null){
-                for (TMLCPrimitivePort port: req.ports){
-                    if (port.checkAuth){
-                        port.checkStrongAuthStatus = 3;
-                        port.mappingName= mappingName;
+                TMLRequest req = getRequestByName(signalName);
+                if (req !=null){
+                    for (TMLCPrimitivePort port: req.ports){
+                        if (port.checkAuth){
+                            port.checkStrongAuthStatus = 3;
+                            port.mappingName= mappingName;
+                        }
                     }
                 }
-            }
-            signalName = s.split("_eventData")[0];
-            for (TMLTask t: getTasks()){
-                if (signalName.contains(t.getName())){
-                    signalName = signalName.replace(t.getName()+"__","");
-                }
-            }
-            TMLEvent ev = getEventByName(signalName);
-            if (ev !=null){
-                if (ev.port.checkAuth){
-                    ev.port.checkStrongAuthStatus=3;
-                    ev.port2.mappingName= mappingName;
+                signalName = s.toString().split("_eventData")[0];
+                for (TMLTask t: getTasks()){
+                    if (signalName.contains(t.getName())){
+                        signalName = signalName.replace(t.getName()+"__","");
+                    }
                 }
-                if (ev.port2.checkAuth){
-                    ev.port2.checkStrongAuthStatus=3;
-                    ev.port2.mappingName= mappingName;
+                TMLEvent ev = getEventByName(signalName);
+                if (ev !=null){
+                    if (ev.port.checkAuth){
+                        ev.port.checkStrongAuthStatus=3;
+                        ev.port2.mappingName= mappingName;
+                    }
+                    if (ev.port2.checkAuth){
+                        ev.port2.checkStrongAuthStatus=3;
+                        ev.port2.mappingName= mappingName;
+                    }
                 }
-            }
-			//Backtrace for security patterns
-            signalName = s.split("__decrypt")[0];
-            /*for (TMLTask t: getTasks()){
-              if (signalName.contains(t.getName())){
-              signalName = signalName.replace(t.getName()+"__","");
-              }
-              }*/
-            List<String> channels=secChannelMap.get(signalName);
-			for (String channelName:channels){
-//            if (channelName!=null){
-                channel = getChannelByShortName(channelName);
-                if (channel!=null){
-                    for (TMLCPrimitivePort port:channel.ports){
-                        if (port.checkAuth){
-                            port.checkStrongAuthStatus = 3;
-                            port.secName= signalName;
+
+                signalName = s.split("__decrypt")[0];
+                List<String> channels=secChannelMap.get(signalName);
+                if (channels!=null){
+                    for (String channelName:channels){
+                        channel = getChannelByShortName(channelName);
+                        if (channel!=null){
+                            for (TMLCPrimitivePort port:channel.ports){
+                                if (port.checkAuth){
+                                    port.checkStrongAuthStatus = 3;
+                                    port.secName= signalName;
+                                }
+                            }
                         }
                     }
-                }
-            }
-        }
+		}
 
 		//In case of HSM 
-		for (String s: satisfiedWeakAuthenticity){
-			String signalName = s.split("__decrypt")[0];
-            signalName = signalName.split("__")[1];
- 			List<String> channels=secChannelMap.get(signalName);
-			for (String channelName: channels){
-//            if (channelName!=null){
-				if (channelName.contains("retData_") || channelName.contains("data_")){
-					channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
-					//channelName=channelName.split("__retData_")[1];
-					String header= channelName.split("__retData_")[0];
-					for (TMLTask t: getTasks()){
-                		if (channelName.contains(t.getName().split("__")[1])){
-                    		channelName = channelName.replace("_"+t.getName().split("__")[1],"");
-                		}
-            		}
-                	TMLChannel channel = getChannelByShortName(channelName);
-                	if (channel!=null){
-	                    for (TMLCPrimitivePort port:channel.ports){
-    	                    if (port.checkAuth){
-    	                        port.checkWeakAuthStatus = 2;
-    	                        port.secName= signalName;
-    	                    }
-    	                }
-    	            }
-				}
-            }
-		}
-		for (String s: nonSatisfiedAuthenticity){
-			String signalName = s.split("__decrypt")[0];
-            signalName = signalName.split("__")[1];
- 			List<String> channels=secChannelMap.get(signalName);
-			for (String channelName: channels){
-            //if (channelName!=null){
-				if (channelName.contains("retData_") || channelName.contains("data_")){
-					channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
-					//channelName=channelName.split("__retData_")[1];
-					String header= channelName.split("__retData_")[0];
-					for (TMLTask t: getTasks()){
-                		if (channelName.contains(t.getName().split("__")[1])){
-                    		channelName = channelName.replace("_"+t.getName().split("__")[1],"");
-                		}
-            		}
-                	TMLChannel channel = getChannelByShortName(channelName);
-                	if (channel!=null){
-	                    for (TMLCPrimitivePort port:channel.ports){
-    	                    if (port.checkAuth){
-    	                        port.checkWeakAuthStatus = 3;
-    	                        port.secName= signalName;
-    	                    }
-    	                }
-    	            }
-				}
-            }
-		}
-		for (String s: satisfiedAuthenticity){
-			String signalName = s.split("__decrypt")[0];
-            signalName = signalName.split("__")[1];
- 			List<String> channels=secChannelMap.get(signalName);
-			for (String channelName: channels){
-//            if (channelName!=null){
-				if (channelName.contains("retData_") || channelName.contains("data_")){
-					channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
-					//channelName=channelName.split("__retData_")[1];
-					String header= channelName.split("__retData_")[0];
-					for (TMLTask t: getTasks()){
-                		if (channelName.contains(t.getName().split("__")[1])){
-                    		channelName = channelName.replace("_"+t.getName().split("__")[1],"");
-                		}
-            		}
-                	TMLChannel channel = getChannelByShortName(channelName);
-                	if (channel!=null){
-	                    for (TMLCPrimitivePort port:channel.ports){
-    	                    if (port.checkAuth){
-    	                        port.checkStrongAuthStatus = 2;
-    	                        port.secName= signalName;
-    	                    }
-    	                }
-    	            }
-				}
+                signalName = s.split("__decrypt")[0];
+                signalName = signalName.split("__")[1];
+                channels=secChannelMap.get(signalName);
+                if (channels!=null){
+                    for (String channelName: channels){
+                        if (channelName.contains("retData_") || channelName.contains("data_")){
+                            channelName=channelName.replaceAll("retData_","").replaceAll("data_","");
+                            String header= channelName.split("__retData_")[0];
+                            for (TMLTask t: getTasks()){
+    	            		if (channelName.contains(t.getName().split("__")[1])){
+                                    channelName = channelName.replace("_"+t.getName().split("__")[1],"");
+    	            		}
+                            }
+                            channel = getChannelByShortName(channelName);
+                            if (channel!=null){
+                                for (TMLCPrimitivePort port:channel.ports){
+    		                    if (port.checkAuth){
+    		                        port.checkWeakAuthStatus = 3;
+    		                        port.secName= signalName;
+    		                    }
+    		                }
+    		            }
+                        }
+                    }
+                }
             }
-		}
+        }
     }
+
     public void clearBacktracing(){
         for (TMLChannel channel: getChannels()){
             for (TMLCPrimitivePort port:channel.ports){
diff --git a/src/tmltranslator/TMLRandomSequence.java b/src/tmltranslator/TMLRandomSequence.java
index 20bcde97a20068bf5f63972fb4c9545dd2bbe7c2..92df51f23f5ba915a9da1bf77a3afcc6d8d85cf7 100755
--- a/src/tmltranslator/TMLRandomSequence.java
+++ b/src/tmltranslator/TMLRandomSequence.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLRandomSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLRequest.java b/src/tmltranslator/TMLRequest.java
index 65ef718670f618f21e6051f02292c57a82f1e088..1447f14e35b45f09fdf591c45fa090a160f7d0e1 100755
--- a/src/tmltranslator/TMLRequest.java
+++ b/src/tmltranslator/TMLRequest.java
@@ -45,9 +45,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLRequest extends TMLCommunicationElement {
     
 	protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLSendRequest.java b/src/tmltranslator/TMLSendRequest.java
index 53351e9e2221be8e603caa9574a064b47d422482..4bb6ff5ee2adf2854ed0a04bd20871c78984b51d 100755
--- a/src/tmltranslator/TMLSendRequest.java
+++ b/src/tmltranslator/TMLSendRequest.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLSendRequest extends TMLActivityElement  {
diff --git a/src/tmltranslator/TMLSequence.java b/src/tmltranslator/TMLSequence.java
index 4f914c4eec7045dea0d410f10d7cb0e28ff94e4a..bac3749177a124f3a928a33a60a0279200dcf823 100755
--- a/src/tmltranslator/TMLSequence.java
+++ b/src/tmltranslator/TMLSequence.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLSyntaxChecking.java b/src/tmltranslator/TMLSyntaxChecking.java
index 6a77696baac5c8c9651bb1d6527f2f720fbca543..141659b62f3454a6b436cdb26c1a583ccfe30758 100755
--- a/src/tmltranslator/TMLSyntaxChecking.java
+++ b/src/tmltranslator/TMLSyntaxChecking.java
@@ -47,10 +47,15 @@
 
 package tmltranslator;
 
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
 
 
 public class TMLSyntaxChecking {
diff --git a/src/tmltranslator/TMLTextSpecification.java b/src/tmltranslator/TMLTextSpecification.java
index 75d86f782de560703e6dd915ff04b9cf703febd0..e6092855a5d72e1b54cd4b3ed2c240cf970d7c7d 100755
--- a/src/tmltranslator/TMLTextSpecification.java
+++ b/src/tmltranslator/TMLTextSpecification.java
@@ -47,9 +47,15 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
 
 public class TMLTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/modelcompiler/AdaifBuffer.java b/src/tmltranslator/modelcompiler/AdaifBuffer.java
index b442ec520b7a192df409e6cb2ee93f7db272d3c7..0bbb61f33ebb38bad4947547a073c5f209ea225a 100644
--- a/src/tmltranslator/modelcompiler/AdaifBuffer.java
+++ b/src/tmltranslator/modelcompiler/AdaifBuffer.java
@@ -46,21 +46,13 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import org.w3c.dom.Element;
-
 import tmltranslator.TMLTask;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public class AdaifBuffer extends Buffer	{
 
 	public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/Buffer.java b/src/tmltranslator/modelcompiler/Buffer.java
index 158e18172c8d4bdc2cbb817d6a2f89a0531d37f5..7084edb3a5e438318cbb518fa631ceada5479f6c 100755
--- a/src/tmltranslator/modelcompiler/Buffer.java
+++ b/src/tmltranslator/modelcompiler/Buffer.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.List;
-
 import tmltranslator.TMLCPLibArtifact;
 import tmltranslator.TMLPort;
 import tmltranslator.TMLTask;
 
+import java.util.List;
+
 public class Buffer	{
 
 	public static final String[] memoryTypesList = { "FEP memory", "MAPPER memory", "ADAIF memory", "INTERLEAVER memory", "MAIN MEMORY memory" };
diff --git a/src/tmltranslator/modelcompiler/BufferMEC.java b/src/tmltranslator/modelcompiler/BufferMEC.java
index 72ecff9fdc57bd49c70c3b93ebdab3de6786a15f..f1e7c12b90e67c3ed3b3af84e57ab5e2fc279eea 100644
--- a/src/tmltranslator/modelcompiler/BufferMEC.java
+++ b/src/tmltranslator/modelcompiler/BufferMEC.java
@@ -45,14 +45,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.util.ArrayList;
-
-import javax.swing.JPanel;
-
 import org.w3c.dom.Element;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public interface BufferMEC	{
 
 	public ArrayList<String> getBufferParameters();
diff --git a/src/tmltranslator/modelcompiler/DMAContext.java b/src/tmltranslator/modelcompiler/DMAContext.java
index a215f8c7e050a5837f25457cbd0b05fe02e35ea3..cc7912370af4398d93967c1f8f982d91dfd9c8a8 100644
--- a/src/tmltranslator/modelcompiler/DMAContext.java
+++ b/src/tmltranslator/modelcompiler/DMAContext.java
@@ -44,15 +44,9 @@
    * @see
    */
 
-package tmltranslator.modelcompiler;;
+package tmltranslator.modelcompiler;
 
-import java.util.*;
-import java.nio.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import myutil.*;
-
-import tmltranslator.*;
+;
 
 public class DMAContext	{
 
diff --git a/src/tmltranslator/modelcompiler/DataTransfer.java b/src/tmltranslator/modelcompiler/DataTransfer.java
index 42ba3a77ad297e33b0bef5a592d5c3e9cf45dc7e..31b3fd914266c85af0909c19bcdabc1b37f4432a 100755
--- a/src/tmltranslator/modelcompiler/DataTransfer.java
+++ b/src/tmltranslator/modelcompiler/DataTransfer.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import tmltranslator.TMLCP;
 import tmltranslator.TMLCPLib;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DataTransfer	{
 
 	public static final int DMA = 0;
diff --git a/src/tmltranslator/modelcompiler/FepBuffer.java b/src/tmltranslator/modelcompiler/FepBuffer.java
index cc990d56b447249cadc78137fbe2498ce1128bfa..b072518106e585bdb434743fafbedec8f77e2ed3 100755
--- a/src/tmltranslator/modelcompiler/FepBuffer.java
+++ b/src/tmltranslator/modelcompiler/FepBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class FepBuffer extends Buffer	{
 
 	public static final String[] dataTypeList = { "int8", "int16", "cpx16", "cpx32" };
diff --git a/src/tmltranslator/modelcompiler/FepMEC.java b/src/tmltranslator/modelcompiler/FepMEC.java
index 2ccb360de80e139480a3fae13c0abbfc9aad315b..aaa75f103087821014131fd2e0253275890b2470 100644
--- a/src/tmltranslator/modelcompiler/FepMEC.java
+++ b/src/tmltranslator/modelcompiler/FepMEC.java
@@ -46,7 +46,8 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Vector;
 
 public class FepMEC extends ArchUnitMEC	{
 
diff --git a/src/tmltranslator/modelcompiler/InterleaverBuffer.java b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
index 95f3f393ecfde6f2321f207e98f683c43a1aeffe..0237297aa0ba3470fa5005470080264a5238bc19 100644
--- a/src/tmltranslator/modelcompiler/InterleaverBuffer.java
+++ b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class InterleaverBuffer extends Buffer	{
 
 	public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/MMBuffer.java b/src/tmltranslator/modelcompiler/MMBuffer.java
index 9a28b60535e0665b25980194d357a517cb668782..76f14e0dd979f60c959ab0c39d47d44b1f78c2f5 100644
--- a/src/tmltranslator/modelcompiler/MMBuffer.java
+++ b/src/tmltranslator/modelcompiler/MMBuffer.java
@@ -46,21 +46,13 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import org.w3c.dom.Element;
-
 import tmltranslator.TMLTask;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public class MMBuffer extends Buffer	{
 
 	public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/MapperBuffer.java b/src/tmltranslator/modelcompiler/MapperBuffer.java
index 5a4f48c09a4ee23f78d628d54c341f2a230675b3..39ef4a1f06e534a8b6810a7d66eefd2081c834d7 100644
--- a/src/tmltranslator/modelcompiler/MapperBuffer.java
+++ b/src/tmltranslator/modelcompiler/MapperBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class MapperBuffer extends Buffer	{
 
 	public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/Operation.java b/src/tmltranslator/modelcompiler/Operation.java
index 89eaa7e912fb7f56876bb89b22f38ab6df05568f..9190dc482d6088e742a43e90c55b75e430be1edc 100755
--- a/src/tmltranslator/modelcompiler/Operation.java
+++ b/src/tmltranslator/modelcompiler/Operation.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import tmltranslator.HwNode;
 import tmltranslator.TMLTask;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Operation	{
 
 	public static final int NONSDR = 0;
diff --git a/src/tmltranslator/modelcompiler/OperationMEC.java b/src/tmltranslator/modelcompiler/OperationMEC.java
index ea88e0cec578a8afcacfc06ee19bcbf2434c0bda..bc4e333fecedda37d8c7a076e974a83ba7eb6718 100755
--- a/src/tmltranslator/modelcompiler/OperationMEC.java
+++ b/src/tmltranslator/modelcompiler/OperationMEC.java
@@ -46,7 +46,9 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public abstract class OperationMEC	{
 
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompiler.java b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
index 6e6d4e8f1a3e5a84695acc2c3509b7bab1c03f4a..6853532edc69bfd487f704ac928ab48dcf5a76bb 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompiler.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
@@ -48,6 +48,15 @@
 
 package tmltranslator.modelcompiler;
 
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import ui.ConfigurationTTool;
+import ui.GTMLModeling;
+import ui.TMLCommunicationPatternPanel;
+
+import javax.swing.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -56,24 +65,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import javax.swing.JFrame;
-
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.TraceManager;
-import tmltranslator.HwNode;
-import tmltranslator.TMLArchitecture;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPLib;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.TMLTask;
-import ui.ConfigurationTTool;
-import ui.GTMLModeling;
-import ui.TMLCommunicationPatternPanel;
-
 public class TMLModelCompiler	{
 
 	public String title;
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
index 1d1670d93f47ed2f86f8f6ec767e00e2d0bcdd1b..4e114bf622f892277e99e0a0dc86d5e7d0cb1c83 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
@@ -49,7 +49,8 @@
 
 package tmltranslator.modelcompiler;
 
-import tmltranslator.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
 
 public class TMLModelCompilerError {
     
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
index 1c530ed614e7965ba0cc308d981023a3a97c1d60..5e36ccce748acf1d0dbe3ab35b5c8b0a4fd35c98 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
@@ -49,9 +49,13 @@
 
 package tmltranslator.modelcompiler;
 
+import myutil.TraceManager;
 import tmltranslator.*;
-import java.util.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class TMLModelCompilerParser {
     
diff --git a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
index b1f52d76774ca88daf54f964cfe860677d731f2f..0c5b2069a2322ff00328573f23a84890001f3ad4 100755
--- a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
@@ -46,8 +46,10 @@
 
 package tmltranslator.tmlcp;
 
+import tmltranslator.TMLCP;
+import tmltranslator.TMLElement;
+
 import java.util.*;
-import tmltranslator.*;
 
 public class TMLCPActivityDiagram  extends TMLElement {
 
diff --git a/src/tmltranslator/tmlcp/TMLCPChoice.java b/src/tmltranslator/tmlcp/TMLCPChoice.java
index 9f09bf8cc6487541c59907bac5d96d93b4b797d7..52e87dd30e0acdaba1ffdd1c31a455e1c2016a38 100755
--- a/src/tmltranslator/tmlcp/TMLCPChoice.java
+++ b/src/tmltranslator/tmlcp/TMLCPChoice.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import java.util.ArrayList;
 
 //The method is not very suited for the language, I should come back later...
 public class TMLCPChoice extends TMLCPElement  {
diff --git a/src/tmltranslator/tmlcp/TMLCPElement.java b/src/tmltranslator/tmlcp/TMLCPElement.java
index 8229ed122ec6ea6feeb61682e16a55f9074c5331..b69d831c9e74ebea83011c1c8123ec30851fbd7e 100755
--- a/src/tmltranslator/tmlcp/TMLCPElement.java
+++ b/src/tmltranslator/tmlcp/TMLCPElement.java
@@ -46,8 +46,10 @@
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
-import java.util.*;
+import tmltranslator.TMLElement;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class TMLCPElement extends TMLElement  {
     protected List<TMLCPElement> nexts;
diff --git a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
index e04dd292068c4e832698560a3fe47198da77c04c..1c5dc350d28c3d1d00111c3522f1e783bf4ca339 100755
--- a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
@@ -47,9 +47,11 @@
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
 
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLCPSequenceDiagram  extends TMLElement {
 
diff --git a/src/tmltranslator/tmlcp/TMLSDElement.java b/src/tmltranslator/tmlcp/TMLSDElement.java
index fc37a9370a7e513d5087f204bd7e67a6cb6435ab..d1778caaf94e0f39f5bcd5b61f240ac619794cb9 100755
--- a/src/tmltranslator/tmlcp/TMLSDElement.java
+++ b/src/tmltranslator/tmlcp/TMLSDElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
+import tmltranslator.TMLElement;
 
 public abstract class TMLSDElement extends TMLElement  {
 	
diff --git a/src/tmltranslator/tmlcp/TMLSDInstance.java b/src/tmltranslator/tmlcp/TMLSDInstance.java
index e7b7720155beb6ee9ee27d3b98fc477bd95d254b..13f2b98274d51d7c3651559de6791a284238ed80 100755
--- a/src/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/tmltranslator/tmlcp/TMLSDInstance.java
@@ -47,11 +47,14 @@
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
-import ui.tmldd.*;
-import java.util.*;
-
-import ui.tmlsd.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
+import tmltranslator.TMLType;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+
+import java.util.ArrayList;
+import java.util.Collections;
 
 public class TMLSDInstance extends TMLElement  {
 
diff --git a/src/tmltranslator/tmlcp/TMLSDMessage.java b/src/tmltranslator/tmlcp/TMLSDMessage.java
index c68750857ed92997e3f8c53764be8f8fc67395a8..66e7cb656880c5b05e7ac0a2dfe76d4836c2b707 100755
--- a/src/tmltranslator/tmlcp/TMLSDMessage.java
+++ b/src/tmltranslator/tmlcp/TMLSDMessage.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
 
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public class TMLSDMessage extends TMLElement  {
 
diff --git a/src/tmltranslator/toautomata/TML2AUT.java b/src/tmltranslator/toautomata/TML2AUT.java
index 90e09d4cc55849076b743afe1a559618f693dc1f..81cdbfc3c92150056e5642a808d08e873b9098ce 100755
--- a/src/tmltranslator/toautomata/TML2AUT.java
+++ b/src/tmltranslator/toautomata/TML2AUT.java
@@ -45,11 +45,17 @@
 
 package tmltranslator.toautomata;
 
-import java.util.*;
-
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import automata.*;
-import myutil.*;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
 
 
 public class TML2AUT {
diff --git a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
index d3f8067a455b842c7a62a87529420ddcfe1097d7..4e52fa7bcb37733d8954f6f54cf77e8328bbc7b8 100755
--- a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
+++ b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
@@ -45,12 +45,17 @@
 
 package tmltranslator.toautomata;
 
-import java.util.*;
+import automata.Automata;
+import myutil.FileException;
+import myutil.FileUtils;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
 
-import translator.*;
-import tmltranslator.*;
-import automata.*;
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class TML2AUTviaLOTOS {
diff --git a/src/tmltranslator/toavatar/TML2Avatar.java b/src/tmltranslator/toavatar/TML2Avatar.java
index 60d2bc47c43a79d9c08d0b86b7370fb056e8de17..0befba876b5cb4753401a557de62dcd185237503 100644
--- a/src/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/tmltranslator/toavatar/TML2Avatar.java
@@ -44,20 +44,18 @@
  */
 
 package tmltranslator.toavatar;
+
+import avatartranslator.*;
+import myutil.TraceManager;
+import proverifspec.ProVerifQueryResult;
 import tmltranslator.*;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.Map;
+import ui.TGComponent;
+import ui.tmlad.*;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.ArrayList;
-
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.TGComponent;
-import myutil.*;
-import avatartranslator.*;
 
 public class TML2Avatar {
 	private TMLMapping tmlmap;
@@ -413,7 +411,7 @@ public class TML2Avatar {
 		if (ae.getReferenceObject()!=null){
 			checkAcc=((TGComponent)ae.getReferenceObject()).getCheckableAccessibility();
 		}
-		AvatarState signalState = new AvatarState("signalstate_"+ae.getName()+"_"+req.getName(),ae.getReferenceObject(), checkAcc);
+		AvatarState signalState = new AvatarState("signalstate_"+ae.getName().replaceAll(" ","")+"_"+req.getName().replaceAll(" ",""),ae.getReferenceObject(), checkAcc);
 		AvatarTransition signalTran = new AvatarTransition(block, "__after_signalstate_"+ae.getName()+"_"+req.getName(), ae.getReferenceObject());
 		if (!signalOutMap.containsKey(req.getName())){
 			sig = new AvatarSignal(getName(req.getName()), AvatarSignal.OUT, req.getReferenceObject());
@@ -443,7 +441,7 @@ public class TML2Avatar {
 			block.addAttribute(requestData);	
 		}
 		if (req.checkAuth){
-		AvatarAttributeState authOrig = new AvatarAttributeState(req.getName()+"__origin",ae.getReferenceObject(),requestData, signalState);
+		AvatarAttributeState authOrig = new AvatarAttributeState(block.getName()+"."+signalState.getName()+"."+requestData.getName(),ae.getReferenceObject(),requestData, signalState);
 		signalAuthOriginMap.put(req.getName(), authOrig);
 		}
 		tran= new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
@@ -457,7 +455,7 @@ public class TML2Avatar {
 	}
 	else if (ae instanceof TMLRandomSequence){
 		//HashMap<Integer, List<AvatarStateMachineElement>> seqs = new HashMap<Integer, List<AvatarStateMachineElement>>();
-		AvatarState choiceState = new AvatarState("seqchoice__"+ae.getName(), ae.getReferenceObject());
+		AvatarState choiceState = new AvatarState("seqchoice__"+ae.getName().replaceAll(" ",""), ae.getReferenceObject());
 		elementList.add(choiceState);
 		if (ae.getNbNext()==2){
 		List<AvatarStateMachineElement> set0= translateState(ae.getNextElement(0), block);
@@ -567,7 +565,7 @@ public class TML2Avatar {
 		if (ae.getReferenceObject()!=null){
 			checkAcc =((TGComponent) ae.getReferenceObject()).getCheckableAccessibility();
 		}
-		AvatarState signalState = new AvatarState("signalstate_"+ae.getName()+"_"+evt.getName(),ae.getReferenceObject(), checkAcc);
+		AvatarState signalState = new AvatarState("signalstate_"+ae.getName().replaceAll(" ","")+"_"+evt.getName(),ae.getReferenceObject(), checkAcc);
 		AvatarTransition signalTran = new AvatarTransition(block, "__after_signalstate_"+ae.getName()+"_"+evt.getName(), ae.getReferenceObject());
 		if (ae instanceof TMLSendEvent){
 		AvatarSignal sig;
@@ -592,17 +590,12 @@ public class TML2Avatar {
 			}
 		}
 			
- 		AvatarAttribute eventData= new AvatarAttribute(evt.getName()+"__eventData", AvatarType.INTEGER, block, null);
-			as.addValue(evt.getName()+"__eventData");
-		if (block.getAvatarAttributeWithName(evt.getName()+"__eventData")==null){
-				block.addAttribute(eventData);
-		}
-			tran= new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
-		elementList.add(signalState);
-		signalState.addNext(signalTran);
-		elementList.add(signalTran);	
-		signalTran.addNext(as);		
-		elementList.add(as);
+ 			tran= new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
+			elementList.add(signalState);
+			signalState.addNext(signalTran);
+			elementList.add(signalTran);	
+			signalTran.addNext(as);		
+			elementList.add(as);
 			as.addNext(tran);
 			elementList.add(tran);
 		
@@ -621,21 +614,18 @@ public class TML2Avatar {
 			}
 			AvatarActionOnSignal as= new AvatarActionOnSignal(ae.getName(), sig, ae.getReferenceObject());
 		for (int i=0; i< aee.getNbOfParams(); i++){
+			
 			if (block.getAvatarAttributeWithName(aee.getParam(i))==null){
 				//Throw Error
-			as.addValue("tmp");
+				as.addValue("tmp");
 				System.out.println("Missing Attribute " + aee.getParam(i));
 			}
 			else {
 			as.addValue(aee.getParam(i));
 			}
 		}
- 		AvatarAttribute eventData= new AvatarAttribute(evt.getName()+"__eventData", AvatarType.INTEGER, block, null);
-			as.addValue(evt.getName()+"__eventData");
-		if (block.getAvatarAttributeWithName(evt.getName()+"__eventData")==null){
-				block.addAttribute(eventData);
-		}
-			tran= new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
+ 		
+		tran= new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
 		elementList.add(signalState);
 		signalState.addNext(signalTran);
 		elementList.add(signalTran);	
@@ -658,7 +648,7 @@ public class TML2Avatar {
 	}
 	else if (ae instanceof TMLActivityElementWithAction){
 		//Might be encrypt or decrypt
-		AvatarState as = new AvatarState(ae.getValue()+"_"+ae.getName(), ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getValue().replaceAll(" ","")+"_"+ae.getName().replaceAll(" ",""), ae.getReferenceObject());
 		tran = new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
 		if (security || ae.securityPattern==null){
 			if (ae.securityPattern!=null && ae.getName().contains("encrypt")){
@@ -670,15 +660,15 @@ public class TML2Avatar {
 			}
 			else if (ae.securityPattern.type.equals("Symmetric Encryption")){
 				if (!ae.securityPattern.nonce.isEmpty()){
-				block.addAttribute(new AvatarAttribute("nonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
+				block.addAttribute(new AvatarAttribute(ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
 				AvatarMethod concat2 = new AvatarMethod("concat2",ae);
 				concat2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
-				concat2.addParameter(block.getAvatarAttributeWithName("nonce_"+ae.securityPattern.nonce));
+				concat2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.nonce));
 				concat2.addReturnParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
-				if (block.getAvatarAttributeWithName(ae.securityPattern.name) !=null && block.getAvatarAttributeWithName("nonce_"+ae.securityPattern.nonce)!=null){
+				if (block.getAvatarAttributeWithName(ae.securityPattern.name) !=null && block.getAvatarAttributeWithName(ae.securityPattern.nonce)!=null){
 					block.addMethod(concat2);
 				}
-				tran.addAction(ae.securityPattern.name+"=concat2("+ae.securityPattern.name + ",nonce_"+ae.securityPattern.nonce+")");
+				tran.addAction(ae.securityPattern.name+"=concat2("+ae.securityPattern.name + ","+ae.securityPattern.nonce+")");
 				}
 				//Securing a key instead of data
 				if (!ae.securityPattern.key.isEmpty()){
@@ -708,14 +698,14 @@ public class TML2Avatar {
 			}
 			else if (ae.securityPattern.type.equals("Asymmetric Encryption")){
 				if (!ae.securityPattern.nonce.isEmpty()){
-				block.addAttribute(new AvatarAttribute("nonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
+				block.addAttribute(new AvatarAttribute(ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
 				AvatarMethod concat2 = new AvatarMethod("concat2",ae);
 				concat2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
-				concat2.addParameter(block.getAvatarAttributeWithName("nonce_"+ae.securityPattern.nonce));
-				if (block.getAvatarAttributeWithName(ae.securityPattern.name) !=null && block.getAvatarAttributeWithName("nonce_"+ae.securityPattern.nonce)!=null){
+				concat2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.nonce));
+				if (block.getAvatarAttributeWithName(ae.securityPattern.name) !=null && block.getAvatarAttributeWithName(ae.securityPattern.nonce)!=null){
 					block.addMethod(concat2);
 				}
-				tran.addAction(ae.securityPattern.name+"=concat2("+ae.securityPattern.name + ",nonce_"+ae.securityPattern.nonce+")");
+				tran.addAction(ae.securityPattern.name+"=concat2("+ae.securityPattern.name + ","+ae.securityPattern.nonce+")");
 				}
 				//Securing a key instead of data
 				if (!ae.securityPattern.key.isEmpty()){
@@ -741,7 +731,7 @@ public class TML2Avatar {
 				ae.securityPattern.state1=as;
 			}
 			else if (ae.securityPattern.type.equals("Nonce")){
-				block.addAttribute(new AvatarAttribute("nonce_"+ae.securityPattern.name, AvatarType.INTEGER, block, null));
+				block.addAttribute(new AvatarAttribute(ae.securityPattern.name, AvatarType.INTEGER, block, null));
 			}
 			else if (ae.securityPattern.type.equals("Hash")){
 				AvatarMethod hash = new AvatarMethod("hash", ae);
@@ -761,6 +751,14 @@ public class TML2Avatar {
 				if (block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName("key_"+ae.securityPattern.name)!=null){
 					block.addMethod(mac);
 				}
+				if (!ae.securityPattern.nonce.isEmpty()){
+					AvatarMethod concat = new AvatarMethod("concat2", ae);
+					concat.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
+					concat.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.nonce));
+					concat.addReturnParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
+					block.addMethod(concat);
+					tran.addAction(ae.securityPattern.name+"=concat2("+ae.securityPattern.name+","+ae.securityPattern.nonce+")");
+				}
 				tran.addAction(ae.securityPattern.name+"_mac = MAC("+ae.securityPattern.name+",key_"+ae.securityPattern.name+")");
 
 				AvatarMethod concat = new AvatarMethod("concat2", ae);
@@ -772,9 +770,9 @@ public class TML2Avatar {
 					block.addMethod(concat);
 				}
 	
-				tran.addAction(ae.securityPattern.name+"_encrypted = concat2("+ae.securityPattern.name+"_mac,"+ae.securityPattern.name+")");
+				tran.addAction(ae.securityPattern.name+"_encrypted = concat2("+ae.securityPattern.name +","+ae.securityPattern.name+"_mac)");
 			}
-				AvatarAttributeState authOrigin = new AvatarAttributeState(ae.securityPattern.name+"1",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), as);
+				AvatarAttributeState authOrigin = new AvatarAttributeState(block.getName()+"."+as.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), as);
 				signalAuthOriginMap.put(ae.securityPattern.name, authOrigin);
 				as.addNext(tran);
 				elementList.add(as);
@@ -784,9 +782,9 @@ public class TML2Avatar {
 			block.addAttribute(new AvatarAttribute(ae.securityPattern.name, AvatarType.INTEGER, block, null));
 			block.addAttribute(new AvatarAttribute(ae.securityPattern.name+"_encrypted", AvatarType.INTEGER, block, null));
 			if (ae.securityPattern.type.equals("Symmetric Encryption")){
-			if (ae.securityPattern.key.isEmpty()){
+				if (ae.securityPattern.key.isEmpty()){
 					AvatarMethod sdecrypt = new AvatarMethod("sdecrypt", ae);
-				block.addAttribute(new AvatarAttribute(ae.securityPattern.name, AvatarType.INTEGER, block,null));
+					block.addAttribute(new AvatarAttribute(ae.securityPattern.name, AvatarType.INTEGER, block,null));
 					sdecrypt.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name+"_encrypted"));
 					sdecrypt.addParameter(block.getAvatarAttributeWithName("key_"+ae.securityPattern.name));
 					if (block.getAvatarAttributeWithName(ae.securityPattern.name+"_encrypted")!=null && block.getAvatarAttributeWithName("key_"+ae.securityPattern.name)!=null){
@@ -808,22 +806,22 @@ public class TML2Avatar {
 					elementList.add(tran);
 				as.addNext(tran);
 				if (!ae.securityPattern.nonce.isEmpty()){
-				block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
-				AvatarMethod get2 = new AvatarMethod("get2",ae);
-				get2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
-				get2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
-				get2.addParameter(block.getAvatarAttributeWithName("testnonce_"+ae.securityPattern.nonce));
-				if (block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName("testnonce_"+ae.securityPattern.nonce)!=null) {
-					block.addMethod(get2);
-				}
-				tran.addAction("get2("+ae.securityPattern.name + ","+ae.securityPattern.name+",testnonce_"+ae.securityPattern.nonce+")");
-				AvatarState guardState = new AvatarState(ae.getName()+"_guarded", ae.getReferenceObject());
-				tran.addNext(guardState);
-				tran=new AvatarTransition(block, "__guard_"+ae.getName(), ae.getReferenceObject());
-				guardState.addNext(tran);
-				tran.setGuard("testnonce_"+ae.securityPattern.nonce+"== nonce_" + ae.securityPattern.nonce);
-				}
-				AvatarState dummy = new AvatarState(ae.getName()+"_dummy", ae.getReferenceObject());
+					block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
+					AvatarMethod get2 = new AvatarMethod("get2",ae);
+					get2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
+					get2.addParameter(block.getAvatarAttributeWithName(ae.securityPattern.name));
+					get2.addParameter(block.getAvatarAttributeWithName("testnonce_"+ae.securityPattern.nonce));
+					if (block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName("testnonce_"+ae.securityPattern.nonce)!=null) {
+						block.addMethod(get2);
+					}
+					tran.addAction("get2("+ae.securityPattern.name + ","+ae.securityPattern.name+",testnonce_"+ae.securityPattern.nonce+")");
+					AvatarState guardState = new AvatarState(ae.getName().replaceAll(" ","")+"_guarded", ae.getReferenceObject());
+					tran.addNext(guardState);
+					tran=new AvatarTransition(block, "__guard_"+ae.getName(), ae.getReferenceObject());
+					guardState.addNext(tran);
+					tran.setGuard("testnonce_"+ae.securityPattern.nonce+"==" + ae.securityPattern.nonce);
+				}
+				AvatarState dummy = new AvatarState(ae.getName().replaceAll(" ","")+"_dummy", ae.getReferenceObject());
 				ae.securityPattern.state2=dummy;
 				tran.addNext(dummy);
 					tran = new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
@@ -831,11 +829,11 @@ public class TML2Avatar {
 					elementList.add(dummy);
 					elementList.add(tran);		
 				if (ae.securityPattern.nonce.isEmpty()){
-					AvatarAttributeState authDest = new AvatarAttributeState(ae.securityPattern.name+"2",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
+					AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+dummy.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
 				signalAuthDestMap.put(ae.securityPattern.name, authDest);
 				}
 				else {
-					AvatarAttributeState authDest = new AvatarAttributeState(ae.securityPattern.name+"3",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
+					AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+dummy.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
 					signalAuthDestMap.put(ae.securityPattern.name, authDest);
 				}
 			}
@@ -873,14 +871,15 @@ public class TML2Avatar {
 				if (block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName(ae.securityPattern.name)!=null) {
 					block.addMethod(get2);
 				}
+
 				tran.addAction("get2("+ae.securityPattern.name + ","+ae.securityPattern.name+",testnonce_"+ae.securityPattern.nonce+")");
-				AvatarState guardState = new AvatarState(ae.getName()+"_guarded", ae.getReferenceObject());
+				AvatarState guardState = new AvatarState(ae.getName().replaceAll(" ","")+"_guarded", ae.getReferenceObject());
 				tran.addNext(guardState);
 				tran=new AvatarTransition(block, "__guard_"+ae.getName(), ae.getReferenceObject());
 				guardState.addNext(tran);
-				tran.setGuard("testnonce_"+ae.securityPattern.nonce+"== nonce_" + ae.securityPattern.nonce);
+				tran.setGuard("testnonce_"+ae.securityPattern.nonce+"==" + ae.securityPattern.nonce);
 				}
-				AvatarState dummy = new AvatarState(ae.getName()+"_dummy", ae.getReferenceObject());
+				AvatarState dummy = new AvatarState(ae.getName().replaceAll(" ","")+"_dummy", ae.getReferenceObject());
 				tran.addNext(dummy);
 					tran = new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
 				dummy.addNext(tran);
@@ -888,11 +887,12 @@ public class TML2Avatar {
 					elementList.add(tran);		
 				ae.securityPattern.state2=dummy;
 				if (ae.securityPattern.nonce.isEmpty()){
-				AvatarAttributeState authDest = new AvatarAttributeState(ae.securityPattern.name+"2",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
+					
+					AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+dummy.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
 					signalAuthDestMap.put(ae.securityPattern.name, authDest);
 				}
 				else {	
-					AvatarAttributeState authDest = new AvatarAttributeState(ae.securityPattern.name+"3",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
+					AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+dummy.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
 					signalAuthDestMap.put(ae.securityPattern.name, authDest);
 				}
 		   		}
@@ -919,23 +919,43 @@ public class TML2Avatar {
 
 				if (block.getAvatarAttributeWithName(ae.securityPattern.name)!=null && block.getAvatarAttributeWithName("key_"+ae.securityPattern.name)!=null){
 					block.addMethod(verifymac);
+
 				}
 
 				tran.addAction("testnonce_"+ae.securityPattern.name+"=verifyMAC("+ae.securityPattern.name+", key_"+ae.securityPattern.name+","+ae.securityPattern.name+"_mac)"); 
+				if (!ae.securityPattern.nonce.isEmpty()){
+					block.addAttribute(new AvatarAttribute("testnonce_"+ae.securityPattern.nonce, AvatarType.INTEGER, block, null));
+					tran.addAction("get2("+ae.securityPattern.name + ","+ae.securityPattern.name+",testnonce_"+ae.securityPattern.nonce+")");
+				}
 				elementList.add(as);
 				elementList.add(tran);
 
 				as.addNext(tran);
-				AvatarState guardState = new AvatarState(ae.getName()+"_guarded", ae.getReferenceObject());
+				AvatarState guardState = new AvatarState(ae.getName().replaceAll(" ","")+"_guarded", ae.getReferenceObject());
 				tran.addNext(guardState);
+
+
 				tran=new AvatarTransition(block, "__guard_"+ae.getName(), ae.getReferenceObject());
+				
 
 				elementList.add(guardState);
 				elementList.add(tran);
 				guardState.addNext(tran);
+				if (!ae.securityPattern.nonce.isEmpty()){
+					
+					//Add extra state and transition
+					tran.setGuard("testnonce_"+ae.securityPattern.nonce+"==" + ae.securityPattern.nonce);
+					AvatarState guardState2 = new AvatarState(ae.getName().replaceAll(" ","")+"_guarded2", ae.getReferenceObject());					
+					tran.addNext(guardState2);
+					tran=new AvatarTransition(block, "__guard_"+ae.getName(), ae.getReferenceObject());
+					elementList.add(guardState2);
+					elementList.add(tran);
+
+					guardState2.addNext(tran);
+				}
 				tran.setGuard("testnonce_"+ae.securityPattern.name);
 				}
-				AvatarState dummy = new AvatarState(ae.getName()+"_dummy", ae.getReferenceObject());
+				AvatarState dummy = new AvatarState(ae.getName().replaceAll(" ","")+"_dummy", ae.getReferenceObject());
 				ae.securityPattern.state2=dummy;
 				tran.addNext(dummy);
 				elementList.add(tran);
@@ -944,7 +964,7 @@ public class TML2Avatar {
 				elementList.add(dummy);
 				elementList.add(tran);		
 
-				AvatarAttributeState authDest = new AvatarAttributeState(ae.securityPattern.name+"2",ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
+				AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+dummy.getName()+"."+ae.securityPattern.name,ae.getReferenceObject(),block.getAvatarAttributeWithName(ae.securityPattern.name), dummy);
 				signalAuthDestMap.put(ae.securityPattern.name, authDest);
 							
 			//Can't decrypt hash or nonce
@@ -957,7 +977,7 @@ public class TML2Avatar {
 		}
 	}
 	else if (ae instanceof TMLActivityElementWithIntervalAction){
-		AvatarState as = new AvatarState(ae.getName(), ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getName().replaceAll(" ",""), ae.getReferenceObject());
 		tran = new AvatarTransition(block, "__after_"+ae.getName(), ae.getReferenceObject());
 		as.addNext(tran);
 		elementList.add(as);
@@ -971,7 +991,7 @@ public class TML2Avatar {
 		if (ae.getReferenceObject()!=null){
 			checkAcc=((TGComponent)ae.getReferenceObject()).getCheckableAccessibility();
 		}
-		AvatarState signalState = new AvatarState("signalstate_"+ae.getName()+"_"+ch.getName(),ae.getReferenceObject(), checkAcc);
+		AvatarState signalState = new AvatarState("signalstate_"+ae.getName().replaceAll(" ","")+"_"+ch.getName(),ae.getReferenceObject(), checkAcc);
 		AvatarTransition signalTran = new AvatarTransition(block, "__after_signalstate_"+ae.getName()+"_"+ch.getName(), ae.getReferenceObject());
 		if (ae instanceof TMLReadChannel){
 			if (!signalInMap.containsKey(ch.getName())){
@@ -992,8 +1012,8 @@ public class TML2Avatar {
 		
 			if (ae.securityPattern!=null){
 				if (ae.securityPattern.type.equals("Nonce")){
-					block.addAttribute(new AvatarAttribute("nonce_"+ae.securityPattern.name, AvatarType.INTEGER, block,null));
-					as.addValue("nonce_"+ae.securityPattern.name);
+					block.addAttribute(new AvatarAttribute(ae.securityPattern.name, AvatarType.INTEGER, block,null));
+					as.addValue(ae.securityPattern.name);
 				}
 				else if (!ae.securityPattern.key.isEmpty()){
 					as.addValue("encryptedKey_"+ae.securityPattern.key);
@@ -1025,7 +1045,7 @@ public class TML2Avatar {
 			elementList.add(tran);
 			if (ch.checkAuth){
 			//Add aftersignal state
-			AvatarState afterSignalState = new AvatarState("aftersignalstate_"+ae.getName()+"_"+ch.getName(),ae.getReferenceObject());
+			AvatarState afterSignalState = new AvatarState("aftersignalstate_"+ae.getName().replaceAll(" ","")+"_"+ch.getName(),ae.getReferenceObject());
 			tran.addNext(afterSignalState);
 			tran = new AvatarTransition(block, "__aftersignalstate_"+ae.getName(), ae.getReferenceObject());
 			afterSignalState.addNext(tran);
@@ -1035,7 +1055,7 @@ public class TML2Avatar {
 				AvatarAttribute channelData= new AvatarAttribute(getName(ch.getName())+"_chData", AvatarType.INTEGER, block, null);
 					block.addAttribute(channelData);
 			}
-			AvatarAttributeState authDest = new AvatarAttributeState(ch.getName()+"__destination",ae.getReferenceObject(),block.getAvatarAttributeWithName(getName(ch.getName())+"_chData"), afterSignalState);
+			AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+afterSignalState.getName()+"."+getName(ch.getName())+"_chData",ae.getReferenceObject(),block.getAvatarAttributeWithName(getName(ch.getName())+"_chData"), afterSignalState);
 			signalAuthDestMap.put(ch.getName(), authDest);
 			}
 
@@ -1058,26 +1078,28 @@ public class TML2Avatar {
 				sig=signalOutMap.get(ch.getName());
 			}
 			if (ch.checkConf){
-			LinkedList<AvatarAttribute> attrs = new LinkedList<AvatarAttribute>();
-			if (!attrsToCheck.contains(getName(ch.getName())+"_chData")){
-				attrs.add(new AvatarAttribute(getName(ch.getName())+"_chData", AvatarType.INTEGER, block, null));
-				attrsToCheck.add(getName(ch.getName())+"_chData");
-				avspec.addPragma(new AvatarPragmaSecret("#Confidentiality "+block.getName() + "."+ch.getName()+"_chData", ch.getReferenceObject(), attrs));
-				}
+                            if (!attrsToCheck.contains(getName(ch.getName())+"_chData")){
+				AvatarAttribute attr = block.getAvatarAttributeWithName(getName(ch.getName())+"_chData");
+                                if (attr != null)
+                                {
+                                    attrsToCheck.add(getName(ch.getName())+"_chData");
+                                    avspec.addPragma(new AvatarPragmaSecret("#Confidentiality "+block.getName() + "."+ch.getName()+"_chData", ch.getReferenceObject(), attr));
+                                }
+                            }
 			}
 			if (ch.checkAuth){
 				if (block.getAvatarAttributeWithName(getName(ch.getName())+"_chData")==null){
 					AvatarAttribute channelData= new AvatarAttribute(getName(ch.getName())+"_chData", AvatarType.INTEGER, block, null);
 					block.addAttribute(channelData);
 			}
-			AvatarAttributeState authOrigin = new AvatarAttributeState(ch.getName()+"__destination",ae.getReferenceObject(),block.getAvatarAttributeWithName(getName(ch.getName())+"_chData"), signalState);
+			AvatarAttributeState authOrigin = new AvatarAttributeState(block.getName()+"."+signalState.getName()+"."+getName(ch.getName())+"_chData",ae.getReferenceObject(),block.getAvatarAttributeWithName(getName(ch.getName())+"_chData"), signalState);
 			signalAuthOriginMap.put(ch.getName(), authOrigin);
 			}  
 			AvatarActionOnSignal as = new AvatarActionOnSignal(ae.getName(), sig, ae.getReferenceObject());
 
 			if (ae.securityPattern!=null){
 				if (ae.securityPattern.type.equals("Nonce")){
-					as.addValue("nonce_"+ae.securityPattern.name);
+					as.addValue(ae.securityPattern.name);
 				}
 				else if (!ae.securityPattern.key.isEmpty()){
 					as.addValue("encryptedKey_"+ae.securityPattern.key);
@@ -1117,7 +1139,7 @@ public class TML2Avatar {
 		//Make initializaton, then choice state with transitions
 		List<AvatarStateMachineElement> elements=translateState(ae.getNextElement(0), block);
 		/*List<AvatarStateMachineElement> afterloop =*/ translateState(ae.getNextElement(1), block);
-		AvatarState initState = new AvatarState(ae.getName()+"__init", ae.getReferenceObject());
+		AvatarState initState = new AvatarState(ae.getName().replaceAll(" ","")+"__init", ae.getReferenceObject());
 		elementList.add(initState);
 		//Build transition to choice
 		tran = new AvatarTransition(block, "loop_init__"+ae.getName(), ae.getReferenceObject());
@@ -1125,7 +1147,7 @@ public class TML2Avatar {
 		elementList.add(tran);
 		initState.addNext(tran);
 		//Choice state
-		AvatarState as = new AvatarState(ae.getName()+"__choice", ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getName().replaceAll(" ","")+"__choice", ae.getReferenceObject());
 		elementList.add(as);
 		tran.addNext(as);
 		//transition to first element of loop
@@ -1171,7 +1193,7 @@ public class TML2Avatar {
 		//Make initializaton, then choice state with transitions
 		List<AvatarStateMachineElement> elements=translateState(ae.getNextElement(0), block);
 		List<AvatarStateMachineElement> afterloop = translateState(ae.getNextElement(1), block);
-		AvatarState initState = new AvatarState(ae.getName()+"__init", ae.getReferenceObject());
+		AvatarState initState = new AvatarState(ae.getName().replaceAll(" ","")+"__init", ae.getReferenceObject());
 		elementList.add(initState);
 		//Build transition to choice
 		tran = new AvatarTransition(block, "loop_init__"+ae.getName(), ae.getReferenceObject());
@@ -1180,7 +1202,7 @@ public class TML2Avatar {
 		elementList.add(tran);
 		initState.addNext(tran);
 		//Choice state
-		AvatarState as = new AvatarState(ae.getName()+"__choice", ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getName().replaceAll(" ","")+"__choice", ae.getReferenceObject());
 		elementList.add(as);
 		tran.addNext(as);
 		//transition to first element of loop
@@ -1232,7 +1254,7 @@ public class TML2Avatar {
 		}
 	}
 	else if (ae instanceof TMLChoice){
-		AvatarState as = new AvatarState(ae.getName(), ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getName().replaceAll(" ",""), ae.getReferenceObject());
 		//Make many choices
 		elementList.add(as);
 		TMLChoice c = (TMLChoice) ae;
@@ -1251,7 +1273,7 @@ public class TML2Avatar {
 
 	}
 	else if (ae instanceof TMLSelectEvt){
-		AvatarState as = new AvatarState(ae.getName(), ae.getReferenceObject());
+		AvatarState as = new AvatarState(ae.getName().replaceAll(" ",""), ae.getReferenceObject());
 		elementList.add(as);
 		//Make many choices
 		//TMLSelectEvt c = (TMLSelectEvt) ae;
@@ -1540,14 +1562,14 @@ public class TML2Avatar {
 			as.addNext(tran);
 			asm.addElement(tran);
 			if (req.checkAuth){
- 			AvatarState afterSignalState = new AvatarState("aftersignalstate_"+req.getName()+"_"+req.getName(),req.getReferenceObject());
+ 			AvatarState afterSignalState = new AvatarState("aftersignalstate_"+req.getName().replaceAll(" ","")+"_"+req.getName().replaceAll(" ",""),req.getReferenceObject());
 				AvatarTransition afterSignalTran = new AvatarTransition(block, "__aftersignalstate_"+req.getName(), req.getReferenceObject());
 				tran.addNext(afterSignalState);
 				afterSignalState.addNext(afterSignalTran);
 				asm.addElement(afterSignalState);
 				asm.addElement(afterSignalTran);
 			afterSignalTran.addNext(newStart);
-				AvatarAttributeState authDest = new AvatarAttributeState(req.getName()+"__destination",obj,requestData, afterSignalState);
+				AvatarAttributeState authDest = new AvatarAttributeState(block.getName()+"."+afterSignalState.getName()+"."+requestData.getName(),obj,requestData, afterSignalState);
 				signalAuthDestMap.put(req.getName(), authDest);
 				}  
 			else {
@@ -1573,11 +1595,9 @@ public class TML2Avatar {
 		for (SecurityPattern secPattern: secPatterns){
 		AvatarAttribute sec = new AvatarAttribute(secPattern.name, AvatarType.INTEGER, block, null);
 		AvatarAttribute enc = new AvatarAttribute(secPattern.name+"_encrypted", AvatarType.INTEGER, block, null);
-			LinkedList<AvatarAttribute> attrs = new LinkedList<AvatarAttribute>();
 		block.addAttribute(sec);
 		block.addAttribute(enc);
-			attrs.add(sec);
-			avspec.addPragma(new AvatarPragmaSecret("#Confidentiality "+block.getName() + "."+ secPattern.name, null, attrs));
+                avspec.addPragma(new AvatarPragmaSecret("#Confidentiality "+block.getName() + "."+ secPattern.name, null, sec));
 		}
 		
 	}
@@ -1586,7 +1606,8 @@ public class TML2Avatar {
 	//Add authenticity pragmas
 	for (String s: signalAuthOriginMap.keySet()){
 		if (signalAuthDestMap.containsKey(s)){
-		AvatarPragmaAuthenticity pragma = new AvatarPragmaAuthenticity("#Authenticity "+s, signalAuthOriginMap.get(s).getReferenceObject(), signalAuthOriginMap.get(s), signalAuthDestMap.get(s));
+		AvatarPragmaAuthenticity pragma = new AvatarPragmaAuthenticity("#Authenticity " + signalAuthOriginMap.get(s).getName() + " " + signalAuthDestMap.get(s).getName(), signalAuthOriginMap.get(s).getReferenceObject(), signalAuthOriginMap.get(s), signalAuthDestMap.get(s));
+			//System.out.println("adding pragma " + s);
 		avspec.addPragma(pragma);
 		}
 	}
@@ -1911,12 +1932,20 @@ public class TML2Avatar {
 	//Check if we matched up all signals
 	for (SecurityPattern sp:symKeys.keySet()){
 		if (symKeys.get(sp).size()>1){	
-			avspec.addPragma(new AvatarPragmaInitialKnowledge("#InitialSystemKnowledge "+sp.name, null, symKeys.get(sp), true));
+			String keys = "";
+			for (AvatarAttribute key: symKeys.get(sp)){
+				keys= keys+" "+key.getBlock().getName() + "."+key.getName();
+			}
+			avspec.addPragma(new AvatarPragmaInitialKnowledge("#InitialSessionKnowledge"+ keys, null, symKeys.get(sp), true));
 		}
 	}
 	for (SecurityPattern sp:pubKeys.keySet()){
 		if (pubKeys.get(sp).size()!=0){
-			avspec.addPragma(new AvatarPragmaInitialKnowledge("#InitialSystemKnowledge "+sp.name, null, pubKeys.get(sp),true));
+			String keys = "";
+			for (AvatarAttribute key: symKeys.get(sp)){
+				keys= keys+" "+key.getBlock().getName() + "."+key.getName();
+			}
+			avspec.addPragma(new AvatarPragmaInitialKnowledge("#InitialSessionKnowledge "+sp.name, null, pubKeys.get(sp),true));
 		}
 	}
 	tmlmap.getTMLModeling().secChannelMap = secChannelMap;
@@ -1925,65 +1954,45 @@ public class TML2Avatar {
 		return avspec;
 	}
 
- //   public void backtracePatterns(List<Stri
-   
-	public void backtraceReachability(List<String> reachableStates, List<String> nonReachableStates){
-	//	System.out.println(stateObjectMap);
-	for (String s: reachableStates){
-		if (stateObjectMap.containsKey(s.replace("enteringState__",""))){
-		Object obj = stateObjectMap.get(s.replace("enteringState__",""));
-		if (obj instanceof TMLADWriteChannel){
-			TMLADWriteChannel wc =(TMLADWriteChannel) obj;
-			wc.reachabilityInformation=1;
-		}
-		if (obj instanceof TMLADReadChannel){
-			TMLADReadChannel wc =(TMLADReadChannel) obj;
-			wc.reachabilityInformation=1;
-		}
-		
-		if (obj instanceof TMLADSendEvent){
-			TMLADSendEvent wc =(TMLADSendEvent) obj;
-			wc.reachabilityInformation=1;
-		}
-		
-		if (obj instanceof TMLADSendRequest){
-			TMLADSendRequest wc =(TMLADSendRequest) obj;
-			wc.reachabilityInformation=1;
-		}
-		if (obj instanceof TMLADWaitEvent){
-			TMLADWaitEvent wc =(TMLADWaitEvent) obj;
-			wc.reachabilityInformation=1;
-		}		
-		}
-	}
-	for (String s:nonReachableStates){
-		if (stateObjectMap.containsKey(s.replace("enteringState__",""))){
-		Object obj = stateObjectMap.get(s.replace("enteringState__",""));
-		if (obj instanceof TMLADWriteChannel){
-			TMLADWriteChannel wc =(TMLADWriteChannel) obj;
-			wc.reachabilityInformation=2;
-		}
-		if (obj instanceof TMLADReadChannel){
-			TMLADReadChannel wc =(TMLADReadChannel) obj;
-			wc.reachabilityInformation=2;
-		}
-		
-		if (obj instanceof TMLADSendEvent){
-			TMLADSendEvent wc =(TMLADSendEvent) obj;
-			wc.reachabilityInformation=2;
-		}
-		
-		if (obj instanceof TMLADSendRequest){
-			TMLADSendRequest wc =(TMLADSendRequest) obj;
-			wc.reachabilityInformation=2;
-		}
-		if (obj instanceof TMLADWaitEvent){
-			TMLADWaitEvent wc =(TMLADWaitEvent) obj;
-			wc.reachabilityInformation=2;
-		}		
-		}
-	}
+	public void backtraceReachability(HashMap<AvatarPragmaReachability, ProVerifQueryResult> reachabilityResults) {
+            for (AvatarPragmaReachability pragma: reachabilityResults.keySet())
+            {
+                ProVerifQueryResult result = reachabilityResults.get(pragma);
+                if (!result.isProved())
+                    continue;
+
+                int r = result.isSatisfied() ? 1 : 2;
+
+                String s = pragma.getBlock().getName() + "__" + pragma.getState().getName();
+
+                if (stateObjectMap.containsKey(s)) {
+                    Object obj = stateObjectMap.get(s);
+                    if (obj instanceof TMLADWriteChannel){
+                            TMLADWriteChannel wc =(TMLADWriteChannel) obj;
+                            wc.reachabilityInformation=r;
+                    }
+                    if (obj instanceof TMLADReadChannel){
+                            TMLADReadChannel wc =(TMLADReadChannel) obj;
+                            wc.reachabilityInformation=r;
+                    }
+                    
+                    if (obj instanceof TMLADSendEvent){
+                            TMLADSendEvent wc =(TMLADSendEvent) obj;
+                            wc.reachabilityInformation=r;
+                    }
+                    
+                    if (obj instanceof TMLADSendRequest){
+                            TMLADSendRequest wc =(TMLADSendRequest) obj;
+                            wc.reachabilityInformation=r;
+                    }
+                    if (obj instanceof TMLADWaitEvent){
+                            TMLADWaitEvent wc =(TMLADWaitEvent) obj;
+                            wc.reachabilityInformation=r;
+                    }		
+                }
+            }
 	}
+
 	public void distributeKeys(){
 		List<TMLTask> tasks = tmlmap.getTMLModeling().getTasks();
 		for (TMLTask t:accessKeys.keySet()){
diff --git a/src/tmltranslator/toavatar/TML2AvatarDP.java b/src/tmltranslator/toavatar/TML2AvatarDP.java
index 019e8c829e84c968dae3849de9a31afb884b10aa..2fe9ebaca5746ed5308f9baaf341d5a301d8066f 100644
--- a/src/tmltranslator/toavatar/TML2AvatarDP.java
+++ b/src/tmltranslator/toavatar/TML2AvatarDP.java
@@ -44,17 +44,21 @@
 
 package tmltranslator.toavatar;
 
-import java.util.*;
-import java.awt.*;
-import tmltranslator.*;
-import ui.*;
-import myutil.*;
-import ui.avatarbd.*;
+import avatartranslator.*;
+import tmltranslator.TMLMapping;
+import ui.AvatarDesignPanel;
+import ui.TAttribute;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarbd.AvatarBDPortConnector;
+import ui.avatarbd.AvatarBDPragma;
 import ui.avatarsmd.*;
 
-import avatartranslator.*;
+import java.util.*;
+
 //import translator.*;
-import ui.window.*;
 
 
 public class TML2AvatarDP {
diff --git a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
index 180f448f73744de07cfe9c7ca14f90d5038e2daa..6778daa373b6f2d42c814e1d03af6c2be9869eb6 100755
--- a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
@@ -45,10 +45,13 @@
 
 package tmltranslator.tomappingsystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.List;
 
 
 public class MappedSystemCTask {
diff --git a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
index f7a173d7e3074776a526c22181eae438cb3d31e5..e7e332e7f05bd8baa3e5c7a575d98a17506233f4 100755
--- a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tomappingsystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 
 public class TML2MappingSystemC {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index b8c2841509477a4c67bd3452f8b6db5ebed206d6..cbe052128bc8c26858a4aea51d28e8da670e154b 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -45,12 +45,15 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
 import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
 
 
 public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
index 546b79b62521987fb6e3a1631df4395a6db4f2b1..c98870e6c51fb6c3238407035883d1488c87d71f 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
@@ -1,12 +1,12 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.List;
-
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLModeling;
 
+import java.util.List;
+
 public class DiploSimulatorFactory {
 	
 	public static final DiploSimulatorFactory INSTANCE = new DiploSimulatorFactory();
diff --git a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
index d5c3dc9411c930e35a59a2d8ef5a19f45124823d..30bd4d85dd2934e08ec7022bcce037dee997b93e 100644
--- a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
+++ b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
@@ -1,10 +1,12 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.TraceManager;
 import tmltranslator.*;
-import javax.script.*;
 
-import myutil.*;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.util.LinkedList;
 
 public class LiveVariableNode{
 	private LinkedList<LiveVariableNode> _succList = new LinkedList<LiveVariableNode>(), _predList = new LinkedList<LiveVariableNode>();
diff --git a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
index a87dee6454d5a001acfd042a554d53f0279a0200..f3a5aa774ef06afa35589f42dbebc1debfdbd818 100644
--- a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
@@ -45,9 +45,16 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 
 public class MappedSystemCTask {
@@ -60,7 +67,7 @@ public class MappedSystemCTask {
     private TMLMapping tmlmapping;
     private int commentNum;
     private boolean debug;
-    private boolean optimize;
+   // private boolean optimize;
     private StaticAnalysis _analysis;
     private LiveVariableNode _startAnaNode=null;
 
@@ -91,7 +98,7 @@ public class MappedSystemCTask {
         functionSig="";
         commentText="";
         commentNum=0;
-        optimize=false;
+       // optimize=false;
 
         _analysis = new StaticAnalysis(_task, _channels, _events, _requests, _depChannels);
         _startAnaNode = _analysis.startAnalysis();
@@ -110,7 +117,7 @@ public class MappedSystemCTask {
         //_startAnaNode = _analysis.startAnalysis();
         //_analysis.determineCheckpoints(aStatistics); //NEW
         debug = _debug;
-        optimize=_optimize;
+     //   optimize=_optimize;
         basicCPPCode();
         makeClassCode();
     }
@@ -215,12 +222,12 @@ public class MappedSystemCTask {
         hcode = Conversion.indentString(hcode, 4);
         cppcode = Conversion.indentString(cppcode, 4);
     }
-
-    private String makeDestructor(){
-        String dest=reference + "::~" + reference + "(){" + CR;
-        if (commentNum!=0) dest+="delete[] _comment" + SCCR;
-        return dest+"}"+CR;
-    }
+//
+//    private String makeDestructor(){
+//        String dest=reference + "::~" + reference + "(){" + CR;
+//        if (commentNum!=0) dest+="delete[] _comment" + SCCR;
+//        return dest+"}"+CR;
+//    }
 
     private String makeConstructorSignature(){
         String constSig=reference+ "(ID iID, Priority iPriority, std::string iName, CPU** iCPUs, unsigned int iNumOfCPUs"+CR;
@@ -596,7 +603,7 @@ public class MappedSystemCTask {
 
         } else if (currElem instanceof TMLSendEvent){
             if (debug) TraceManager.addDev("Checking Send\n");
-            TMLSendEvent sendEvt=(TMLSendEvent)currElem;
+           // TMLSendEvent sendEvt=(TMLSendEvent)currElem;
             cmdName= "_send" + currElem.getID();
             hcode+="TMLSendCommand " + cmdName + SCCR;
             handleParameters(currElem, cmdName, false, getFormattedLiveVarStr(currElem));
@@ -604,7 +611,7 @@ public class MappedSystemCTask {
 
         } else if (currElem instanceof TMLSendRequest){
             if (debug) TraceManager.addDev("Checking Request\n");
-            TMLSendRequest sendReq=(TMLSendRequest)currElem;
+            //TMLSendRequest sendReq=(TMLSendRequest)currElem;
             cmdName= "_request" + currElem.getID();
             hcode+="TMLRequestCommand " + cmdName + SCCR;
             handleParameters(currElem, cmdName, false, getFormattedLiveVarStr(currElem));
@@ -612,7 +619,7 @@ public class MappedSystemCTask {
 
         } else if (currElem instanceof TMLWaitEvent){
             if (debug) TraceManager.addDev("Checking Wait\n");
-            TMLWaitEvent waitEvt = (TMLWaitEvent)currElem;
+           // TMLWaitEvent waitEvt = (TMLWaitEvent)currElem;
             cmdName= "_wait" + currElem.getID();
             hcode+="TMLWaitCommand " + cmdName + SCCR;
             handleParameters(currElem, cmdName, true, getFormattedLiveVarStr(currElem));
@@ -808,8 +815,11 @@ public class MappedSystemCTask {
         LinkedList<HwCommunicationNode> commNodeRefList = tmlmapping.findNodesForElement(writeCmd.getChannel(0));
         for(int i=1; i<writeCmd.getNbOfChannels(); i++){
             LinkedList<HwCommunicationNode> commNodeCmpList = tmlmapping.findNodesForElement(writeCmd.getChannel(i));
+            
             if (commNodeCmpList.size()!=commNodeRefList.size()) return false;
-            Iterator it = commNodeCmpList.iterator();
+            
+            Iterator<HwCommunicationNode> it = commNodeCmpList.iterator();
+            
             for(HwCommunicationNode cmnode: commNodeRefList) {
                 if (it.next()!=cmnode) return false;
             }
@@ -900,7 +910,7 @@ public class MappedSystemCTask {
 
     private String makeAttributesCode() {
         String code = "";
-        int i;
+       // int i;
         for(TMLAttribute att: task.getAttributes()) {
             //if (!att.name.endsWith("__req")){ //NEW
             if (att.hasInitialValue())
@@ -917,7 +927,7 @@ public class MappedSystemCTask {
 
     private String makeAttributesDeclaration() {
         String code = "";
-        int i;
+      //  int i;
         for(TMLAttribute att: task.getAttributes()) {
             //if (!att.name.endsWith("__req")){  //NEW
             code += "ParamType " + att.name;
diff --git a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
index d87df65b56f13241615c4433fad96dde41ed7506..2df16b5f872c258b0f1c6213647f9e22c886dad3 100644
--- a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
+++ b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
@@ -1,21 +1,10 @@
 package tmltranslator.tomappingsystemc2;
 
+import tmltranslator.*;
+
 import java.util.Arrays;
 import java.util.Collection;
 
-import tmltranslator.CPPCodeGenerationHelper;
-import tmltranslator.HwA;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwCommunicationNode;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLEvent;
-import tmltranslator.TMLTask;
-
 public class NamesGenerationHelper {
 	
 	private static final String[] RESERVED_WORDS = {
diff --git a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
index 77ecbd05cc15f7b2717377b1757786784ac673d9..da6045b1e9d072d1e4afc084ec5aeea13cfba6b1 100644
--- a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
+++ b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
@@ -1,10 +1,14 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.TraceManager;
 import tmltranslator.*;
-import java.util.regex.*;
 
-import myutil.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 //import java.util.HashSet;
 
 public class StaticAnalysis{
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
index 98b20593e514e28f0c8926b40ebce5741b91f4bb..6ca05877e67aaedb5784c8379f859b5db68cc379 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
@@ -45,11 +45,14 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
-import tmltranslator.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import req.ebrdd.*;
+import tmltranslator.*;
+
+import java.util.LinkedList;
 
 
 public class SystemCEBRDD {
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
index 5f02acc621433fe44220d4778fb457a39e54c150..864796326c461ae8f79226b16a5bf46d670d94ca 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
@@ -45,10 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tepe.*;
-import java.util.regex.*;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class SystemCTEPE {
diff --git a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
index 7b752c7a7cf7436147a771bdb56cc374960eaf56..95b45ad1759651029f5c3b9c6ade747cc8dc2472 100644
--- a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
@@ -45,12 +45,15 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
 import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
 
 
 public class TML2MappingSystemC implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/toproverif/TML2ProVerif.java b/src/tmltranslator/toproverif/TML2ProVerif.java
index fc84fc8375434cbe5edb02e102fefae36b3fb48d..b174022ea56ff8e7d5a3bbe0c83d83885b100513 100644
--- a/src/tmltranslator/toproverif/TML2ProVerif.java
+++ b/src/tmltranslator/toproverif/TML2ProVerif.java
@@ -45,21 +45,18 @@
 
 package tmltranslator.toproverif;
 
-import java.util.LinkedList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-
-import ui.ConfigurationTTool;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import proverifspec.*;
-import myutil.*;
 import tmltranslator.*;
+import ui.ConfigurationTTool;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.*;
 
 public class TML2ProVerif {
 
diff --git a/src/tmltranslator/tosystemc/SystemCTask.java b/src/tmltranslator/tosystemc/SystemCTask.java
index 69ec35b66d21f5f8f1476aa32ca62a0d1e350ed8..eae7ed1ed8ba626c63fbdca7f9e39e3687ed7956 100755
--- a/src/tmltranslator/tosystemc/SystemCTask.java
+++ b/src/tmltranslator/tosystemc/SystemCTask.java
@@ -45,10 +45,10 @@
 
 package tmltranslator.tosystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.ListIterator;
 
 
 public class SystemCTask {
diff --git a/src/tmltranslator/tosystemc/TML2SystemC.java b/src/tmltranslator/tosystemc/TML2SystemC.java
index 44fd92b0d876242c942c1ab08460841610ae027f..016f9dd632d719deaf1033d3e81bb73dc6f1f772 100755
--- a/src/tmltranslator/tosystemc/TML2SystemC.java
+++ b/src/tmltranslator/tosystemc/TML2SystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tosystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class TML2SystemC {
diff --git a/src/tmltranslator/toturtle/Mapping2TIF.java b/src/tmltranslator/toturtle/Mapping2TIF.java
index 61ef55b011eacab08a55559112c4f5d7d242e781..4ed40a30e1d7c9e9cae4148ba21df82ec571a6d4 100755
--- a/src/tmltranslator/toturtle/Mapping2TIF.java
+++ b/src/tmltranslator/toturtle/Mapping2TIF.java
@@ -44,12 +44,16 @@
 
 package tmltranslator.toturtle;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import translator.*;
-import ui.*;
+import ui.CheckingError;
+import ui.TGComponent;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class Mapping2TIF {
diff --git a/src/tmltranslator/toturtle/TML2TURTLE.java b/src/tmltranslator/toturtle/TML2TURTLE.java
index 0f880b19654213c09111b8552fe7188beacae7d4..83a5b14ee2aa0e354f97cb662e1dc28c86b36427 100755
--- a/src/tmltranslator/toturtle/TML2TURTLE.java
+++ b/src/tmltranslator/toturtle/TML2TURTLE.java
@@ -45,12 +45,14 @@
 
 package tmltranslator.toturtle;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import translator.*;
-import ui.*;
+import ui.CheckingError;
+
+import java.util.Iterator;
+import java.util.Vector;
 
 
 public class TML2TURTLE {
diff --git a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
index e4300b14c8e44a639dcf71bfc8418e193c2fbdaa..ff518f2a0cdba84a170a6cff3103624233cd4320 100755
--- a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
+++ b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
@@ -45,12 +45,12 @@
 
 package tmltranslator.touppaal;
 
-import java.awt.*;
-import java.util.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
 
-import uppaaldesc.*;
-import myutil.*;
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public class RelationTMLUPPAAL {
     
diff --git a/src/tmltranslator/touppaal/TML2UPPAAL.java b/src/tmltranslator/touppaal/TML2UPPAAL.java
index e30ec5aac36f71c445cb018f80937269cc2d1fbd..4c786fda7e53eedff0fe63b262e9985dbe143c25 100755
--- a/src/tmltranslator/touppaal/TML2UPPAAL.java
+++ b/src/tmltranslator/touppaal/TML2UPPAAL.java
@@ -45,12 +45,16 @@
 
 package tmltranslator.touppaal;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import uppaaldesc.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 
 public class TML2UPPAAL {
 
diff --git a/src/tmltranslator/touppaal/TMLActivityElementLocation.java b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
index 44e730e58f340daaed1bd69e1f3b24513369cb03..5f9b9ffcf3f4a3c004df3c5aaaf1162b2842047a 100755
--- a/src/tmltranslator/touppaal/TMLActivityElementLocation.java
+++ b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
@@ -45,8 +45,8 @@
 
 package tmltranslator.touppaal;
 
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLActivityElement;
+import uppaaldesc.UPPAALLocation;
 
 public class TMLActivityElementLocation {
 	public TMLActivityElement elt;
diff --git a/src/tmltranslator/touppaal/TMLTaskTemplate.java b/src/tmltranslator/touppaal/TMLTaskTemplate.java
index 0499c739df30c90d64b5b9fdd8ecc4b9cf0795df..1f1c319ca07203e9c20222afc64b126bd3414ddb 100755
--- a/src/tmltranslator/touppaal/TMLTaskTemplate.java
+++ b/src/tmltranslator/touppaal/TMLTaskTemplate.java
@@ -45,8 +45,8 @@
 
 package tmltranslator.touppaal;
 
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALTemplate;
 
 public class TMLTaskTemplate {
 	public TMLTask task;
diff --git a/src/tpndescription/TPN.java b/src/tpndescription/TPN.java
index 5409fdef4b37d836e85b8fa9e20cac11a27005e8..c6113215be6a8d0fc55341bb61566ceef0a233bb 100755
--- a/src/tpndescription/TPN.java
+++ b/src/tpndescription/TPN.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tpndescription;
 
-import java.util.*;
+import myutil.IntMatrix;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TPN {
     public static int INDEX  = 0;
diff --git a/src/tpndescription/Transition.java b/src/tpndescription/Transition.java
index fabf215c68914d77a969918b97d385cb07bb960f..08f1a631bf2b14845b2ada62c27d8c79b65644c7 100755
--- a/src/tpndescription/Transition.java
+++ b/src/tpndescription/Transition.java
@@ -45,7 +45,8 @@
 
 package tpndescription;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class Transition {
     public static int INDEX  = 0;
diff --git a/src/translator/ADChoice.java b/src/translator/ADChoice.java
index cc52414dda83e3e79754afef5b93fdefef951564..d346c38a6505909b0a79ab3f5b0121fc9dfc1267 100755
--- a/src/translator/ADChoice.java
+++ b/src/translator/ADChoice.java
@@ -45,9 +45,9 @@
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Vector;
 
 public class ADChoice extends ADComponent implements NonBlockingADComponent {
     protected Vector guard; // String
diff --git a/src/translator/ADComponent.java b/src/translator/ADComponent.java
index bdbb0d9168dcfa9ab53e05e9725f8133d6f8c405..74d00f99aaadfe20cb2575118b68c93d3c81df1f 100755
--- a/src/translator/ADComponent.java
+++ b/src/translator/ADComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public abstract class ADComponent implements Cloneable {
     protected boolean selected = false;
diff --git a/src/translator/ADParallel.java b/src/translator/ADParallel.java
index f7a9706a9dfa4797638b901e6a8fc2bbeeb9e6ae..76c4545b1c70429cb7189885706290236d4443f4 100755
--- a/src/translator/ADParallel.java
+++ b/src/translator/ADParallel.java
@@ -45,9 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Vector;
 
 public class ADParallel extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
     protected String valueGate;
diff --git a/src/translator/ADPreempt.java b/src/translator/ADPreempt.java
index c2faaa63603c311f0df72fefce55e573a489e31a..ecc2b869b3cc3eafcd315871a0fb06d9f38b2026 100755
--- a/src/translator/ADPreempt.java
+++ b/src/translator/ADPreempt.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class ADPreempt extends ADComponent implements NonBlockingADComponent {
diff --git a/src/translator/ADSequence.java b/src/translator/ADSequence.java
index 09911482c5c564086fd556c20431ca3cafad2131..0c6f82b4a17c05d9d5f13370d5b4739a2438b6eb 100755
--- a/src/translator/ADSequence.java
+++ b/src/translator/ADSequence.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class ADSequence extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
diff --git a/src/translator/ActivityDiagram.java b/src/translator/ActivityDiagram.java
index 457a8f07c636aba366a4bc2332651fd61b1cc1a5..88711e80a460ff085d54f77caffa410a427d5114 100755
--- a/src/translator/ActivityDiagram.java
+++ b/src/translator/ActivityDiagram.java
@@ -45,9 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class ActivityDiagram extends Vector<ADComponent>{
     
diff --git a/src/translator/FIFOFiniteAndGetSizeTClass.java b/src/translator/FIFOFiniteAndGetSizeTClass.java
index b0370e5632ae8e63e7d0619d5dfa7d24b4d5218b..0d72068edb6afcf88491483a2b20052363260b8d 100755
--- a/src/translator/FIFOFiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOFiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOFiniteAndGetSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOInfiniteAndGetSizeTClass.java b/src/translator/FIFOInfiniteAndGetSizeTClass.java
index f031c4e42803194f707dc90021848a4087f45d9f..49dccb895bcf401589a8055f52085331a16cea86 100755
--- a/src/translator/FIFOInfiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOInfiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOInfiniteAndGetSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOSizeTClass.java b/src/translator/FIFOSizeTClass.java
index 1303b78201d8821feb523730431c4a79805ec409..99626b205a3d17a2efbba816bc8adc64eb9f968b 100755
--- a/src/translator/FIFOSizeTClass.java
+++ b/src/translator/FIFOSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOTClass.java b/src/translator/FIFOTClass.java
index cfb84ad514ba86db59e75529a50cd948a9ab0a9d..922e06d1e0b982e04b72551dfb2d629953f4c523 100755
--- a/src/translator/FIFOTClass.java
+++ b/src/translator/FIFOTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOTClass  {
     public int getNbPara();
diff --git a/src/translator/GroupOfGates.java b/src/translator/GroupOfGates.java
index c58770a47b9d1046cd826b25e2a2ffa9f879c4ca..1247b9b4747cd91b5504c5d9fdab078f06ce0559 100755
--- a/src/translator/GroupOfGates.java
+++ b/src/translator/GroupOfGates.java
@@ -46,8 +46,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package translator;
 
 
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.SortedVector;
 
 public class GroupOfGates extends SortedVector implements Comparable<GroupOfGates>, GenericTree {
     /**
diff --git a/src/translator/HLProcess.java b/src/translator/HLProcess.java
index 4d78a92292dd3d3f8456be7cdc1b5ad8f91f075f..a12e78b8c1addb6c4a90c6f1327f4c63a74be669 100755
--- a/src/translator/HLProcess.java
+++ b/src/translator/HLProcess.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class HLProcess extends Process {
     private TClass tc;
diff --git a/src/translator/Param.java b/src/translator/Param.java
index ef8e66544b4c34957bb73f2a864edacfed087d4a..130592201c0898f34da189a0b1d6b7878e67d14f 100755
--- a/src/translator/Param.java
+++ b/src/translator/Param.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import translator.tojava.*;
+import translator.tojava.JKeyword;
 
 public class Param {
     private String name;
diff --git a/src/translator/Process.java b/src/translator/Process.java
index cb840d846f5576450064dca5d3c0fe3d035b8cd1..45f85c3da6a79ff64a2805bab5c15daf2d09d774 100755
--- a/src/translator/Process.java
+++ b/src/translator/Process.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class Process {
     protected String name;
diff --git a/src/translator/Relation.java b/src/translator/Relation.java
index 9bc91ef039f0c6b411afd7f4b71b2434683e01f8..fdd67663e494d68a63057766978fdbd81b68d727 100755
--- a/src/translator/Relation.java
+++ b/src/translator/Relation.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class Relation {
     // composition operator
diff --git a/src/translator/TClass.java b/src/translator/TClass.java
index 26b4027a1e5de55769d707d760f4f42c60a094e1..e3a577f675f59ea1fbcdbf878091476e53fcaad1 100755
--- a/src/translator/TClass.java
+++ b/src/translator/TClass.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+
+import java.util.Vector;
 
 public class TClass {
     private String name;
diff --git a/src/translator/TClassBasicFIFO.java b/src/translator/TClassBasicFIFO.java
index 7202630c38904343a9331b02000c6bd046df182d..f93005e5252067d643ec956ae217d2623bbf7cc9 100755
--- a/src/translator/TClassBasicFIFO.java
+++ b/src/translator/TClassBasicFIFO.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-
 public class TClassBasicFIFO extends TClassBuffer {
     
     public TClassBasicFIFO(String name) {
diff --git a/src/translator/TClassBuffer.java b/src/translator/TClassBuffer.java
index 7acd20c5268c0c844f8c3716c579024f385b04fb..8ea9c5df3f5c36e4fba2549ad25386e01b3bc709 100755
--- a/src/translator/TClassBuffer.java
+++ b/src/translator/TClassBuffer.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public abstract class TClassBuffer extends TClass {
 	
diff --git a/src/translator/TClassBufferIn.java b/src/translator/TClassBufferIn.java
index c3f60ba737e3e38079d35e84a166d4a1e6854cc7..03c26eb06c01cd562bcce5a923ccaf9034aaf360 100755
--- a/src/translator/TClassBufferIn.java
+++ b/src/translator/TClassBufferIn.java
@@ -44,8 +44,6 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
 
 public class TClassBufferIn extends TClassBuffer {
     
diff --git a/src/translator/TClassBufferOut.java b/src/translator/TClassBufferOut.java
index af406020288e1875aaf721b105bfdee7c109739f..dcfdb027c8516e65341082c7cb875a5105ba42ef 100755
--- a/src/translator/TClassBufferOut.java
+++ b/src/translator/TClassBufferOut.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-
 public class TClassBufferOut extends TClassBuffer {
     
     public TClassBufferOut(String name) {
diff --git a/src/translator/TClassEventCommon.java b/src/translator/TClassEventCommon.java
index 7edb542f1f846ed0981f203d3e3e818e6ea66c23..2748c98e277e3806dc2eae7c54dbdf39b7f19137 100755
--- a/src/translator/TClassEventCommon.java
+++ b/src/translator/TClassEventCommon.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface TClassEventCommon  {
     public int getNbPara();
diff --git a/src/translator/TClassEventFinite.java b/src/translator/TClassEventFinite.java
index a336a74cad1f3c5853c569f3fb3706e44ac82db7..a262ed6c72f7811b5c7816873c2dca82d033cd56 100755
--- a/src/translator/TClassEventFinite.java
+++ b/src/translator/TClassEventFinite.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventFinite extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
      private int nbPara;
diff --git a/src/translator/TClassEventFiniteBlocking.java b/src/translator/TClassEventFiniteBlocking.java
index 735b0bc55ac486e48d37622a3ad2ea3c4c6baa25..f77220f916b8dac5c11bc9821a3abd2fc78d61b9 100755
--- a/src/translator/TClassEventFiniteBlocking.java
+++ b/src/translator/TClassEventFiniteBlocking.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventFiniteBlocking extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
 	private int nbPara;
diff --git a/src/translator/TClassEventInfinite.java b/src/translator/TClassEventInfinite.java
index 9f903d411079fffa73c88df16d14c29f160e436d..f5857a2a8b0c1fa3b1ba0202c5ab65178bdfe444 100755
--- a/src/translator/TClassEventInfinite.java
+++ b/src/translator/TClassEventInfinite.java
@@ -44,10 +44,11 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
 
-import myutil.*;
+import myutil.TraceManager;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventInfinite extends TClass implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
   private int nbPara;
diff --git a/src/translator/TClassInfiniteFIFO.java b/src/translator/TClassInfiniteFIFO.java
index 3f8da9419943f0d49d26f84c1f014ecb3abdd9b4..07ff2ccc4523a52d39357c97c9a3355c50e9f70a 100755
--- a/src/translator/TClassInfiniteFIFO.java
+++ b/src/translator/TClassInfiniteFIFO.java
@@ -44,8 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassInfiniteFIFO extends TClassBuffer implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
 
diff --git a/src/translator/TClassRequest.java b/src/translator/TClassRequest.java
index 9e2bbe9240cd97c6be9f309c075aa7ff610ddce0..3f10a47844d15e52ee6ce13e25e191c72284e809 100755
--- a/src/translator/TClassRequest.java
+++ b/src/translator/TClassRequest.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassRequest extends TClass implements FIFOTClass{
     
diff --git a/src/translator/TIFExchange.java b/src/translator/TIFExchange.java
index 14d39e96db223b006e5af6f48294132ddb36beac..2a31973363885454e9b305f9bca9213f449a4612 100755
--- a/src/translator/TIFExchange.java
+++ b/src/translator/TIFExchange.java
@@ -45,13 +45,19 @@
 
 package translator;
 
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 
 public class TIFExchange {
 	private TURTLEModeling tm;
diff --git a/src/translator/TURTLEModelChecker.java b/src/translator/TURTLEModelChecker.java
index dcc679f4c7bafa08932490157b368bd8db367ebb..62896b9e2cf1bc944c5d77fd7de41517f2e8e618 100755
--- a/src/translator/TURTLEModelChecker.java
+++ b/src/translator/TURTLEModelChecker.java
@@ -45,12 +45,18 @@
 
 package translator;
 
-import ui.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.TraceManager;
+import ui.CheckingError;
+import ui.CorrespondanceTGElement;
+import ui.TGComponent;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 
 public class TURTLEModelChecker {
diff --git a/src/translator/TURTLEModeling.java b/src/translator/TURTLEModeling.java
index f9918d0e7681fab4e028f3d82f74f9410eba94ef..c57d838811e75277bf87044f57c901e915815d24 100755
--- a/src/translator/TURTLEModeling.java
+++ b/src/translator/TURTLEModeling.java
@@ -45,11 +45,13 @@
 
 package translator;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
 import ui.CheckingError;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
+
 public class TURTLEModeling {
 	private String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}"};
     
diff --git a/src/translator/TURTLETranslator.java b/src/translator/TURTLETranslator.java
index baee7048f903c56831a89d13c0b0394ec41f017c..fb82fb1f73c10647bd825fbad2ff76fcbdbe8210 100755
--- a/src/translator/TURTLETranslator.java
+++ b/src/translator/TURTLETranslator.java
@@ -45,10 +45,12 @@
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
+import ui.CheckingError;
 
-import ui.*;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TURTLETranslator {
 
diff --git a/src/translator/tojava/ComponentId.java b/src/translator/tojava/ComponentId.java
index ab8a60776230b92b7222c18b8a1e9576486b16d1..eeaa0f95cd84a3c4798688e03bcf58da31f0c73e 100755
--- a/src/translator/tojava/ComponentId.java
+++ b/src/translator/tojava/ComponentId.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import translator.*;
+import translator.ADComponent;
 
 public class ComponentId  {
     public ADComponent adc;
diff --git a/src/translator/tojava/JAttribute.java b/src/translator/tojava/JAttribute.java
index 2d6c6eb8887d206538e17b605b0e5e68b28224e5..395a368062fd65bcc55931da0c1a524d60843170 100755
--- a/src/translator/tojava/JAttribute.java
+++ b/src/translator/tojava/JAttribute.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import translator.*;
+import translator.Param;
 
 public class JAttribute {
     private String access;
diff --git a/src/translator/tojava/JOperation.java b/src/translator/tojava/JOperation.java
index 8be0f601f49f0b2586077e29a843d85da565cca5..58e558cb56fb04c4c4c2f45acd202af3b667e6c9 100755
--- a/src/translator/tojava/JOperation.java
+++ b/src/translator/tojava/JOperation.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import myutil.*;
-import translator.*;
+import myutil.Conversion;
+import translator.ADComponent;
 
 public class JOperation  {
     public String name;
diff --git a/src/translator/tojava/JavaClass.java b/src/translator/tojava/JavaClass.java
index 6ef7eae38144a69dec6b4f0e4f5ff0ec0282f4a3..7137567126e65b7c068aedfa55d1daf166d945e7 100755
--- a/src/translator/tojava/JavaClass.java
+++ b/src/translator/tojava/JavaClass.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
 
-import myutil.*;
+import java.util.Vector;
 
 public class JavaClass {
     
diff --git a/src/translator/tojava/MainClass.java b/src/translator/tojava/MainClass.java
index f3afa2e041654324901a626753e6927ec53a2726..bb13a085f578596a56d595d12e7f1527e0a2a1af 100755
--- a/src/translator/tojava/MainClass.java
+++ b/src/translator/tojava/MainClass.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
 
 public class MainClass {
     
diff --git a/src/translator/tojava/TURTLE2Java.java b/src/translator/tojava/TURTLE2Java.java
index 1d504480cb1f3bdb75d742cedff29622247d8857..fb0cac9da76d8588e3a366a110e77b18ea99ff1a 100755
--- a/src/translator/tojava/TURTLE2Java.java
+++ b/src/translator/tojava/TURTLE2Java.java
@@ -45,12 +45,15 @@
 
 package translator.tojava;
 
-import java.util.*;
-
-import ddtranslator.*;
-import myutil.*;
+import ddtranslator.TClassLinkNode;
+import myutil.Conversion;
+import myutil.FileException;
 import translator.*;
 
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
 public class TURTLE2Java {
     
     //private static int gateId;
diff --git a/src/translator/tosimujava/JSimuGate.java b/src/translator/tosimujava/JSimuGate.java
index 01af5fb4b4f60c33dcaf2500752a761454ea30c8..79cecd1412f8f15ffb66cd3952b64eb1b8698ad2 100755
--- a/src/translator/tosimujava/JSimuGate.java
+++ b/src/translator/tosimujava/JSimuGate.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tosimujava;
 
-import translator.tojava.*;
+import translator.tojava.JKeyword;
 
 public class JSimuGate implements Comparable {
     private String name;
diff --git a/src/translator/tosimujava/MainClassSimu.java b/src/translator/tosimujava/MainClassSimu.java
index 26ea9c6b586586a73eaa231578f025ee378fb166..b059f9c4b9ccbfb1d5984f74d0d69caf966fdc4c 100755
--- a/src/translator/tosimujava/MainClassSimu.java
+++ b/src/translator/tosimujava/MainClassSimu.java
@@ -46,8 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package translator.tosimujava;
 
 
-import translator.tojava.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JKeyword;
+import translator.tojava.TURTLE2Java;
 
 public class MainClassSimu {
     
diff --git a/src/translator/tosimujava/TJavaProcess.java b/src/translator/tosimujava/TJavaProcess.java
index 810dc60a9e85a4dd2768f2d02722f931f337d248..3778f42797e3a4e42f4cd394bed7614250f61445 100755
--- a/src/translator/tosimujava/TJavaProcess.java
+++ b/src/translator/tosimujava/TJavaProcess.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tosimujava;
 
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+import translator.tojava.TURTLE2Java;
 
-import translator.tojava.*;
-import myutil.*;
+import java.util.Vector;
 
 public class TJavaProcess {
     
diff --git a/src/translator/tosimujava/TURTLE2SimuJava.java b/src/translator/tosimujava/TURTLE2SimuJava.java
index 5837728c56056b0cae2ad4357642bec0883074f3..477d8f5373d38c98c5eaeeb1f306dbb0861751de 100755
--- a/src/translator/tosimujava/TURTLE2SimuJava.java
+++ b/src/translator/tosimujava/TURTLE2SimuJava.java
@@ -45,12 +45,19 @@
 
 package translator.tosimujava;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import translator.*;
+import translator.tojava.ComponentId;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 //import ddtranslator.*;
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
 
 public class TURTLE2SimuJava {
     
diff --git a/src/translator/totpn/TURTLE2TPN.java b/src/translator/totpn/TURTLE2TPN.java
index 3335126a4da2dd736174245fe081f1ddf11b0391..8c5c7f18abcfd3589dd1276b9234af34d3268151 100755
--- a/src/translator/totpn/TURTLE2TPN.java
+++ b/src/translator/totpn/TURTLE2TPN.java
@@ -45,13 +45,15 @@
 
 package translator.totpn;
 
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
+import myutil.FileException;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
 import translator.*;
 import ui.CheckingError;
 
+import java.util.LinkedList;
+
 public class TURTLE2TPN {
     
     private TPN tpn;
diff --git a/src/translator/touppaal/ADComponentLocation.java b/src/translator/touppaal/ADComponentLocation.java
index 17475a0b7913f74b49237d71ad8d8bf164032225..47e98ac2812403a0396ba4c835c8a66f87fa6073 100755
--- a/src/translator/touppaal/ADComponentLocation.java
+++ b/src/translator/touppaal/ADComponentLocation.java
@@ -45,8 +45,8 @@
 
 package translator.touppaal;
 
-import translator.*;
-import uppaaldesc.*;
+import translator.ADComponent;
+import uppaaldesc.UPPAALLocation;
 
 public class ADComponentLocation {
 	public ADComponent adc;
diff --git a/src/translator/touppaal/RelationTIFUPPAAL.java b/src/translator/touppaal/RelationTIFUPPAAL.java
index de7bcac207a4327019b5c611afb9d274e5cb8865..0b217e04f13af9ffa94eb09f337c294ab525f640 100755
--- a/src/translator/touppaal/RelationTIFUPPAAL.java
+++ b/src/translator/touppaal/RelationTIFUPPAAL.java
@@ -45,12 +45,12 @@
 
 package translator.touppaal;
 
-import java.awt.*;
-import java.util.*;
+import translator.ADComponent;
+import translator.TClass;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
 
-import uppaaldesc.*;
-import myutil.*;
-import translator.*;
+import java.util.ArrayList;
 
 public class RelationTIFUPPAAL {
     
diff --git a/src/translator/touppaal/TClassTemplate.java b/src/translator/touppaal/TClassTemplate.java
index 6b7ec0f3be4781e898bc53f219f804e205cc6107..9338a6dd51ed50747a933fa221587df7cbc2b536 100755
--- a/src/translator/touppaal/TClassTemplate.java
+++ b/src/translator/touppaal/TClassTemplate.java
@@ -45,8 +45,8 @@
 
 package translator.touppaal;
 
-import translator.*;
-import uppaaldesc.*;
+import translator.TClass;
+import uppaaldesc.UPPAALTemplate;
 
 public class TClassTemplate {
 	public TClass tclass;
diff --git a/src/translator/touppaal/TURTLE2UPPAAL.java b/src/translator/touppaal/TURTLE2UPPAAL.java
index 0d79b0d668a1428a852c18a3dc12341b1fae8daa..d535fd28d3197e34c5a822a98aa44100f919b60a 100755
--- a/src/translator/touppaal/TURTLE2UPPAAL.java
+++ b/src/translator/touppaal/TURTLE2UPPAAL.java
@@ -45,12 +45,20 @@
 
 package translator.touppaal;
 
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import translator.*;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TURTLE2UPPAAL {
 	
diff --git a/src/ttool.txt b/src/ttool.txt
index 44989fe76223c9a03b224f65a97b0efcb294e14f..2e56d7a9ad04fb0ecef3c719e79eb02fde23406b 100755
--- a/src/ttool.txt
+++ b/src/ttool.txt
@@ -1,2 +1,2 @@
 Main-Class: Main
-Class-Path: ./jsoup-1.8.1.jar ./commons-codec-1.10.jar ./gs-core-1.3.jar ./gs-ui-1.3.jar
+Class-Path: ./jsoup-1.8.1.jar ./commons-codec-1.10.jar ./gs-core-1.3.jar ./gs-ui-1.3.jar ./commons-io-2.5.jar
diff --git a/src/ui/ADDPanel.java b/src/ui/ADDPanel.java
index 2007521124e7343687ca3497631e76f741136c18..47159b172e733aea9abc508cf963afa271db2eaa 100755
--- a/src/ui/ADDPanel.java
+++ b/src/ui/ADDPanel.java
@@ -46,24 +46,33 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatardd.ADDDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.avatardd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class ADDPanel extends TURTLEPanel {
     public ADDDiagramPanel tmladd;
-    public Vector validated, ignored;
+   // public Vector validated, ignored;
 
     public ADDPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+        // Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDesignAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDesignAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -89,7 +98,7 @@ public class ADDPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(tmladd);
         tmladd.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBar, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab("Deployment Diagram", IconManager.imgic60, toolBarPanel, "Opens deployment diagram");
diff --git a/src/ui/ActionPerformer.java b/src/ui/ActionPerformer.java
index 9c738ef40ea99e3fb0075a3ae2a1f12abd59b7ef..46f67b09258c346202ed7992aadc93a120380756 100755
--- a/src/ui/ActionPerformer.java
+++ b/src/ui/ActionPerformer.java
@@ -48,8 +48,8 @@
 
 package ui;
 
-import java.awt.event.*;
 import javax.swing.*;
+import java.awt.event.ActionEvent;
 
 public class ActionPerformer {
 
@@ -62,7 +62,9 @@ public class ActionPerformer {
             mgui.newDesign();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_NEW_ANALYSIS].getActionCommand())) {
             mgui.newAnalysis();
-        } else if (command.equals(mgui.actions[TGUIAction.ACT_OPEN].getActionCommand())) {
+        } else if (command.equals(mgui.actions[TGUIAction.ACT_OPEN_FROM_NETWORK].getActionCommand())) {
+            mgui.openNetworkProject();
+	} else if (command.equals(mgui.actions[TGUIAction.ACT_OPEN].getActionCommand())) {
             mgui.openProject();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_MERGE].getActionCommand())) {
             mgui.mergeProject();
@@ -155,8 +157,6 @@ public class ActionPerformer {
             mgui.generateAUTS();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_GEN_UPPAAL].getActionCommand())) {
             mgui.generateUPPAAL();
-        } else if (command.equals(mgui.actions[TGUIAction.ACT_GEN_PROVERIF].getActionCommand())) {
-            mgui.generateProVerif();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_DSE].getActionCommand())) {
             mgui.dse();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER].getActionCommand())) {
diff --git a/src/ui/ActivityDiagramPanelInterface.java b/src/ui/ActivityDiagramPanelInterface.java
index 28c5c635fd468a37103285e098fee4a15d48a057..a87bfbf71b6abf7249fe41fc8c77281a892936f9 100755
--- a/src/ui/ActivityDiagramPanelInterface.java
+++ b/src/ui/ActivityDiagramPanelInterface.java
@@ -47,7 +47,7 @@
 
 package ui;
 
-import java.util.*;
+import java.util.List;
 
 
 public interface ActivityDiagramPanelInterface {
diff --git a/src/ui/AnalysisPanel.java b/src/ui/AnalysisPanel.java
index d8400451a4bfca79c326eb9f02ee51c7ada44231..d9a4d30289c956f34784bfc4ebc3938a0eaf3203 100755
--- a/src/ui/AnalysisPanel.java
+++ b/src/ui/AnalysisPanel.java
@@ -46,30 +46,38 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import ui.iod.*;
-import ui.sd.*;
-import ui.sd2.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.iod.InteractionOverviewDiagramToolBar;
 import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AnalysisPanel extends TURTLEPanel {
     public InteractionOverviewDiagramPanel iodp;
 
     public AnalysisPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneAnalysisAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneAnalysisAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -92,7 +100,7 @@ public class AnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(iodp);
         iodp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarIOD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab("Interaction Overview Diagram", IconManager.imgic17, toolBarPanel, "Opens interaction overview diagram");
@@ -114,17 +122,12 @@ public class AnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(sdp);
         sdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarSequence, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic18, toolBarPanel, "Open the sequence diagram of " + s);
-        //tabbedPane.setVisible(true);
-        //sdp.setVisible(true);
-        //jsp.setVisible(true);
-        //tabbedPane.setSelectedIndex(panels.size()-1);
 
         return true;
-
     }
 
     public boolean addSequenceDiagramZV(String s) {
@@ -141,17 +144,12 @@ public class AnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(sdp);
         sdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarSequence, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic18, toolBarPanel, "Open the sequence diagram of " + s);
-        //tabbedPane.setVisible(true);
-        //sdp.setVisible(true);
-        //jsp.setVisible(true);
-        //tabbedPane.setSelectedIndex(panels.size()-1);
 
         return true;
-
     }
 
     public boolean addIODiagram(String s) {
@@ -169,7 +167,7 @@ public class AnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(iodp);
         iodp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarIOD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic17, toolBarPanel, "Opens interaction overview diagram");
@@ -192,7 +190,7 @@ public class AnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(ucdp);
         ucdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarUC, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic19, toolBarPanel, "Open the use case diagram of " + s);
@@ -301,7 +299,7 @@ public class AnalysisPanel extends TURTLEPanel {
 
         //TraceManager.addDev("Adding instances to last SD Step 2");
 
-        ListIterator iterator = _ucdp.getComponentList().listIterator();
+        Iterator<TGComponent> iterator = _ucdp.getComponentList().iterator();
         TGComponent tgc;
 
         // To determine whether an actor is on the left, or on the right
@@ -315,7 +313,7 @@ public class AnalysisPanel extends TURTLEPanel {
         } else {
             systemName = "System";
             while(iterator.hasNext()) {
-                tgc = (TGComponent)(iterator.next());
+                tgc = iterator.next();
                 if ((tgc instanceof UCDActor) || (tgc instanceof UCDActorBox)) {
                     middleX = middleX + tgc.getX();
                     cptTotal ++;
@@ -327,11 +325,11 @@ public class AnalysisPanel extends TURTLEPanel {
         //TraceManager.addDev("Adding instances to last SD Step 3");
 
         // Classify actors
-        LinkedList <TGComponent> actors = new LinkedList();
-        iterator = _ucdp.getComponentList().listIterator();
+        java.util.List<TGComponent> actors = new LinkedList<TGComponent>();
+        iterator = _ucdp.getComponentList().iterator();
         int i;
         while(iterator.hasNext()) {
-            tgc = (TGComponent)(iterator.next());
+            tgc = iterator.next();
             if ((tgc instanceof UCDActor) || (tgc instanceof UCDActorBox)) {
                 for(i=0; i<actors.size(); i++) {
                     if (actors.get(i).getX() > tgc.getX()) {
diff --git a/src/ui/AnalysisPanelTranslator.java b/src/ui/AnalysisPanelTranslator.java
index fd9d3b2887a0b18313820bd78615dd8fe1463d86..d28e533bcc8882bc962b0d834d278088ba858be3 100755
--- a/src/ui/AnalysisPanelTranslator.java
+++ b/src/ui/AnalysisPanelTranslator.java
@@ -47,19 +47,21 @@ package ui;
 //import java.io.*;
 //import java.awt.*;
 //import javax.swing.*;
-import java.util.*;
 
+import sddescription.*;
+import ui.iod.*;
+import ui.sd.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 //import myutil.*;
-import ui.iod.*;
-import ui.sd.*;
 //import ui.ucd.*;
 //import ui.tree.*;
 //import ui.window.*;
-
 //import ddtranslator.*;
-import sddescription.*;
 //import sdtranslator.*;
 
 public class AnalysisPanelTranslator {
diff --git a/src/ui/AttackTreePanel.java b/src/ui/AttackTreePanel.java
index 8243a898e81d21e1735c4c3722282a8dd6eeb545..356be7a9bd0c59d71d403425341186578cc7108b 100755
--- a/src/ui/AttackTreePanel.java
+++ b/src/ui/AttackTreePanel.java
@@ -46,12 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.atd.*;
+import myutil.GraphicLib;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.atd.AttackTreeDiagramToolbar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
 
 public class AttackTreePanel extends TURTLEPanel {
     public AttackTreeDiagramPanel atdp;
@@ -59,9 +62,10 @@ public class AttackTreePanel extends TURTLEPanel {
     public AttackTreePanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+        // Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
@@ -101,7 +105,7 @@ public class AttackTreePanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(atdp);
         atdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarAt, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic1074, toolBarPanel, "Opens Attack Tree Diagram");
@@ -158,9 +162,10 @@ public class AttackTreePanel extends TURTLEPanel {
         TGComponent tgc;
 
         for(int i=0; i<panels.size(); i++) {
-            ListIterator iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+            Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+           
             while(iterator.hasNext()) {
-                tgc = (TGComponent)(iterator.next());
+                tgc = iterator.next();
                 tgc.setAVATARMet(0);
                 tgc.setInternalAvatarMet(0);
 
diff --git a/src/ui/AttackTreePanelTranslator.java b/src/ui/AttackTreePanelTranslator.java
index efe049c3a1c55dd3172639c83542c5f8303b81eb..c6b3895895770421bcc136a42bcd7bec5fadb975 100644
--- a/src/ui/AttackTreePanelTranslator.java
+++ b/src/ui/AttackTreePanelTranslator.java
@@ -44,15 +44,13 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import attacktrees.*;
+import avatartranslator.*;
 import ui.atd.*;
 
-import attacktrees.*;
+import java.util.LinkedList;
+
 //import translator.*;
-import ui.window.*;
-import avatartranslator.*;
 
 
 public class AttackTreePanelTranslator {
diff --git a/src/ui/AvatarAnalysisPanel.java b/src/ui/AvatarAnalysisPanel.java
index d71622d6469a52b51f319a0ccfe71f6730293087..f4cbec8906f12ee7c8e094141ff69a497ed4d292 100755
--- a/src/ui/AvatarAnalysisPanel.java
+++ b/src/ui/AvatarAnalysisPanel.java
@@ -46,29 +46,36 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import ui.iod.*;
-import ui.sd.*;
-import ui.sd2.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarad.AvatarADToolBar;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatarcd.AvatarCDToolBar;
 import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AvatarAnalysisPanel extends TURTLEPanel {
 
     public AvatarAnalysisPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneAnalysisAction(e);
-                }
-            };
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneAnalysisAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -91,7 +98,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(sdp);
         sdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
         toolBarPanel.add(toolBarSequence, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic18, toolBarPanel, "Open the sequence diagram of " + s);
@@ -118,7 +125,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(sdp);
         sdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarSequence, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic18, toolBarPanel, "Open the sequence diagram of " + s);
@@ -146,7 +153,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(ucdp);
         ucdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarUC, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic19, toolBarPanel, "Open the use case diagram of " + s);
@@ -168,7 +175,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(acdp);
         acdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarACD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic600, toolBarPanel, "Open the context diagram of " + s);
@@ -190,7 +197,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(aadp);
         aadp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarAAD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic5048, toolBarPanel, "Open the activity diagram of " + s);
@@ -261,7 +268,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
 
         //TraceManager.addDev("Adding instances to last SD Step 2");
 
-        ListIterator iterator = _ucdp.getComponentList().listIterator();
+        Iterator<TGComponent> iterator = _ucdp.getComponentList().iterator();
         TGComponent tgc;
 
         // To determine whether an actor is on the left, or on the right
@@ -275,7 +282,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         } else {
             systemName = "System";
             while(iterator.hasNext()) {
-                tgc = (TGComponent)(iterator.next());
+                tgc = iterator.next();
                 if ((tgc instanceof UCDActor) || (tgc instanceof UCDActorBox)) {
                     middleX = middleX + tgc.getX();
                     cptTotal ++;
@@ -287,11 +294,11 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
         //TraceManager.addDev("Adding instances to last SD Step 3");
 
         // Classify actors
-        LinkedList <TGComponent> actors = new LinkedList();
-        iterator = _ucdp.getComponentList().listIterator();
+        java.util.List<TGComponent> actors = new LinkedList<TGComponent>();
+        iterator = _ucdp.getComponentList().iterator();
         int i;
         while(iterator.hasNext()) {
-            tgc = (TGComponent)(iterator.next());
+            tgc = iterator.next();
             if ((tgc instanceof UCDActor) || (tgc instanceof UCDActorBox)) {
                 for(i=0; i<actors.size(); i++) {
                     if (actors.get(i).getX() > tgc.getX()) {
diff --git a/src/ui/AvatarDeploymentPanelTranslator.java b/src/ui/AvatarDeploymentPanelTranslator.java
index b7fd935d0df43556f6761e4bbd8d5d0d523291c5..9c75b0c66f8ba29bc22b59073fb9f85d8c80ced4 100644
--- a/src/ui/AvatarDeploymentPanelTranslator.java
+++ b/src/ui/AvatarDeploymentPanelTranslator.java
@@ -46,44 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import ddtranslatorSoclib.AvatarBridge;
-import ddtranslatorSoclib.AvatarBus;
-import ddtranslatorSoclib.AvatarCPU;
-import ddtranslatorSoclib.AvatarChannel;
-import ddtranslatorSoclib.AvatarComponent;
-import ddtranslatorSoclib.AvatarConnectingPoint;
-import ddtranslatorSoclib.AvatarConnector;
-import ddtranslatorSoclib.AvatarCoproMWMR;
-import ddtranslatorSoclib.AvatarCrossbar;
-import ddtranslatorSoclib.AvatarICU;
-import ddtranslatorSoclib.AvatarMappedObject;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarTTY;
-import ddtranslatorSoclib.AvatarTask;
-import ddtranslatorSoclib.AvatarTimer;
-import ddtranslatorSoclib.AvatarVgmn;
-import ddtranslatorSoclib.AvatarddSpecification;
-import ui.avatardd.ADDBlockArtifact;
-import ui.avatardd.ADDBridgeNode;
-import ui.avatardd.ADDBusNode;
-import ui.avatardd.ADDCPUNode;
-import ui.avatardd.ADDChannelArtifact;
-import ui.avatardd.ADDConnector;
-import ui.avatardd.ADDCoproMWMRNode;
-import ui.avatardd.ADDCrossbarNode;
-import ui.avatardd.ADDDiagramPanel;
-import ui.avatardd.ADDICUNode;
-import ui.avatardd.ADDMemoryNode;
-import ui.avatardd.ADDRAMNode;
-import ui.avatardd.ADDTTYNode;
-import ui.avatardd.ADDTimerNode;
-import ui.avatardd.ADDVgmnNode;
+import ddtranslatorSoclib.*;
+import ui.avatardd.*;
+
+import java.util.*;
 
 public class AvatarDeploymentPanelTranslator {
 
diff --git a/src/ui/AvatarDesignPanel.java b/src/ui/AvatarDesignPanel.java
index daa5a61fb0fae5c60eb45c9e1dbd8fcfad4b85b7..65b0f0c039e6bcb26362d1056f661e72cbf39941 100644
--- a/src/ui/AvatarDesignPanel.java
+++ b/src/ui/AvatarDesignPanel.java
@@ -46,20 +46,25 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-
 import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.GraphicLib;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import ui.avatarbd.*;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.avatarsmd.AvatarSMDState;
+import ui.avatarsmd.AvatarSMDToolBar;
 
-
-import proverifspec.*;
-
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.*;
 
 public class AvatarDesignPanel extends TURTLEPanel {
     public AvatarBDPanel abdp;
@@ -67,12 +72,18 @@ public class AvatarDesignPanel extends TURTLEPanel {
 
     public AvatarDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+
+        // Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDesignAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDesignAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -311,6 +322,28 @@ public class AvatarDesignPanel extends TURTLEPanel {
 
     }
 
+    public LinkedList<String> getPropertyPragmas() {
+        LinkedList<String> result = new LinkedList<String> ();
+        for (Object tgc: abdp.getComponentList()) {
+            if (tgc instanceof AvatarBDPragma) {
+                result.addAll(((AvatarBDPragma) tgc).getProperties());
+            }
+        }
+
+        return result;
+    }
+
+    public LinkedList<String> getModelPragmas() {
+        LinkedList<String> result = new LinkedList<String> ();
+        for (Object tgc: abdp.getComponentList()) {
+            if (tgc instanceof AvatarBDPragma) {
+                result.addAll(((AvatarBDPragma) tgc).getModels());
+            }
+        }
+
+        return result;
+    }
+
 
     public void resetModelBacktracingProVerif() {
         if (abdp == null) {
@@ -358,8 +391,21 @@ public class AvatarDesignPanel extends TURTLEPanel {
         resetModelBacktracingProVerif();
 
         // Confidential attributes
-        LinkedList<AvatarAttribute> secretAttributes = pvoa.getSecretTerms ();
-        LinkedList<AvatarAttribute> nonSecretAttributes = pvoa.getNonSecretTerms ();
+        HashMap<AvatarPragmaSecret, ProVerifQueryResult> confResults = pvoa.getConfidentialityResults();
+        LinkedList<AvatarAttribute> secretAttributes = new LinkedList<AvatarAttribute> ();
+        LinkedList<AvatarAttribute> nonSecretAttributes = new LinkedList<AvatarAttribute> ();
+        for (AvatarPragmaSecret pragma: confResults.keySet())
+        {
+            ProVerifQueryResult result = confResults.get(pragma);
+            if (result.isProved())
+            {
+                if (result.isSatisfied())
+                    secretAttributes.add(pragma.getArg());
+                else
+                    nonSecretAttributes.add(pragma.getArg());
+            }
+        }
+
         for (AvatarBDBlock bdBlock: abdp.getFullBlockList ())
             for (TAttribute tattr: bdBlock.getAttributeList ()) {
                 if (tattr.getType () == TAttribute.OTHER) {
@@ -397,69 +443,34 @@ public class AvatarDesignPanel extends TURTLEPanel {
                 }
             }
 
-        String block, state;
-        int index;
-        int i;
-        Iterator<TGComponent> iterator;
-        TGComponent tgc;
 
         // Reachable states
-        for(String s: pvoa.getReachableEvents()) {
-            index = s.indexOf("__");
-            if (index != -1) {
-                block = s.substring(index+2, s.length());
-                index = block.indexOf("__");
-                if (index != -1) {
-                    state = block.substring(index+2, block.length());
-                    block = block.substring(0, index);
-                    TraceManager.addDev("Block=" + block + " state=" + state);
-                    for(i=0; i<panels.size(); i++) {
-                        tdp = (TDiagramPanel)(panels.get(i));
-                        if ((tdp instanceof AvatarSMDPanel) && (tdp.getName().compareTo(block) == 0)){
-                            iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
-                            while(iterator.hasNext()) {
-                                tgc = iterator.next();
-                                if (tgc instanceof AvatarSMDState) {
-                                    ((AvatarSMDState)tgc).setSecurityInfo(AvatarSMDState.REACHABLE, state);
-                                }
+        HashMap<AvatarPragmaReachability, ProVerifQueryResult> reachResults = pvoa.getReachabilityResults();
+        for (AvatarPragmaReachability pragma: reachResults.keySet())
+        {
+            ProVerifQueryResult result = reachResults.get(pragma);
+            if (result.isProved())
+            {
+                for(int i=0; i<panels.size(); i++) {
+                    tdp = (TDiagramPanel)(panels.get(i));
+                    if ((tdp instanceof AvatarSMDPanel) && (tdp.getName().compareTo(pragma.getBlock().getName()) == 0)) {
+                        Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+                        while(iterator.hasNext()) {
+                            TGComponent tgc = iterator.next();
+                            if (tgc instanceof AvatarSMDState) {
+                                ((AvatarSMDState)tgc).setSecurityInfo(
+                                    result.isSatisfied() ? AvatarSMDState.REACHABLE : AvatarSMDState.NOT_REACHABLE,
+                                    pragma.getState().getName());
                             }
-
                         }
-                    }
-                }
-            }
-        }
 
-        for(String s: pvoa.getNonReachableEvents()) {
-            index = s.indexOf("__");
-            if (index != -1) {
-                block = s.substring(index+2, s.length());
-                index = block.indexOf("__");
-                if (index != -1) {
-                    state = block.substring(index+2, block.length());
-                    block = block.substring(0, index);
-                    TraceManager.addDev("Block=" + block + " state=" + state);
-                    for(i=0; i<panels.size(); i++) {
-                        tdp = (TDiagramPanel)(panels.get(i));
-                        if ((tdp instanceof AvatarSMDPanel) && (tdp.getName().compareTo(block) == 0)){
-                            iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
-                            while(iterator.hasNext()) {
-                                tgc = (TGComponent)(iterator.next());
-                                if (tgc instanceof AvatarSMDState) {
-                                    ((AvatarSMDState)tgc).setSecurityInfo(AvatarSMDState.NOT_REACHABLE, state);
-                                }
-                            }
-                        }
+                        break;
                     }
                 }
             }
         }
 
-        LinkedList<String> notProved = pvoa.getNotProved ();
-        LinkedList<String> satisfied = pvoa.getSatisfiedAuthenticity ();
-        LinkedList<String> satisfiedWeak = pvoa.getSatisfiedWeakAuthenticity ();
-        LinkedList<String> nonSatisfied = pvoa.getNonSatisfiedAuthenticity ();
-
+        HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> authResults = pvoa.getAuthenticityResults();
         for (Object ob: abdp.getComponentList())
             if (ob instanceof AvatarBDPragma) {
                 AvatarBDPragma pragma = (AvatarBDPragma) ob;
@@ -489,29 +500,53 @@ public class AvatarDesignPanel extends TURTLEPanel {
 
                             LinkedList<TAttribute> types = abdp.getAttributesOfDataType (tattrA.getTypeOther ());
                             int toBeFound = types.size ();
-                            int weakLeft = types.size();
                             boolean ko = false;
+                            boolean weakKo = false;
                             boolean isNotProved = false;
+                            boolean weakIsNotProved = false;
 
                             for (TAttribute type: types) {
-                                String evA = argA[0] + "__" + argA[2] + "__"+ type.getId () + "__" + argA[1];
-                                String evB = argB[0] + "__" + argB[2] + "__"+ type.getId () + "__" + argB[1];
-                                String ev = evB + " ==> " + evA;
-                                if (satisfiedWeak.contains (ev)) {
-                                    weakLeft--;
-                                }
-                                if (nonSatisfied.contains (ev)) {
-                                    ko = true;
-                                } else if (notProved.contains (ev)) {
-                                    toBeFound --;
-                                    isNotProved = true;
-                                } else if (satisfied.contains (ev)) {
+                                for (AvatarPragmaAuthenticity pragmaAuth: authResults.keySet())
+                                {
+                                    if (!pragmaAuth.getAttrA().getAttribute().getBlock().getName().equals(argA[0].replaceAll("\\.", "__"))
+                                            || !pragmaAuth.getAttrB().getAttribute().getBlock().getName().equals(argB[0].replaceAll("\\.", "__"))
+                                            || !pragmaAuth.getAttrA().getAttribute().getName().equals(argA[2] + "__" + type.getId())
+                                            || !pragmaAuth.getAttrB().getAttribute().getName().equals(argB[2] + "__" + type.getId())
+                                            || !pragmaAuth.getAttrA().getState().getName().equals(argA[1].replaceAll("\\.", "__"))
+                                            || !pragmaAuth.getAttrB().getState().getName().equals(argB[1].replaceAll("\\.", "__")))
+                                        continue;
+
+                                    ProVerifQueryAuthResult result = authResults.get(pragmaAuth);
                                     toBeFound --;
+
+                                    if (result.isProved())
+                                    {
+                                        if (!result.isSatisfied())
+                                        {
+                                            ko = true;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        isNotProved = true;
+                                    }
+
+                                    if (result.isWeakProved())
+                                    {
+                                        if (!result.isWeakSatisfied())
+                                        {
+                                            weakKo = true;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        weakIsNotProved = true;
+                                    }
+
+                                    break;
                                 }
                             }
-                            if (weakLeft==0){
-                                pragma.authWeakMap.put(prop, 1);
-                            }
+
                             if (ko)
                                 pragma.authStrongMap.put(prop, 2);
                             else if (toBeFound == 0) {
@@ -520,18 +555,63 @@ public class AvatarDesignPanel extends TURTLEPanel {
                                 else
                                     pragma.authStrongMap.put(prop, 1);
                             }
+
+                            if (weakKo)
+                                pragma.authWeakMap.put(prop, 2);
+                            else if (toBeFound == 0) {
+                                if (weakIsNotProved)
+                                    pragma.authWeakMap.put(prop, 3);
+                                else
+                                    pragma.authWeakMap.put(prop, 1);
+                            }
+
                         } else {
-                            String evA = argA[0] + "__" + argA[2] + "__" + argA[1];
-                            String evB = argB[0] + "__" + argB[2] + "__" + argB[1];
-                            String ev = evB + " ==> " + evA;
-                            if (satisfiedWeak.contains (ev))
-                                pragma.authWeakMap.put(prop, 1);
-                            if (nonSatisfied.contains (ev))
-                                pragma.authStrongMap.put(prop, 2);
-                            else if (notProved.contains (ev))
-                                pragma.authStrongMap.put(prop, 3);
-                            else if (satisfied.contains (ev))
-                                pragma.authStrongMap.put(prop, 1);
+                            for (AvatarPragmaAuthenticity pragmaAuth: authResults.keySet())
+                            {
+                                if (!pragmaAuth.getAttrA().getAttribute().getBlock().getName().equals(argA[0].replaceAll("\\.", "__"))
+                                        || !pragmaAuth.getAttrB().getAttribute().getBlock().getName().equals(argB[0].replaceAll("\\.", "__"))
+                                        || !pragmaAuth.getAttrA().getAttribute().getName().equals(argA[2])
+                                        || !pragmaAuth.getAttrB().getAttribute().getName().equals(argB[2])
+                                        || !pragmaAuth.getAttrA().getState().getName().equals(argA[1].replaceAll("\\.", "__"))
+                                        || !pragmaAuth.getAttrB().getState().getName().equals(argB[1].replaceAll("\\.", "__")))
+                                    continue;
+
+                                ProVerifQueryAuthResult result = authResults.get(pragmaAuth);
+
+                                if (result.isProved())
+                                {
+                                    if (result.isSatisfied())
+                                    {
+                                        pragma.authStrongMap.put(prop, 1);
+                                    }
+                                    else
+                                    {
+                                        pragma.authStrongMap.put(prop, 2);
+                                    }
+                                }
+                                else
+                                {
+                                    pragma.authStrongMap.put(prop, 3);
+                                }
+
+                                if (result.isWeakProved())
+                                {
+                                    if (result.isWeakSatisfied())
+                                    {
+                                        pragma.authWeakMap.put(prop, 1);
+                                    }
+                                    else
+                                    {
+                                        pragma.authWeakMap.put(prop, 2);
+                                    }
+                                }
+                                else
+                                {
+                                    pragma.authWeakMap.put(prop, 3);
+                                }
+
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index 867d588cd6d80a5d26a07a7a08024d4e85567ea6..4b328ea34486c1215c45e1f11145e99bb094888b 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -44,13 +44,13 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 import ui.avatarbd.*;
 import ui.avatarsmd.*;
 
-import avatartranslator.*;
+import java.util.*;
 
 public class AvatarDesignPanelTranslator {
 
diff --git a/src/ui/AvatarMADsPanel.java b/src/ui/AvatarMADsPanel.java
index f3591db9c5a0ec5444460020142d60e606008b6d..ef0079b78f5fc75f545b24316fdb2e7c2cfa00cb 100644
--- a/src/ui/AvatarMADsPanel.java
+++ b/src/ui/AvatarMADsPanel.java
@@ -46,24 +46,30 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.avatarmad.*;
+import myutil.GraphicLib;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmad.AvatarMADToolBar;
 
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class AvatarMADsPanel extends TURTLEPanel {
     
     public AvatarMADsPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+
+        // Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneMADAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -93,7 +99,7 @@ public class AvatarMADsPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp	= new JScrollDiagramPanel(amadp);
         amadp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarActivity, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         panels.add(amadp);
diff --git a/src/ui/AvatarMethod.java b/src/ui/AvatarMethod.java
index 6ed469873fcc2300d8155710c15f9367caf6d804..12a19dff07852e84b74d43c5c4af9198db36ad25 100644
--- a/src/ui/AvatarMethod.java
+++ b/src/ui/AvatarMethod.java
@@ -47,11 +47,12 @@
 
 package ui;
 
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
 
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarMethod {
 
diff --git a/src/ui/AvatarMethodologyPanel.java b/src/ui/AvatarMethodologyPanel.java
index b1de004ee3c4512b0d6e99b56240945d1ef2510f..176c9b707458e8386f911414b77039f4ed086bb5 100755
--- a/src/ui/AvatarMethodologyPanel.java
+++ b/src/ui/AvatarMethodologyPanel.java
@@ -46,31 +46,38 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.avatarmethodology.*;
+import myutil.GraphicLib;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class AvatarMethodologyPanel extends TURTLEPanel {
-    public AvatarMethodologyDiagramPanel dmd;
+    
+	public AvatarMethodologyDiagramPanel dmd;
 
     public AvatarMethodologyPanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDiplodocusMethodologyAction(e);
-                }
-            };
+
+        	@Override
+        	public void stateChanged(ChangeEvent e){
+        		mgui.paneDiplodocusMethodologyAction(e);
+        	}
+        };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
 
@@ -92,7 +99,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         TGConnectingPoint p1, p2;
         p1 = tgc1.getTGConnectingPointAtIndex(0);
         p2 = tgc2.getTGConnectingPointAtIndex(0);
-        Vector listPoint = new Vector();
+        Vector<Point> listPoint = new Vector<Point>();
         Point p = new Point(210, 235);
         listPoint.add(p);
         TGConnector tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -103,7 +110,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         // Reqs -> Analysis
         p1 = tgc2.getTGConnectingPointAtIndex(1);
         p2 = tgc3.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         p = new Point(310, 335);
         listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -114,7 +121,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         // Analysis -> Design
         p1 = tgc3.getTGConnectingPointAtIndex(1);
         p2 = tgc4.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         p = new Point(410, 435);
         listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -125,7 +132,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         // Design -> Prototyping
         p1 = tgc4.getTGConnectingPointAtIndex(1);
         p2 = tgc5.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         p = new Point(510, 535);
         listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -136,13 +143,11 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         // Reqs -> Prop
         p1 = tgc2.getTGConnectingPointAtIndex(2);
         p2 = tgc6.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
         dmd.getComponentList().add(0, tgco);
-
-
     }
 
     public void init() {
@@ -159,7 +164,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
     }
 
     public boolean addAvatarMethodologyDiagram(String s) {
-        AvatarMethodologyDiagramToolbar dmdt = new AvatarMethodologyDiagramToolbar(mgui);
+        AvatarMethodologyDiagramToolbar dmdt = new AvatarMethodologyDiagramToolbar( mgui );
         toolbars.add(dmdt);
 
         toolBarPanel = new JPanel();
@@ -176,7 +181,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(dmd);
         dmd.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT );
         toolBarPanel.add(dmdt, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic99, toolBarPanel, "Opens avatar methodology");
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 7bdd7d2f82de589ddad5b66810bf1874a1bae47e..bd7369210b6be61a37549445c004d36d330b8f2a 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -46,13 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
+import myutil.GraphicLib;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarpd.AvatarPDToolBar;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarrd.AvatarRDToolBar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class AvatarRequirementPanel extends TURTLEPanel {
     public AvatarRDPanel ardp;
@@ -61,17 +65,21 @@ public class AvatarRequirementPanel extends TURTLEPanel {
     public AvatarRequirementPanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneRequirementAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneRequirementAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
 
@@ -104,7 +112,7 @@ public class AvatarRequirementPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(ardp);
         ardp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(ardtb, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic84, toolBarPanel, "Opens requirement diagram");
@@ -112,7 +120,6 @@ public class AvatarRequirementPanel extends TURTLEPanel {
         JPanel toolBarPanel = new JPanel();
         toolBarPanel.setLayout(new BorderLayout());
 
-
         return true;
     }
 
@@ -134,7 +141,7 @@ public class AvatarRequirementPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(apdp);
         apdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(apdtb, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic82, toolBarPanel, "Opens Parametric Diagram");
diff --git a/src/ui/AvatarRequirementPanelTranslator.java b/src/ui/AvatarRequirementPanelTranslator.java
index 4065111e0eeaa59318ec5696641421d801f90699..2e8dd7df34f158fb7a270f11c5515ebe85cc33c4 100644
--- a/src/ui/AvatarRequirementPanelTranslator.java
+++ b/src/ui/AvatarRequirementPanelTranslator.java
@@ -44,13 +44,12 @@
 
 package ui;
 
-import java.util.*;
-
-
-
-import myutil.*;
-import ui.avatarpd.*;
+import myutil.TraceManager;
 import tepe.*;
+import ui.avatarpd.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
 
 
 public class AvatarRequirementPanelTranslator {
diff --git a/src/ui/AvatarSignal.java b/src/ui/AvatarSignal.java
index cf6f19edebaf4af6a831345bae253decf27c229f..2b12b882f147fe3f7e487710b84e81d03ea9519f 100644
--- a/src/ui/AvatarSignal.java
+++ b/src/ui/AvatarSignal.java
@@ -47,11 +47,8 @@
 
 package ui;
 
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
 public class AvatarSignal extends AvatarMethod {
 
diff --git a/src/ui/CheckingError.java b/src/ui/CheckingError.java
index ffb962788dd185009571bcc979ff2ae277836517..63f037f2a240d457b022a2bf3099534f8133dc7d 100755
--- a/src/ui/CheckingError.java
+++ b/src/ui/CheckingError.java
@@ -45,10 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import avatartranslator.*;
-
-import translator.*;
-import tmltranslator.*;
+import avatartranslator.AvatarBlock;
+import tmltranslator.TMLTask;
+import translator.Relation;
+import translator.TClass;
 
 
 
diff --git a/src/ui/ClassDiagramPanelInterface.java b/src/ui/ClassDiagramPanelInterface.java
index c121ae4ac9df9d9c419ecb4ee39c4d587641ab51..4d3f9a937ed504f1251022901c287561309dea57 100755
--- a/src/ui/ClassDiagramPanelInterface.java
+++ b/src/ui/ClassDiagramPanelInterface.java
@@ -47,7 +47,7 @@
 
 package ui;
 
-import java.util.*;
+import java.util.List;
 
 public interface ClassDiagramPanelInterface {
   public List<TGComponent> getComponentList();
diff --git a/src/ui/ColorManager.java b/src/ui/ColorManager.java
index 7ffb06f6edc9ab86f32c01613a0c1259ed32de0e..c8aef4469d2bff67e26d51ef4925086edba985a0 100755
--- a/src/ui/ColorManager.java
+++ b/src/ui/ColorManager.java
@@ -44,8 +44,9 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-import myutil.*;
 
 /**
  * Class
@@ -74,6 +75,7 @@ public class ColorManager {
     public static final Color TEPEID = new Color(163, 5, 253);
     public static final Color AVATARID = new Color(163, 5, 253);
     public static Color SELECTED_0 = Color.blue;
+    public static Color SELECTED_ELEMENT = Color.green;
     public static final Color MOVING_0 = Color.magenta;
     public static final Color ADDING_0 = Color.lightGray;
 
diff --git a/src/ui/ConfigurationTTool.java b/src/ui/ConfigurationTTool.java
index 2355b01605fa5110b1cc88449c781ef32205247f..720a02eb665422b12c0dbb414144046547e36532 100755
--- a/src/ui/ConfigurationTTool.java
+++ b/src/ui/ConfigurationTTool.java
@@ -46,13 +46,20 @@
 package ui;
 
 //import java.awt.*;
-import java.io.*;
 
-import org.w3c.dom.*;
-//import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 
-import myutil.*;
+//import org.xml.sax.*;
 
 /**
  * Class
@@ -141,6 +148,13 @@ public class ConfigurationTTool {
     public static String RequirementOntologyWebsite = "";
     public static String AttackOntologyWebsite = "";
 
+    // PLUGINS
+    public static String PLUGIN_JAVA_CODE_GENERATOR = "";
+
+    // URL for models
+    public static String URL_MODEL = "http://ttool.telecom-paristech.fr/networkmodels/models.txt";
+
+    // Others
     public static String LastOpenFile = "";
     public static boolean LastOpenFileDefined = false;
 
@@ -274,8 +288,8 @@ public class ConfigurationTTool {
                 write = true;
             }
         }
-	index0 = data.indexOf("ProVerifHash");
-	if (index0 > -1) {
+        index0 = data.indexOf("ProVerifHash");
+        if (index0 > -1) {
             index1 = data.indexOf('"', index0);
             if (index1 > -1) {
                 index2 = data.indexOf('"', index1 + 1);
@@ -286,14 +300,14 @@ public class ConfigurationTTool {
                 }
             }
         }
-	else {
-	    index1= data.indexOf("</TURTLECONFIGURATION>");
+        else {
+            index1= data.indexOf("</TURTLECONFIGURATION>");
             if (index1 > -1) {
                 location = "<ProVerifHash data=\"" + ConfigurationTTool.ProVerifHash + "\"/>\n\n";
                 data = data.substring(0, index1) + location + data.substring(index1, data.length());
                 write = true;
             }
-	}
+        }
         if (write) {
             //sb.append("Writing data=" + data);
             try {
@@ -374,14 +388,14 @@ public class ConfigurationTTool {
         // AVATAR: executable code
         sb.append("\nAVATAR (executable code):\n");
         sb.append("AVATARExecutableCodeDirectory: " + AVATARExecutableCodeDirectory + "\n");
- sb.append("AVATARMPSoCCodeDirectory: " + AVATARMPSoCCodeDirectory + "\n");
-sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
+        sb.append("AVATARMPSoCCodeDirectory: " + AVATARMPSoCCodeDirectory + "\n");
+        sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
         sb.append("AVATARExecutableCodeHost: " + AVATARExecutableCodeHost + "\n");
         sb.append("AVATARExecutableCodeCompileCommand: " + AVATARExecutableCodeCompileCommand + "\n");
         sb.append("AVATARExecutableCodeExecuteCommand: " + AVATARExecutableCodeExecuteCommand + "\n");
         sb.append("AVATARExecutableSocLibCodeCompileCommand: " + AVATARExecutableSoclibCodeCompileCommand + "\n");
         sb.append("AVATARExecutableSocLibCodeExecuteCommand: " + AVATARExecutableSoclibCodeExecuteCommand + "\n");
-	sb.append("AVATARExecutableSocLibCodeTraceCommand: " + AVATARExecutableSoclibCodeTraceCommand + "\n");
+        sb.append("AVATARExecutableSocLibCodeTraceCommand: " + AVATARExecutableSoclibCodeTraceCommand + "\n");
         sb.append("AVATARExecutableSocLibCodeTraceFile: " + AVATARExecutableSoclibTraceFile + "\n");
 
         sb.append("\nProVerif:\n");
@@ -418,14 +432,14 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
             sb.append("SystemCCodeExecuteCommand: " + SystemCCodeExecuteCommand + "\n");
             sb.append("SystemCCodeInteractiveExecuteCommand: " + SystemCCodeInteractiveExecuteCommand + "\n");
             sb.append("GTKWavePath: " + GTKWavePath + "\n");
-	    // TML
-	    sb.append("TMLCodeDirectory: " + TMLCodeDirectory + "\n");
+            // TML
+            sb.append("TMLCodeDirectory: " + TMLCodeDirectory + "\n");
 
-	     //Application C code
-	     sb.append("CCodeDirectory: " + CCodeDirectory + "\n");
+            //Application C code
+            sb.append("CCodeDirectory: " + CCodeDirectory + "\n");
         }
 
-       
+
 
         // VCD
         sb.append("VCDPath: " + VCDPath + "\n");
@@ -440,6 +454,13 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
         sb.append("Requirement ontology website: " + RequirementOntologyWebsite + "\n");
         sb.append("Attack ontology website: " + AttackOntologyWebsite + "\n");
 
+	// Plugins
+	sb.append("Plugins:\n");
+	sb.append("Plugin for java code generation: " + PLUGIN_JAVA_CODE_GENERATOR + "\n");
+
+	// URL
+	sb.append("URLs:\n");
+	sb.append("URL for loading models from network: " + URL_MODEL + "\n");
 
         sb.append("\nCustom external commands:\n");
         sb.append("ExternalCommand1Host: " + ExternalCommand1Host + "\n");
@@ -600,10 +621,10 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
             nl = doc.getElementsByTagName("AVATARExecutableCodeDirectory");
             if (nl.getLength() > 0)
                 AVATARExecutableCodeDirectory(nl);
-	    nl = doc.getElementsByTagName("AVATARMPSoCCodeDirectory");
+            nl = doc.getElementsByTagName("AVATARMPSoCCodeDirectory");
             if (nl.getLength() > 0)
                 AVATARMPSoCCodeDirectory(nl);
-	    nl = doc.getElementsByTagName("AVATARMPSoCCompileCommand");
+            nl = doc.getElementsByTagName("AVATARMPSoCCompileCommand");
             if (nl.getLength() > 0)
                 AVATARMPSoCCompileCommand(nl);
             nl = doc.getElementsByTagName("AVATARExecutableCodeHost");
@@ -621,7 +642,7 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
             nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeExecuteCommand");
             if (nl.getLength() > 0)
                 AVATARExecutableSoclibCodeExecuteCommand(nl);
-	    nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeTraceCommand");
+            nl = doc.getElementsByTagName("AVATARExecutableSoclibCodeTraceCommand");
             if (nl.getLength() > 0)
                 AVATARExecutableSoclibCodeTraceCommand(nl);
             nl = doc.getElementsByTagName("AVATARExecutableSoclibTraceFile");
@@ -649,7 +670,7 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
             nl = doc.getElementsByTagName("TMLCodeDirectory");
             if (nl.getLength() > 0)
                 TMLCodeDirectory(nl);
-                
+
             nl = doc.getElementsByTagName("CCodeDirectory");
             if (nl.getLength() > 0)
                 CCodeDirectory(nl);
@@ -712,6 +733,14 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
             if (nl.getLength() > 0)
                 ExternalCommand2(nl);
 
+	    nl = doc.getElementsByTagName("PLUGIN_JAVA_CODE_GENERATOR");
+            if (nl.getLength() > 0)
+                PluginJavaCodeGenerator(nl);
+
+	    nl = doc.getElementsByTagName("URL_MODEL");
+            if (nl.getLength() > 0)
+                URLModel(nl);
+
             nl = doc.getElementsByTagName("LastOpenFile");
             if (nl.getLength() > 0)
                 LastOpenFile(nl);
@@ -1204,7 +1233,7 @@ sb.append("AVATARMPSoCCompileCommand: " + AVATARMPSoCCompileCommand + "\n");
         }
     }
 
-private static void AVATARMPSoCCodeDirectory(NodeList nl) throws MalformedConfigurationException {
+    private static void AVATARMPSoCCodeDirectory(NodeList nl) throws MalformedConfigurationException {
         try {
             Element elt = (Element)(nl.item(0));
             AVATARMPSoCCodeDirectory = elt.getAttribute("data");
@@ -1212,10 +1241,10 @@ private static void AVATARMPSoCCodeDirectory(NodeList nl) throws MalformedConfig
             throw new MalformedConfigurationException(e.getMessage());
         }
     }
-private static void AVATARMPSoCCompileCommand(NodeList nl) throws MalformedConfigurationException {
+    private static void AVATARMPSoCCompileCommand(NodeList nl) throws MalformedConfigurationException {
         try {
             Element elt = (Element)(nl.item(0));
-             AVATARMPSoCCompileCommand= elt.getAttribute("data");
+            AVATARMPSoCCompileCommand= elt.getAttribute("data");
         } catch (Exception e) {
             throw new MalformedConfigurationException(e.getMessage());
         }
@@ -1266,7 +1295,7 @@ private static void AVATARMPSoCCompileCommand(NodeList nl) throws MalformedConfi
             throw new MalformedConfigurationException(e.getMessage());
         }
     }
-    
+
     private static void AVATARExecutableSoclibCodeTraceCommand(NodeList nl) throws MalformedConfigurationException {
         try {
             Element elt = (Element)(nl.item(0));
@@ -1375,6 +1404,25 @@ private static void AVATARMPSoCCompileCommand(NodeList nl) throws MalformedConfi
         }
     }
 
+    private static void PluginJavaCodeGenerator(NodeList nl) throws MalformedConfigurationException {
+        try {
+            Element elt = (Element)(nl.item(0));
+            PLUGIN_JAVA_CODE_GENERATOR = elt.getAttribute("data");
+        } catch (Exception e) {
+            throw new MalformedConfigurationException(e.getMessage());
+        }
+    }
+
+    private static void URLModel(NodeList nl) throws MalformedConfigurationException {
+        try {
+            Element elt = (Element)(nl.item(0));
+            URL_MODEL = elt.getAttribute("data");
+        } catch (Exception e) {
+            throw new MalformedConfigurationException(e.getMessage());
+        }
+    }
+
+
     private static void LastOpenFile(NodeList nl) throws MalformedConfigurationException {
         try {
             Element elt = (Element)(nl.item(0));
diff --git a/src/ui/CorrespondanceTGElement.java b/src/ui/CorrespondanceTGElement.java
index 5444bde99ddf3872ac85db9f213541f039d97a37..b3797fe0d948064eabdacd9d457d181e71d86403 100755
--- a/src/ui/CorrespondanceTGElement.java
+++ b/src/ui/CorrespondanceTGElement.java
@@ -47,16 +47,25 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarLibraryFunction;
+import req.ebrdd.EBRDDComponent;
+import req.ebrdd.EBRDDGeneralComponent;
+import sddescription.Evt;
+import sddescription.HMSCElement;
+import sddescription.HMSCNode;
+import sddescription.MSC;
+import tepe.TEPEComponent;
+import tmltranslator.DIPLOElement;
+import tmltranslator.HwNode;
+import tmltranslator.TMLActivityElement;
+import translator.ADComponent;
+import translator.TClass;
+import ui.cd.TCDTClass;
 
-import avatartranslator.*;
-import req.ebrdd.*;
-import translator.*;
-import tmltranslator.*;
-import sddescription.*;
-import ui.cd.*;
-import tepe.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class CorrespondanceTGElement {
     private Vector<TGComponent> tg; //tgelement
diff --git a/src/ui/DefaultText.java b/src/ui/DefaultText.java
index b3017de6b2aa4ae2046faae713f000fc6354c5f6..b6bee2206dd1954ab86e3185535067d68a8d831c 100755
--- a/src/ui/DefaultText.java
+++ b/src/ui/DefaultText.java
@@ -49,8 +49,8 @@ package ui;
 
 public class DefaultText  {
 
-    public static String BUILD = "12230";
-    public static String DATE = "2017/05/22 02:01:02 CET";
+    public static String BUILD = "12243";
+    public static String DATE = "2017/06/02 02:01:04 CET";
     
     
     public static StringBuffer sbAbout = makeAbout();
diff --git a/src/ui/DeploymentPanel.java b/src/ui/DeploymentPanel.java
index 5da70b25339270387a19248a3de6d3615450ef67..82b6940c320cf41a50e50b23f0a932b6f01573ad 100755
--- a/src/ui/DeploymentPanel.java
+++ b/src/ui/DeploymentPanel.java
@@ -46,29 +46,37 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.dd.TDeploymentDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.dd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class DeploymentPanel extends TURTLEPanel {
     public TDeploymentDiagramPanel tddp; 
-    public Vector validated, ignored;
+    //public Vector validated, ignored;
     
     public DeploymentPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+       
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneDesignAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
     
-    
     public void init() {
          
         //  Class Diagram toolbar
@@ -87,7 +95,7 @@ public class DeploymentPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp	= new JScrollDiagramPanel(tddp);
         tddp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarDep, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab("Deployment Diagram", IconManager.imgic60, toolBarPanel, "Opens deployment diagram");
diff --git a/src/ui/DesignPanel.java b/src/ui/DesignPanel.java
index 2378089435aa561f8fa783ca121ad3abefa932c8..85c73b903a05ede345bef17260f2b1903ad9e54a 100755
--- a/src/ui/DesignPanel.java
+++ b/src/ui/DesignPanel.java
@@ -46,25 +46,38 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.ad.TActivityDiagramPanel;
+import ui.ad.TActivityDiagramToolBar;
+import ui.cd.TCDTClass;
+import ui.cd.TClassDiagramPanel;
+import ui.cd.TClassDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import ui.cd.*;
-import ui.ad.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class DesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
-    public TClassDiagramPanel tcdp; 
-    public java.util.List<TClassInterface> validated, ignored;
 
+	public TClassDiagramPanel tcdp; 
+    
+	public java.util.List<TClassInterface> validated, ignored;
 
     public DesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneDesignAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
diff --git a/src/ui/DesignPanelTranslator.java b/src/ui/DesignPanelTranslator.java
index 593a3f4deb48ee03f92c4244e90580cfc5aae6ca..49180bc12a6e672353d27dbd0e168c5fee7d9c75 100755
--- a/src/ui/DesignPanelTranslator.java
+++ b/src/ui/DesignPanelTranslator.java
@@ -44,16 +44,17 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import translator.*;
 import ui.ad.*;
 import ui.cd.*;
-
-import translator.*;
-
 import ui.osad.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
 public class DesignPanelTranslator {
     protected TURTLEDesignPanelInterface dp;
     protected LinkedList<CheckingError> checkingErrors, warnings;
diff --git a/src/ui/DiplodocusMethodologyPanel.java b/src/ui/DiplodocusMethodologyPanel.java
index 323b0d7cccbddb1ced632de9b32a34be4edc6a06..87582ebcdbf5538f72ba2221517f83bfb6539e04 100755
--- a/src/ui/DiplodocusMethodologyPanel.java
+++ b/src/ui/DiplodocusMethodologyPanel.java
@@ -46,13 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.diplodocusmethodology.*;
+import myutil.GraphicLib;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class DiplodocusMethodologyPanel extends TURTLEPanel {
     public DiplodocusMethodologyDiagramPanel dmd;
@@ -60,20 +62,23 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
     public DiplodocusMethodologyPanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDiplodocusMethodologyAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDiplodocusMethodologyAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
-
     }
 
     // Put the methodology
@@ -89,7 +94,7 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
         TGConnectingPoint p1, p2;
         p1 = tgc1.getTGConnectingPointAtIndex(0);
         p2 = tgc3.getTGConnectingPointAtIndex(0);
-        Vector listPoint = new Vector();
+        Vector<Point> listPoint = new Vector<Point>();
         TGConnector tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
@@ -98,7 +103,7 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
         // cp -> mapping
         p1 = tgc4.getTGConnectingPointAtIndex(0);
         p2 = tgc3.getTGConnectingPointAtIndex(2);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
@@ -107,7 +112,7 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
         // Archi -> mapping
         p1 = tgc2.getTGConnectingPointAtIndex(0);
         p2 = tgc3.getTGConnectingPointAtIndex(1);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
@@ -147,7 +152,7 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(dmd);
         dmd.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(dmdt, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic98, toolBarPanel, "Opens diplodocus methodology");
diff --git a/src/ui/DocumentationGenerator.java b/src/ui/DocumentationGenerator.java
index 39e79c95d15bb59f635ce6ef354a6b101a92ea06..0c7cfdf5fb43788b402a5b51d1b56a1b91c1d65e 100644
--- a/src/ui/DocumentationGenerator.java
+++ b/src/ui/DocumentationGenerator.java
@@ -47,20 +47,25 @@
 
 package ui;
 
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.SteppedAlgorithm;
+import ui.ad.TActivityDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import javax.imageio.ImageIO;
 import javax.swing.*;
-import java.util.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.text.*;
-
-import myutil.*;
-import ui.ad.*;
-import ui.dd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.avatarsmd.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Vector;
 
 public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIElement {
 
diff --git a/src/ui/EBRDDTranslator.java b/src/ui/EBRDDTranslator.java
index 646fbaa6263a6ced9cd2730295c1a2a18bc5bcca..8515aa33719bcf2aa0ec8e85dfab9bcecc791a7c 100755
--- a/src/ui/EBRDDTranslator.java
+++ b/src/ui/EBRDDTranslator.java
@@ -44,11 +44,17 @@
 
 package ui;
 
-import java.util.*;
-
-import ui.ebrdd.*;
 import req.ebrdd.*;
-import tmltranslator.*;
+import tmltranslator.TMLType;
+import ui.ebrdd.EBRDDAttributeBox;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDStartState;
+import ui.ebrdd.TGConnectorEBRDDERC;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 
 public class EBRDDTranslator {
diff --git a/src/ui/FormatManager.java b/src/ui/FormatManager.java
index bd30dfe8d9a391e1926ccd7f19f961b7739b78e3..d97e54e3c1565d77dfba0aa7c678f9db9b8826c8 100755
--- a/src/ui/FormatManager.java
+++ b/src/ui/FormatManager.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.io.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
 
 public class FormatManager {
     
diff --git a/src/ui/GNCModeling.java b/src/ui/GNCModeling.java
index f3228ef059b4dbd744452da5ec1dc96dad70050c..7e2b3a56aa6fc1804e63066817fb5b98ba0838d6 100755
--- a/src/ui/GNCModeling.java
+++ b/src/ui/GNCModeling.java
@@ -47,12 +47,13 @@
 
 package ui;
 
-import java.util.*;
-
-
-import ui.ncdd.*;
+import myutil.TreeCell;
 import nc.*;
-import myutil.*;
+import ui.ncdd.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class GNCModeling  {
 	private NCStructure ncs;
diff --git a/src/ui/GProactiveDesign.java b/src/ui/GProactiveDesign.java
index cf7c20136807254e5c89893af85134e2af965a80..86d13be78b759921ddc02a66651584118f86c474 100755
--- a/src/ui/GProactiveDesign.java
+++ b/src/ui/GProactiveDesign.java
@@ -47,25 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
-
-import fr.inria.oasis.vercors.cttool.model.Attribute;
-import fr.inria.oasis.vercors.cttool.model.Component;
-import fr.inria.oasis.vercors.cttool.model.ComponentImpl;
-import fr.inria.oasis.vercors.cttool.model.InPort;
-import fr.inria.oasis.vercors.cttool.model.Interface;
-import fr.inria.oasis.vercors.cttool.model.InterfaceImpl;
-import fr.inria.oasis.vercors.cttool.model.Message;
-import fr.inria.oasis.vercors.cttool.model.MessageImpl;
-import fr.inria.oasis.vercors.cttool.model.OutPort;
-import fr.inria.oasis.vercors.cttool.model.Port;
-
+import fr.inria.oasis.vercors.cttool.model.*;
 import translator.*;
-
 import ui.procsd.*;
 import ui.prosmd.*;
 import ui.prosmd.util.CorrespondanceSMDManager;
 
+import java.util.*;
+
 public class GProactiveDesign  {
     private TURTLEModeling tm;
     private ProactiveDesignPanel pdp;
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index 2b769f06105127cd7bbc7beb2640b936bf5b44c9..d8ee8262342192a4a4c01a78b0f87ec12230ca6a 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -48,18 +48,31 @@
 
 package ui;
 
-import java.util.*;
-
+import avatartranslator.AvatarSpecification;
+import myutil.Conversion;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.tmlcp.TMLCPElement;
+import tmltranslator.tmlcp.TMLSDAction;
+import tmltranslator.tmlcp.TMLSDEvent;
+import tmltranslator.tmlcp.TMLSDMessage;
 import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
+import ui.tmlcd.TMLChannelOperator;
+import ui.tmlcd.TMLEventOperator;
+import ui.tmlcd.TMLRequestOperator;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmlcompd.TMLCPath;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+import ui.tmlcompd.TMLCRecordComponent;
 import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.*;
-import tmltranslator.tmlcp.*;
-import myutil.*;
-import tmltranslator.modelcompiler.*;
-import avatartranslator.*;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
+import java.util.*;
 
 
 public class GTMLModeling  {
@@ -1670,7 +1683,7 @@ public class GTMLModeling  {
                 listE.addCor(tmlexecii, tgc);
 
             } else if (tgc instanceof TMLADEncrypt) {
-                tmlexecc = new TMLExecC("encrypt", tgc);
+                tmlexecc = new TMLExecC("encrypt_"+((TMLADEncrypt)tgc).securityContext, tgc);
                 activity.addElement(tmlexecc);
                 SecurityPattern sp = securityPatterns.get(((TMLADEncrypt)tgc).securityContext);
                 if (sp ==null){
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 751149ff2df8304fb631ab07b64a6a0a154494a3..87311199f6d523724c4ba8bfe1f600ee98589ef9 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -45,47 +45,7 @@
 
 package ui;
 
-import java.awt.Point;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.swing.JOptionPane;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarPragma;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
 import avatartranslator.toproverif.AVATAR2ProVerif;
 import avatartranslator.totpn.AVATAR2TPN;
 import avatartranslator.toturtle.AVATAR2TURTLE;
@@ -95,13 +55,16 @@ import ddtranslator.DDTranslator;
 import launcher.LauncherException;
 import launcher.RemoteExecutionThread;
 import launcher.RshClient;
-import myutil.Conversion;
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.TraceManager;
+import myutil.*;
 import nc.NCStructure;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
 import proverifspec.ProVerifSpec;
 import req.ebrdd.EBRDD;
 import sddescription.HMSC;
@@ -110,33 +73,7 @@ import sddescription.SDExchange;
 import sdtranslator.SDTranslationException;
 import sdtranslator.SDTranslator;
 import tmatrix.RequirementModeling;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwLink;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.SecurityPattern;
-import tmltranslator.TMLActivityElement;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPTextSpecification;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.HwCPU;
-import tmltranslator.TMLStopState;
-import tmltranslator.TMLChoice;
-import tmltranslator.TMLExecI;
-import tmltranslator.TMLReadChannel;
-import tmltranslator.TMLWriteChannel;
-import tmltranslator.TMLTask;
-import tmltranslator.TMLActivity;
-import tmltranslator.TMLStartState;
-import tmltranslator.TMLForLoop;
-import tmltranslator.TMLTextSpecification;
+import tmltranslator.*;
 import tmltranslator.modelcompiler.TMLModelCompiler;
 import tmltranslator.toautomata.TML2AUT;
 import tmltranslator.toautomata.TML2AUTviaLOTOS;
@@ -147,43 +84,21 @@ import tmltranslator.toturtle.TML2TURTLE;
 import tmltranslator.touppaal.RelationTMLUPPAAL;
 import tmltranslator.touppaal.TML2UPPAAL;
 import tpndescription.TPN;
-import translator.ADComponent;
-import translator.Gate;
-import translator.GroupOfGates;
-import translator.MasterGateManager;
-import translator.TClass;
-import translator.TIFExchange;
-import translator.TURTLEModelChecker;
-import translator.TURTLEModeling;
-import translator.TURTLETranslator;
+import translator.*;
 import translator.totpn.TURTLE2TPN;
 import translator.touppaal.RelationTIFUPPAAL;
 import translator.touppaal.TURTLE2UPPAAL;
 import ui.ad.TActivityDiagramPanel;
 import ui.atd.AttackTreeDiagramPanel;
 import ui.avatarad.AvatarADPanel;
-import ui.avatarbd.AvatarBDBlock;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarbd.AvatarBDPanel;
-import ui.avatarbd.AvatarBDPortConnector;
-import ui.avatarbd.AvatarBDPragma;
-import ui.avatarbd.AvatarBDStateMachineOwner;
+import ui.avatarbd.*;
 import ui.avatarcd.AvatarCDPanel;
-import ui.avatarbd.AvatarBDDataType;
-// AVATAR
-// AVATAR
 import ui.avatardd.ADDDiagramPanel;
 import ui.avatarmad.AvatarMADPanel;
 import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
 import ui.avatarpd.AvatarPDPanel;
 import ui.avatarrd.AvatarRDPanel;
-import ui.avatarsmd.AvatarSMDConnector;
-import ui.avatarsmd.AvatarSMDPanel;
-import ui.avatarsmd.AvatarSMDReceiveSignal;
-import ui.avatarsmd.AvatarSMDSendSignal;
-import ui.avatarsmd.AvatarSMDStartState;
-import ui.avatarsmd.AvatarSMDState;
-import ui.avatarsmd.AvatarSMDStopState;
+import ui.avatarsmd.*;
 import ui.cd.TCDTClass;
 import ui.cd.TCDTObject;
 import ui.cd.TClassDiagramPanel;
@@ -192,6 +107,7 @@ import ui.dd.TDDNode;
 import ui.dd.TDeploymentDiagramPanel;
 import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
 import ui.iod.InteractionOverviewDiagramPanel;
 import ui.ncdd.NCDiagramPanel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
@@ -202,54 +118,33 @@ import ui.procsd.ProactiveCSDPanel;
 import ui.prosmd.ProactiveSMDPanel;
 import ui.req.Requirement;
 import ui.req.RequirementDiagramPanel;
-import ui.sd.*;
-import ui.sd2.*;
 import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
-import ui.tmlad.TGConnectorTMLAD;
-import ui.tmlad.TMLADDecrypt;
-import ui.tmlad.TMLADEncrypt;
-import ui.tmlad.TMLADSendRequest;
-import ui.tmlad.TMLADReadRequestArg;
-import ui.tmlad.TMLADReadChannel;
-import ui.tmlad.TMLADExecI;
-import ui.tmlad.TMLADChoice;
-import ui.tmlad.TMLADStartState;
-import ui.tmlad.TMLADActionState;
-import ui.tmlad.TMLADEncrypt;
-import ui.tmlad.TMLADDecrypt;
-import ui.tmlad.TMLADForEverLoop;
-import ui.tmlad.TMLADWriteChannel;
-import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.*;
 import ui.tmlcd.TMLTaskDiagramPanel;
 import ui.tmlcd.TMLTaskOperator;
-import ui.tmlcompd.TMLCChannelOutPort;
-import ui.tmlcompd.TMLCCompositeComponent;
-import ui.tmlcompd.TMLCPortConnector;
-import ui.tmlcompd.TMLCPrimitiveComponent;
-import ui.tmlcompd.TMLCPrimitivePort;
-import ui.tmlad.TMLADStopState;
-import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.*;
 import ui.tmlcp.TMLCPPanel;
-import ui.tmldd.TMLArchiCPNode;
-import ui.tmldd.TMLArchiCPUNode;
-import ui.tmldd.TMLArchiDiagramPanel;
-import ui.tmldd.TMLArchiKey;
-import ui.tmldd.TMLArchiArtifact;
-import ui.tmldd.TMLArchiBUSNode;
-import ui.tmldd.TMLArchiHWANode;
-import ui.tmldd.TMLArchiMemoryNode;
-import ui.tmldd.TMLArchiConnectorNode;
+import ui.tmldd.*;
 import ui.tmlsd.TMLSDPanel;
+import ui.tree.GraphTree;
 import ui.tree.InvariantDataTree;
 import ui.tree.SearchTree;
 import ui.tree.SyntaxAnalysisTree;
 import ui.ucd.UseCaseDiagramPanel;
 import ui.window.JFrameSimulationTrace;
 import uppaaldesc.UPPAALSpec;
+
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
 import java.util.*;
-import ui.tree.*;
+import java.util.List;
 
-import ui.graph.*;
+// AVATAR
+// AVATAR
 
 //Communication Pattern javaCC parser
 //import compiler.tmlCPparser.*;
@@ -1150,7 +1045,7 @@ public class GTURTLEModeling {
 		return cpuTaskMap;
 	}
 
-	public void addHSM(MainGUI gui, HashMap<String, ArrayList<String>> selectedCpuTasks){
+	public void addHSM(MainGUI gui, Map<String, List<String>> selectedCpuTasks){
 		System.out.println("Adding HSM");
 		String encComp="100";
 		String decComp="100";
@@ -1221,8 +1116,8 @@ public class GTURTLEModeling {
 				//System.out.println("No Components found");
 				continue;
 			}
-			System.out.println("nonAuthChans " + nonAuthChans);
-			System.out.println("nonSecChans "+ nonSecChans);
+		//	System.out.println("nonAuthChans " + nonAuthChans);
+			//System.out.println("nonSecChans "+ nonSecChans);
 			for (TMLCPrimitiveComponent comp: comps){
 
 				HashMap<String, HSMChannel> compChannels = new HashMap<String, HSMChannel>();
@@ -1262,7 +1157,7 @@ public class GTURTLEModeling {
 							}
 						}
 						else {
-							System.out.println("security context:"+writeChannel.securityContext);
+							//System.out.println("security context:"+writeChannel.securityContext);
 							fromStart = tad.findTGConnectorEndingAt(tg.getTGConnectingPointAtIndex(0));
 							if (fromStart!=null){
 								channelInstances.add(tg);
@@ -1314,17 +1209,17 @@ public class GTURTLEModeling {
 						}
 					}
 					if (tg instanceof TMLADEncrypt){
-						TMLADEncrypt enc = (TMLADEncrypt) tg;
+					//	TMLADEncrypt enc = (TMLADEncrypt) tg;
 						secOperators.add(tg);
 						//}
 					}
 					if (tg instanceof TMLADDecrypt){
-						TMLADDecrypt dec = (TMLADDecrypt) tg;
+					//	TMLADDecrypt dec = (TMLADDecrypt) tg;
 						secOperators.add(tg);
 						//}
 					}
 				}
-				System.out.println("compchannels " +compChannels);
+				//System.out.println("compchannels " +compChannels);
 				List<ChannelData> hsmChans = new ArrayList<ChannelData>();
 				ChannelData chd = new ChannelData("startHSM_"+cpuName,false,false);
 				hsmChans.add(chd);
@@ -1360,7 +1255,7 @@ public class GTURTLEModeling {
 				//Remove existing security elements
 				for (TGComponent op: secOperators){
 					TGConnector prev = tad.findTGConnectorEndingAt(op.getTGConnectingPointAtIndex(0));
-					TGConnectingPoint point = prev.getTGConnectingPointP1();
+					//TGConnectingPoint point = prev.getTGConnectingPointP1();
 					TGConnector end = tad.findTGConnectorStartingAt(op.getTGConnectingPointAtIndex(1));
 					TGConnectingPoint point2 = end.getTGConnectingPointP2();
 					tad.removeComponent(op);
@@ -1398,7 +1293,7 @@ public class GTURTLEModeling {
 					tad.addComponent(fromStart, xpos, ypos, false, true);
 
 					//Add connection
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					fromStart.setP1(req.getTGConnectingPointAtIndex(1));
 					TMLADWriteChannel wr =new TMLADWriteChannel(xpos, ypos+yShift, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
 					
@@ -1413,7 +1308,7 @@ public class GTURTLEModeling {
 					fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 					tad.addComponent(fromStart, xpos, ypos, false, true);
 
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					tad.addComponent(fromStart, xpos, ypos, false, true);
 					fromStart.setP1(wr.getTGConnectingPointAtIndex(1));
 					
@@ -1435,7 +1330,7 @@ public class GTURTLEModeling {
 					yShift+=50;
 
 					//Add connector
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					tad.addComponent(fromStart, xpos, ypos, false, true);
 					fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 					yShift+=50;
@@ -1468,7 +1363,7 @@ public class GTURTLEModeling {
 					ypos = chan.getY();
 					fromStart = tad.findTGConnectorStartingAt(chan.getTGConnectingPointAtIndex(1));
 					if (fromStart==null){
-						fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(chan.getTGConnectingPointAtIndex(1));
 						tad.addComponent(fromStart, xpos,ypos,false,true);
 					}
@@ -1493,7 +1388,7 @@ public class GTURTLEModeling {
 
 
 					//Add connection
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					fromStart.setP1(act.getTGConnectingPointAtIndex(1));
 					fromStart.setP2(req.getTGConnectingPointAtIndex(0));
 					tad.addComponent(fromStart, xpos, ypos, false, true);
@@ -1510,7 +1405,7 @@ public class GTURTLEModeling {
 
 
 					//Add connection
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					fromStart.setP1(req.getTGConnectingPointAtIndex(1));
 					fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 					tad.addComponent(fromStart, xpos, ypos, false, true);
@@ -1523,14 +1418,14 @@ public class GTURTLEModeling {
 					rd.securityContext = ch.securityContext;;
 					tad.addComponent(rd, xpos, ypos+yShift, false,true);
 
-					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					tad.addComponent(fromStart, xpos, ypos, false, true);
 					fromStart.setP1(wr.getTGConnectingPointAtIndex(1));
 					fromStart.setP2(rd.getTGConnectingPointAtIndex(0));
 					yShift+=50;
 
 					if (point!=null){
-						fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						tad.addComponent(fromStart, xpos, ypos, false, true);
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						//Direct the last TGConnector back to the start of the write channel operator
@@ -1563,7 +1458,7 @@ public class GTURTLEModeling {
 			TMLActivityDiagramPanel tad = t.getTMLActivityDiagramPanel("HSM_"+cpuName);
 
 			TMLADStartState start = (TMLADStartState) tad.getComponentList().get(0);
-			fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+			fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 
 
 			TMLADReadRequestArg req = new TMLADReadRequestArg(300, 100, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
@@ -1583,7 +1478,7 @@ public class GTURTLEModeling {
 
 
 			//Connect readrequest and choice
-			fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+			fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 			fromStart.setP1(req.getTGConnectingPointAtIndex(1));
 			fromStart.setP2(choice.getTGConnectingPointAtIndex(0));
 			tad.addComponent(fromStart, 300,200,false,true);
@@ -1603,7 +1498,7 @@ public class GTURTLEModeling {
 						choice2= new TMLADChoice(xc, 250, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
 						tad.addComponent(choice2, xc, 400,false,true);
 						//Connect new choice operator to top choice
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(choice.getTGConnectingPointAtIndex(i/3+1));
 						fromStart.setP2(choice2.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
@@ -1613,7 +1508,7 @@ public class GTURTLEModeling {
 					rd.securityContext = ch.securityContext;;
 					tad.addComponent(rd, xc,300,false,true);
 					//Connect choice and readchannel						
-					fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					fromStart.setP1(choice2.getTGConnectingPointAtIndex(i%3+1));
 					fromStart.setP2(rd.getTGConnectingPointAtIndex(0));
 			
@@ -1628,18 +1523,18 @@ public class GTURTLEModeling {
 						TMLADDecrypt dec = new TMLADDecrypt(xc, 500, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
 						dec.securityContext =  ch.securityContext;
 		   			 	tad.addComponent(dec, xc, 500,false,true);
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(dec.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
 						
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(dec.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
 						
 						//Connect encrypt and writechannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(dec.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
@@ -1667,13 +1562,13 @@ public class GTURTLEModeling {
 						tad.addComponent(enc, xc, 500,false,true);
 					
 						//Connect encrypt and readchannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(enc.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
 							
 						//Connect encrypt and writechannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(enc.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
@@ -1695,7 +1590,7 @@ public class GTURTLEModeling {
 					tad.addComponent(rd, xc,300,false,true);
 					//Connect choice and readchannel
 				
-					fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+					fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 					fromStart.setP1(choice.getTGConnectingPointAtIndex(i));
 					fromStart.setP2(rd.getTGConnectingPointAtIndex(0));
 			
@@ -1712,13 +1607,13 @@ public class GTURTLEModeling {
 						dec.securityContext = ch.securityContext;
 			   		 	tad.addComponent(dec, xc, 500,false,true);
 
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(dec.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
 						
 						//Connect encrypt and writechannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(dec.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
@@ -1745,13 +1640,13 @@ public class GTURTLEModeling {
 						tad.addComponent(enc, xc, 500,false,true);
 						
 						//Connect encrypt and readchannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(rd.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(enc.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
 						
 						//Connect encrypt and writechannel
-						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						fromStart.setP1(enc.getTGConnectingPointAtIndex(1));
 						fromStart.setP2(wr.getTGConnectingPointAtIndex(0));
 						tad.addComponent(fromStart, 300,200,false,true);
@@ -1831,7 +1726,7 @@ public class GTURTLEModeling {
 			//For all the tasks that receive encrypted data, decrypt it, assuming it has no associated HSM
 			for (TMLTask task: tmap.getTMLModeling().getTasks()){
 				int xpos, ypos;
-				System.out.println("loop 2");
+				//System.out.println("loop 2");
 				TMLActivityDiagramPanel tad = t.getTMLActivityDiagramPanel(task.getName());
 				HashSet<TGComponent> channelInstances = new HashSet<TGComponent>();
 				for (String chan: secChannels.keySet()){
@@ -1855,7 +1750,7 @@ public class GTURTLEModeling {
 						ypos = chI.getY()+10;
 						fromStart = tad.findTGConnectorStartingAt(chI.getTGConnectingPointAtIndex(1));
 						if (fromStart==null){
-							fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+							fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 							fromStart.setP1(chI.getTGConnectingPointAtIndex(1));
 							tad.addComponent(fromStart, xpos,ypos,false,true);
 						}
@@ -1869,7 +1764,7 @@ public class GTURTLEModeling {
 
 						fromStart.setP2(dec.getTGConnectingPointAtIndex(0));
 						if (point!=null){
-							fromStart=new TGConnectorTMLAD(dec.getX(), dec.getY(), tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+							fromStart=new TGConnectorTMLAD(dec.getX(), dec.getY(), tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 							tad.addComponent(fromStart, xpos, ypos, false, true);
 							fromStart.setP1(dec.getTGConnectingPointAtIndex(1));
 
@@ -1924,7 +1819,7 @@ public class GTURTLEModeling {
 
 
 						fromStart.setP2(enc.getTGConnectingPointAtIndex(0));
-						fromStart=new TGConnectorTMLAD(enc.getX(), enc.getY(), tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector());
+						fromStart=new TGConnectorTMLAD(enc.getX(), enc.getY(), tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
 						tad.addComponent(fromStart, xpos, ypos, false, true);
 						fromStart.setP1(enc.getTGConnectingPointAtIndex(1));
 
@@ -1990,7 +1885,7 @@ public class GTURTLEModeling {
 			archPanel.addComponent(bus, cpu.getX()+200, cpu.getY()+200, false, true);
 
 			//Connect Bus and CPU
-			TMLArchiConnectorNode connect =new  TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector());
+			TMLArchiConnectorNode connect =new  TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector<Point>());
 			TGConnectingPoint p1 = bus.findFirstFreeTGConnectingPoint(true,true);
 			p1.setFree(false);
 			connect.setP2(p1);
@@ -2003,7 +1898,7 @@ public class GTURTLEModeling {
 			archPanel.addComponent(connect, cpu.getX()+100, cpu.getY()+100, false, true);
 			//Connect Bus and HWA
 
-			connect = new TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector());
+			connect = new TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector<Point>());
 			p1 = bus.findFirstFreeTGConnectingPoint(true,true);
 			p1.setFree(false);
 			connect.setP2(p1);
@@ -2015,7 +1910,7 @@ public class GTURTLEModeling {
 			archPanel.addComponent(connect, cpu.getX()+100, cpu.getY()+100, false, true);
 			//Connect Bus and Memory
 
-			connect = new TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector());
+			connect = new TMLArchiConnectorNode(cpu.getX()+100, cpu.getY()+100, archPanel.getMinX(), archPanel.getMaxX(), archPanel.getMinY(), archPanel.getMaxY(), true, null, archPanel, null, null, new Vector<Point>());
 			p1 = bus.findFirstFreeTGConnectingPoint(true,true);
 			p1.setFree(false);
 			connect.setP2(p1);
@@ -2099,23 +1994,24 @@ public class GTURTLEModeling {
 
 			ProVerifOutputAnalyzer pvoa = getProVerifOutputAnalyzer ();
 			pvoa.analyzeOutput(data, true);
-			for (String nonConf: pvoa.getNonSecretStrings()){
-				nonSecChans.add(nonConf);
-				TraceManager.addDev(nonConf + " is not secret");
-				//Find all tasks that receive this data
-				
-				TMLChannel chan = map.getTMLModeling().getChannelByShortName(nonConf.split("__")[1].replaceAll("_chData",""));
+                        HashMap<AvatarPragmaSecret, ProVerifQueryResult> confResults = pvoa.getConfidentialityResults();
+			for (AvatarPragmaSecret pragma: confResults.keySet()) {
+                            if (confResults.get(pragma).isProved() && !confResults.get(pragma).isSatisfied())
+                            {
+				nonSecChans.add(pragma.getArg().getBlock().getName() + "__" + pragma.getArg().getName());
+				TraceManager.addDev(pragma.getArg().getBlock().getName() + "." + pragma.getArg().getName()+ " is not secret");
+				TMLChannel chan = map.getTMLModeling().getChannelByShortName(pragma.getArg().getName().replaceAll("_chData",""));
 				for (String block:chan.getTaskNames()){
-					nonSecChans.add(block+"__"+nonConf.split("__")[1]);
+					nonSecChans.add(block+"__"+pragma.getArg().getName());
 				}
+                            }
 			}
-			for (String nonAuth: pvoa.getNonSatisfiedAuthenticity()) {
-				String chanName= nonAuth.split("_chData")[0];
-				nonAuthChans.add(chanName);
-				String ch2=nonAuth.split(" ==> ")[1];
-				ch2=ch2.split("_chData")[0];
-				nonAuthChans.add(ch2);
-				TraceManager.addDev(nonAuth);
+                        HashMap<AvatarPragmaAuthenticity, ProVerifQueryAuthResult> authResults = pvoa.getAuthenticityResults();
+			for (AvatarPragmaAuthenticity pragma: authResults.keySet()) {
+                            if (authResults.get(pragma).isProved() && !authResults.get(pragma).isSatisfied()) {
+				nonAuthChans.add(pragma.getAttrA().getAttribute().getBlock().getName() + "__" + pragma.getAttrA().getState().getName().replaceAll("_chData", ""));
+				nonAuthChans.add(pragma.getAttrB().getAttribute().getBlock().getName() + "__" + pragma.getAttrB().getState().getName().replaceAll("_chData", ""));
+                            }
 			}
 			TraceManager.addDev("all results displayed");
 
@@ -2577,7 +2473,7 @@ public class GTURTLEModeling {
 
 							}
 						}
-						if (tg.getY() > ypos && tg!=dec){
+						if (tg.getY() > ypos && tg!=dec && tg!=comp){
 
 							tg.setCd(tg.getX(), tg.getY()+yShift);
 						}
@@ -2924,7 +2820,6 @@ public class GTURTLEModeling {
 		warnings = avatar2proverif.getWarnings();
 		languageID = PROVERIF;
 		mgui.setMode(MainGUI.EDIT_PROVERIF_OK);
-		//mgui.setMode(MainGUI.MODEL_PROVERIF_OK);
 		//uppaalTable = tml2uppaal.getRelationTIFUPPAAL(_debug);
 		try {
 			if (avatar2proverif.saveInFile(_path)){
@@ -2955,8 +2850,6 @@ public class GTURTLEModeling {
 
 
 	  languageID = TPN;
-	  mgui.setMode(MainGUI.EDIT_PROVERIF_OK);
-	  //mgui.setMode(MainGUI.MODEL_PROVERIF_OK);
 	  //uppaalTable = tml2uppaal.getRelationTIFUPPAAL(_debug);
 	  return true;
 	  /*try {
@@ -3984,6 +3877,10 @@ public class GTURTLEModeling {
 
 		removeAllComponents();
 		mgui.reinitMainTabbedPane();
+
+		// Issue #42: the selected tabs should be memorized before decrementing the pointer
+		final Point prevSelectedTabs = savedPanels.elementAt( pointerOperation );
+		
 		try {
 			pointerOperation --;
 			TraceManager.addDev("Decrementing pointer =" + pointerOperation);
@@ -3994,11 +3891,13 @@ public class GTURTLEModeling {
 		}
 
 		TraceManager.addDev("Selecting tab");
-
-		Point p = (Point)(savedPanels.elementAt(pointerOperation));
-		if (p != null) {
-			TraceManager.addDev("Selecting tab panel=" + p.getX() + " diagram=" + p.getY());
-			TDiagramPanel tdp = mgui.selectTab(p);
+		
+		// Issue #42:
+		//Point p = savedPanels.elementAt(pointerOperation);
+		
+		if ( prevSelectedTabs != null ) {
+			TraceManager.addDev("Selecting tab panel=" + prevSelectedTabs.getX() + " diagram=" + prevSelectedTabs.getY());
+			TDiagramPanel tdp = mgui.selectTab( prevSelectedTabs );
 			tdp.mode = TDiagramPanel.NORMAL;
 			tdp.setDraw(true);
 			tdp.repaint();
@@ -7948,7 +7847,7 @@ public class GTURTLEModeling {
 		if (tdp == null) {
 			throw new MalformedModelingException();
 		}
-		boolean error = false;
+		//boolean error = false;
 
 		for(int i=0; i<nl.getLength(); i++) {
 			n = nl.item(i);
@@ -7973,7 +7872,7 @@ public class GTURTLEModeling {
 			CheckingError ce = new CheckingError(CheckingError.BEHAVIOR_ERROR, "A component could not be correctly loaded - type=" + t);
 			ce.setTDiagramPanel(tdp);
 			checkingErrors.add(ce);
-					error = true;
+					//error = true;
 				}
 			}
 		}
@@ -7985,7 +7884,7 @@ public class GTURTLEModeling {
 
 	public int getTypeOfComponentNode(Node n) {
 	try {
-		NodeList nl = n.getChildNodes();
+		//NodeList nl = n.getChildNodes();
 			Element elt = (Element)n;
 		return Integer.decode(elt.getAttribute("type")).intValue();
 	} catch (Exception e){
@@ -9197,7 +9096,16 @@ public class GTURTLEModeling {
 				AvatarSMDReceiveSignal smdrs = new AvatarSMDReceiveSignal(x, y, x, x*2, y, y*2, false, null, smp);
 				tgcomp=smdrs;
 				smp.addComponent(smdrs, x, y, false, true);
-				String name=sig.minString();
+//				String name=sig.minString();
+				//System.out.println("signal values" +((AvatarActionOnSignal)asme).getValues());
+				String parameters="";
+				if (((AvatarActionOnSignal)asme).getValues().size()>0){
+					parameters+=((AvatarActionOnSignal)asme).getValues().get(0);
+					for (int i=1; i < ((AvatarActionOnSignal)asme).getValues().size(); i++){
+						parameters=parameters+","+((AvatarActionOnSignal)asme).getValues().get(i);
+					}
+				}
+				String name=sig.getName()+"("+parameters+")";
 				smdrs.setValue(name);
 				// sig.setName(name);
 				smdrs.recalculateSize();
@@ -9213,8 +9121,16 @@ public class GTURTLEModeling {
 			else {
 				AvatarSMDSendSignal smdss = new AvatarSMDSendSignal(x, y, x, x*2, y, y*2, false, null, smp);
 				tgcomp=smdss;
-				smp.addComponent(smdss, x, y, false, true);
-				String name=sig.minString();
+				smp.addComponent(smdss, x, y, false, true);				
+				String parameters="";
+				if (((AvatarActionOnSignal)asme).getValues().size()>0){
+					parameters+=((AvatarActionOnSignal)asme).getValues().get(0);
+					for (int i=1; i < ((AvatarActionOnSignal)asme).getValues().size(); i++){
+						parameters=parameters+","+((AvatarActionOnSignal)asme).getValues().get(i);
+					}
+				}
+				String name=sig.getName()+"("+parameters+")";
+				//String name=sig.minString();
 				smdss.setValue(name);
 				smdss.recalculateSize();
 				SMDMap.put(asme, smdss);
@@ -9396,9 +9312,9 @@ public class GTURTLEModeling {
 					else {
 
 						AvatarBDBlock father= blockMap.get(ab.getFather().getName().split("__")[ab.getFather().getName().split("__").length-1]);
-						System.out.println("blockmap " + blockMap);
+						//System.out.println("blockmap " + blockMap);
 						if (father==null){
-							System.out.println("Missing father block " + ab.getFather().getName());
+							//System.out.println("Missing father block " + ab.getFather().getName());
 							continue;
 						}
 						AvatarBDBlock bl = new AvatarBDBlock(father.getX()+blockIncMap.get(ab.getFather()), father.getY()+10, abd.getMinX(), abd.getMaxX(), abd.getMinY(), abd.getMaxY(), false, father, abd);
@@ -9437,7 +9353,7 @@ public class GTURTLEModeling {
 		for (String bl1: originDestMap.keySet()){
 			for (String bl2:originDestMap.get(bl1)){
 				Vector<Point> points=new Vector<Point>();
-				System.out.println("Finding " + bl1 + " and bl2 "+ bl2);
+			//	System.out.println("Finding " + bl1 + " and bl2 "+ bl2);
 				if (blockMap.get(bl1)==null || blockMap.get(bl2)==null){
 					continue;
 				}
@@ -9516,6 +9432,13 @@ public class GTURTLEModeling {
 				}
 			}
 			else if (p.getName().contains("Authenticity")){
+				t=p.getName();
+			}
+			else if (p.getName().contains("Initial")){
+				t=p.getName();
+			}
+			else {
+				t=p.getName();
 			}
 			s=s.concat(t+"\n");
 			//  i++;
diff --git a/src/ui/GTURTLEOSModeling.java b/src/ui/GTURTLEOSModeling.java
index 066f60b20689f618c7f944a4553b306d25344c42..a09dd6b9aeff2191b9c2549cf2ca9080b1ab11ea 100755
--- a/src/ui/GTURTLEOSModeling.java
+++ b/src/ui/GTURTLEOSModeling.java
@@ -47,10 +47,12 @@
 
 package ui;
 
-import java.util.*;
+import translator.TClass;
+import translator.TURTLEModeling;
+import ui.oscd.TOSClass;
 
-import ui.oscd.*;
-import translator.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class GTURTLEOSModeling  {
     private TURTLEOSDesignPanel tosdp;
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index f67937e4c8151995fd708e3d76b15037ad8b456a..5cc4bfa936a5884b81852f156e76096ab04b5f60 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -45,9 +45,9 @@
 
 package ui;
 
-import java.net.*;
+import javax.swing.*;
 import java.awt.*;
-import javax.swing.ImageIcon;
+import java.net.URL;
 
 /**
  * Class
diff --git a/src/ui/Invariant.java b/src/ui/Invariant.java
index 98836c65036661fba63d1e35968500405410aa14..b48681f67f532b89241ee727c5e2a0cce74015c6 100755
--- a/src/ui/Invariant.java
+++ b/src/ui/Invariant.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import myutil.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
 
-import java.util.*;
+import java.util.LinkedList;
 
 
 public class Invariant implements GenericTree {
diff --git a/src/ui/InvariantSynchro.java b/src/ui/InvariantSynchro.java
index 5a4ad263b972d9c8640776a423b407e9ca25b855..95afda0ddf883791682a60f3eda3de18c3a162ba 100755
--- a/src/ui/InvariantSynchro.java
+++ b/src/ui/InvariantSynchro.java
@@ -46,9 +46,7 @@
 
 package ui;
 
-import myutil.*;
-
-import java.util.*;
+import myutil.GenericTree;
 
 
 public class InvariantSynchro implements GenericTree {
diff --git a/src/ui/JMenuBarTurtle.java b/src/ui/JMenuBarTurtle.java
index b5f56eae6306688700341f01353cbcbdf6bcfc59..42860940f3e198bb0c5757c086db2e11cf08193e 100755
--- a/src/ui/JMenuBarTurtle.java
+++ b/src/ui/JMenuBarTurtle.java
@@ -94,6 +94,8 @@ public  class JMenuBarTurtle extends JMenuBar   {
         menuItem.addMouseListener(mgui.mouseHandler);
         menuItem = file.add(mgui.actions[TGUIAction.ACT_OPEN]);
         menuItem.addMouseListener(mgui.mouseHandler);
+	menuItem = file.add(mgui.actions[TGUIAction.ACT_OPEN_FROM_NETWORK]);
+        menuItem.addMouseListener(mgui.mouseHandler);
         menuItem = file.add(mgui.actions[TGUIAction.ACT_SAVE]);
         menuItem.addMouseListener(mgui.mouseHandler);
         menuItem = file.add(mgui.actions[TGUIAction.ACT_SAVE_AS]);
diff --git a/src/ui/JTextAreaWriter.java b/src/ui/JTextAreaWriter.java
index 9a4fc95d898366c2b04f078ffe1987db0bb72507..6daada3dab3b3661202b7e576ff2118d30da05ff 100644
--- a/src/ui/JTextAreaWriter.java
+++ b/src/ui/JTextAreaWriter.java
@@ -1,10 +1,9 @@
 package ui;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.io.Writer;
 
-import javax.swing.JTextArea;
-
 public class JTextAreaWriter extends Writer {
 
 	private final JTextArea textArea;
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 9dfa8c39c0c95c83ae812301a809ad237bb566ee..ee4e1ad4955a6ff38fc43e9c76febd30a78906d6 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -45,12 +45,13 @@
 
 package ui;
 
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * Class        *
@@ -198,11 +199,6 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
             genlotos.addMouseListener(mgui.mouseHandler);
         }
 
-        /*if (MainGUI.proverifOn) {
-          button = add(mgui.actions[TGUIAction.ACT_GEN_PROVERIF]);
-          button.addMouseListener(mgui.mouseHandler);
-          }*/
-
         addSeparator();
 
         checkcode = add(mgui.actions[TGUIAction.ACT_CHECKCODE]);
diff --git a/src/ui/MSCDrawer.java b/src/ui/MSCDrawer.java
index d125b784221c44227f4a92e1f79bee4bf10a0409..5672f541f6fd918c86da0515738da744971353bc 100755
--- a/src/ui/MSCDrawer.java
+++ b/src/ui/MSCDrawer.java
@@ -46,11 +46,15 @@
 
 package ui;
 
-import java.util.*;
-
 import sddescription.*;
-import ui.sd.*;
-import ui.iod.*;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.sd.SDInstance;
+import ui.sd.SequenceDiagramPanel;
+import ui.sd.TGConnectorMessageSD;
+
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class MSCDrawer {
     public final static int DEC = 50;
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 66803074ab65188ea1890b3f8225eb6a6dcf85d3..18a1bcf7a0fa22767febd75e7480ccb2a5ebfaa7 100644
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -48,76 +48,17 @@
 
 package ui;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.imageio.ImageIO;
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import avatartranslator.AvatarSpecification;
 import ddtranslatorSoclib.AvatarddSpecification;
 import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
 import launcher.RemoteExecutionThread;
 import launcher.RshClient;
-import myutil.BrowserControl;
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.PeriodicBehavior;
-import myutil.PeriodicBehaviorThread;
-import myutil.TraceManager;
+import myutil.*;
 import proverifspec.ProVerifOutputAnalyzer;
 import translator.MasterGateManager;
 import ui.ad.TActivityDiagramPanel;
 import ui.atd.AttackTreeDiagramPanel;
 import ui.avatarad.AvatarADPanel;
-// AVATAR
 import ui.avatarbd.AvatarBDLibraryFunction;
 import ui.avatarbd.AvatarBDPortConnector;
 import ui.avatarbd.AvatarBDStateMachineOwner;
@@ -130,23 +71,13 @@ import ui.avatarrd.AvatarRDPanel;
 import ui.avatarsmd.AvatarSMDPanel;
 import ui.cd.TClassDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
-import ui.file.AUTFileFilter;
-import ui.file.DTAFileFilter;
-import ui.file.MSCFilter;
-import ui.file.RGFileFilter;
-import ui.file.RTLFileFilter;
-import ui.file.TDotFilter;
-import ui.file.TFileFilter;
-import ui.file.TImgFilter;
-import ui.file.TLSAFileFilter;
-import ui.file.TLibFilter;
-import ui.file.TSVGFilter;
-import ui.file.TTIFFilter;
+import ui.file.*;
 import ui.graph.AUTGraph;
 import ui.graph.RG;
 import ui.interactivesimulation.JFrameInteractiveSimulation;
 import ui.interactivesimulation.SimulationTransaction;
 import ui.iod.InteractionOverviewDiagramPanel;
+import ui.networkmodelloader.JDialogLoadingNetworkModel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
 import ui.prosmd.ProactiveSMDPanel;
 import ui.req.Requirement;
@@ -164,6 +95,22 @@ import ui.tree.JDiagramTree;
 import ui.ucd.UseCaseDiagramPanel;
 import ui.window.*;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.*;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+// AVATAR
+
 public  class MainGUI implements ActionListener, WindowListener, KeyListener, PeriodicBehavior {
 
     public static boolean systemcOn;
@@ -227,7 +174,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     //@author: Huy TRUONG
     public JDialogSearchBox searchBox;
- 
+
 
     public final static byte NOT_OPENED = 0;
     public final static byte OPENED = 1;
@@ -274,7 +221,6 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     public final static byte UPPAAL_OK = 42;
     public final static byte NC_OK = 43;
     public final static byte MODEL_UPPAAL_OK = 44;
-    public final static byte MODEL_PROVERIF_OK = 45;
     public final static byte EDIT_PROVERIF_OK = 46;
     public final static byte AVATAR_SYNTAXCHECKING_OK = 47;
     public final static byte PANEL_CHANGED = 48;
@@ -362,11 +308,15 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     // Invariants
     Invariant currentInvariant;
 
-    // Thread fof autosave
+    // Thread for autosave
     PeriodicBehaviorThread pbt;
 
     private TMLArchiPanel tmlap;    // USed to retrieve the currently opened architecture panel
 
+    // Plugin management
+    //public static PluginManager pluginManager;
+
+
     public MainGUI(boolean _turtleOn, boolean _systemcOn, boolean _lotosOn, boolean _proactiveOn, boolean _tpnOn, boolean _osOn, boolean _uppaalOn, boolean _ncOn, boolean _avatarOn, boolean _proverifOn, boolean
                    _avatarOnly, boolean _experimental) {
         turtleOn = _turtleOn;
@@ -386,6 +336,8 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         pbt = new PeriodicBehaviorThread(this, 120000); // save every two minutes
 
+        PluginManager.pluginManager = new PluginManager();
+
     }
 
     public void setKey(String _sk) {
@@ -636,7 +588,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void setMode(byte m) {
         mode = m;
-	ModeManager.setMode(mode, actions, mainBar, this);
+        ModeManager.setMode(mode, actions, mainBar, this);
     }
 
 
@@ -1077,7 +1029,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 list.addAll( ((TMLComponentDesignPanel)tp).getAllTMLTasksAttributes() );
             }
         }
-        
+
         return list;
     }
 
@@ -1473,8 +1425,8 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     private void addTURTLEPanel() {
 
         //TraceManager.addDev("New TURTLE Panels");
-        // tabbed pane
-        mainTabbedPane = new JTabbedPane();
+		// Issue #41 Ordering of tabbed panes 
+        mainTabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         mainTabbedPane.setBackground(ColorManager.MainTabbedPane);
         mainTabbedPane.setForeground(Color.black);
 
@@ -2222,10 +2174,10 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 frame.setTitle("TTool: " + file.getAbsolutePath());
                 makeLotosFile();
 
-		if (gtm.getCheckingErrors().size() > 0) {
-		    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
-		}
-		
+                if (gtm.getCheckingErrors().size() > 0) {
+                    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+                }
+
             } catch (MalformedModelingException mme) {
                 JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
             }
@@ -2234,6 +2186,23 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     }
 
+    public void openNetworkProject() {
+        boolean b = actions[TGUIAction.ACT_SAVE].isEnabled();
+        if (b) {
+            if (!saveBeforeAction("Save and Open", "Open")) {
+                return;
+            }
+            /*  int back = JOptionPane.showConfirmDialog(frame, "Current modeling has not been saved\nDo you really want to open a new one ?", "To quit, or not to quit ?", JOptionPane.OK_CANCEL_OPTION);
+                if (back == JOptionPane.CANCEL_OPTION) {
+                return;
+                }*/
+        }
+
+	JDialogLoadingNetworkModel jdlnm = new JDialogLoadingNetworkModel(frame, this, "Opening a network model", ConfigurationTTool.URL_MODEL);
+	GraphicLib.centerOnParent(jdlnm, 700, 800);
+	jdlnm.setVisible(true); // blocked until dialog has been closed
+    }
+
 
     public void openProject() {
         // check if a current modeling is opened
@@ -2257,12 +2226,17 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             file = jfc.getSelectedFile();
+	    openProjectFromFile(file);
         }
 
+    }
+
+    public void openProjectFromFile(File _f) {
+
         String s = null;
-        if(checkFileForOpen(file)) {
+        if(checkFileForOpen(_f)) {
             try {
-                FileInputStream fis = new FileInputStream(file);
+                FileInputStream fis = new FileInputStream(_f);
                 int nb = fis.available();
 
                 byte [] ba = new byte[nb];
@@ -2285,7 +2259,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
             gtm.enableUndo(false);
 
             // Update configuration
-            updateLastOpenFile(file);
+            updateLastOpenFile(_f);
 
             //TraceManager.addDev("Loading");
             // load the new TURTLE modeling
@@ -2294,11 +2268,11 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 //gtm.saveOperation(tcdp);
                 frame.setTitle("TTool: " + file.getAbsolutePath());
                 makeLotosFile();
-		
-		if (gtm.getCheckingErrors().size() > 0) {
-		    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
-		
-		}
+
+                if (gtm.getCheckingErrors().size() > 0) {
+                    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+
+                }
             } catch (MalformedModelingException mme) {
                 JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
                 frame.setTitle("TToolt: unamed project");
@@ -2350,16 +2324,16 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 //gtm.saveOperation(tcdp);
                 frame.setTitle("TTool: " + file.getAbsolutePath());
                 makeLotosFile();
-				
-				if (gtm.getCheckingErrors().size() > 0) {
-				    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
-				}
+
+                if (gtm.getCheckingErrors().size() > 0) {
+                    JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
+                }
             }
             catch (MalformedModelingException mme) {
                 JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
                 frame.setTitle("TTool: unamed project");
             }
-            
+
             dtree.forceUpdate();
             gtm.enableUndo(true);
             gtm.saveOperation(getCurrentSelectedPoint());
@@ -2524,7 +2498,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         if( checkFileForSave(file)) {
             String s = gtm.makeXMLFromTurtleModeling(-1);
-            
+
             try {
                 if (gtm == null) {
                     throw new Exception("Internal model Error 1");
@@ -2782,7 +2756,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         } else {
             s += zoom + "%";
         }
-	//TraceManager.addDev("Seeting zoom in " + getCurrentTDiagramPanel());
+        //TraceManager.addDev("Seeting zoom in " + getCurrentTDiagramPanel());
         actions[TGUIAction.ACT_SHOW_ZOOM].setName(TGUIAction.ACT_SHOW_ZOOM, s);
     }
 
@@ -2796,11 +2770,11 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void nextDiag() {
         getCurrentJTabbedPane().setSelectedIndex(Math.min(getCurrentJTabbedPane().getTabCount(), getCurrentJTabbedPane().getSelectedIndex() + 1));
-     }
+    }
 
     public void lastDiag() {
         getCurrentJTabbedPane().setSelectedIndex(getCurrentJTabbedPane().getTabCount() - 1);
-     }
+    }
 
     //@author: Huy TRUONG
     //open a new External Search Dialog
@@ -2838,7 +2812,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     }
 
     public void aboutVersion() {
-         JFrameBasicText jft = new JFrameBasicText("About TTool ...", DefaultText.getAboutText(), IconManager.imgic324);
+        JFrameBasicText jft = new JFrameBasicText("About TTool ...", DefaultText.getAboutText(), IconManager.imgic324);
         jft.setIconImage(IconManager.img8);
         GraphicLib.centerOnParent(jft, 700, 800 );
         jft.setVisible(true);
@@ -2846,7 +2820,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     }
 
     public void showTToolConfiguration() {
-         JFrameBasicText jft = new JFrameBasicText("Your configuration of TTool ...", ConfigurationTTool.getConfiguration(systemcOn), IconManager.imgic76);
+        JFrameBasicText jft = new JFrameBasicText("Your configuration of TTool ...", ConfigurationTTool.getConfiguration(systemcOn), IconManager.imgic76);
         jft.setIconImage(IconManager.img8);
         //jft.setSize(700, 800);
         GraphicLib.centerOnParent(jft, 700, 800 );
@@ -2871,7 +2845,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     }
 
     public void oneClickLOTOSRG() {
-       // boolean ret;
+        // boolean ret;
         if (!checkModelingSyntax(true)) {
             TraceManager.addDev("Syntax error");
             return;
@@ -2886,7 +2860,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     }
 
     public void oneClickRTLOTOSRG() {
-       // boolean ret;
+        // boolean ret;
         if (!checkModelingSyntax(true)) {
             TraceManager.addDev("Syntax error");
             return;
@@ -3083,7 +3057,6 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 if (b) {
                     ret = true;
                     setMode(MainGUI.AVATAR_SYNTAXCHECKING_OK);
-                    //setMode(MainGUI.MODEL_PROVERIF_OK);
                     //setMode(MainGUI.GEN_DESIGN_OK);
                     /*
                       if (!automatic) {
@@ -3142,7 +3115,6 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 if (b) {
                     ret = true;
                     setMode(MainGUI.AVATAR_SYNTAXCHECKING_OK);
-                    //setMode(MainGUI.MODEL_PROVERIF_OK);
                     //setMode(MainGUI.GEN_DESIGN_OK);
                     /*
                       if (!automatic) {
@@ -3370,12 +3342,12 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 JDialogSelectRequirements.ignored = rdp.ignored;
                 Vector<Requirement> reqsToValidate = new Vector<Requirement>();
                 JDialogSelectRequirements jdsreq = new JDialogSelectRequirements(frame, reqsToValidate, rdp.getComponentList(), "Choosing requirements to verify");
-                
+
                 if (!automatic) {
                     GraphicLib.centerOnParent(jdsreq);
                     jdsreq.setVisible(true); // Blocked until dialog has been closed
                 }
-                
+
                 if (reqsToValidate.size() > 0) {
                     rdp.validated = JDialogSelectRequirements.validated;
                     rdp.ignored = JDialogSelectRequirements.ignored;
@@ -3598,7 +3570,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         if (tp == null) {return null;}
         if (!(tp instanceof TMLComponentDesignPanel)) {return null;}
         TMLComponentDesignPanel tmlcomp = (TMLComponentDesignPanel)tp;
-        ArrayList<String> strlist = tmlcomp.getAllCryptoConfig();
+        List<String> strlist = tmlcomp.getAllCryptoConfig();
         String[] strarray = new String[strlist.size()];
         strlist.toArray(strarray);
         return strarray;
@@ -3608,7 +3580,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         if (tp == null) {return null;}
         if (!(tp instanceof TMLComponentDesignPanel)) {return null;}
         TMLComponentDesignPanel tmlcomp = (TMLComponentDesignPanel)tp;
-        ArrayList<String> strlist = tmlcomp.getAllNonce();
+        List<String> strlist = tmlcomp.getAllNonce();
         String[] strarray = new String[strlist.size()];
         strlist.toArray(strarray);
         return strarray;
@@ -3682,14 +3654,14 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                 }*/
             gtm.getTMLMapping().getTMLModeling().clearBacktracing();
             gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, getTabName(tp));
-            gtm.getTML2Avatar().backtraceReachability(pvoa.getReachableEvents(), pvoa.getNonReachableEvents());
-            gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getSatisfiedAuthenticity(), pvoa.getSatisfiedWeakAuthenticity(), pvoa.getNonSatisfiedAuthenticity(), getTabName(tp));
+            gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
+            gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getAuthenticityResults(), getTabName(tp));
         }
         else if (tp instanceof TMLComponentDesignPanel){
             gtm.getTMLMapping().getTMLModeling().clearBacktracing();
             gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, "Default Mapping");
-            gtm.getTML2Avatar().backtraceReachability(pvoa.getReachableEvents(), pvoa.getNonReachableEvents());
-            gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getSatisfiedAuthenticity(), pvoa.getSatisfiedWeakAuthenticity(), pvoa.getNonSatisfiedAuthenticity(), "Default Mapping");
+            gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
+            gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa.getAuthenticityResults(), "Default Mapping");
         }
         return;
     }
@@ -3888,7 +3860,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void generateAUTS() {
         JDialogGenAUTS jdgauts = new JDialogGenAUTS(frame, this, "Generation of automata via LOTOS", gtm.getPathCaesar(),
-        											GTURTLEModeling.getPathBcgio(),
+                                                    GTURTLEModeling.getPathBcgio(),
                                                     REMOTE_RTL_LOTOS_FILE,
                                                     GTURTLEModeling.getCaesarHost(), ConfigurationTTool.TGraphPath);
         //  jdgauts.setSize(450, 600);
@@ -3909,7 +3881,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void avatarSimulation() {
         TraceManager.addDev("Avatar simulation");
-        jfais = new JFrameAvatarInteractiveSimulation(frame, this, "Interactive simulation", gtm.getAvatarSpecification());
+        jfais = new JFrameAvatarInteractiveSimulation( /*frame,*/ this, "Interactive simulation", gtm.getAvatarSpecification());
         jfais.setIconImage(IconManager.img9);
         // jfais.setSize(900, 600);
         GraphicLib.centerOnParent(jfais, 900, 600);
@@ -3932,8 +3904,11 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void avatarProVerifVerification() {
         TraceManager.addDev("Avatar proverif fv");
-        //JDialogProVerifGeneration jgen = new JDialogProVerifGeneration(frame, this, "ProVerif: code generation and verification", ConfigurationTTool.ProVerifVerifierHost, ConfigurationTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath);
-        JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, ConfigurationTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath);
+        TURTLEPanel tp = this.getCurrentTURTLEPanel();
+        AvatarDesignPanel adp = null;
+        if (tp instanceof AvatarDesignPanel)
+            adp = (AvatarDesignPanel) tp;
+        JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, ConfigurationTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath, adp);
         // jgen.setSize(500, 450);
         GraphicLib.centerOnParent(jgen, 500, 450);
         jgen.setVisible(true);
@@ -4025,21 +4000,21 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                   }*/
                 TraceManager.addDev( "About to open the window at line 4198" );
                 if (showWindow) {
-		    TURTLEPanel tp = getCurrentTURTLEPanel();
-		    boolean result = false;
-		    
-		    if ((tp instanceof TMLDesignPanel) || (tp instanceof TMLComponentDesignPanel)) {
-			result = gtm.generateUPPAALFromTML(ConfigurationTTool.UPPAALCodeDirectory, false, 1024, true);
-		    }
-		    if (result != false) {
-			formalValidation();
-		    }
+                    TURTLEPanel tp = getCurrentTURTLEPanel();
+                    boolean result = false;
+
+                    if ((tp instanceof TMLDesignPanel) || (tp instanceof TMLComponentDesignPanel)) {
+                        result = gtm.generateUPPAALFromTML(ConfigurationTTool.UPPAALCodeDirectory, false, 1024, true);
+                    }
+                    if (result != false) {
+                        formalValidation();
+                    }
                     /*JDialogUPPAALGeneration jgen = new JDialogUPPAALGeneration(frame, this, "UPPAAL code generation", ConfigurationTTool.UPPAALCodeDirectory, JDialogUPPAALGeneration.DIPLODOCUS_MODE);
                     //  jgen.setSize(450, 500);
                     GraphicLib.centerOnParent(jgen, 450, 500);
                     jgen.setVisible(true);*/
-		    
-		    }
+
+                }
                 return;
             }
         }
@@ -4059,7 +4034,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         TraceManager.addDev("Execute avatar model checker");
         gtm.generateAvatarFromTML(true,false);
         if (gtm.getAvatarSpecification()==null){
-	    TraceManager.addDev("Null avatar spec");
+            TraceManager.addDev("Null avatar spec");
             return;
         }
         JDialogAvatarModelChecker jmc = new JDialogAvatarModelChecker(frame, this, "Avatar: Model Checking", gtm.getAvatarSpecification(), ConfigurationTTool.TGraphPath, experimentalOn);
@@ -4069,33 +4044,6 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     }
 
 
-    public void generateProVerif() {
-        TraceManager.addDev("Generate ProVerif!");
-
-        JDialogProVerifGeneration jgen = new JDialogProVerifGeneration(frame, this, "ProVerif: code generation and verification", ConfigurationTTool.ProVerifVerifierHost, ConfigurationTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath);
-        //jgen.setSize(500, 450);
-        GraphicLib.centerOnParent(jgen, 500, 450);
-        jgen.setVisible(true);
-        dtree.toBeUpdated();
-
-        // Generate from AVATAR
-        /*if (gtm.getTURTLEModelingState() == 3) {
-          boolean result = gtm.generateProVerifFromAVATAR(ConfigurationTTool.ProVerifCodeDirectory);
-          if (result) {
-          JOptionPane.showMessageDialog(frame,
-          "0 error, " + getCheckingWarnings().size() + " warning(s). ProVerif specification generated",
-          "Successful translation from the Avatar to a ProVerif specification",
-          JOptionPane.INFORMATION_MESSAGE);
-          } else {
-          JOptionPane.showMessageDialog(frame,
-          "" + getCheckingErrors().size() + " errors, " +getCheckingWarnings().size() + " warning(s). ProVerif specification could NOT be generated",
-          "ERROR during translation from AVATAR to UPPAAL",
-          JOptionPane.INFORMATION_MESSAGE);
-          }
-          }*/
-    }
-
-
     public List<String> generateAllAUT(String path) {
         return gtm.generateAUT(path);
     }
@@ -5073,7 +5021,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         TURTLEPanel tp;// = getCurrentTURTLEPanel();
         TDiagramPanel tdp1;
-      //  BufferedImage image;
+        //  BufferedImage image;
         File file1;
         String name = file.getAbsolutePath();
         name = name.substring(0, name.length() - 4);
@@ -5364,15 +5312,15 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     public List<TGComponent> getAllTMLComponents() {
         TURTLEPanel tp;
         List<TGComponent> ll = new LinkedList<TGComponent>();
-        
+
         for(int i=0; i<tabs.size(); i++) {
             tp = (TURTLEPanel)(tabs.elementAt(i));
-            
+
             if (tp instanceof TMLComponentDesignPanel) {
                 ll.addAll(((TMLComponentDesignPanel)tp).tmlctdp.getComponentList());
             }
         }
-        
+
         return ll;
     }
 
@@ -5778,7 +5726,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         return false;
     }
 
-     public boolean openSequenceDiagramZV(String s) {
+    public boolean openSequenceDiagramZV(String s) {
         int index = getCurrentJTabbedPane().indexOfTab(s);
         if (index > -1) {
             getCurrentJTabbedPane().setSelectedIndex(index);
@@ -5877,14 +5825,14 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         return getSequenceDiagramPanel(tp, s);
     }
 
-    
+
     public ui.sd2.SequenceDiagramPanel getSequenceDiagramPanelZV(int index, String s) {
         //TraceManager.addDev("Searching for " + s);
         TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
         return getSequenceDiagramPanelZV(tp, s);
     }
 
-    
+
     public AttackTreeDiagramPanel getAttackTreeDiagramPanel(int index, int indexTab, String s) {
         //TraceManager.addDev("Searching for " + s);
         TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
@@ -6029,7 +5977,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         setPanelMode();
         return true;
     }
-    
+
     public boolean createUniqueSequenceDiagram(TURTLEPanel tp, String s) {
         int i;
         for(i=0; i<1000; i++) {
@@ -6047,7 +5995,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         setPanelMode();
         return true;
     }
-    
+
 
     public boolean createUniqueSequenceDiagramZV(TURTLEPanel tp, String s) {
         int i;
@@ -6561,7 +6509,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
             getCurrentTDiagramPanel().repaint();
         }
 
-	if (getCurrentTDiagramPanel() instanceof ui.sd2.SequenceDiagramPanel) {
+        if (getCurrentTDiagramPanel() instanceof ui.sd2.SequenceDiagramPanel) {
             ((ui.sd2.SequenceDiagramPanel)(getCurrentTDiagramPanel())).alignInstances();
             changeMade(getCurrentTDiagramPanel(), TDiagramPanel.MOVE_COMPONENT);
             getCurrentTDiagramPanel().repaint();
@@ -8158,6 +8106,12 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         private Action listener = new AbstractAction() {
 
+                /**
+                 *
+                 */
+                private static final long serialVersionUID = -3632935027104753332L;
+
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     JMenuItem item = (JMenuItem)e.getSource();
                     String ac = item.getActionCommand();
@@ -8217,8 +8171,6 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
                     }
                 }
             };
-
-
     }
 
 
diff --git a/src/ui/MalformedConfigurationException.java b/src/ui/MalformedConfigurationException.java
index 587cb692d84536481f2fa94a47493033c5f834dd..fb5b2e9265f65745d4d12d87ee6bbe08280a139d 100755
--- a/src/ui/MalformedConfigurationException.java
+++ b/src/ui/MalformedConfigurationException.java
@@ -48,6 +48,11 @@ package ui;
 
 public	class MalformedConfigurationException extends Exception {
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3702606106817772428L;
+
 	public MalformedConfigurationException(String s) {
 		super(s);
 	}
diff --git a/src/ui/ModeManager.java b/src/ui/ModeManager.java
index 415934e1e88f1eff0d47c26a028d679f7d8c49df..0e90c2b30f6329ec883cc5ea88fee4c4146280b9 100755
--- a/src/ui/ModeManager.java
+++ b/src/ui/ModeManager.java
@@ -48,9 +48,7 @@
 
 package ui;
 
-import java.awt.event.*;
-import javax.swing.*;
-import myutil.*;
+import myutil.TraceManager;
 
 public class ModeManager {
 
@@ -60,6 +58,7 @@ public class ModeManager {
             mgui.activeActions(false);
             actions[TGUIAction.ACT_NEW].setEnabled(true);
             actions[TGUIAction.ACT_OPEN].setEnabled(true);
+	    actions[TGUIAction.ACT_OPEN_FROM_NETWORK].setEnabled(true);
             actions[TGUIAction.ACT_OPEN_TIF].setEnabled(true);
             actions[TGUIAction.ACT_OPEN_SD].setEnabled(true);
             actions[TGUIAction.ACT_OPEN_LAST].setEnabled(true);
@@ -150,10 +149,6 @@ public class ModeManager {
             //actions[TGUIAction.ACT_SIMU_JAVA].setEnabled(true);
             //actions[TGUIAction.ACT_GEN_RTLOTOS].setEnabled(true);
             //actions[TGUIAction.ACT_PROJECTION].setEnabled(false);
-            break;
-        case MainGUI.MODEL_PROVERIF_OK:
-            actions[TGUIAction.ACT_GEN_PROVERIF].setEnabled(true);
-
             break;
         case MainGUI.EDIT_PROVERIF_OK:
             actions[TGUIAction.ACT_VIEW_RTLOTOS].setEnabled(true);
@@ -217,7 +212,6 @@ public class ModeManager {
             actions[TGUIAction.ACT_GEN_AUT].setEnabled(false);
             actions[TGUIAction.ACT_GEN_AUTS].setEnabled(false);
             actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(false);
-            actions[TGUIAction.ACT_GEN_PROVERIF].setEnabled(false);
             actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER].setEnabled(false);
             actions[TGUIAction.ACT_CHECKCODE].setEnabled(false);
             actions[TGUIAction.ACT_SIMULATION].setEnabled(false);
@@ -243,7 +237,6 @@ public class ModeManager {
             actions[TGUIAction.ACT_GEN_TMLTXT].setEnabled(false);
             actions[TGUIAction.ACT_GEN_CCODE].setEnabled(false);
             actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(false);
-            actions[TGUIAction.ACT_GEN_PROVERIF].setEnabled(false);
             //actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER].setEnabled(false);
             actions[TGUIAction.ACT_GEN_AUT].setEnabled(false);
             actions[TGUIAction.ACT_GEN_AUTS].setEnabled(false);
@@ -263,7 +256,6 @@ public class ModeManager {
             actions[TGUIAction.ACT_GEN_AUT].setEnabled(false);
             actions[TGUIAction.ACT_GEN_AUTS].setEnabled(false);
             actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(false);
-            actions[TGUIAction.ACT_GEN_PROVERIF].setEnabled(false);
             actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER].setEnabled(false);
             actions[TGUIAction.ACT_CHECKCODE].setEnabled(false);
             actions[TGUIAction.ACT_SIMULATION].setEnabled(false);
diff --git a/src/ui/NCPanel.java b/src/ui/NCPanel.java
index 611f0ddb3c4441ce9bc6ea51e9d0d6ffe571ea12..f87a7f78ea66fb2c4683a7f84980ee0a4e5f8c98 100755
--- a/src/ui/NCPanel.java
+++ b/src/ui/NCPanel.java
@@ -46,24 +46,33 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.ncdd.NCDiagramPanel;
+import ui.ncdd.NCDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.ncdd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class NCPanel extends TURTLEPanel {
     public NCDiagramPanel ncdp;
-    public Vector validated, ignored;
+//    public Vector validated, ignored;
 
     public NCPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+       
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDesignAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDesignAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -86,7 +95,7 @@ public class NCPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(ncdp);
         ncdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarNC, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab("Network Calculus Diagram", IconManager.imgic60, toolBarPanel, "Opens network calculus diagram");
diff --git a/src/ui/ProactiveDesignPanel.java b/src/ui/ProactiveDesignPanel.java
index 20665e5275fad93f4fc9a11b7bd6c23ff80f8b8f..2789140a351d98e09735486d7aa3a38dbd33d2ac 100755
--- a/src/ui/ProactiveDesignPanel.java
+++ b/src/ui/ProactiveDesignPanel.java
@@ -46,11 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.procsd.ProActiveCompSpecificationCSDPanel;
+import ui.procsd.ProactiveCSDPanel;
+import ui.procsd.ProactiveCSDToolBar;
+import ui.prosmd.ProactiveSMDPanel;
+import ui.prosmd.ProactiveSMDToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import ui.procsd.*;
-import ui.prosmd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class ProactiveDesignPanel extends TURTLEPanel {
    
@@ -65,12 +71,18 @@ public class ProactiveDesignPanel extends TURTLEPanel {
 
 	public ProactiveDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneAnalysisAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -109,7 +121,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
          JScrollDiagramPanel jsp	= new JScrollDiagramPanel(newCSDPanel);
          newCSDPanel.jsp = jsp;
          jsp.setWheelScrollingEnabled(true);
-         jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+         jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
          toolBarPanel.add(toolBarCSD, BorderLayout.NORTH);
          toolBarPanel.add(jsp, BorderLayout.CENTER);
          tabbedPane.addTab(name, IconManager.imgic17, toolBarPanel, "Opens composite structure diagram");
@@ -140,7 +152,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp	= new JScrollDiagramPanel(newCSDPanel);
         newCSDPanel.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarCSD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(name, IconManager.imgic17, toolBarPanel, "Opens composite structure diagram");
@@ -149,11 +161,11 @@ public class ProactiveDesignPanel extends TURTLEPanel {
     
     public String addSMD(String s) {
     	
-    	for (int k=0;k<panels.size();k++)
-    	{
-    		TDiagramPanel tg=(TDiagramPanel)panels.get(k);
-    		//System.out.println(tg.toString()+"\n");
-    	}
+//    	for (int k=0;k<panels.size();k++)
+//    	{
+//    		TDiagramPanel tg=(TDiagramPanel)panels.get(k);
+//    		//System.out.println(tg.toString()+"\n");
+//    	}
     	
         // Ensure that s is unique
         // Otherwise -> add an index
@@ -176,26 +188,18 @@ public class ProactiveDesignPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp	= new JScrollDiagramPanel(psmdp);
         psmdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBar, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic18, toolBarPanel, "Open the state machine diagram diagram of " + s);
-        //tabbedPane.setVisible(true);
-        //sdp.setVisible(true);
-        //jsp.setVisible(true);
-        //tabbedPane.setSelectedIndex(panels.size()-1);
-        
-        //Commented by Solange
-        //return true;
-        
     } 
 
     public String saveHeaderInXml(String extensionToName) {
-	if (extensionToName == null) {
-	    return "<Modeling type=\"ProActive Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
-	}
-	return "<Modeling type=\"ProActive Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
-	
+		if (extensionToName == null) {
+		    return "<Modeling type=\"ProActive Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
+		}
+
+		return "<Modeling type=\"ProActive Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
     }
     
     public String saveTailInXml() {
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index 8f685a8ba4a0badc4b1022aba2ae4a363aee58a2..a025312caef38a7433be866bba54f188b09a0925 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -46,13 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.req.*;
-import ui.ebrdd.*;
+import myutil.GraphicLib;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDToolBar;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementDiagramToolBar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class RequirementPanel extends TURTLEPanel {
     public RequirementDiagramPanel rdp;
@@ -61,17 +65,21 @@ public class RequirementPanel extends TURTLEPanel {
     public RequirementPanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneRequirementAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneRequirementAction(e);
+            }
+        };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
 
@@ -103,7 +111,7 @@ public class RequirementPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(rdp);
         rdp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarReq, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic1000, toolBarPanel, "Opens requirement diagram");
@@ -132,7 +140,7 @@ public class RequirementPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(ebrdd);
         ebrdd.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarEBRDD, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic1058, toolBarPanel, "Opens EBRDD");
diff --git a/src/ui/SysmlsecMethodologyPanel.java b/src/ui/SysmlsecMethodologyPanel.java
index 78b01c4e2e710d6f59cf0eac9f1dab9efa04d079..0f1e1710b5e4ea64aa1959b9b3938071e59e8c93 100755
--- a/src/ui/SysmlsecMethodologyPanel.java
+++ b/src/ui/SysmlsecMethodologyPanel.java
@@ -46,13 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import ui.sysmlsecmethodology.*;
+import myutil.GraphicLib;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class SysmlsecMethodologyPanel extends TURTLEPanel {
     public SysmlsecMethodologyDiagramPanel dmd;
@@ -60,17 +62,21 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
     public SysmlsecMethodologyPanel(MainGUI _mgui) {
         super(_mgui);
 
-        tabbedPane = new JTabbedPane();
-        UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
-        UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+        UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
         SwingUtilities.updateComponentTreeUI(tabbedPane);
         //tabbedPane.setOpaque(true);
 
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDiplodocusMethodologyAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDiplodocusMethodologyAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
 
@@ -129,7 +135,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         TGConnectingPoint p1, p2;
         p1 = tgc1.getTGConnectingPointAtIndex(0);
         p2 = tgc2.getTGConnectingPointAtIndex(0);
-        Vector listPoint = new Vector();
+        Vector<Point> listPoint = new Vector<Point>();
         Point p = new Point(210, 235);
         listPoint.add(p);
         TGConnector tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -140,7 +146,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         // Reqs -> Attacks
         p1 = tgc2.getTGConnectingPointAtIndex(1);
         p2 = tgc10.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         //p = new Point(375, 370);
         //listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -148,10 +154,10 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         p2.setFree(false);
         dmd.getComponentList().add(0, tgco);
 
-	// Attacks -> Reqs
+        // Attacks -> Reqs
         p1 = tgc10.getTGConnectingPointAtIndex(1);
         p2 = tgc2.getTGConnectingPointAtIndex(2);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         //p = new Point(375, 370);
         //listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -162,7 +168,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         // Analysis -> Design
         p1 = tgc3.getTGConnectingPointAtIndex(1);
         p2 = tgc4.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         p = new Point(xa+60, ya+125);
         listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -173,7 +179,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         // Design -> Prototyping
         p1 = tgc4.getTGConnectingPointAtIndex(1);
         p2 = tgc5.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         p = new Point(xa+160, ya+225);
         listPoint.add(p);
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -184,7 +190,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         // Reqs -> Prop
         p1 = tgc2.getTGConnectingPointAtIndex(0);
         p2 = tgc6.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
 	p = new Point(xa-305, 235);
 	listPoint.add(p);
 	p = new Point(xa-305, ya+50);
@@ -198,7 +204,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
 	// App -> mapping
         p1 = tgc7.getTGConnectingPointAtIndex(0);
         p2 = tgc9.getTGConnectingPointAtIndex(0);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
@@ -207,7 +213,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
 	// cp -> mapping
         p1 = tgc11.getTGConnectingPointAtIndex(0);
         p2 = tgc9.getTGConnectingPointAtIndex(2);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
@@ -216,18 +222,15 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         // Archi -> mapping
         p1 = tgc8.getTGConnectingPointAtIndex(0);
         p2 = tgc9.getTGConnectingPointAtIndex(1);
-        listPoint = new Vector();
+        listPoint = new Vector<Point>();
         tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
         p1.setFree(false);
         p2.setFree(false);
         dmd.getComponentList().add(0, tgco);
-
-
-	dmd.bringToBack(infoParti);
-	dmd.bringToBack(infoSw);
-	dmd.bringToBack(infoReq);
-
-
+	
+		dmd.bringToBack(infoParti);
+		dmd.bringToBack(infoSw);
+		dmd.bringToBack(infoReq);
     }
 
     public void init() {
@@ -261,7 +264,7 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         JScrollDiagramPanel jsp = new JScrollDiagramPanel(dmd);
         dmd.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(dmdt, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         tabbedPane.addTab(s, IconManager.imgic99, toolBarPanel, "Opens SysMLSec methodology");
@@ -269,10 +272,6 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
         JPanel toolBarPanel = new JPanel();
         toolBarPanel.setLayout(new BorderLayout());
 
-
-	
-
-        //TGComponent tgc = TGComponentManager.addComponent(100, 100, TGComponentManager.DIPLODODUSMETHODOLOGY_REF_APPLICATION, dmd);
         mgui.changeMade(dmd, TDiagramPanel.NEW_COMPONENT);
 
         return true;
diff --git a/src/ui/TAction.java b/src/ui/TAction.java
index 04abee894b5ef8b4b9878b0ce780cd247dde64c3..bcf3d00b8280c849b094b138bf88b16d5b3e55ee 100755
--- a/src/ui/TAction.java
+++ b/src/ui/TAction.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import javax.swing.ImageIcon;
+import javax.swing.*;
 
 public class TAction  {
 	
diff --git a/src/ui/TAttribute.java b/src/ui/TAttribute.java
index 35112d8f458b8411a3e12e80e0b254d992d5f2cb..e3c1efb833d2ef21ed97baee822aa253b55f86e3 100755
--- a/src/ui/TAttribute.java
+++ b/src/ui/TAttribute.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
+import tmltranslator.TMLTextSpecification;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
 
-import translator.*;
-import translator.tojava.*;
-import tmltranslator.*;
+import java.util.List;
 
 public class TAttribute {
     
diff --git a/src/ui/TClassAndGateDS.java b/src/ui/TClassAndGateDS.java
index 68965adc5612d00fe8640c88381e3fa680cb6ca6..d1b4e4d54589ad84423cf0e43c485d5a25783ccc 100755
--- a/src/ui/TClassAndGateDS.java
+++ b/src/ui/TClassAndGateDS.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import translator.*;
+import translator.Gate;
+import translator.TClass;
 
 public class TClassAndGateDS implements Comparable {
     
diff --git a/src/ui/TClassSynchroInterface.java b/src/ui/TClassSynchroInterface.java
index 93950a64df8d6659e9794cec446a1939a2df7cb5..88d4cc93304f65f0df6179c5a4c9c361274aef33 100755
--- a/src/ui/TClassSynchroInterface.java
+++ b/src/ui/TClassSynchroInterface.java
@@ -47,9 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.List;
+import ui.cd.TCDSynchroGateList;
 
-import ui.cd.*;
+import java.util.List;
 
 public interface TClassSynchroInterface extends TClassInterface  {
     public List<TAttribute> gatesNotSynchronizedOn(TCDSynchroGateList tcdsgl);
diff --git a/src/ui/TDiagramMouseManager.java b/src/ui/TDiagramMouseManager.java
index 3d7147d45a5c2c9498455a2ef20aaf68bef09cdd..7e084cf9ae31a6f7df4e6b7aae889e6a6875ab39 100755
--- a/src/ui/TDiagramMouseManager.java
+++ b/src/ui/TDiagramMouseManager.java
@@ -46,13 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.window.JDialogSearchBox;
 
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.util.ArrayList;
 
-import ui.window.JDialogSearchBox;
-
 public class TDiagramMouseManager implements MouseListener, MouseMotionListener  {
 
     private TDiagramPanel tdp;
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index 7ee45f4b4b997a6b3bc52ccce8b44646c9577333..7ec1eaa399b3da4d3aa6e51dbb04d9de92ab84ab 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -46,35 +46,12 @@
 
 package ui;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.RepaintManager;
-
 import myutil.GenericTree;
 import myutil.GraphicLib;
 import myutil.SVGGraphics;
 import myutil.TraceManager;
 import ui.atd.ATDBlock;
 import ui.avatarad.AvatarADActivity;
-// AVATAR
 import ui.avatarbd.AvatarBDBlock;
 import ui.avatarbd.AvatarBDDataType;
 import ui.avatarbd.AvatarBDLibraryFunction;
@@ -82,12 +59,7 @@ import ui.avatarcd.AvatarCDBlock;
 import ui.avatarmad.AvatarMADAssumption;
 import ui.avatarrd.AvatarRDRequirement;
 import ui.avatarsmd.AvatarSMDState;
-import ui.cd.TCDCompositionOperatorWithSynchro;
-import ui.cd.TCDSynchroGateList;
-import ui.cd.TCDTClass;
-import ui.cd.TCDTData;
-import ui.cd.TCDTObject;
-import ui.cd.TGConnectorAssociation;
+import ui.cd.*;
 import ui.ncdd.NCEqNode;
 import ui.ncdd.NCRouteArtifact;
 import ui.ncdd.NCSwitchNode;
@@ -102,6 +74,16 @@ import ui.window.JDialogCode;
 import ui.window.JDialogNote;
 import ui.window.JDialogSearchBox;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.*;
+import java.util.List;
+
+// AVATAR
+
 public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     protected TDiagramMouseManager tdmm;
@@ -165,7 +147,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     protected final int increment = 500;
 
     private double zoom = 1.0;
- //   private boolean zoomed = false;
+    //   private boolean zoomed = false;
 
     private boolean draw;
 
@@ -403,9 +385,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 //TraceManager.addDev("Painting " + tgc.getName() + " x=" + tgc.getX() + " y=" + tgc.getY());
                 tgc.draw(g);
             }
-	    else {
-	        //TraceManager.addDev("Ignoring " + tgc.getName() + " x=" + tgc.getX() + " y=" + tgc.getY()); 
-	    }
+            else {
+                //TraceManager.addDev("Ignoring " + tgc.getName() + " x=" + tgc.getX() + " y=" + tgc.getY());
+            }
         }
     }
 
@@ -450,12 +432,12 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 continue;
 
             tgc.draw (g);
-	    
-	    // CONNECTING POINTS
+
+            // CONNECTING POINTS
             if (this.mgui.getTypeButtonSelected () != TGComponentManager.EDIT)
                 tgc.drawTGConnectingPoint (g, this.mgui.getIdButtonSelected());
 
-            if (this.mode == MOVE_CONNECTOR_HEAD) 
+            if (this.mode == MOVE_CONNECTOR_HEAD)
                 tgc.drawTGConnectingPoint (g, this.type);
 
             if (this.javaVisible && (tgc.hasPostJavaCode () || tgc.hasPreJavaCode ()))
@@ -480,10 +462,10 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         if (this.mode == SELECTING_COMPONENTS) {
             g.setColor(Color.black);
             GraphicLib.dashedRect (g,
-                    Math.min(this.initSelectX, this.currentSelectX),
-                    Math.min(this.initSelectY, this.currentSelectY),
-                    Math.abs(this.currentSelectX - this.initSelectX),
-                    Math.abs(this.currentSelectY - this.initSelectY));
+                                   Math.min(this.initSelectX, this.currentSelectX),
+                                   Math.min(this.initSelectY, this.currentSelectY),
+                                   Math.abs(this.currentSelectX - this.initSelectX),
+                                   Math.abs(this.currentSelectY - this.initSelectY));
         }
 
         if ((this.mode == SELECTED_COMPONENTS || this.mode == MOVING_SELECTED_COMPONENTS) && this.selectedTemp) {
@@ -616,7 +598,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         StringBuffer s;
 
         //Added by Solange to see the components in the list
-    //    LinkedList<TGComponent> ruteoList = this.componentList;
+        //    LinkedList<TGComponent> ruteoList = this.componentList;
         //
         for (TGComponent tgc: this.componentList) {
             if ((selected == false) || (tgc.isSelected())) {
@@ -628,7 +610,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 sb.append("\n");
             }
         }
-        
+
         return sb;
     }
 
@@ -717,7 +699,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
         TGComponent tmp = componentPointed;
         componentPointed = null;
-	this.setToolTipText(null);
+        this.setToolTipText(null);
         for (TGComponent tgc: this.componentList) {
             //state = tgc.getState();
             tgcTmp = tgc.isOnMeHL(x, y);
@@ -725,12 +707,12 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 if (!pointedElementFound) {
                     componentPointed = tgcTmp;
                     tgc.setState(TGState.POINTED);
-		    String tooltip = componentPointed.getToolTipText();
-		    if (tooltip!=null && tooltip.length()>0){
-		    	this.setToolTipText(tooltip);
-		    }
-		    String tmpinfo = componentPointed.getStatusInformation();
-		    if (tmpinfo != null) { mgui.setStatusBarText(tmpinfo);}
+                    String tooltip = componentPointed.getToolTipText();
+                    if (tooltip!=null && tooltip.length()>0){
+                        this.setToolTipText(tooltip);
+                    }
+                    String tmpinfo = componentPointed.getStatusInformation();
+                    if (tmpinfo != null) { mgui.setStatusBarText(tmpinfo);}
                     pointedElementFound = true;
                     info = 2;
                 } else {
@@ -847,7 +829,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             if (pointedElementFound)
                 b =  tgc.setStateTGConnectingPoint(TGConnectingPoint.NORMAL) || b;
             else {
-		b =  tgc.setStateTGConnectingPoint(TGConnectingPoint.NORMAL) || b;
+                b =  tgc.setStateTGConnectingPoint(TGConnectingPoint.NORMAL) || b;
                 TGConnectingPoint cp = tgc.getFreeTGConnectingPointAtAndCompatible(x, y, type);
                 if ((cp != null) && (cp.isOut()) && (cp.isFree()) && (cp.isCompatibleWith(type))) {
                     selectedConnectingPoint = cp;
@@ -860,9 +842,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         return b;
     }
 
-     public boolean highlightInAndFreeConnectingPoint(int x, int y, int type) {
+    public boolean highlightInAndFreeConnectingPoint(int x, int y, int type) {
         TGConnectingPoint cp;
-     //   int state;
+        //   int state;
         boolean b = false;
         boolean pointedElementFound = false;
         selectedConnectingPoint = null;
@@ -898,7 +880,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     public TGComponent addComponent(int x, int y, int id, boolean swallow) {
         TGComponent tgc = TGComponentManager.addComponent(x, y, id, this);
         addComponent(tgc, x, y, swallow, true);
-	
+
         return tgc;
     }
 
@@ -1309,7 +1291,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         componentMenu.add(removeInternalComment);
         componentMenu.add(checkAccessibility);
         componentMenu.add(checkInvariant);
-		componentMenu.add(checkLatency);
+        componentMenu.add(checkLatency);
         componentMenu.add(checkMasterMutex);
         componentMenu.add(breakpoint);
 
@@ -1414,8 +1396,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         checkInvariant = new JMenuItem("Check for mutual exclusion");
         checkInvariant.addActionListener(menuAL);
 
-		checkLatency = new JMenuItem("Set latency measurement checkpoint");
-		checkLatency.addActionListener(menuAL);
+        checkLatency = new JMenuItem("Set latency measurement checkpoint");
+        checkLatency.addActionListener(menuAL);
 
         checkMasterMutex = new JMenuItem("Search for other states in mutual exclusion with");
         checkMasterMutex.addActionListener(menuAL);
@@ -1594,7 +1576,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             componentPopup.setInternalComment(jdn.getText());
             mgui.changeMade(this, CHANGE_VALUE_COMPONENT);
             repaint();
-            
+
             return;
         }
 
@@ -1616,11 +1598,11 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
                 componentPopup.setCheckableInvariant(!componentPopup.getCheckableInvariant());
             }
         }
-		if (e.getSource() == checkLatency) {
-			if (componentPopup instanceof CheckableLatency){
-				componentPopup.setCheckLatency(!componentPopup.getCheckLatency());
-			}
-		}
+        if (e.getSource() == checkLatency) {
+            if (componentPopup instanceof CheckableLatency){
+                componentPopup.setCheckLatency(!componentPopup.getCheckLatency());
+            }
+        }
         if (e.getSource() == checkMasterMutex) {
 
             if (componentPopup instanceof CheckableInvariant) {
@@ -2109,21 +2091,21 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
 
     public int getRawMinX() {
-	return minLimit;
+        return minLimit;
     }
 
     public int getRawMaxX() {
-	return maxX;
+        return maxX;
     }
 
     public int getRawMinY() {
-	return minLimit;
+        return minLimit;
     }
 
     public int getRawMaxY() {
-	return maxY;
+        return maxY;
     }
-    
+
     public int getMaxX() {
         //return maxX;
         return (int)(Math.ceil(maxX * zoom));
@@ -2139,7 +2121,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     }
 
     public int getMaxY() {
-	//return maxY;
+        //return maxY;
         return (int)(Math.ceil(maxY * zoom));
     }
 
@@ -2301,13 +2283,13 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         return null;
     }
 
-	public void getAllLatencyChecks(ArrayList<TGComponent> _list){
-		for (TGComponent tgc: this.componentList) {
-			if (tgc.getCheckLatency()){
-				_list.add(tgc);
-			}
-		}
-	}
+    public void getAllLatencyChecks(ArrayList<TGComponent> _list){
+        for (TGComponent tgc: this.componentList) {
+            if (tgc.getCheckLatency()){
+                _list.add(tgc);
+            }
+        }
+    }
     public void getAllCheckableTGComponent(ArrayList<TGComponent> _list) {
         for (TGComponent tgc: this.componentList)
             if (tgc.hasCheckableAccessibility())
@@ -2404,46 +2386,46 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public String findTClassName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkTClassInterface (TClassInterface o, String name) {
-                return o.getClassName ().equals (name);
-            }
-            public boolean checkTCDTData (TCDTData o, String name) {
-                return o.getValue ().equals (name);
-            }
-        });
+                public boolean checkTClassInterface (TClassInterface o, String name) {
+                    return o.getClassName ().equals (name);
+                }
+                public boolean checkTCDTData (TCDTData o, String name) {
+                    return o.getValue ().equals (name);
+                }
+            });
     }
 
     public String findTOSClassName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkTOSClass (TOSClass o, String name) {
-                return o.getClassName ().equals (name);
-            }
-        });
+                public boolean checkTOSClass (TOSClass o, String name) {
+                    return o.getClassName ().equals (name);
+                }
+            });
     }
 
     public String findRequirementName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkRequirement (Requirement o, String name) {
-                return o.getRequirementName ().equals (name);
-            }
-        });
+                public boolean checkRequirement (Requirement o, String name) {
+                    return o.getRequirementName ().equals (name);
+                }
+            });
     }
 
     public String findTMLPrimitiveComponentName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkTMLCPrimitiveComponent (TMLCPrimitiveComponent o, String name) {
-                return o.getValue ().equals (name);
-            }
-            public boolean checkTMLCRecordComponent (TMLCRecordComponent o, String name) {
-                return o.getValue ().equals (name);
-            }
-            public boolean checkTMLCCompositeComponent (TMLCCompositeComponent o, String name) {
-                for (int i=0; i<o.getNbInternalTGComponent (); i++)
-                    if (this.isNameAlreadyTaken (o.getInternalTGComponent (i), name))
-                        return true;
-                return false;
-            }
-        });
+                public boolean checkTMLCPrimitiveComponent (TMLCPrimitiveComponent o, String name) {
+                    return o.getValue ().equals (name);
+                }
+                public boolean checkTMLCRecordComponent (TMLCRecordComponent o, String name) {
+                    return o.getValue ().equals (name);
+                }
+                public boolean checkTMLCCompositeComponent (TMLCCompositeComponent o, String name) {
+                    for (int i=0; i<o.getNbInternalTGComponent (); i++)
+                        if (this.isNameAlreadyTaken (o.getInternalTGComponent (i), name))
+                            return true;
+                    return false;
+                }
+            });
     }
 
     public String findTMLRecordComponentName(String name) {
@@ -2452,80 +2434,80 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public String findTMLTaskName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkTMLTaskInterface (TMLTaskInterface o, String name) {
-                return o.getTaskName ().equals (name);
-            }
-        });
+                public boolean checkTMLTaskInterface (TMLTaskInterface o, String name) {
+                    return o.getTaskName ().equals (name);
+                }
+            });
     }
 
     public String findBlockName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkATDBlock (ATDBlock o, String name) {
-                return o.getName ().equals (name);
-            }
-        });
+                public boolean checkATDBlock (ATDBlock o, String name) {
+                    return o.getName ().equals (name);
+                }
+            });
     }
 
     public String findAvatarBDBlockName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarBDBlock (AvatarBDBlock o, String name) {
-                if (o.getValue ().equals (name))
-                    return true;
-                return o.hasInternalBlockWithName (name);
-            }
-            public boolean checkAvatarBDLibraryFunction (AvatarBDLibraryFunction o, String name) {
-                return o.getFunctionName ().equals (name);
-            }
-            public boolean checkAvatarBDDataType (AvatarBDDataType o, String name) {
-                return o.getDataTypeName ().equals (name);
-            }
-        });
+                public boolean checkAvatarBDBlock (AvatarBDBlock o, String name) {
+                    if (o.getValue ().equals (name))
+                        return true;
+                    return o.hasInternalBlockWithName (name);
+                }
+                public boolean checkAvatarBDLibraryFunction (AvatarBDLibraryFunction o, String name) {
+                    return o.getFunctionName ().equals (name);
+                }
+                public boolean checkAvatarBDDataType (AvatarBDDataType o, String name) {
+                    return o.getDataTypeName ().equals (name);
+                }
+            });
     }
 
     public String findAvatarCDBlockName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarCDBlock (AvatarCDBlock o, String name) {
-                if (o.getValue ().equals (name))
-                    return true;
-                return o.hasInternalBlockWithName (name);
-            }
-        });
+                public boolean checkAvatarCDBlock (AvatarCDBlock o, String name) {
+                    if (o.getValue ().equals (name))
+                        return true;
+                    return o.hasInternalBlockWithName (name);
+                }
+            });
     }
 
     public String findAvatarSMDStateName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarSMDState (AvatarSMDState o, String name) {
-                if (o.getValue ().equals (name))
-                    return true;
-                return o.hasInternalStateWithName (name);
-            }
-        });
+                public boolean checkAvatarSMDState (AvatarSMDState o, String name) {
+                    if (o.getValue ().equals (name))
+                        return true;
+                    return o.hasInternalStateWithName (name);
+                }
+            });
     }
 
     public String findAvatarADActivityName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarADActivity (AvatarADActivity o, String name) {
-                if (o.getValue ().equals (name))
-                    return true;
-                return o.hasInternalActivityWithName (name);
-            }
-        });
+                public boolean checkAvatarADActivity (AvatarADActivity o, String name) {
+                    if (o.getValue ().equals (name))
+                        return true;
+                    return o.hasInternalActivityWithName (name);
+                }
+            });
     }
 
     public String findAvatarAssumptionName(String name, int start) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarMADAssumption (AvatarMADAssumption o, String name) {
-                return o.getValue ().equals (name);
-            }
-        });
+                public boolean checkAvatarMADAssumption (AvatarMADAssumption o, String name) {
+                    return o.getValue ().equals (name);
+                }
+            });
     }
 
     public String findAvatarRequirementName(String name, int start) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkAvatarRDRequirement (AvatarRDRequirement o, String name) {
-                return o.getValue ().equals (name);
-            }
-        });
+                public boolean checkAvatarRDRequirement (AvatarRDRequirement o, String name) {
+                    return o.getValue ().equals (name);
+                }
+            });
     }
 
     public String findAvatarRequirementID(String id) {
@@ -2555,13 +2537,13 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public String findTObjectName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkTCDTObject (TCDTObject o, String name) {
-                return o.getObjectName ().equals (name);
-            }
-//            public boolean checkTCDTClass (TCDTClass o, String name) {
-//                return o.getClassName ().startsWith (name);
-//            }
-        });
+                public boolean checkTCDTObject (TCDTObject o, String name) {
+                    return o.getObjectName ().equals (name);
+                }
+                //            public boolean checkTCDTClass (TCDTClass o, String name) {
+                //                return o.getClassName ().startsWith (name);
+                //            }
+            });
     }
 
     public String findTObjectName(String name1, String name2) {
@@ -2584,26 +2566,26 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public String findNodeName(String name) {
         return this.findGoodName (name, new NameChecker () {
-            public boolean checkNCEqNode (NCEqNode o, String name) {
-                if (o.getName ().equals (name))
-                    return true;
-                for (NCTrafficArtifact arti: o.getArtifactList ())
-                    if (arti.getValue ().equals (name))
+                public boolean checkNCEqNode (NCEqNode o, String name) {
+                    if (o.getName ().equals (name))
                         return true;
-                return false;
-            }
-            public boolean checkNCSwitchNode (NCSwitchNode o, String name) {
-                if (o.getName ().equals (name))
-                    return true;
-                for (NCRouteArtifact arti: o.getArtifactList ())
-                    if (arti.getValue ().equals (name))
+                    for (NCTrafficArtifact arti: o.getArtifactList ())
+                        if (arti.getValue ().equals (name))
+                            return true;
+                    return false;
+                }
+                public boolean checkNCSwitchNode (NCSwitchNode o, String name) {
+                    if (o.getName ().equals (name))
                         return true;
-                return false;
-            }
-//            public boolean checkNCConnectorNode (NCConnectorNode o, String name) {
-//                return o.getInterfaceName ().equals (name);
-//            }
-        });
+                    for (NCRouteArtifact arti: o.getArtifactList ())
+                        if (arti.getValue ().equals (name))
+                            return true;
+                    return false;
+                }
+                //            public boolean checkNCConnectorNode (NCConnectorNode o, String name) {
+                //                return o.getInterfaceName ().equals (name);
+                //            }
+            });
     }
 
     public String findInterfaceName(String name) {
@@ -2624,19 +2606,19 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public boolean isAlreadyATMLPrimitiveComponentName(String name) {
         return !this.isNameUnique (name, new NameChecker () {
-            public boolean checkTMLCPrimitiveComponent (TMLCPrimitiveComponent o, String name) {
-                return o.getValue ().equals (name);
-            }
-            public boolean checkTMLCRecordComponent (TMLCRecordComponent o, String name) {
-                return o.getValue ().equals (name);
-            }
-            public boolean checkTMLCCompositeComponent (TMLCCompositeComponent o, String name) {
-                for (int i=0; i<o.getNbInternalTGComponent (); i++)
-                    if (this.isNameAlreadyTaken (o.getInternalTGComponent (i), name))
-                        return true;
-                return false;
-            }
-        });
+                public boolean checkTMLCPrimitiveComponent (TMLCPrimitiveComponent o, String name) {
+                    return o.getValue ().equals (name);
+                }
+                public boolean checkTMLCRecordComponent (TMLCRecordComponent o, String name) {
+                    return o.getValue ().equals (name);
+                }
+                public boolean checkTMLCCompositeComponent (TMLCCompositeComponent o, String name) {
+                    for (int i=0; i<o.getNbInternalTGComponent (); i++)
+                        if (this.isNameAlreadyTaken (o.getInternalTGComponent (i), name))
+                            return true;
+                    return false;
+                }
+            });
     }
 
     public boolean isAlreadyATOSClassName(String name) {
@@ -2645,37 +2627,37 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     public boolean isTClassNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkTClassInterface (TClassInterface o, String name) {
-                return o.getClassName ().equals (name);
-            }
-            public boolean checkTCDTData (TCDTData o, String name) {
-                return o.getValue ().equals (name);
-            }
-        });
+                public boolean checkTClassInterface (TClassInterface o, String name) {
+                    return o.getClassName ().equals (name);
+                }
+                public boolean checkTCDTData (TCDTData o, String name) {
+                    return o.getValue ().equals (name);
+                }
+            });
     }
 
     public boolean isTOSClassNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkTOSClass (TOSClass o, String name) {
-                return o.getClassName ().equals (name);
-            }
-        });
+                public boolean checkTOSClass (TOSClass o, String name) {
+                    return o.getClassName ().equals (name);
+                }
+            });
     }
 
     public boolean isTMLTaskNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkTMLTaskInterface (TMLTaskInterface o, String name) {
-                return o.getTaskName ().equals (name);
-            }
-        });
+                public boolean checkTMLTaskInterface (TMLTaskInterface o, String name) {
+                    return o.getTaskName ().equals (name);
+                }
+            });
     }
 
     public boolean isBlockNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkATDBlock (ATDBlock o, String name) {
-                return o.getName ().equals (name);
-            }
-        });
+                public boolean checkATDBlock (ATDBlock o, String name) {
+                    return o.getName ().equals (name);
+                }
+            });
     }
 
     /**
@@ -2689,65 +2671,65 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
      */
     public boolean isAvatarBlockNameUnique (String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkAvatarBDBlock (AvatarBDBlock o, String name) {
-                if (o.getValue ().equals (name))
-                    return true;
-                return o.hasInternalBlockWithName (name);
-            }
-            public boolean checkAvatarBDLibraryFunction (AvatarBDLibraryFunction o, String name) {
-                return o.getFunctionName ().equals (name);
-            }
-            public boolean checkAvatarBDDataType (AvatarBDDataType o, String name) {
-                return o.getDataTypeName ().equals (name);
-            }
-        });
+                public boolean checkAvatarBDBlock (AvatarBDBlock o, String name) {
+                    if (o.getValue ().equals (name))
+                        return true;
+                    return o.hasInternalBlockWithName (name);
+                }
+                public boolean checkAvatarBDLibraryFunction (AvatarBDLibraryFunction o, String name) {
+                    return o.getFunctionName ().equals (name);
+                }
+                public boolean checkAvatarBDDataType (AvatarBDDataType o, String name) {
+                    return o.getDataTypeName ().equals (name);
+                }
+            });
     }
 
     public boolean isNCNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkNCEqNode (NCEqNode o, String name) {
-                if (o.getName ().equals (name))
-                    return true;
-                for (NCTrafficArtifact arti: o.getArtifactList ())
-                    if (arti.getValue ().equals (name))
+                public boolean checkNCEqNode (NCEqNode o, String name) {
+                    if (o.getName ().equals (name))
                         return true;
-                return false;
-            }
-            public boolean checkNCSwitchNode (NCSwitchNode o, String name) {
-                if (o.getName ().equals (name))
-                    return true;
-                for (NCRouteArtifact arti: o.getArtifactList ())
-                    if (arti.getValue ().equals (name))
+                    for (NCTrafficArtifact arti: o.getArtifactList ())
+                        if (arti.getValue ().equals (name))
+                            return true;
+                    return false;
+                }
+                public boolean checkNCSwitchNode (NCSwitchNode o, String name) {
+                    if (o.getName ().equals (name))
                         return true;
-                return false;
-            }
-//            public boolean checkNCConnectorNode (NCConnectorNode o, String name) {
-//                return o.getInterfaceName ().equals (name);
-//            }
-        });
+                    for (NCRouteArtifact arti: o.getArtifactList ())
+                        if (arti.getValue ().equals (name))
+                            return true;
+                    return false;
+                }
+                //            public boolean checkNCConnectorNode (NCConnectorNode o, String name) {
+                //                return o.getInterfaceName ().equals (name);
+                //            }
+            });
     }
 
     public boolean isRequirementNameUnique(String name) {
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkRequirement (Requirement o, String name) {
-                return o.getRequirementName ().equals (name);
-            }
-        });
+                public boolean checkRequirement (Requirement o, String name) {
+                    return o.getRequirementName ().equals (name);
+                }
+            });
     }
 
     public boolean isTObjectNameUnique(String name) {
         // FIXME: this is not coherent with findTObjectName !!!
         return this.isNameUnique (name, new NameChecker () {
-            public boolean checkTClassInterface (TClassInterface o, String name) {
-                return o.getClassName ().equals (name);
-            }
-        });
+                public boolean checkTClassInterface (TClassInterface o, String name) {
+                    return o.getClassName ().equals (name);
+                }
+            });
+    }
+    public void setMaxPanelSize(int x, int y){
+        maxX=x;
+        maxY=y;
+        updateSize();
     }
-	public void setMaxPanelSize(int x, int y){
-		maxX=x;
-		maxY=y;
-		updateSize();
-	}
     // For compatibility with ttool v0.41
     // Assumes no internal duplicate id
     public void checkForDuplicateId() {
@@ -3054,7 +3036,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
         Vector<Point> listPoint = new Vector<Point>();
 
-       // Vector v = new Vector();
+        // Vector v = new Vector();
 
         int distance = 100;
         TGConnectingPoint found = null;
@@ -3117,7 +3099,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             tgc.setDIPLOID(-1);
     }
 
-    public void getListOfBreakPoints(ArrayList<Point> points, int taskID) {
+    public void getListOfBreakPoints( java.util.List<Point> points, int taskID) {
         for (TGComponent tgc: this.componentList)
             if (tgc.getBreakpoint() && (tgc.getDIPLOID() != -1)) {
                 boolean found = false;
@@ -3135,9 +3117,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     }
 
     public String svgCapture() {
-	int w = this.getWidth();
+        int w = this.getWidth();
         int h = this.getHeight();
-	int x = getRealMinX();
+        int x = getRealMinX();
         int y = getRealMinY();
         w = getRealMaxX() - x;
         h = getRealMaxY() - y;
@@ -3153,14 +3135,12 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         w = Math.min(w, getWidth() - x);
         h = Math.min(h, getHeight() - y);
 
-	
+
         StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" standalone=\"no\"?>\n");
-        sb.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");	
-	//sb.append(" width=\"" + (w+x) + "\" height=\"" + (h+y) + "\" viewbox=\"" + x + " " + y + " " + w + " " + h + "\">\n");
+        sb.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
+        //sb.append(" width=\"" + (w+x) + "\" height=\"" + (h+y) + "\" viewbox=\"" + x + " " + y + " " + w + " " + h + "\">\n");
         sb.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\"");
-	sb.append(" width=\"" + (w+x) + "\" height=\"" + (h+y) + "\" viewbox=\"" + x + " " + y + " " + w + " " + h + "\">\n");
-
-
+        sb.append(" width=\"" + (w+x) + "\" height=\"" + (h+y) + "\" viewbox=\"" + x + " " + y + " " + w + " " + h + "\">\n");
 
         SVGGraphics svgg = new SVGGraphics((Graphics2D)lastGraphics);
 
@@ -3171,9 +3151,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
         TraceManager.addDev("Painting for svg done");
         sb.append(svgg.getSVGString());
         RepaintManager.currentManager(this).setDoubleBufferingEnabled(true);
-	
-        sb.append("</svg>");
 
+        sb.append("</svg>");
 
         return sb.toString();
     }
diff --git a/src/ui/TGCAttributeBox.java b/src/ui/TGCAttributeBox.java
index ab77f797b3d638901ae2d4b42e27720b62516fcf..ef59cad0c762e2bdf8269c97aa978fd4eed567d5 100755
--- a/src/ui/TGCAttributeBox.java
+++ b/src/ui/TGCAttributeBox.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.cd.TCDTClass;
+import ui.cd.TGConnectingPointTClasses;
+import ui.window.JDialogAttribute;
 
-import myutil.*;
-
-import ui.cd.*;
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public abstract class TGCAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/TGCNote.java b/src/ui/TGCNote.java
index 19ec7da45f330a16745b14affc449f582bc1716d..b798016ea7b09792a4a79c86df80c957b342d7c5 100755
--- a/src/ui/TGCNote.java
+++ b/src/ui/TGCNote.java
@@ -46,19 +46,16 @@
 
 package ui;
 
-import java.awt.Color;
-import java.awt.Graphics;
-
-import javax.swing.JFrame;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.Conversion;
-import myutil.GraphicLib;
 import ui.window.JDialogNote;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TGCNote extends TGCScalableWithoutInternalComponent {
 
     protected String[] values;
diff --git a/src/ui/TGCOneLineText.java b/src/ui/TGCOneLineText.java
index a00530b28a7d408930aa1f42999c08b5cbc8a0c6..e48984438160674698eab7f6db99ef476c6851ec 100755
--- a/src/ui/TGCOneLineText.java
+++ b/src/ui/TGCOneLineText.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
 import javax.swing.*;
+import java.awt.*;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TGCOneLineText extends TGCWithoutInternalComponent{
     protected boolean emptyText;
diff --git a/src/ui/TGCPanelInfo.java b/src/ui/TGCPanelInfo.java
index 4e66a07ce976f37ae10b011fdf416d1a85037a7c..84581e763706ad1e551b070bb8ef258661acf857 100755
--- a/src/ui/TGCPanelInfo.java
+++ b/src/ui/TGCPanelInfo.java
@@ -46,14 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import java.awt.*;
 
 public class TGCPanelInfo extends TGCScalableWithoutInternalComponent {
 
diff --git a/src/ui/TGCPointOfConnector.java b/src/ui/TGCPointOfConnector.java
index 626f80ba7c4a56235891cb06b19004028f1ca6e3..ee8c8b6d182528edcfe42669eea36e1949c69e31 100755
--- a/src/ui/TGCPointOfConnector.java
+++ b/src/ui/TGCPointOfConnector.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import javax.swing.*;
 
-import myutil.*;
-
 public class TGCPointOfConnector extends TGCScalableWithoutInternalComponent {
     private int width = 8;
     private int height = 8;
diff --git a/src/ui/TGCScalableOneLineText.java b/src/ui/TGCScalableOneLineText.java
index 4ef46305bfb1c7502ca7db37c68ff084bf8b5703..1a45aaf854a9b89b50cd156884c587ac2cc87378 100755
--- a/src/ui/TGCScalableOneLineText.java
+++ b/src/ui/TGCScalableOneLineText.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
 import javax.swing.*;
+import java.awt.*;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TGCScalableOneLineText extends TGCScalableWithoutInternalComponent {
     protected boolean emptyText;
diff --git a/src/ui/TGCScalableWithInternalComponent.java b/src/ui/TGCScalableWithInternalComponent.java
index a78fc9c306ed5861781c610cb2d7446137297f2a..062f69f597d77e71647786a41a3df765ddc5c17a 100755
--- a/src/ui/TGCScalableWithInternalComponent.java
+++ b/src/ui/TGCScalableWithInternalComponent.java
@@ -46,8 +46,6 @@
 
 package ui;
 
-import myutil.*;
-
 //import java.awt.*;
 
 public abstract class TGCScalableWithInternalComponent extends TGCWithInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponent.java b/src/ui/TGCScalableWithoutInternalComponent.java
index a475d52080d1e054fe04500d0baabad4b14d25e5..e087c7e7425bdc5d4d4dc23a5eed45edf75387de 100755
--- a/src/ui/TGCScalableWithoutInternalComponent.java
+++ b/src/ui/TGCScalableWithoutInternalComponent.java
@@ -47,8 +47,6 @@
 
 package ui;
 
-import myutil.TraceManager;
-
 //import java.awt.*;
 
 public abstract class TGCScalableWithoutInternalComponent extends TGCWithoutInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
index a2861ee2caa460b67f1095a0993323f6fad4ad1b..619318ece3a449540bb4570406f1a02159e4d15c 100755
--- a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
+++ b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
@@ -47,10 +47,13 @@
 
 package ui;
 
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
-import javax.swing.*;
 
 //import java.awt.*;
 
diff --git a/src/ui/TGCTimeDelay.java b/src/ui/TGCTimeDelay.java
index 540115070b76732a14004a40fd4c00d4c2bea3c5..e6b99e99f812d3d5422e9400169ed8f87075662b 100644
--- a/src/ui/TGCTimeDelay.java
+++ b/src/ui/TGCTimeDelay.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeIntervalUnit;
+
 import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
 
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TGCTimeDelay extends TGCWithoutInternalComponent{
     protected int minWidth = 10;
diff --git a/src/ui/TGCTimeInterval.java b/src/ui/TGCTimeInterval.java
index 4a500a4e5b65f792e0fdd31518cc12e813d4463b..b4e13ab1a83a13a36d629aecd7a5d457a912009b 100755
--- a/src/ui/TGCTimeInterval.java
+++ b/src/ui/TGCTimeInterval.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeInterval;
+
 import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
 
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TGCTimeInterval extends TGCScalableWithoutInternalComponent{
     protected int minWidth = 10;
diff --git a/src/ui/TGCWithOneLineText.java b/src/ui/TGCWithOneLineText.java
index e5920608bad277653c0bc48014af9205d1e39563..916b497cf313839f95e88a61280a8057e4a06e8d 100755
--- a/src/ui/TGCWithOneLineText.java
+++ b/src/ui/TGCWithOneLineText.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
-import javax.swing.*;
 
 
 /**
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index aa8d0cd97a5e3ce7cb40bd10322154e6cb534dc4..2e31149449934bbe23814eefd6cafb4f6d52db07 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -47,23 +47,29 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.procsd.ProCSDPort;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.NodeList;
+import ui.interactivesimulation.SimulationTransaction;
 import ui.procsd.ProCSDComponent;
+import ui.procsd.ProCSDPort;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiFirewallNode;
 
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public abstract class TGComponent implements CDElement, GenericTree {
 
diff --git a/src/ui/TGComponentAndUPPAALQuery.java b/src/ui/TGComponentAndUPPAALQuery.java
index 4e22d98470dac928f017d71a9d2cb804cb903d73..1ab896ffde534922192d3f44d32dc0f74149fb25 100755
--- a/src/ui/TGComponentAndUPPAALQuery.java
+++ b/src/ui/TGComponentAndUPPAALQuery.java
@@ -47,8 +47,6 @@
 
 package ui;
 
-import java.util.*;
-
 public class TGComponentAndUPPAALQuery {
     public TGComponent tgc;
     public String uppaalQuery;
diff --git a/src/ui/TGComponentManager.java b/src/ui/TGComponentManager.java
index 31ba78ff195f7a07d0537bbd667e71eebb7eccc6..50e4b7d1e054268680f1602e253f498b1ea48726 100755
--- a/src/ui/TGComponentManager.java
+++ b/src/ui/TGComponentManager.java
@@ -48,51 +48,44 @@
 package ui;
 
 //import java.awt.*;
-import java.util.*;
-import myutil.*;
 
 import ui.ad.*;
+import ui.atd.*;
+import ui.avatarad.*;
+import ui.avatarbd.*;
+import ui.avatarcd.*;
+import ui.avatardd.*;
+import ui.avatarmad.*;
+import ui.avatarmethodology.*;
+import ui.avatarpd.*;
+import ui.avatarrd.*;
+import ui.avatarsmd.*;
 import ui.cd.*;
-import ui.dd.*;
+import ui.dd.TDDArtifact;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+import ui.diplodocusmethodology.*;
+import ui.ebrdd.*;
 import ui.iod.*;
-import ui.sd.*;
-import ui.sd2.*;
-import ui.ucd.*;
-
+import ui.ncdd.*;
+import ui.osad.*;
+import ui.oscd.*;
+import ui.procsd.*;
+import ui.prosmd.*;
 import ui.req.*;
-import ui.ebrdd.*;
-
-import ui.atd.*;
-
-
-// DIPLODOCUS
+import ui.sysmlsecmethodology.*;
 import ui.tmlad.*;
 import ui.tmlcd.*;
-import ui.tmldd.*;
 import ui.tmlcompd.*;
 import ui.tmlcp.*;
+import ui.tmldd.*;
 import ui.tmlsd.*;
-import ui.diplodocusmethodology.*;
-
-import ui.procsd.*;
-import ui.prosmd.*;
-
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.ncdd.*;
+import ui.ucd.*;
 
-import ui.avatarmethodology.*;
-import ui.avatarmad.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarcd.*; // Context Diagram
-import ui.avatarad.*; // Activity Diagram
+import java.util.LinkedList;
+import java.util.Vector;
 
-import ui.sysmlsecmethodology.*;
+// DIPLODOCUS
 
 public class TGComponentManager {
 
diff --git a/src/ui/TGConnectingPoint.java b/src/ui/TGConnectingPoint.java
index f2d623655badb7cc8a5015e344a7c9329b8e485d..39a822675d9e65ac045741f89e505496f0416007 100755
--- a/src/ui/TGConnectingPoint.java
+++ b/src/ui/TGConnectingPoint.java
@@ -47,9 +47,9 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import java.awt.*;
 
 public class TGConnectingPoint implements CDElement {
 
diff --git a/src/ui/TGConnectingPointTwoFathers.java b/src/ui/TGConnectingPointTwoFathers.java
index 861e969f288fe4f8b2d5baaaaac64620d727c259..d37fa7ad7923883d68ad2d606b59ae4f27f9e860 100755
--- a/src/ui/TGConnectingPointTwoFathers.java
+++ b/src/ui/TGConnectingPointTwoFathers.java
@@ -46,8 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-import myutil.*;
 
 public class TGConnectingPointTwoFathers extends TGConnectingPoint{
 	protected CDElement container2;
diff --git a/src/ui/TGConnector.java b/src/ui/TGConnector.java
index 8ec0c91430dad23c7b2bd744c7b9eeef25f87fae..566b0e0bac18cda1c4ab596a72f1a669754ca71a 100755
--- a/src/ui/TGConnector.java
+++ b/src/ui/TGConnector.java
@@ -47,13 +47,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 public abstract class TGConnector extends TGCScalableWithInternalComponent      {
 
diff --git a/src/ui/TGConnectorAttribute.java b/src/ui/TGConnectorAttribute.java
index 959028644d90bb0257e322c03bb72cd6e69eaaae..3b6ba49d38181ea477d3e276d10a61b44d55d830 100755
--- a/src/ui/TGConnectorAttribute.java
+++ b/src/ui/TGConnectorAttribute.java
@@ -46,11 +46,12 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorAttribute extends TGConnector {
     
diff --git a/src/ui/TGConnectorComment.java b/src/ui/TGConnectorComment.java
index a33dea21b68d4ba8187c475551209f673941768b..3301d0a1a14c032ea451a2e0512b6097853ea3af 100755
--- a/src/ui/TGConnectorComment.java
+++ b/src/ui/TGConnectorComment.java
@@ -46,11 +46,12 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorComment extends TGConnector {
 
diff --git a/src/ui/TGConnectorFullArrow.java b/src/ui/TGConnectorFullArrow.java
index f9f72e0c8d46b470969e088d2543783e64418dab..0d641185825ea53c0ede90754066d135db88873d 100755
--- a/src/ui/TGConnectorFullArrow.java
+++ b/src/ui/TGConnectorFullArrow.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorFullArrow extends TGConnector implements TGConnectorBetweenElementsInterface {
 	protected int arrowLength = 10;
diff --git a/src/ui/TGConnectorInfo.java b/src/ui/TGConnectorInfo.java
index fc3e52e8acdbbe56150d4cabc3f604402a3fc140..29f77682d2e12bc7a1a212507f28636db78e3bda 100644
--- a/src/ui/TGConnectorInfo.java
+++ b/src/ui/TGConnectorInfo.java
@@ -47,14 +47,6 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-
 public  class TGConnectorInfo  {
     
     public TGConnector connector;
diff --git a/src/ui/TGConnectorWithCommentConnectionPoints.java b/src/ui/TGConnectorWithCommentConnectionPoints.java
index 55ea937dda6b9424b60e4597c3fe6b6ea3887faf..646027a30cb186a1dfaaa49f8ddd6840933b8415 100755
--- a/src/ui/TGConnectorWithCommentConnectionPoints.java
+++ b/src/ui/TGConnectorWithCommentConnectionPoints.java
@@ -46,11 +46,11 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.TraceManager;
+
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 
 public abstract class TGConnectorWithCommentConnectionPoints extends TGConnector {
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 992d83fd47f66ed13bf47e1c2c4ae51585bdf6f9..6f341c06a373f9fe5b2de19aaeb4a6c77ca9c96a 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -46,21 +46,23 @@
 
 package ui;
 
+import javax.swing.*;
+import javax.swing.event.EventListenerList;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 
-import javax.swing.*;
-
-import javax.swing.event.EventListenerList;
-
 
 public class TGUIAction extends AbstractAction {
-    // Actions
+    
+    private static final long serialVersionUID = -4942930048930203001L;
+	
+	// Actions
     public static final int ACT_NEW = 0;
     public static final int ACT_NEW_DESIGN = 100;
     public static final int ACT_NEW_ANALYSIS = 101;
     public static final int ACT_OPEN = 1;
+    public static final int ACT_OPEN_FROM_NETWORK = 455;
     public static final int ACT_OPEN_LAST = 154;
     public static final int ACT_MERGE = 228;
     public static final int ACT_SAVE = 2;
@@ -467,7 +469,6 @@ public class TGUIAction extends AbstractAction {
     public static final int ACT_GEN_RTLOTOS = 27;
     public static final int ACT_GEN_LOTOS = 155;
     public static final int ACT_GEN_UPPAAL = 204;
-    public static final int ACT_GEN_PROVERIF = 331;
     public static final int ACT_AVATAR_MODEL_CHECKER = 433;
     public static final int ACT_GEN_JAVA = 112;
     public static final int ACT_SIMU_JAVA = 167;
@@ -599,7 +600,7 @@ public class TGUIAction extends AbstractAction {
     public static final int ACT_INTERNAL_SEARCH = 415;
     //--
 
-    public static final int NB_ACTION = 455;
+    public static final int NB_ACTION = 456;
 
     private  static final TAction [] actions = new TAction[NB_ACTION];
 
@@ -645,7 +646,8 @@ public class TGUIAction extends AbstractAction {
         actions[ACT_NEW] = new TAction("new-command", "New", IconManager.imgic20, IconManager.imgic21, "New", "New modeling", 'N');
         actions[ACT_NEW_DESIGN] = new TAction("new-command-design", "New design", IconManager.imgic14, IconManager.imgic14, "New design", "New TURTLE design", 0);
         actions[ACT_NEW_ANALYSIS] = new TAction("new-command-analysis", "New analysis", IconManager.imgic17, IconManager.imgic17, "New analysis", "New TURTLE analysis", 0);
-        actions[ACT_OPEN] = new TAction("open-command","Open", IconManager.imgic22, IconManager.imgic23, "Open", "Open an existing TURTLE modeling",'O', true);
+        actions[ACT_OPEN] = new TAction("open-command","Open", IconManager.imgic22, IconManager.imgic23, "Open", "Open an existing TTooll model",'O', true);
+	actions[ACT_OPEN_FROM_NETWORK] = new TAction("open-command-from-network","Open from TTool repository", IconManager.imgic22, IconManager.imgic23, "Open from TTool repository", "Open an existing TTool model from the TTool repository (TTool website)",'O', true);
         actions[ACT_OPEN_LAST] = new TAction("openlast-command","Open file: " + ConfigurationTTool.LastOpenFile, IconManager.imgic22, IconManager.imgic23, "Open: " + ConfigurationTTool.LastOpenFile, "Open the lastly saved TTool model", 0);
         actions[ACT_MERGE] = new TAction("merge-command","Merge", IconManager.imgic22, IconManager.imgic23, "Merge", "Merge the current TTool modeling with another one saved in a file ", 0);
         actions[ACT_SAVE] = new TAction("save-command", "Save",IconManager.imgic24, IconManager.imgic25, "Save", "Save an opened or a new TTool modeling", 'S', true);
@@ -702,7 +704,6 @@ public class TGUIAction extends AbstractAction {
         actions[ACT_ONECLICK_LOTOS_RG] = new TAction("gen_rglotos-command", "One-click LOTOS-based verification", IconManager.imgic342, IconManager.imgic342, "One-click LOTOS-based verification",  "Generates a LOTOS-based RG  from TTool diagrams", '0');
         actions[ACT_ONECLICK_RTLOTOS_RG] = new TAction("gen_rgrtlotos-command", "Generate RT-LOTOS-based RG", IconManager.imgic342, IconManager.imgic342, "Generate RT-LOTOS-based RG ",  "Generates an RT-LOTOS-based RG  from TTool diagrams", '0');
         actions[ACT_GEN_UPPAAL] = new TAction("gen_uppaal-command", "Safety formal verification with UPPAAL", IconManager.imgic86, IconManager.imgic86, "Generate UPPAAL specification",  "Generates a UPPAAL specification from TTool diagrams", '0');
-        actions[ACT_GEN_PROVERIF] = new TAction("gen_proverif-command", "Generate ProVerif Code", IconManager.imgic34, IconManager.imgic35, "Generate ProVerif specification",  "Generates a ProVerif specification from AVATAR diagrams", '0');
 	actions[ACT_AVATAR_MODEL_CHECKER] = new TAction("avatar-model-checker", "Avatar model checker", IconManager.imgic140, IconManager.imgic140, "Avatar model checker",  "Executes the AVATAR model checker from an AVATAR design", '0');
         actions[ACT_GEN_JAVA] = new TAction("gen_java-command", "Generate JAVA", IconManager.imgic38, IconManager.imgic39, "Generate JAVA",  "Generates Java code from TURTLE diagrams", 0);
         actions[ACT_SIMU_JAVA] = new TAction("gen_simujava-command", "Java-based simulation", IconManager.imgic38, IconManager.imgic39, "JAVA-based simualtion",  "Simulate diagrams using Java language", 0);
diff --git a/src/ui/TMLArchiPanel.java b/src/ui/TMLArchiPanel.java
index 0302cf8d7d8df95a5fd17dfc91542c03ff981193..3c8141b271fe5b626c09eeac07f030ca2d75f56d 100755
--- a/src/ui/TMLArchiPanel.java
+++ b/src/ui/TMLArchiPanel.java
@@ -46,11 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.tmldd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLArchiPanel extends TURTLEPanel {
     public TMLArchiDiagramPanel tmlap; 
@@ -58,16 +62,23 @@ public class TMLArchiPanel extends TURTLEPanel {
     
     public TMLArchiPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneDesignAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
     
+    @Override
     public void init() {
          
         //  Class Diagram toolbar
@@ -80,10 +91,10 @@ public class TMLArchiPanel extends TURTLEPanel {
         //Class	diagram
         tmlap = new TMLArchiDiagramPanel(mgui, toolBarTML);
         tmlap.setName("DIPLODOCUS architecture and mapping Diagram");
-	toolBarTML.setPanel(tmlap);
-	// Diagram toolbar
-   
-        
+
+        toolBarTML.setPanel(tmlap);
+		// Diagram toolbar
+           
         tmlap.tp = this;
         tdp = tmlap;
         panels.add(tmlap); // Always first in list
diff --git a/src/ui/TMLCommunicationPatternPanel.java b/src/ui/TMLCommunicationPatternPanel.java
index 5faf2ad58353d7e5620caf181d4cbc34473dbe01..c74e29dc9132825c6c5b4438d7bff5734638467a 100755
--- a/src/ui/TMLCommunicationPatternPanel.java
+++ b/src/ui/TMLCommunicationPatternPanel.java
@@ -46,13 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmlcp.TMLCPToolBar;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDToolBar;
 
-import ui.tmlcp.*;
-import ui.tmlsd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLCommunicationPatternPanel extends TURTLEPanel {
     public TMLCPPanel tmlcpp;
@@ -60,12 +64,18 @@ public class TMLCommunicationPatternPanel extends TURTLEPanel {
 
     public TMLCommunicationPatternPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneAnalysisAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneAnalysisAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
diff --git a/src/ui/TMLComponentDesignPanel.java b/src/ui/TMLComponentDesignPanel.java
index f11f05c999c39f2d4eb6a07aa10d99ffbf00b80b..de97df5707fa8f099eac3f561a6dedbb80274cfc 100755
--- a/src/ui/TMLComponentDesignPanel.java
+++ b/src/ui/TMLComponentDesignPanel.java
@@ -47,28 +47,47 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramToolBar;
+import ui.tmldd.TMLArchiDiagramPanel;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLComponentDesignPanel extends TURTLEPanel {
-    public TMLComponentTaskDiagramPanel tmlctdp;
-    public Vector<TGComponent> validated, ignored;
+    
+	public TMLComponentTaskDiagramPanel tmlctdp;
+    
+	public Vector<TGComponent> validated, ignored;
 
     public TMLComponentDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDesignAction(e);
-                }
-            };
+        	
+        	@Override
+        	public void stateChanged(ChangeEvent e){
+        		mgui.paneDesignAction(e);
+        	}
+        };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
+        
+        // Issue #41: Ordering of tabbed panes
+        tabbedPane.setTabLayoutPolicy( JTabbedPane.SCROLL_TAB_LAYOUT );
     }
 
     public TMLActivityDiagramPanel getTMLActivityDiagramPanel(String _name) {
@@ -144,7 +163,6 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         mgui.changeMade(tmlctdp, TDiagramPanel.NEW_COMPONENT);
 
         //jsp.setVisible(true);
-
     }
 
      public String saveHeaderInXml(String extensionToName) {
@@ -194,7 +212,7 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
 	return tmlctdp.getAllTMLTaskNames(_name);
     }
 
-    public void getListOfBreakPoints(ArrayList<Point> points) {
+    public void getListOfBreakPoints( java.util.List<Point> points ) {
        // TGComponent tgc;
         Iterator<TMLCPrimitiveComponent> iterator = tmlctdp.getPrimitiveComponentList().listIterator();
         TMLCPrimitiveComponent tmlcpc;
@@ -217,19 +235,23 @@ public class TMLComponentDesignPanel extends TURTLEPanel {
         }
     }
     
-    public ArrayList<String> getAllCryptoConfig(){
-	ArrayList<String> cryptoConfigs=new ArrayList<String>();
-	TMLActivityDiagramPanel tmladp;
-        for(int i=1; i<panels.size(); i++) {
+    public java.util.List<String> getAllCryptoConfig(){
+    	java.util.List<String> cryptoConfigs=new ArrayList<String>();
+    	TMLActivityDiagramPanel tmladp;
+        
+    	for(int i=1; i<panels.size(); i++) {
             tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
             cryptoConfigs.addAll(tmladp.getAllCryptoConfig());
         }
-	return cryptoConfigs;
+	
+    	return cryptoConfigs;
     }
-    public ArrayList<String> getAllNonce(){
-	ArrayList<String> ns=new ArrayList<String>();
-	TMLActivityDiagramPanel tmladp;
-        for(int i=1; i<panels.size(); i++) {
+    
+    public java.util.List<String> getAllNonce(){
+    	java.util.List<String> ns=new ArrayList<String>();
+    	TMLActivityDiagramPanel tmladp;
+        
+    	for(int i=1; i<panels.size(); i++) {
             tmladp = (TMLActivityDiagramPanel)(panels.elementAt(i));
             ns.addAll(tmladp.getAllNonce());
         }
diff --git a/src/ui/TMLDesignPanel.java b/src/ui/TMLDesignPanel.java
index 38705e3b00c6da96cf0b6eaa19c36584bc0fff4a..4f16f65db315fe0beb2a48ad64869210b9d98dc4 100755
--- a/src/ui/TMLDesignPanel.java
+++ b/src/ui/TMLDesignPanel.java
@@ -47,13 +47,21 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramToolBar;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmldd.TMLArchiDiagramPanel;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.tmlcd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLDesignPanel extends TURTLEPanel {
     public TMLTaskDiagramPanel tmltdp;
@@ -61,12 +69,18 @@ public class TMLDesignPanel extends TURTLEPanel {
 
     public TMLDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
-                public void stateChanged(ChangeEvent e){
-                    mgui.paneDesignAction(e);
-                }
-            };
+        	
+        	@Override
+            public void stateChanged(ChangeEvent e){
+                mgui.paneDesignAction(e);
+            }
+        };
+
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
diff --git a/src/ui/TMLTaskInterface.java b/src/ui/TMLTaskInterface.java
index 9c6e04f1972c131609eddd9c0e947fc6a8602e78..473c3b775717e402a7015a86aea0bdcb7d18edaf 100755
--- a/src/ui/TMLTaskInterface.java
+++ b/src/ui/TMLTaskInterface.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui;
 
 
-import ui.tmlad.*;
+import ui.tmlad.TMLActivityDiagramPanel;
 
 public interface TMLTaskInterface  {
     public String getTaskName();
diff --git a/src/ui/TToolUpdater.java b/src/ui/TToolUpdater.java
index cb4e7545d4692a1b3175681a6d1c1d8d3d805408..9276991575a5d7394398cf9f516d0d1459114289 100755
--- a/src/ui/TToolUpdater.java
+++ b/src/ui/TToolUpdater.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.io.*;
-import java.net.*;
 import javax.swing.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
 
 
 public class TToolUpdater extends Thread {
diff --git a/src/ui/TURTLEModelingDrawer.java b/src/ui/TURTLEModelingDrawer.java
index 1c2db407c9c0e106cb4d01a78621dd6c221e8b9b..dbd9a92e504b7c272a346cea24804abb162390ca 100755
--- a/src/ui/TURTLEModelingDrawer.java
+++ b/src/ui/TURTLEModelingDrawer.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.util.*;
-
 import translator.*;
-import ui.cd.*;
 import ui.ad.*;
+import ui.cd.TCDCompositionOperatorWithSynchro;
+import ui.cd.TCDTClass;
+
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class TURTLEModelingDrawer {
     private MainGUI mgui;
diff --git a/src/ui/TURTLEOSDesignPanel.java b/src/ui/TURTLEOSDesignPanel.java
index e8125f1925a44eafbeb35cfc1c7c927cbe481719..ae29ac04deb635e1daffa22e19f66223ed014de1 100755
--- a/src/ui/TURTLEOSDesignPanel.java
+++ b/src/ui/TURTLEOSDesignPanel.java
@@ -46,26 +46,35 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramToolBar;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramToolBar;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.oscd.*;
-import ui.osad.*;
-//import ui.tmlcd.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class TURTLEOSDesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
-    public Vector validated, ignored;
+    //public Vector validated, ignored;
     public TURTLEOSClassDiagramPanel toscdp;
 
     public TURTLEOSDesignPanel(MainGUI _mgui) {
         super(_mgui);
-        tabbedPane = new JTabbedPane();
+        
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        
         cl = new ChangeListener() {
+        	
+        	@Override
             public void stateChanged(ChangeEvent e){
                 mgui.paneDesignAction(e);
             }
         };
+        
         tabbedPane.addChangeListener(cl);
         tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
     }
@@ -102,7 +111,7 @@ public class TURTLEOSDesignPanel extends TURTLEPanel implements TURTLEDesignPane
         JScrollDiagramPanel jsp	= new JScrollDiagramPanel(tosadp);
         tosadp.jsp = jsp;
         jsp.setWheelScrollingEnabled(true);
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
         toolBarPanel.add(toolBarActivity, BorderLayout.NORTH);
         toolBarPanel.add(jsp, BorderLayout.CENTER);
         panels.add(tosadp);
@@ -128,7 +137,7 @@ public class TURTLEOSDesignPanel extends TURTLEPanel implements TURTLEDesignPane
           JScrollDiagramPanel jsp	= new JScrollDiagramPanel(toscdp);
           toscdp.jsp = jsp;
           jsp.setWheelScrollingEnabled(true);
-          jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+          jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT);
           toolBarPanel.add(toolBarTOS, BorderLayout.NORTH);
           toolBarPanel.add(jsp, BorderLayout.CENTER);
           tabbedPane.addTab("TURTLE-OS Class diagram", IconManager.imgic62, toolBarPanel, "Opens TURTLE-OS class diagram");
diff --git a/src/ui/TURTLEPanel.java b/src/ui/TURTLEPanel.java
index 3c0f39bd6bfe5737f80d56518128f4e6df9ce662..c6326075e8e207c6830af2620d87809b82713b66 100755
--- a/src/ui/TURTLEPanel.java
+++ b/src/ui/TURTLEPanel.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GenericTree;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import myutil.*;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public abstract class TURTLEPanel implements GenericTree {
     public JTabbedPane tabbedPane;
diff --git a/src/ui/TURTLEPanelPopupListener.java b/src/ui/TURTLEPanelPopupListener.java
index f1906a26c08647bfadca72672371ea402d79b195..8e46244ab5bc1952203a88f8927ecf7404d53a66 100755
--- a/src/ui/TURTLEPanelPopupListener.java
+++ b/src/ui/TURTLEPanelPopupListener.java
@@ -46,12 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import ui.ucd.UseCaseDiagramPanel;
 
-import ui.ucd.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 
 public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto tabs */ {
@@ -72,9 +74,11 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
     public void mousePressed(MouseEvent e) {
         checkForPopup(e);
     }
+    
     public void mouseReleased(MouseEvent e) {
         checkForPopup(e);
     }
+    
     public void mouseClicked(MouseEvent e) {
         checkForPopup(e);
     }
@@ -95,7 +99,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
         sort = createMenuItem("Sort");
         newucd = createMenuItem("New Use Case Diagram");
         newsd = createMenuItem("New Sequence Diagram (old version)");
-	newsdzv = createMenuItem("New Sequence Diagram");
+        newsdzv = createMenuItem("New Sequence Diagram");
         newsdfromucd = createMenuItem("New Sequence Diagram (from Use Case Diagram)");
         newreq = createMenuItem("New Requirement Diagram");
         newebrdd = createMenuItem("New Event-Based Requirement Description Diagram");
@@ -117,12 +121,13 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
         menu.add(sort);
         menu.addSeparator();
         menu.add(newucd);
+        
         if (mgui.isAvatarOn()) {
             menu.add(newavatarcd);
             menu.add(newavatarad);
         }
         menu.add(newsd);
-	menu.add(newsdzv);
+        menu.add(newsdzv);
 	
         menu.add(newsdfromucd);
         menu.addSeparator();
@@ -187,7 +192,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
 
         newucd.setEnabled(tp.isUCDEnabled());
         newsd.setEnabled(tp.isSDEnabled());
-	newsdzv.setEnabled(tp.isSDEnabled());
+        newsdzv.setEnabled(tp.isSDEnabled());
         newsdfromucd.setEnabled(tp.isSDEnabled() && (mgui.getCurrentTDiagramPanel() instanceof UseCaseDiagramPanel));
         newreq.setEnabled(tp.isReqEnabled());
         newebrdd.setEnabled(tp.isReqEnabled());
@@ -202,61 +207,61 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
 
     private Action listener = new AbstractAction() {
 
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JMenuItem item = (JMenuItem)e.getSource();
-                String ac = item.getActionCommand();
-                if(ac.equals("Rename")) {
-                    tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
-                } else if (ac.equals("Remove")) {
-                    tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
-                } else if (ac.equals("Move to the left")) {
-                    tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
-                } else if (ac.equals("Move to the right")) {
-                    tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
-                } else if (ac.equals("Sort")) {
-                    GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
-                    mgui.changeMade(null, -1);
-                } else if (ac.equals("New Use Case Diagram")) {
-                    mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
-                    mgui.changeMade(null, -1);
-                } else if (item == newsd) {
-                    mgui.createUniqueSequenceDiagram(tp, "MyScenario");
-                    mgui.changeMade(null, -1);
-		} else if (item == newsdzv) {
-                    mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
-                    mgui.changeMade(null, -1); 
-                } else if (item == newsdfromucd) {
-                    mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
-                    mgui.changeMade(null, -1);
-                } else if (ac.equals("New Requirement Diagram")) {
-                    mgui.createRequirementDiagram(tp, "Requirement Diagram");
-                    mgui.changeMade(null, -1);
-                } else if (ac.equals("New Attack Tree Diagram")) {
-                    mgui.createAttackTreeDiagram(tp, "Attack Tree");
-                    mgui.changeMade(null, -1);
-                } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
-                    mgui.createEBRDD(tp, "EBRDD");
-                    mgui.changeMade(null, -1);
-                } else if (ac.equals("New ProActive State Machine Diagram")) {
-                    mgui.createProActiveSMD(tp, "ProActive SMD");
-                    mgui.changeMade(null, -1);
-                } else if (e.getSource() == newavatarrd) {
-                    mgui.createAvatarRD(tp, "AVATAR RD");
-                    mgui.changeMade(null, -1);
-                } else if (e.getSource() == newavatarpd) {
-                    mgui.createAvatarPD(tp, "AVATAR PD");
-                    mgui.changeMade(null, -1);
-                } else if (e.getSource() == newavatarcd) {
-                    mgui.createUniqueAvatarCD(tp, "Context Diagram");
-                    mgui.changeMade(null, -1);
-                } else if (e.getSource() == newavatarad) {
-                    mgui.createUniqueAvatarAD(tp, "Activity Diagram");
-                    mgui.changeMade(null, -1);
-                } else if (e.getSource() == newavatarmad) {
-                    mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
-                    mgui.changeMade(null, -1);
-                }
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            JMenuItem item = (JMenuItem)e.getSource();
+            String ac = item.getActionCommand();
+            if(ac.equals("Rename")) {
+                tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
+            } else if (ac.equals("Remove")) {
+                tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
+            } else if (ac.equals("Move to the left")) {
+                tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
+            } else if (ac.equals("Move to the right")) {
+                tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
+            } else if (ac.equals("Sort")) {
+                GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
+                mgui.changeMade(null, -1);
+            } else if (ac.equals("New Use Case Diagram")) {
+                mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
+                mgui.changeMade(null, -1);
+            } else if (item == newsd) {
+                mgui.createUniqueSequenceDiagram(tp, "MyScenario");
+                mgui.changeMade(null, -1);
+            } else if (item == newsdzv) {
+                mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
+                mgui.changeMade(null, -1); 
+            } else if (item == newsdfromucd) {
+                mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
+                mgui.changeMade(null, -1);
+            } else if (ac.equals("New Requirement Diagram")) {
+                mgui.createRequirementDiagram(tp, "Requirement Diagram");
+                mgui.changeMade(null, -1);
+            } else if (ac.equals("New Attack Tree Diagram")) {
+                mgui.createAttackTreeDiagram(tp, "Attack Tree");
+                mgui.changeMade(null, -1);
+            } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
+                mgui.createEBRDD(tp, "EBRDD");
+                mgui.changeMade(null, -1);
+            } else if (ac.equals("New ProActive State Machine Diagram")) {
+                mgui.createProActiveSMD(tp, "ProActive SMD");
+                mgui.changeMade(null, -1);
+            } else if (e.getSource() == newavatarrd) {
+                mgui.createAvatarRD(tp, "AVATAR RD");
+                mgui.changeMade(null, -1);
+            } else if (e.getSource() == newavatarpd) {
+                mgui.createAvatarPD(tp, "AVATAR PD");
+                mgui.changeMade(null, -1);
+            } else if (e.getSource() == newavatarcd) {
+                mgui.createUniqueAvatarCD(tp, "Context Diagram");
+                mgui.changeMade(null, -1);
+            } else if (e.getSource() == newavatarad) {
+                mgui.createUniqueAvatarAD(tp, "Activity Diagram");
+                mgui.changeMade(null, -1);
+            } else if (e.getSource() == newavatarmad) {
+                mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
+                mgui.changeMade(null, -1);
             }
-        };
+        }
+    };
 }
diff --git a/src/ui/ThreadGUIElement.java b/src/ui/ThreadGUIElement.java
index 0638fd2d19ed2e32e87392830991b44781a95b5c..75f319169bd5b88bed142f1ee5722efcc5b31881 100755
--- a/src/ui/ThreadGUIElement.java
+++ b/src/ui/ThreadGUIElement.java
@@ -47,13 +47,17 @@
 
 package ui;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.ExternalCall;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
+import ui.window.JDialogCancel;
+import ui.window.JFrameStatistics;
 
-import myutil.*;
-import ui.window.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class ThreadGUIElement extends Thread {
diff --git a/src/ui/VectorLRArtifactTClassGate.java b/src/ui/VectorLRArtifactTClassGate.java
index 7f104cf3c1e170ed467f955388737e57f8ee5091..7ff616f5b4a25fcfe137cd8a11d55783f22a8297 100755
--- a/src/ui/VectorLRArtifactTClassGate.java
+++ b/src/ui/VectorLRArtifactTClassGate.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
+import ui.cd.TCDTClass;
 
-import ui.cd.*;
+import java.util.Collection;
+import java.util.Vector;
 
 
 public class VectorLRArtifactTClassGate extends Vector {
diff --git a/src/ui/ad/TADActionState.java b/src/ui/ad/TADActionState.java
index 890a6c49ae09765512f31853595057135e21fe80..7a352c2713b6f4e15ec73442902f14d1270f9684 100755
--- a/src/ui/ad/TADActionState.java
+++ b/src/ui/ad/TADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, ActionStateErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ad/TADArrayGetState.java b/src/ui/ad/TADArrayGetState.java
index 80f8eb3a5af947d4f4f11c288f7c887bf5efb6c2..fb913627928f3eaad613989d9506445daecb90b2 100755
--- a/src/ui/ad/TADArrayGetState.java
+++ b/src/ui/ad/TADArrayGetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArrayGet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADArrayGetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ad/TADArraySetState.java b/src/ui/ad/TADArraySetState.java
index 2aab31333c109eb534fc3dcd5d2078c913de2d4b..cf415af4ba5828fb5603e6db3a2bc701642567c5 100755
--- a/src/ui/ad/TADArraySetState.java
+++ b/src/ui/ad/TADArraySetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArraySet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADArraySetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ad/TADChoice.java b/src/ui/ad/TADChoice.java
index f69817bd55db36a361064a4384fc53bc0f15c096..10a4c6ad3aa3a007138943b1c980347c73199128 100755
--- a/src/ui/ad/TADChoice.java
+++ b/src/ui/ad/TADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TADChoice extends TGCWithInternalComponent  {
     private int lineLength = 10;
diff --git a/src/ui/ad/TADDeterministicDelay.java b/src/ui/ad/TADDeterministicDelay.java
index 5c4a21572a9c18a8df9fa52f6fc3933335c7fb00..e97ddb51e561aafef615e58aee96302047d79519 100755
--- a/src/ui/ad/TADDeterministicDelay.java
+++ b/src/ui/ad/TADDeterministicDelay.java
@@ -46,11 +46,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADDeterministicDelay extends TGCWithInternalComponent {
     private int lineLength = 5;
diff --git a/src/ui/ad/TADJunction.java b/src/ui/ad/TADJunction.java
index 961f8a86af336f7f6e116eb888bc397f4e1db3f0..6ae55001b91ad5511dd434686a1a1ae0d3f2825a 100755
--- a/src/ui/ad/TADJunction.java
+++ b/src/ui/ad/TADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TADJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/ad/TADNonDeterministicDelay.java b/src/ui/ad/TADNonDeterministicDelay.java
index c82d67593eb8bc3c3a8f6f34fd90d54c671ed5f9..1fccd4d0d10ee384b8e752cf20f6aca516a18bdb 100755
--- a/src/ui/ad/TADNonDeterministicDelay.java
+++ b/src/ui/ad/TADNonDeterministicDelay.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADNonDeterministicDelay extends TGCWithInternalComponent{
     private int lineLength = 5;
     private int textX = 5;
diff --git a/src/ui/ad/TADParallel.java b/src/ui/ad/TADParallel.java
index 6ab2e92bbb9ae9f98c5ed9f74342bf6561fc25e4..dada738cf1ebb5569d9c88ae8d1d5c1fd66e98b4 100755
--- a/src/ui/ad/TADParallel.java
+++ b/src/ui/ad/TADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADParallel extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADPreemption.java b/src/ui/ad/TADPreemption.java
index b150477fa0f33c6684721a09f01722779b4795ea..01aba1b7242702fadb56704c1b800f09bdf48135 100755
--- a/src/ui/ad/TADPreemption.java
+++ b/src/ui/ad/TADPreemption.java
@@ -47,11 +47,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADPreemption extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADSequence.java b/src/ui/ad/TADSequence.java
index eea17e72e38bf797ba769786807fdb3d77b7f96f..b027992e04339db29a366565dbd2220b94561e51 100755
--- a/src/ui/ad/TADSequence.java
+++ b/src/ui/ad/TADSequence.java
@@ -47,12 +47,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADSequence extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADStartState.java b/src/ui/ad/TADStartState.java
index 999c90f2577e6d14289357cfce2294177fde665e..0505ee7b86ced9fb26db328a0ee7b63b0a6f3a9d 100755
--- a/src/ui/ad/TADStartState.java
+++ b/src/ui/ad/TADStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/ad/TADStopState.java b/src/ui/ad/TADStopState.java
index 9338e0e6d42b3e1bc6f054371c3a4eb64c3fa22b..a35d25960f02c35c5c37da59d9ffbedabcdba215 100755
--- a/src/ui/ad/TADStopState.java
+++ b/src/ui/ad/TADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/ad/TADTimeCapture.java b/src/ui/ad/TADTimeCapture.java
index ba80e25bdf9170b2e2dad3bfcacac96d5a1ba09b..d64fb0a93a46f348c6c8302268b3673f8fda76a6 100755
--- a/src/ui/ad/TADTimeCapture.java
+++ b/src/ui/ad/TADTimeCapture.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeCapture extends TGCOneLineText implements ActionStateErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ad/TADTimeInterval.java b/src/ui/ad/TADTimeInterval.java
index 9813c53328b2190a1d89866d3c6f51a9e2485fc2..c6397b6988f685b49472808f1855f8043611ce23 100755
--- a/src/ui/ad/TADTimeInterval.java
+++ b/src/ui/ad/TADTimeInterval.java
@@ -46,13 +46,12 @@
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeInterval extends TGCWithInternalComponent{
     private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/ad/TADTimeLimitedOffer.java b/src/ui/ad/TADTimeLimitedOffer.java
index cd3d595e62c914f82b05c550c8cbcd0c64ecc096..6bdabe8c9fd04b677859b6a2170be5749db56fcd 100755
--- a/src/ui/ad/TADTimeLimitedOffer.java
+++ b/src/ui/ad/TADTimeLimitedOffer.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeLimitedOffer extends TGCWithInternalComponent implements ActionStateErrorHighlight  {
 	protected int lineLength = 25;
 	protected int lineDistance = 10;
diff --git a/src/ui/ad/TADTimeLimitedOfferWithLatency.java b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
index b42e37340a50f17695817c2bae80c2e9e142314d..3926683b0f65814b7555c7089dcaceea26e14823 100755
--- a/src/ui/ad/TADTimeLimitedOfferWithLatency.java
+++ b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeLimitedOfferWithLatency extends TGCWithInternalComponent implements ActionStateErrorHighlight {
     protected int lineLength = 25;
     protected int lineLengthLatency = 5;
diff --git a/src/ui/ad/TActivityDiagramPanel.java b/src/ui/ad/TActivityDiagramPanel.java
index 3de459a5f73bc288c6aee5faf2357ebbb4436a7f..6c6f185ec91ec72fd04c58d3fe9df334eaae3af9 100755
--- a/src/ui/ad/TActivityDiagramPanel.java
+++ b/src/ui/ad/TActivityDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.ad;
 
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class TActivityDiagramPanel extends TDiagramPanel implements ActivityDiagramPanelInterface {
     
     public  TActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ad/TActivityDiagramToolBar.java b/src/ui/ad/TActivityDiagramToolBar.java
index c48020e6aa302a4ed07e98d3a774b8d760bd42aa..c04d47443e7459cfa21a80de37200b569564717f 100755
--- a/src/ui/ad/TActivityDiagramToolBar.java
+++ b/src/ui/ad/TActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TActivityDiagramToolBar extends TToolBar {
     
     
diff --git a/src/ui/ad/TGConnectingPointAD.java b/src/ui/ad/TGConnectingPointAD.java
index 8a0127e7874360765cde614898039d150a8f125b..492d70778d62ef14ff6fb049753d3d31ce4cd85a 100755
--- a/src/ui/ad/TGConnectingPointAD.java
+++ b/src/ui/ad/TGConnectingPointAD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointAD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/atd/ATDAttack.java b/src/ui/atd/ATDAttack.java
index 352b34517a354e5ba684270cd1055534a3b4d772..04168746f13630962adc54794fd198c396d083a9 100755
--- a/src/ui/atd/ATDAttack.java
+++ b/src/ui/atd/ATDAttack.java
@@ -46,14 +46,16 @@
 
 package ui.atd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttack;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ATDAttack extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes, CheckableAccessibility, CanBeDisabled {
     private int textY1 = 3;
diff --git a/src/ui/atd/ATDAttackConnectingPoint.java b/src/ui/atd/ATDAttackConnectingPoint.java
index 36b703953c6a7a64c309499de6c8999089ecdd8c..6f5961e91676b42e2a8dd7fdba26b49bea910708 100755
--- a/src/ui/atd/ATDAttackConnectingPoint.java
+++ b/src/ui/atd/ATDAttackConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ATDAttackConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/atd/ATDAttackConnector.java b/src/ui/atd/ATDAttackConnector.java
index 31891fd6c7fe75979716b38d34be12009e504723..1c17b0795b1dd278ce364ef19944fa796c3b13c7 100755
--- a/src/ui/atd/ATDAttackConnector.java
+++ b/src/ui/atd/ATDAttackConnector.java
@@ -47,18 +47,14 @@
 package ui.atd;
 
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/atd/ATDBlock.java b/src/ui/atd/ATDBlock.java
index a7ec4447c9e5d66e894edee0bdaffed1791ff625..0587375f85869e2481c3cb15d3142aca5a4b696e 100755
--- a/src/ui/atd/ATDBlock.java
+++ b/src/ui/atd/ATDBlock.java
@@ -46,15 +46,12 @@
 
 package ui.atd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class ATDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent {
diff --git a/src/ui/atd/ATDCompositionConnectingPoint.java b/src/ui/atd/ATDCompositionConnectingPoint.java
index 08127de7249e2afb59bae798c02ee873272e5614..ecf965c77a86f73baf5776388cc484b5445cfcab 100755
--- a/src/ui/atd/ATDCompositionConnectingPoint.java
+++ b/src/ui/atd/ATDCompositionConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ATDCompositionConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/atd/ATDCompositionConnector.java b/src/ui/atd/ATDCompositionConnector.java
index ccf7a848a8ed1d76c94f539c5c15e95d0a7efe77..e890bcb21ce0fe983b3ee89d4f2c3b808fa978d2 100755
--- a/src/ui/atd/ATDCompositionConnector.java
+++ b/src/ui/atd/ATDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class ATDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/atd/ATDConstraint.java b/src/ui/atd/ATDConstraint.java
index b74800dfec81fea0dcd705865a05892969acc3d6..11e145a0bbeb2b25f55f0969d2a09d2ca94b3149 100755
--- a/src/ui/atd/ATDConstraint.java
+++ b/src/ui/atd/ATDConstraint.java
@@ -46,14 +46,15 @@
 
 package ui.atd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraintText;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ATDConstraint extends TGCScalableWithInternalComponent implements  SwallowedTGComponent, ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/atd/AttackTreeDiagramPanel.java b/src/ui/atd/AttackTreeDiagramPanel.java
index 50d14c6c329372388acb63fd27e8e7e0deb220d6..6806733cdb21f261d4ce51655cdbb908f1aadb41 100644
--- a/src/ui/atd/AttackTreeDiagramPanel.java
+++ b/src/ui/atd/AttackTreeDiagramPanel.java
@@ -47,14 +47,16 @@
 package ui.atd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttributes{
     
     public  AttackTreeDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/atd/AttackTreeDiagramToolbar.java b/src/ui/atd/AttackTreeDiagramToolbar.java
index 2343a48afd859a06e9890ec2f8610ed5845f31ee..c3318ef1a5f62aad49a4696a003fa93f25558cda 100755
--- a/src/ui/atd/AttackTreeDiagramToolbar.java
+++ b/src/ui/atd/AttackTreeDiagramToolbar.java
@@ -46,12 +46,15 @@
 
 package ui.atd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AttackTreeDiagramToolbar extends TToolBar {
 
     public AttackTreeDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarad/AvatarADAcceptEventAction.java b/src/ui/avatarad/AvatarADAcceptEventAction.java
index c5c7bef0e8694145c5a7657988adecac6b12ca09..901cc5a54fae46b1f73f17b4f0b86cd21d2399e6 100755
--- a/src/ui/avatarad/AvatarADAcceptEventAction.java
+++ b/src/ui/avatarad/AvatarADAcceptEventAction.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarADAcceptEventAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADAction.java b/src/ui/avatarad/AvatarADAction.java
index f67c21b74263763a9e2e5deeabfa92cfe232776c..88ca981c89fe14831ac9ebdaaad68858bbcbdc16 100755
--- a/src/ui/avatarad/AvatarADAction.java
+++ b/src/ui/avatarad/AvatarADAction.java
@@ -46,13 +46,13 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/avatarad/AvatarADActivity.java b/src/ui/avatarad/AvatarADActivity.java
index a412e75ee6903da9b766346e001011cd06208e3f..b7b95626c0d6f446efeee102434c51db646977ab 100644
--- a/src/ui/avatarad/AvatarADActivity.java
+++ b/src/ui/avatarad/AvatarADActivity.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarADActivity extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADAssociationConnector.java b/src/ui/avatarad/AvatarADAssociationConnector.java
index 558caf1771b8af8e6af6c0b3f04f5c4228721780..b084074273a4eceebaae1f1a6370dd1183875aff 100755
--- a/src/ui/avatarad/AvatarADAssociationConnector.java
+++ b/src/ui/avatarad/AvatarADAssociationConnector.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class AvatarADAssociationConnector extends TGConnector {
     int w, h;
     
diff --git a/src/ui/avatarad/AvatarADBasicComponent.java b/src/ui/avatarad/AvatarADBasicComponent.java
index 6c505b8e0009b05ceb7b6d7ca47ceac51ba577f8..4228c59228d45090c2cb796f94f849f471e6b2c8 100644
--- a/src/ui/avatarad/AvatarADBasicComponent.java
+++ b/src/ui/avatarad/AvatarADBasicComponent.java
@@ -46,10 +46,6 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
 import ui.*;
 
 public abstract class AvatarADBasicComponent extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADChoice.java b/src/ui/avatarad/AvatarADChoice.java
index 90e60339efd81680938376154d63eb9396274c32..34d89632e5740ff7f0d1655571eb823850bb9d89 100755
--- a/src/ui/avatarad/AvatarADChoice.java
+++ b/src/ui/avatarad/AvatarADChoice.java
@@ -47,12 +47,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADChoice extends TGCScalableWithInternalComponent implements SwallowedTGComponent, EmbeddedComment, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/avatarad/AvatarADConnectingPoint.java b/src/ui/avatarad/AvatarADConnectingPoint.java
index c74268d4f611b1dff630392dd25545c5914649c4..e757fdf7a61ba33b84d564098ec206adcfc0d170 100644
--- a/src/ui/avatarad/AvatarADConnectingPoint.java
+++ b/src/ui/avatarad/AvatarADConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarad;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarADConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarad/AvatarADJunction.java b/src/ui/avatarad/AvatarADJunction.java
index 860e8602f23ce557690afb582d775c372d8f69bc..7e5a6f100025a8ed2f01814f35f6ff5e25de5fb7 100755
--- a/src/ui/avatarad/AvatarADJunction.java
+++ b/src/ui/avatarad/AvatarADJunction.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class AvatarADJunction extends AvatarADBasicComponent {
 
diff --git a/src/ui/avatarad/AvatarADPanel.java b/src/ui/avatarad/AvatarADPanel.java
index 51a7da508aab561bb98e6ab8cd886049b3ef65cb..bea5ec927911f0838fcda0beefb48c1a6e86c70b 100644
--- a/src/ui/avatarad/AvatarADPanel.java
+++ b/src/ui/avatarad/AvatarADPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarad;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarADPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarad/AvatarADParallel.java b/src/ui/avatarad/AvatarADParallel.java
index 2cc1d7d6cf62d4c18e676160f3c6eacb14dd0094..9520563a074020cbbee719f1a5266de08d674fc4 100755
--- a/src/ui/avatarad/AvatarADParallel.java
+++ b/src/ui/avatarad/AvatarADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADParallel extends AvatarADBasicComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/avatarad/AvatarADPartition.java b/src/ui/avatarad/AvatarADPartition.java
index 9a3e68172cfe09b5289c719215a4d2e8cf309276..0642eb11ddee22de369d5b51f5f801932b4d5aad 100755
--- a/src/ui/avatarad/AvatarADPartition.java
+++ b/src/ui/avatarad/AvatarADPartition.java
@@ -46,12 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADPartition extends AvatarADBasicComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarad/AvatarADSendSignalAction.java b/src/ui/avatarad/AvatarADSendSignalAction.java
index fd9f1f9c67a9611c132f93196a10e469d6afd884..b2255463a50fdca6b3ba36e491bd8b5e30fb8050 100755
--- a/src/ui/avatarad/AvatarADSendSignalAction.java
+++ b/src/ui/avatarad/AvatarADSendSignalAction.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarADSendSignalAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStartState.java b/src/ui/avatarad/AvatarADStartState.java
index 177807958c754d8eb7920fa1043722919a40c729..0c1bea85251b972a9314f080095027b72338d254 100755
--- a/src/ui/avatarad/AvatarADStartState.java
+++ b/src/ui/avatarad/AvatarADStartState.java
@@ -46,12 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADStartState extends AvatarADBasicComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarad/AvatarADStopFlow.java b/src/ui/avatarad/AvatarADStopFlow.java
index dc9c8fd300539f665772733389c2f52bf9701c75..ee4858adc9f67382a4bbde90f0aa076e8d1cc4df 100755
--- a/src/ui/avatarad/AvatarADStopFlow.java
+++ b/src/ui/avatarad/AvatarADStopFlow.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADStopFlow extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStopState.java b/src/ui/avatarad/AvatarADStopState.java
index 525e919d7999635e9850a4a2275c3cd0cd9a462b..c176c9f8b0e33595cd460c1f3a873f231f275d58 100755
--- a/src/ui/avatarad/AvatarADStopState.java
+++ b/src/ui/avatarad/AvatarADStopState.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADStopState extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADToolBar.java b/src/ui/avatarad/AvatarADToolBar.java
index f0dfcb0c7cf3d4200526b78795dfffc8591b38fa..7f05f0702a8c44400bd5737730dac6a3d9727547 100644
--- a/src/ui/avatarad/AvatarADToolBar.java
+++ b/src/ui/avatarad/AvatarADToolBar.java
@@ -47,12 +47,15 @@
 
 package ui.avatarad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarADToolBar extends TToolBar {
 
     public AvatarADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarbd/AvatarBDBlock.java b/src/ui/avatarbd/AvatarBDBlock.java
index 6f967fed604daf3b799f7c5c42d7905b19d724ab..9ba8593fffa49d840bf36c7a521a4034699e26e0 100644
--- a/src/ui/avatarbd/AvatarBDBlock.java
+++ b/src/ui/avatarbd/AvatarBDBlock.java
@@ -46,16 +46,21 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import ui.avatarsmd.*;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class AvatarBDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, GenericTree, AvatarBDStateMachineOwner {
diff --git a/src/ui/avatarbd/AvatarBDCompositionConnector.java b/src/ui/avatarbd/AvatarBDCompositionConnector.java
index e25495aac9bd3cc53a6358900683bc9fcf1ef2b2..bef4f0f6d82c9e4d136b3912070e9c53fccf6184 100644
--- a/src/ui/avatarbd/AvatarBDCompositionConnector.java
+++ b/src/ui/avatarbd/AvatarBDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarbd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarBDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarbd/AvatarBDConnectingPoint.java b/src/ui/avatarbd/AvatarBDConnectingPoint.java
index 1aecc576a15cd646ea43778ad0b5798b0902e4a0..165ac9167fa5a8ad6ec6cde05944ad2f8b253950 100644
--- a/src/ui/avatarbd/AvatarBDConnectingPoint.java
+++ b/src/ui/avatarbd/AvatarBDConnectingPoint.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarbd;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarBDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarbd/AvatarBDDataType.java b/src/ui/avatarbd/AvatarBDDataType.java
index 7c32aaead911b24fa62664699810dfb6209b831f..0ee1a6d10f6b63b0d7d231222aa94e0ca04822ab 100644
--- a/src/ui/avatarbd/AvatarBDDataType.java
+++ b/src/ui/avatarbd/AvatarBDDataType.java
@@ -46,15 +46,17 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarBDDataType extends TGCScalableWithInternalComponent implements GenericTree  {
diff --git a/src/ui/avatarbd/AvatarBDFirewall.java b/src/ui/avatarbd/AvatarBDFirewall.java
index cf0e6286d23d4b42240a9ef65afb506c2c5d8a21..863e5538cdd629cd0fd829c07ef7a846fa808333 100755
--- a/src/ui/avatarbd/AvatarBDFirewall.java
+++ b/src/ui/avatarbd/AvatarBDFirewall.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarFirewall;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class AvatarBDFirewall extends TGCScalableWithoutInternalComponent {
     private int textY1 = 15;
diff --git a/src/ui/avatarbd/AvatarBDLibraryFunction.java b/src/ui/avatarbd/AvatarBDLibraryFunction.java
index ebdd8128e044249727e1a1134f87ca58bba6d7ca..363b19b0b60c55746eb20062abea9c1f7836efb1 100644
--- a/src/ui/avatarbd/AvatarBDLibraryFunction.java
+++ b/src/ui/avatarbd/AvatarBDLibraryFunction.java
@@ -38,38 +38,20 @@
 
 package ui.avatarbd;
 
-import java.util.LinkedList;
-import java.util.Iterator;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-
-import java.awt.Graphics;
-import java.awt.Font;
-import java.awt.Color;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
 import myutil.GraphicLib;
 import myutil.TraceManager;
-
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TAttribute;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.MalformedModelingException;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.AvatarSignal;
-import ui.AvatarMethod;
-import ui.AvatarDesignPanel;
-import ui.SwallowedTGComponent;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 import ui.avatarsmd.AvatarSMDPanel;
 import ui.window.JDialogAvatarLibraryFunction;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+
 /**
  * This class represent a Library Function block on an avatar block diagram.
  *
diff --git a/src/ui/avatarbd/AvatarBDPanel.java b/src/ui/avatarbd/AvatarBDPanel.java
index 3ec53da696c07131fda33e920470f00ec2b7c3cd..4453eabd4b908138ac39f495708962d35842ef79 100644
--- a/src/ui/avatarbd/AvatarBDPanel.java
+++ b/src/ui/avatarbd/AvatarBDPanel.java
@@ -47,13 +47,16 @@
 package ui.avatarbd;
 
 
-import org.w3c.dom.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.avatardd.*;
-import java.util.*;
+import ui.avatardd.ADDDiagramPanel;
 import ui.avatarsmd.AvatarSMDPanel;
-import myutil.*;
+
+import java.util.*;
 
 public class AvatarBDPanel extends TDiagramPanel {
     private LinkedList<AvatarBDStateMachineOwner> validated, ignored;
@@ -502,6 +505,36 @@ public class AvatarBDPanel extends TDiagramPanel {
         return list;
     }
 
+    public AvatarBDBlock getBlockFromFQN (String name) {
+        for (TGComponent tgc: this.componentList)
+            if (tgc instanceof AvatarBDBlock) {
+                if (((AvatarBDBlock) tgc).getFullyQualifiedName().equals(name))
+                    return (AvatarBDBlock) tgc;
+
+                for (AvatarBDBlock subBlock: ((AvatarBDBlock) tgc).getFullBlockList()) {
+                    if (subBlock.getFullyQualifiedName().equals(name))
+                        return subBlock;
+                }
+            }
+
+        return null;
+    }
+
+    public AvatarBDBlock getBlockFromOwnerName (String name) {
+        for (TGComponent tgc: this.componentList)
+            if (tgc instanceof AvatarBDBlock) {
+                if (((AvatarBDBlock) tgc).getOwnerName().equals(name))
+                    return (AvatarBDBlock) tgc;
+
+                for (AvatarBDBlock subBlock: ((AvatarBDBlock) tgc).getFullBlockList()) {
+                    if (subBlock.getOwnerName().equals(name))
+                        return subBlock;
+                }
+            }
+
+        return null;
+    }
+
     public LinkedList<AvatarBDLibraryFunction> getFullLibraryFunctionList () {
         LinkedList<AvatarBDLibraryFunction> list = new LinkedList<AvatarBDLibraryFunction> ();
 
diff --git a/src/ui/avatarbd/AvatarBDPortConnector.java b/src/ui/avatarbd/AvatarBDPortConnector.java
index f0cd48240d8d605116d51781e5f7d8bfd2d80d3e..e1e47e22d298035ec9053d44dbba9443a7dba774 100644
--- a/src/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/ui/avatarbd/AvatarBDPortConnector.java
@@ -47,15 +47,18 @@
 package ui.avatarbd;
 
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSignalAssociation;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarbd/AvatarBDPragma.java b/src/ui/avatarbd/AvatarBDPragma.java
index 36d1535128e10885ac0eb102a1c382bcf1ca78e7..f52a95d6cf3bd27de5ddd02dfc1bb9a799ad9692 100755
--- a/src/ui/avatarbd/AvatarBDPragma.java
+++ b/src/ui/avatarbd/AvatarBDPragma.java
@@ -46,17 +46,20 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import avatartranslator.*;
+import ui.window.JDialogPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
 
 public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
 
@@ -139,6 +142,10 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
 		return properties;
     }
 
+    public LinkedList<String> getModels() {
+        return this.models;
+    }
+
     public void internalDrawing(Graphics g) {
         Font f = g.getFont();
         Font fold = f;
diff --git a/src/ui/avatarbd/AvatarBDSafetyPragma.java b/src/ui/avatarbd/AvatarBDSafetyPragma.java
index f380252b493c51f2957435441135ffcbce669bc8..60968b838dd464cdea18ec944c4b4339dc245893 100644
--- a/src/ui/avatarbd/AvatarBDSafetyPragma.java
+++ b/src/ui/avatarbd/AvatarBDSafetyPragma.java
@@ -46,16 +46,20 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.window.JDialogSafetyPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
 
 public class AvatarBDSafetyPragma extends TGCScalableWithoutInternalComponent {
 
diff --git a/src/ui/avatarbd/AvatarBDStateMachineOwner.java b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
index dcd5d68652642605b3bfb0a7c6b65560242e2688..e917269d75ec64286455e0ac29692024b5769341 100755
--- a/src/ui/avatarbd/AvatarBDStateMachineOwner.java
+++ b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
@@ -38,13 +38,13 @@
 
 package ui.avatarbd;
 
-import java.util.LinkedList;
-
-import ui.AvatarSignal;
 import ui.AvatarMethod;
+import ui.AvatarSignal;
 import ui.TAttribute;
 import ui.avatarsmd.AvatarSMDPanel;
 
+import java.util.LinkedList;
+
 /**
  * This interface represent block diagram elements that are associated to a state machine.
  * It defines the functions so that a state machine can deal transparently no matter if
diff --git a/src/ui/avatarbd/AvatarBDToolBar.java b/src/ui/avatarbd/AvatarBDToolBar.java
index 6f0710d5e531cea8e434dce1f800ada3db437197..7e9c23674a90cafba008a4ba8d84de212cb21a74 100644
--- a/src/ui/avatarbd/AvatarBDToolBar.java
+++ b/src/ui/avatarbd/AvatarBDToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarbd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarBDToolBar extends TToolBar {
 
     public AvatarBDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarcd/AvatarCDActorBox.java b/src/ui/avatarcd/AvatarCDActorBox.java
index 94494d262b34f4e63056eac5d81f720b97fb478c..2e703766edecad171a31c5409fd2f4a3b91af454 100755
--- a/src/ui/avatarcd/AvatarCDActorBox.java
+++ b/src/ui/avatarcd/AvatarCDActorBox.java
@@ -46,11 +46,11 @@
 
 package ui.avatarcd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarCDActorBox extends TGCScalableOneLineText {
     /*protected int lineLength = 5;
       protected int textX =  5;
diff --git a/src/ui/avatarcd/AvatarCDActorStickman.java b/src/ui/avatarcd/AvatarCDActorStickman.java
index c16ebd26b650aba7910d0354837ac137b4df032a..6130fcaa0f67e12b71545230994eb3e01f62f108 100755
--- a/src/ui/avatarcd/AvatarCDActorStickman.java
+++ b/src/ui/avatarcd/AvatarCDActorStickman.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarCDActorStickman extends TGCScalableOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/avatarcd/AvatarCDAssociationConnector.java b/src/ui/avatarcd/AvatarCDAssociationConnector.java
index 711a3f1e61ea7b4594ed4b968305a07701584498..5e42439905553e6508b34076eebea53854c92e3b 100755
--- a/src/ui/avatarcd/AvatarCDAssociationConnector.java
+++ b/src/ui/avatarcd/AvatarCDAssociationConnector.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class AvatarCDAssociationConnector extends TGConnector {
     int w, h;
     
diff --git a/src/ui/avatarcd/AvatarCDBlock.java b/src/ui/avatarcd/AvatarCDBlock.java
index 3fc4860b35f1df79a3e4f13b7d68449adc0e3183..a23bfa643d37110bcea75fb36b90370d96e14a78 100644
--- a/src/ui/avatarcd/AvatarCDBlock.java
+++ b/src/ui/avatarcd/AvatarCDBlock.java
@@ -46,15 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarCDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarcd/AvatarCDCompositionConnector.java b/src/ui/avatarcd/AvatarCDCompositionConnector.java
index d5b5783ce62c001c76e6387dc54f51c99a04edb3..d3b84113937d6d55f87dd081b890e8751a945651 100644
--- a/src/ui/avatarcd/AvatarCDCompositionConnector.java
+++ b/src/ui/avatarcd/AvatarCDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarcd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarCDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarcd/AvatarCDConnectingPoint.java b/src/ui/avatarcd/AvatarCDConnectingPoint.java
index fde9bb32a5951ea03482addf2b4d930d081cd035..5b5a8227b8084612b65306e91af5074a98d13383 100644
--- a/src/ui/avatarcd/AvatarCDConnectingPoint.java
+++ b/src/ui/avatarcd/AvatarCDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarcd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarCDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarcd/AvatarCDPanel.java b/src/ui/avatarcd/AvatarCDPanel.java
index 841c61b593f9394f651beb3bd2c28d723a1b81a5..05d23913ca3bea8067cf2da362b70e4c451ca7d1 100644
--- a/src/ui/avatarcd/AvatarCDPanel.java
+++ b/src/ui/avatarcd/AvatarCDPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarcd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarCDPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarcd/AvatarCDToolBar.java b/src/ui/avatarcd/AvatarCDToolBar.java
index 4dc7fd392c672b7c4a3cae3162562a6b8349cfee..ffc5b989222d43bc7efa1e9de2d370f9cdf8266a 100644
--- a/src/ui/avatarcd/AvatarCDToolBar.java
+++ b/src/ui/avatarcd/AvatarCDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarCDToolBar extends TToolBar {
     
     public AvatarCDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDArtifact.java b/src/ui/avatardd/ADDArtifact.java
index 68970020ffd03388d09e308d18dd21843e9f7ff0..2d3c303c6c50181999391a556208bc548035664d 100755
--- a/src/ui/avatardd/ADDArtifact.java
+++ b/src/ui/avatardd/ADDArtifact.java
@@ -46,15 +46,14 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBlockArtifact.java b/src/ui/avatardd/ADDBlockArtifact.java
index 029ff259eb23ec4bfacffede5d403f750645da88..e01df3a3d4a750cfe85f485c802b8979f82b6d5b 100755
--- a/src/ui/avatardd/ADDBlockArtifact.java
+++ b/src/ui/avatardd/ADDBlockArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlockArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDBlockArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBridgeNode.java b/src/ui/avatardd/ADDBridgeNode.java
index 96c51ffe91db06a0b30534528a9a75db557c394e..77221cc8822e46c3c878bc891a11d1459ce6d6e3 100755
--- a/src/ui/avatardd/ADDBridgeNode.java
+++ b/src/ui/avatardd/ADDBridgeNode.java
@@ -47,13 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ADDBridgeNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
     private int textY2 = 30;
diff --git a/src/ui/avatardd/ADDBusNode.java b/src/ui/avatardd/ADDBusNode.java
index d9e39f35430506ca150f2d928bc6b11ff56a48c8..8b957a72507d806255908d00daad31ab19eea354 100755
--- a/src/ui/avatardd/ADDBusNode.java
+++ b/src/ui/avatardd/ADDBusNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDBusNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDBusNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCPUNode.java b/src/ui/avatardd/ADDCPUNode.java
index 6d069f595f468c29b723954e3c82c8648225e357..99fa5c88bdb235af9ea83ab303af4742862f8008 100755
--- a/src/ui/avatardd/ADDCPUNode.java
+++ b/src/ui/avatardd/ADDCPUNode.java
@@ -46,15 +46,16 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCPUNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDChannelArtifact.java b/src/ui/avatardd/ADDChannelArtifact.java
index e6895003758b4de3c467b6936b429db3418a1cf0..f3a13ae7ac3bbd234cc28367d89392431b246aad 100755
--- a/src/ui/avatardd/ADDChannelArtifact.java
+++ b/src/ui/avatardd/ADDChannelArtifact.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarChannelArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDChannelArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDCommunicationNode.java b/src/ui/avatardd/ADDCommunicationNode.java
index db8330745da9920b9bbade6a9d456a93f747968e..84ad9885eb954dcf0224b8ec0bb8b9bcf4c947c5 100755
--- a/src/ui/avatardd/ADDCommunicationNode.java
+++ b/src/ui/avatardd/ADDCommunicationNode.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public abstract class ADDCommunicationNode extends ADDNode {
     
diff --git a/src/ui/avatardd/ADDConnectingPoint.java b/src/ui/avatardd/ADDConnectingPoint.java
index 910aac4699c4dba7d97bced6fed5edabdaf9f6a9..6fea3c22ec32e8a54e69f268e345e4b40bc3e3b0 100755
--- a/src/ui/avatardd/ADDConnectingPoint.java
+++ b/src/ui/avatardd/ADDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatardd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ADDConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/avatardd/ADDConnector.java b/src/ui/avatardd/ADDConnector.java
index f6c95c0f5639b0757f5ef8e1d82891342c5cc654..909e37b37c1982267cccae5f06227ab54a76071a 100755
--- a/src/ui/avatardd/ADDConnector.java
+++ b/src/ui/avatardd/ADDConnector.java
@@ -47,16 +47,17 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatardd;
 
 
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public  class ADDConnector extends TGConnector  {
     public static final String NO_SPY = "Remove spy";
diff --git a/src/ui/avatardd/ADDCoproMWMRNode.java b/src/ui/avatardd/ADDCoproMWMRNode.java
index 0d5c84d9e6711ac9361a29a7c7272e55cc89776d..8a7fe9a3aa300aed4f8a407b949a39246cbc479b 100755
--- a/src/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/ui/avatardd/ADDCoproMWMRNode.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCoproMWMRNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttributes {
 	private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCrossbarNode.java b/src/ui/avatardd/ADDCrossbarNode.java
index 07c90966f217726a4a2f5a338135fea2ecdca851..6bee4e3d2a0d0bc351d2e0c84d418d94423e39d0 100755
--- a/src/ui/avatardd/ADDCrossbarNode.java
+++ b/src/ui/avatardd/ADDCrossbarNode.java
@@ -46,17 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCrossbarNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDCrossbarNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDMANode.java b/src/ui/avatardd/ADDDMANode.java
index 2b3e733feba7cce0f9caa02e98f1027a2630b101..a30b5bda76e50683a9018a402b24cc7be97a3a14 100755
--- a/src/ui/avatardd/ADDDMANode.java
+++ b/src/ui/avatardd/ADDDMANode.java
@@ -46,17 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDDMANode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDiagramPanel.java b/src/ui/avatardd/ADDDiagramPanel.java
index efaab8cda574474ba40b5b1beeabbcd7740a50b9..72a31697e23f377dab59e1c1eeb50b3ad9f8b28d 100755
--- a/src/ui/avatardd/ADDDiagramPanel.java
+++ b/src/ui/avatardd/ADDDiagramPanel.java
@@ -48,11 +48,12 @@
 package ui.avatardd;
 
 
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
-import myutil.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     private int masterClockFrequency = 200; // in MHz
diff --git a/src/ui/avatardd/ADDDiagramToolBar.java b/src/ui/avatardd/ADDDiagramToolBar.java
index a87b2f9c9d5d5c54beb4cd4a824a87f6aae15150..c7697c8d8e30922d18c81a74f71d6ec83d10a7f4 100755
--- a/src/ui/avatardd/ADDDiagramToolBar.java
+++ b/src/ui/avatardd/ADDDiagramToolBar.java
@@ -49,12 +49,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class ADDDiagramToolBar extends TToolBar {
     
     public ADDDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDICUNode.java b/src/ui/avatardd/ADDICUNode.java
index 92093ad67989698d6cbbb2713f3dcf4a0fd889b7..87fa5a5a03304af234eaf74f8c0f2b9b827ee47d 100755
--- a/src/ui/avatardd/ADDICUNode.java
+++ b/src/ui/avatardd/ADDICUNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDICUNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDICUNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDMemoryNode.java b/src/ui/avatardd/ADDMemoryNode.java
index 1f7ac056efd863825c1308440775865f99c25d83..3811760de6ee0584be2a2078de0c04cd700fed3f 100755
--- a/src/ui/avatardd/ADDMemoryNode.java
+++ b/src/ui/avatardd/ADDMemoryNode.java
@@ -46,16 +46,16 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDMemoryNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
     protected int textY1 = 15;
diff --git a/src/ui/avatardd/ADDNode.java b/src/ui/avatardd/ADDNode.java
index b04b8fae2cc6001ff6fb8f9f58a73e8d6e029d8c..d1188f19a6edbe7cef726547eb3a990184aeaf16 100755
--- a/src/ui/avatardd/ADDNode.java
+++ b/src/ui/avatardd/ADDNode.java
@@ -46,17 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import tmltranslator.HwNode;
+import ui.TDiagramPanel;
+import ui.TGCWithInternalComponent;
+import ui.TGComponent;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public abstract class ADDNode extends TGCWithInternalComponent  {
     protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
diff --git a/src/ui/avatardd/ADDRAMNode.java b/src/ui/avatardd/ADDRAMNode.java
index 808d31213aa0bcaece689e8f18de55c6d6b8bb54..ff2fecff8a32291d72c1783588cb52da093b733f 100755
--- a/src/ui/avatardd/ADDRAMNode.java
+++ b/src/ui/avatardd/ADDRAMNode.java
@@ -46,10 +46,10 @@
 
 package ui.avatardd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Vector;
+
 
 public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
 
diff --git a/src/ui/avatardd/ADDROMNode.java b/src/ui/avatardd/ADDROMNode.java
index 7f6de6c0834893a1d1327db0944049ca0f7c075a..59615234fc3c630399e20e120e2bf6b8d2bcc925 100755
--- a/src/ui/avatardd/ADDROMNode.java
+++ b/src/ui/avatardd/ADDROMNode.java
@@ -46,17 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
 
 public class ADDROMNode extends ADDMemoryNode implements  WithAttributes {
     
diff --git a/src/ui/avatardd/ADDTTYNode.java b/src/ui/avatardd/ADDTTYNode.java
index aa290d699bbbf9898d47f8944fc6c27fb36b1ee4..c57881e0b10f7c5bdc107b501968338b60448bfa 100755
--- a/src/ui/avatardd/ADDTTYNode.java
+++ b/src/ui/avatardd/ADDTTYNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTTYNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDTTYNode extends ADDNode implements WithAttributes {
 	private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDTimerNode.java b/src/ui/avatardd/ADDTimerNode.java
index 73d63c80f65701fd84ce9a0a8d0af14ae593b636..35d34bb6a21023318210cf892e1bfa885c2e5a6d 100755
--- a/src/ui/avatardd/ADDTimerNode.java
+++ b/src/ui/avatardd/ADDTimerNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTimerNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDVgmnNode.java b/src/ui/avatardd/ADDVgmnNode.java
index 2062efdda87dccde9383813c63634ba0abd69069..110eb317ff70c84c3dd46da334f64f3738b2f991 100755
--- a/src/ui/avatardd/ADDVgmnNode.java
+++ b/src/ui/avatardd/ADDVgmnNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDVgmnNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDVgmnNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
index c009f7e9ed521f07f8dd3488197e2d7b284c4e10..29c0a018b29acb37c8cb1c377996ab88b2af66e6 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
 
 import javax.swing.*;
 import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class AvatarInteractiveSimulationActions extends AbstractAction {
     // Actions
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
index 87ffd43de487d7b82e05ed849d21f117105b91a9..5705b80097532f6a3064cc126adf56411dc0d58e 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
@@ -46,9 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import javax.swing.*;
-
-import avatartranslator.*;
+import avatartranslator.AvatarRelation;
 
 
 public  class AvatarInteractiveSimulationFIFOData  {
diff --git a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
index 5f318836ba00a7347d7cf3f0013e5e1880be0706..0ee7598c2a87c95d0b560f712ba754aa2932f855 100755
--- a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarinteractivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMainCommandsToolBar extends AvatarInteractiveSimulationBar {
     
     
diff --git a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
index caa103e5e183e65e8e3459fbf7db43e3f0ef1347..5ccbe32118ecbd912ed2e42161cb2f2c3458202e 100755
--- a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
@@ -48,8 +48,6 @@ package ui.avatarinteractivesimulation;
 
 import javax.swing.*;
 
-import ui.*;
-
 public class AvatarSaveCommandsToolBar extends AvatarInteractiveSimulationBar {
     
     
diff --git a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
index 65b7686e82039b791bb9c1b182102656a4d65a5d..9d0db4ee813522e7296984588aae13f202d57819 100644
--- a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
@@ -48,18 +48,21 @@
 
 package ui.avatarinteractivesimulation;
 
+import avatartranslator.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import myutil.GraphicLib;
+import ui.ColorManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Vector;
 
 public class AvatarSpecificationSimulationSDPanel extends JPanel implements MouseMotionListener  {
 
diff --git a/src/ui/avatarinteractivesimulation/BlockTableModel.java b/src/ui/avatarinteractivesimulation/BlockTableModel.java
index 5ecfe4f768927cdd74240c5870979fe1a141a748..77a0e529c4a0c26c09ce8c2c9112be93cf2d66a6 100755
--- a/src/ui/avatarinteractivesimulation/BlockTableModel.java
+++ b/src/ui/avatarinteractivesimulation/BlockTableModel.java
@@ -46,11 +46,10 @@
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import myutil.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
 
 public class BlockTableModel extends AbstractTableModel {
     private AvatarSpecificationSimulation ass;
diff --git a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 20d396f4c34cfae71babe732cfaac6055685fa88..d3d01d9b7ab5eaa2010a4ef3184d257c77ee993e 100755
--- a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -45,42 +45,41 @@
 
 package ui.avatarinteractivesimulation;
 
-//import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
 import avatartranslator.*;
 import avatartranslator.directsimulation.*;
-import ui.avatarbd.*;
+import myutil.*;
+import ui.*;
+import ui.avatarbd.AvatarBDPortConnector;
 
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public  class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarSimulationInteraction, ActionListener, Runnable, MouseListener, ItemListener, ListSelectionListener, WindowListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
     private static int TRACED_TRANSACTIONS = 1000;
     private static int LAST_TRANSACTIONS = 0;
 
 
-    private static String buttonStartS = "Start simulator";
-    private static String buttonStopAndCloseS = "Stop simulator and close";
-
-    private static int NOT_STARTED = 0;
-    private static int STARTED = 1;
+//    private static String buttonStartS = "Start simulator";
+//    private static String buttonStopAndCloseS = "Stop simulator and close";
+//
+//    private static int NOT_STARTED = 0;
+//    private static int STARTED = 1;
 
     private static long SPACE_UPDATE_TIME = 100;
 
-    private Frame f;
+   // private Frame f;
     private MainGUI mgui;
-    private String title;
+ //   private String title;
 
     protected JButton buttonClose, buttonStart, buttonStopAndClose;
     protected JTextArea jta;
@@ -112,7 +111,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
 
     //List of transactions
 
-    private JList listPendingTransactions;
+    private JList<AvatarSimulationPendingTransaction> listPendingTransactions;
     private TGComponent selectedComponentForTransaction1, selectedComponentForTransaction2;
     private AvatarSimulationBlock previousBlock;
 
@@ -172,10 +171,10 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
 
     // Asynchronous transactions
     private JPanel asyncPanel;
-    private JComboBox comboFIFOs;
+    private JComboBox<AvatarInteractiveSimulationFIFOData> comboFIFOs;
     private Vector<AvatarInteractiveSimulationFIFOData> fifos;
     private JButton delete, up, down;
-    private JList asyncmsgs;
+    private JList<AvatarSimulationAsynchronousTransaction> asyncmsgs;
     private int nbOfAsyncMsgs;
 
     // Sequence Diagram
@@ -203,8 +202,8 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
     private AvatarSpecification avspec;
     private AvatarSpecificationSimulation ass;
     private Thread simulationThread;
-    private boolean resetThread;
-    private boolean killThread;
+//    private boolean resetThread;
+//    private boolean killThread;
 
     private LinkedList<TGComponent> runningTGComponents;
     private int nbOfAllExecutedElements = 0;
@@ -217,12 +216,12 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
     // Async messages
     Vector<AvatarSimulationAsynchronousTransaction> lastAsyncmsgs;
 
-    public JFrameAvatarInteractiveSimulation(Frame _f, MainGUI _mgui, String _title, AvatarSpecification _avspec) {
+    public JFrameAvatarInteractiveSimulation(/*Frame _f,*/ MainGUI _mgui, String _title, AvatarSpecification _avspec) {
         super(_title);
 
-        f = _f;
+     //   f = _f;
         mgui = _mgui;
-        title = _title;
+      //  title = _title;
         avspec = _avspec;
 
         addWindowListener(this);
@@ -390,32 +389,21 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
         sdpanel.setMyScrollPanel(jsp);
         jsp.setWheelScrollingEnabled(true);
         //jsp.setPreferredSize(new Dimension(800, 400));
-        jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+        jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT );
         lowerPartPanel.add(jsp, BorderLayout.CENTER);
 
-
-
         // Commands
         commands = new JPanel(new BorderLayout());
-        //commands.setFloatable(true);
-        //commands.setMinimumSize(new Dimension(300, 250));
         commands.setBorder(new javax.swing.border.TitledBorder("Commands"));
 
-
-
-
-        commandTab = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        commandTab = GraphicLib.createTabbedPane();//new JTabbedPane();
         commands.add(commandTab, BorderLayout.CENTER);
-        //commandTab.setBackground(ColorManager.InteractiveSimulationBackground);
 
 
         // Control commands
         jp01 = new JPanel(new BorderLayout());
         commandTab.addTab("Control", null, jp01, "Main control commands");
-        //jp01.setMinimumSize(new Dimension(375, 400));
-        //gridbag01 = new GridBagLayout();
-        //c01 = new GridBagConstraints();
-        //jp01.setLayout(gridbag01);
 
         mctb = new AvatarMainCommandsToolBar(this);
         jp01.add(mctb, BorderLayout.NORTH);
@@ -442,7 +430,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
         panellpt.setLayout(new BorderLayout());
         panellpt.setBorder(new javax.swing.border.TitledBorder("Pending transactions"));
 
-        listPendingTransactions = new JList();
+        listPendingTransactions = new JList<AvatarSimulationPendingTransaction>();
         //listPendingTransactions.setPreferredSize(new Dimension(400, 300));
         listPendingTransactions.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION );
         listPendingTransactions.addListSelectionListener(this);
@@ -524,8 +512,8 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
 
         //c02.gridwidth = GridBagConstraints.REMAINDER; //end row
 
-
-        infoTab = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        infoTab = GraphicLib.createTabbedPane();// new JTabbedPane();
         infoTab.setPreferredSize(new Dimension(300, 200));
         infos.add(infoTab, BorderLayout.CENTER);
 
@@ -884,7 +872,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
         ca.fill = GridBagConstraints.HORIZONTAL;
         ca.gridheight = 1;
 
-        comboFIFOs = new JComboBox(fifos);
+        comboFIFOs = new JComboBox<AvatarInteractiveSimulationFIFOData>(fifos);
         comboFIFOs.addActionListener(this);
         asyncPanel.add(comboFIFOs, ca);
         ca.fill = GridBagConstraints.BOTH;
@@ -899,7 +887,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
         cb.fill = GridBagConstraints.BOTH;
         cb.gridheight = 1;
         borderjlist.setBorder(new javax.swing.border.TitledBorder("Top of selected FIFO:"));
-        asyncmsgs = new JList();
+        asyncmsgs = new JList<AvatarSimulationAsynchronousTransaction>();
         JScrollPane pane = new JScrollPane(asyncmsgs);
         borderjlist.add(pane, cb);
         asyncPanel.add(borderjlist, ca);
@@ -1408,8 +1396,6 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
                 for(AvatarInteractiveSimulationFIFOData fifo: fifos) {
                     fifo.nb=0;
                 }
-
-
             }
 
             if (lastAsyncmsgs != null) {
diff --git a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
index 22ff4838fe888b64a8fd971229c33f6722551a8d..614bc17467564552c7cdbc9c46d9cf314ef540a7 100755
--- a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
+++ b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
@@ -46,13 +46,13 @@
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarState;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import ui.avatarsmd.AvatarSMDState;
 
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import ui.avatarsmd.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class MetElementsTableModel extends AbstractTableModel {
     private static String ERROR_STRING = "-";
diff --git a/src/ui/avatarinteractivesimulation/TransactionTableModel.java b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
index 5b279d0d8f875d824d833590e00354872a91d704..c335a90ee6a8f9a3402d1556fdf1fa110788ff53 100755
--- a/src/ui/avatarinteractivesimulation/TransactionTableModel.java
+++ b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
@@ -46,13 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import ui.*;
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TransactionTableModel extends AbstractTableModel {
 	private static String ERROR_STRING = "-"; 
diff --git a/src/ui/avatarinteractivesimulation/VariableTableModel.java b/src/ui/avatarinteractivesimulation/VariableTableModel.java
index 6ef74636a9ead43165694b57f79a8c6e9aea3510..0c12b3bc087c84a7f469f8609023db624150b4cb 100755
--- a/src/ui/avatarinteractivesimulation/VariableTableModel.java
+++ b/src/ui/avatarinteractivesimulation/VariableTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class VariableTableModel extends AbstractTableModel {
 	private static String ERROR_STRING = "-"; 
diff --git a/src/ui/avatarmad/AvatarMADAssumption.java b/src/ui/avatarmad/AvatarMADAssumption.java
index 02d7db9c856b2aacb397c0ebbbe0ad83cc905518..57b922cdd27eb736955054dde29780ba1562623b 100644
--- a/src/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/ui/avatarmad/AvatarMADAssumption.java
@@ -47,15 +47,17 @@
 package ui.avatarmad;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAssumption;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarMADAssumption extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
index b6f86e2a986b0ea42bb5f742f92c83208653645c..a24056b13900021f48d60f141497085d7f852edd 100644
--- a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADAssumptionConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
index 86f4e65d45d5ccb175a492db9f56edf2c105e1c1..154936a51a6a2625ea484f86eebcf8839a8f9480 100644
--- a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
@@ -47,17 +47,10 @@
 package ui.avatarmad;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
 
 public  class AvatarMADBelongsToCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 12;
diff --git a/src/ui/avatarmad/AvatarMADCompositionConnector.java b/src/ui/avatarmad/AvatarMADCompositionConnector.java
index c78da26ff4751165f0d494347fd95497185251c2..cdfa0465a6b726e92288e68d93985942aef515ef 100644
--- a/src/ui/avatarmad/AvatarMADCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADCompositionConnector.java
@@ -46,13 +46,12 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADCompositionConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADDiagramReference.java b/src/ui/avatarmad/AvatarMADDiagramReference.java
index 0ee7a4e1bad3e8f8455471dbae10ab3190a26955..117780c774cf2bfb2d98139f6f1ec25b37b59868 100644
--- a/src/ui/avatarmad/AvatarMADDiagramReference.java
+++ b/src/ui/avatarmad/AvatarMADDiagramReference.java
@@ -47,16 +47,11 @@
 package ui.avatarmad;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarMADDiagramReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADElementReference.java b/src/ui/avatarmad/AvatarMADElementReference.java
index 4b497e889db13c2c1aac7ec1ba103c9b02b499b9..0425ad544d4a79e32a527bab9927c491c6fdc0d6 100644
--- a/src/ui/avatarmad/AvatarMADElementReference.java
+++ b/src/ui/avatarmad/AvatarMADElementReference.java
@@ -47,16 +47,11 @@
 package ui.avatarmad;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarMADElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADImpactConnector.java b/src/ui/avatarmad/AvatarMADImpactConnector.java
index 8b4e28ec59e9e16c3f9decc45dfaf7fa7152d67d..5e453796f083d89663b08e8744136cdb1616d616 100644
--- a/src/ui/avatarmad/AvatarMADImpactConnector.java
+++ b/src/ui/avatarmad/AvatarMADImpactConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADImpactConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADMeetConnector.java b/src/ui/avatarmad/AvatarMADMeetConnector.java
index 2fab7cb36ec01d6a3b8a599597ee04824c0294f4..33b4fa707ea75f4df31317c8239ea40ee7b473e8 100644
--- a/src/ui/avatarmad/AvatarMADMeetConnector.java
+++ b/src/ui/avatarmad/AvatarMADMeetConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADMeetConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADPanel.java b/src/ui/avatarmad/AvatarMADPanel.java
index aa30f5716b81ea9a1480f8caa3e083a720334f66..d5d0234f9c504538e3bc7a8b72b2deda4e455364 100644
--- a/src/ui/avatarmad/AvatarMADPanel.java
+++ b/src/ui/avatarmad/AvatarMADPanel.java
@@ -47,7 +47,6 @@
 package ui.avatarmad;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
diff --git a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
index 11f75bf41547ce5ed96e5f82077da790d080e790..1c5199301888251c60994386ef67829465ef6373 100644
--- a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADToAssumptionsConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
index 13496965bcbc9167900e18cf8e1913a422eab3e2..5d1d4c7db0db2eaecb6f21756c9dd1b1304059b3 100644
--- a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADToOthersConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADToolBar.java b/src/ui/avatarmad/AvatarMADToolBar.java
index 6b28feb05b65c1138061d348d3bc51e8399c612d..80042aa4f815955106f56c11274c73cfdbeb8cab 100644
--- a/src/ui/avatarmad/AvatarMADToolBar.java
+++ b/src/ui/avatarmad/AvatarMADToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarmad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMADToolBar extends TToolBar {
 
     public AvatarMADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarmad/AvatarMADVersioningConnector.java b/src/ui/avatarmad/AvatarMADVersioningConnector.java
index ee195fb03d63f8553c6b5dba867fc84a2ec67aba..9a118120a70bc9fda74d87deb196855640a3e64d 100644
--- a/src/ui/avatarmad/AvatarMADVersioningConnector.java
+++ b/src/ui/avatarmad/AvatarMADVersioningConnector.java
@@ -46,17 +46,17 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogVersioningConnector;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  class AvatarMADVersioningConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h, w1;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
index f2bb3282439dbe0823074fa52cd8d7a6e9362c78..7335072a4c41a2b4bfbf7d8ccff8a000a4f92c0b 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnector.java b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
index 2b5426ce5dbf92c75345f3c4e087ad15539c57d8..b2e3e9664a7e05e80f9c0d91ef69c5a63b57091d 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnector.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 3bdc0987adf9b3c55f7e6d90569699e0d5023bc1..18e528e3353fd09e012e0681a7095ce9cb358667 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -47,12 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent { 
     //protected boolean emptyText;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
index 0baea57fa643cdbc8b2301aa7d128cfa1c42f4a2..26cc2ce45b8b96114e961afb632a2cf505ec0c16 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
 package ui.avatarmethodology;
 
 import org.w3c.dom.Element;
-
 import ui.*;
 
 public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 37acee7b05793586e3ff4bb46f44447824d548d4..5884e4eeb940d1a66d8ce7c12bda002dd28a46cd 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 23bf7568456e89e8480a6d8facea9b1ba39845d6..f507e085fe1366cce1d42542889a7d581a14a9ee 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMethodologyDiagramToolbar extends TToolBar {
     
     public AvatarMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 2e9f9fe29302ba293a540d1dd13012c8e017f2a0..8d73ed846fa3653f0424e45ba7a6d17394ff1aba 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index cd8e9f2d8cbf055ab20d43e1892558c7e5795ed6..5e2078cceb728861f7916833cb53328430b3083c 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
index a5e6ca989b0dea8909d46651cc8abd916ab9b97a..8c8e85fbb87287b93b6822521f141fbf1584ed23 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToDesign extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
index f7bdc9557a9a7e4e302ccf6cec0cd8afe970e388..6b88fc05b9fdeb271790f201f2ad44f2c22be29c 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToProperties extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index 79908b115bb580cbe48062b594a5bce2fc491f8e..f375b5358bfe4d00733434de346b07bb5aca3750 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index c5b99a6b7e78aab76cdb5e3044e6ba1b677118ba..c8cf199f4e7026105e3da9a6713487c906ff7c0f 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarpd/AvatarPDAlias.java b/src/ui/avatarpd/AvatarPDAlias.java
index 4e2e4f1eba37490332c99df9d131fb11347fa36e..c073fd81e6580f148a48111fdeb73cd94edf8d9c 100644
--- a/src/ui/avatarpd/AvatarPDAlias.java
+++ b/src/ui/avatarpd/AvatarPDAlias.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAlias extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDAttribute.java b/src/ui/avatarpd/AvatarPDAttribute.java
index a71f345dfc6c00021e57dbfb471651d0525103db..29cd0fbbff2a26cfa3e5428c20a9fd55845fcb77 100644
--- a/src/ui/avatarpd/AvatarPDAttribute.java
+++ b/src/ui/avatarpd/AvatarPDAttribute.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAttribute extends AvatarPDToggle implements SwallowedTGComponent {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
index f847bee4ad2cc2ac798c6386ae5e55bdd71bf146..6b6e6ce53adce743c9100a5522783d32b6a39571 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDAttributeConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnector.java b/src/ui/avatarpd/AvatarPDAttributeConnector.java
index 0f67c3ad5628893697ca72dcbf2a67a9c1ff5b93..71f3daf6d753a47c955eee01d661accd50925eac 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnector.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnector.java
@@ -48,18 +48,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDAttributeConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDAttributeSetting.java b/src/ui/avatarpd/AvatarPDAttributeSetting.java
index af8dfe76f7906daf83106ef72e307a5397534561..93cfbef74a49ba7b2171ffa18c66c86833b35dbe 100644
--- a/src/ui/avatarpd/AvatarPDAttributeSetting.java
+++ b/src/ui/avatarpd/AvatarPDAttributeSetting.java
@@ -46,15 +46,11 @@
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAttributeSetting extends AvatarPDToggle implements ConstraintListInterface {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDBlock.java b/src/ui/avatarpd/AvatarPDBlock.java
index ef60830f26706efb0d2d062d998c073a6ccbd477..ef1f1237c33b92513e9fd80b8fb4bf47df7224e6 100644
--- a/src/ui/avatarpd/AvatarPDBlock.java
+++ b/src/ui/avatarpd/AvatarPDBlock.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class AvatarPDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarpd/AvatarPDBoolEq.java b/src/ui/avatarpd/AvatarPDBoolEq.java
index 80d36ddf4a27693b1d5603fadc5bba50e342d3a9..ba5780c9be3c3b2ff93b3fb6eef2fdee7a58b9f9 100644
--- a/src/ui/avatarpd/AvatarPDBoolEq.java
+++ b/src/ui/avatarpd/AvatarPDBoolEq.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDBoolEq extends AvatarPDToggle implements ConstraintListInterface {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDCompositionConnector.java b/src/ui/avatarpd/AvatarPDCompositionConnector.java
index ae3b69c007d161bfdf4f5e807249294df8dc166c..6b6a14c59fce9019c3a8b2c16219d4b1a482fbd0 100644
--- a/src/ui/avatarpd/AvatarPDCompositionConnector.java
+++ b/src/ui/avatarpd/AvatarPDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarPDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarpd/AvatarPDConnectingPoint.java b/src/ui/avatarpd/AvatarPDConnectingPoint.java
index d58b72267049f00f80adfee5b9ca24a9bab4d74a..65f1909d78c27b6214f134259a52936dff184d77 100644
--- a/src/ui/avatarpd/AvatarPDConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
index 35a8c8348bacced8b56b7f4cb2d12b822ab83338..208785f6c588ff440884bf5b619ef5d29885ed64 100644
--- a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDForbiddenSignalConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDLogicalConstraint.java b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
index ef7c0a6b280205360dbfad441f343bb0a539995a..cf8da6374c88d8662ba0680eb7ebe36e8c615c69 100644
--- a/src/ui/avatarpd/AvatarPDLogicalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDLogicalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDPanel.java b/src/ui/avatarpd/AvatarPDPanel.java
index fac816b62b187cd3b424eff3ddfa4363c5da11bd..5bad652df429d2147ee74db84b0727ed7fd2aa0b 100644
--- a/src/ui/avatarpd/AvatarPDPanel.java
+++ b/src/ui/avatarpd/AvatarPDPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarpd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarPDPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarpd/AvatarPDProperty.java b/src/ui/avatarpd/AvatarPDProperty.java
index 7f195e55c719760d2868804f225653844fb90537..3dfc572e6b4be79e3b5e5d54afc1f83ecb9b2303 100644
--- a/src/ui/avatarpd/AvatarPDProperty.java
+++ b/src/ui/avatarpd/AvatarPDProperty.java
@@ -46,14 +46,16 @@
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarProperty;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDProperty extends TGCScalableWithInternalComponent implements  WithAttributes {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
index 5fa134d712ff7c2d184499c863d48a92b770a817..76dabe0cf71c2f57231cb61b6b0cf791b819915f 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDPropertyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnector.java b/src/ui/avatarpd/AvatarPDPropertyConnector.java
index 4e881e35e0bc9e1bd0c80658162abd026c96fcea..7a58062907194cad91c6635b93ff640c4bc69b21 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnector.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnector.java
@@ -47,15 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
+import ui.window.JDialogAvatarPropertyConnector;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDPropertyConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDPropertyRelation.java b/src/ui/avatarpd/AvatarPDPropertyRelation.java
index 509b5ea2743cf5909fd7f9da82375ce2a4399fd7..e4bf5c3ee190cd77539c4de6cb5bac3efddd65cc 100644
--- a/src/ui/avatarpd/AvatarPDPropertyRelation.java
+++ b/src/ui/avatarpd/AvatarPDPropertyRelation.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDPropertyRelation extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDSignal.java b/src/ui/avatarpd/AvatarPDSignal.java
index a860f3db478480da8bbcd5e00f359400290568a5..2fda7601e18e3119fe6fe9197f170927f6ef96d9 100644
--- a/src/ui/avatarpd/AvatarPDSignal.java
+++ b/src/ui/avatarpd/AvatarPDSignal.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDSignal extends TGCScalableWithInternalComponent implements SwallowedTGComponent  {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
index 662f1425e79c3501fe261ccaad6d41c304289153..06c59638c880491a655adc6a3d28c3738c929cf7 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDSignalConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDSignalConnector.java b/src/ui/avatarpd/AvatarPDSignalConnector.java
index 02af2491bc31c659828ed15df2f967169e71c76d..4acbb027f43b9c6bf0e7c405530424bab8ec0c28 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnector.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnector.java
@@ -47,18 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDSignalConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDTemporalConstraint.java b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
index b39f9b2d0f4f4c09dacd76b66030b87a840281ae..b47457f50dfc1c922a4378dacb84a99955e1147c 100644
--- a/src/ui/avatarpd/AvatarPDTemporalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
@@ -46,16 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-import java.awt.geom.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDTemporalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDToggle.java b/src/ui/avatarpd/AvatarPDToggle.java
index 6874b7b103aa5002545363384fd0504433e8caab..a23900cae862cca7e5324485a7235ab77c77e1ec 100644
--- a/src/ui/avatarpd/AvatarPDToggle.java
+++ b/src/ui/avatarpd/AvatarPDToggle.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public abstract class  AvatarPDToggle extends TGCScalableWithInternalComponent {
 	
diff --git a/src/ui/avatarpd/AvatarPDToolBar.java b/src/ui/avatarpd/AvatarPDToolBar.java
index a0c03535bed76e0b8d476b5fffda6a003adaa7bf..b8ebd516581cd61ab6bdca757a068dd6be3028c5 100644
--- a/src/ui/avatarpd/AvatarPDToolBar.java
+++ b/src/ui/avatarpd/AvatarPDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarPDToolBar extends TToolBar {
     
     public AvatarPDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDCompositionConnector.java b/src/ui/avatarrd/AvatarRDCompositionConnector.java
index 85817ce3533284a22e0d0169904b854d63fc9318..951f01ef689e5de9e699c181ec341cbd30d9220f 100644
--- a/src/ui/avatarrd/AvatarRDCompositionConnector.java
+++ b/src/ui/avatarrd/AvatarRDCompositionConnector.java
@@ -46,13 +46,12 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDCompositionConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
index 513b91ea3f0e48c0b8aad2ee0c5c5805d89b7362..3f256cd673fb52685e088c5c9f5b6de5e0aecbb4 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointDerive extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
index dea95fcd48a4405565fe9208b2c94fef7b2e87ae..cd666e1b6af39f370a011c0c6f1dc66a760d30ff 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
@@ -49,7 +49,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointSatisfy extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
index 24f93a2dd160d6956f16863d817995b66f064beb..dc33803f01a1499cfec2b8ed0262eb1a8fb9b823 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointVerify extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarrd/AvatarRDCopyConnector.java b/src/ui/avatarrd/AvatarRDCopyConnector.java
index b64bd53a6f1da6c22e884fc1015c4e87f2cd32c7..1ca77d94674adb34a63a2f88d79daeee42171922 100755
--- a/src/ui/avatarrd/AvatarRDCopyConnector.java
+++ b/src/ui/avatarrd/AvatarRDCopyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDCopyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDDeriveConnector.java b/src/ui/avatarrd/AvatarRDDeriveConnector.java
index ff4b2b4379e4bee03f991c39e6abeab712f4b0a0..73f3313f2c69186d75fe4283c984b15275a0b809 100755
--- a/src/ui/avatarrd/AvatarRDDeriveConnector.java
+++ b/src/ui/avatarrd/AvatarRDDeriveConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDDeriveConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDElementReference.java b/src/ui/avatarrd/AvatarRDElementReference.java
index 488a2f7c36dfab4e84a16c3b1902e5fbb871f398..72db3f7b66cb03847da165da2369078e49e11c07 100644
--- a/src/ui/avatarrd/AvatarRDElementReference.java
+++ b/src/ui/avatarrd/AvatarRDElementReference.java
@@ -47,16 +47,11 @@
 package ui.avatarrd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarRDElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDPanel.java b/src/ui/avatarrd/AvatarRDPanel.java
index 9bded347721662aba219170d34cb99c20f008ed7..c54ebe6a4b4d6b448910dabb65331cd8aa5b2bfa 100755
--- a/src/ui/avatarrd/AvatarRDPanel.java
+++ b/src/ui/avatarrd/AvatarRDPanel.java
@@ -47,10 +47,13 @@
 package ui.avatarrd;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
 public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
     public Vector validated, ignored;
     
diff --git a/src/ui/avatarrd/AvatarRDProperty.java b/src/ui/avatarrd/AvatarRDProperty.java
index a017e1f87fe6c67eb78c783f56d002e0d46b0ebb..7c6420e9ffa1d17cf0e6da1159b1c132db533248 100755
--- a/src/ui/avatarrd/AvatarRDProperty.java
+++ b/src/ui/avatarrd/AvatarRDProperty.java
@@ -47,16 +47,11 @@
 package ui.avatarrd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDRefineConnector.java b/src/ui/avatarrd/AvatarRDRefineConnector.java
index 01307813543cdcb3a15596156d5efa0c82393378..e6c767db173fb3eb29e1510c1c73443a59518af5 100755
--- a/src/ui/avatarrd/AvatarRDRefineConnector.java
+++ b/src/ui/avatarrd/AvatarRDRefineConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDRefineConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDRequirement.java b/src/ui/avatarrd/AvatarRDRequirement.java
index e9cebc2a41e578c291c371856b3c74dba3c3e689..175821a1161168293861228c0ecafd6af80d796b 100755
--- a/src/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/ui/avatarrd/AvatarRDRequirement.java
@@ -47,15 +47,19 @@
 package ui.avatarrd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class AvatarRDRequirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDSatisfyConnector.java b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
index ff11f0093c021a7fabae2831e321ffff5e85f5c3..66c9c5e36f58399b5dcf21dece22ea40d7672884 100755
--- a/src/ui/avatarrd/AvatarRDSatisfyConnector.java
+++ b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
@@ -47,13 +47,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDSatisfyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDToolBar.java b/src/ui/avatarrd/AvatarRDToolBar.java
index c1b0c30c75b2a07cf1d85b1513be3417eb6b136b..652560b18c573477fc3ca3c1cf9d091ec651aac9 100755
--- a/src/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/ui/avatarrd/AvatarRDToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarrd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarRDToolBar extends TToolBar {
 
     public AvatarRDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDVerifyConnector.java b/src/ui/avatarrd/AvatarRDVerifyConnector.java
index a6462c04470af79e97400eb3cd122dc2235e735b..5458fb420178980386bef9c0446e79a3d56451dc 100755
--- a/src/ui/avatarrd/AvatarRDVerifyConnector.java
+++ b/src/ui/avatarrd/AvatarRDVerifyConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDVerifyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarsmd/AvatarSMDBasicComponent.java b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
index 7619ec116a1d9ea89cb744031f16b9ed043afa36..1440d9e331e87a6dafeca3daeb07aa0d909e760c 100644
--- a/src/ui/avatarsmd/AvatarSMDBasicComponent.java
+++ b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
@@ -46,10 +46,6 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
 import ui.*;
 
 public abstract class AvatarSMDBasicComponent extends TGCWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarsmd/AvatarSMDChoice.java b/src/ui/avatarsmd/AvatarSMDChoice.java
index 6a25ce126f8bdb33f5ee4efd58d61b09309ede39..9dd3cc34727d37c141598f63a0bdfce80b977a1d 100755
--- a/src/ui/avatarsmd/AvatarSMDChoice.java
+++ b/src/ui/avatarsmd/AvatarSMDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarSMDChoice extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight, PartOfInvariant {
     private int lineLength = 10;
     private int lineOutLength = 10;
diff --git a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
index 362ea8a650a3edd596212d16d6f8d73fc0771233..95b182c2f57496350a36772fbd795321664278aa 100644
--- a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
+++ b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarsmd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarSMDConnectingPoint extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/avatarsmd/AvatarSMDConnector.java b/src/ui/avatarsmd/AvatarSMDConnector.java
index e7729795181d97d4110e9ea487d87b2683e551c4..b18678b60a92d7f4579e341b35ec4fa569f2c71a 100644
--- a/src/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/ui/avatarsmd/AvatarSMDConnector.java
@@ -46,14 +46,14 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints {
     protected int arrowLength = 10;
     //protected AvatarSMDTransitionInfo myTransitionInfo;
diff --git a/src/ui/avatarsmd/AvatarSMDExpireTimer.java b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
index 74eee38370025868d586c9a74b58cf6c6f7954b4..2cbee164c74e9fd0ff9dab238d04dcde6ee84102 100644
--- a/src/ui/avatarsmd/AvatarSMDExpireTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
@@ -46,15 +46,15 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDExpireTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
index c3fc4986a3a84ff56ae7a9d15aaed8c3dfabdc0f..c32869b8b77758dc14cad32c435dba3045b04c89 100644
--- a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
+++ b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
@@ -38,36 +38,18 @@
 
 package ui.avatarsmd;
 
-import java.util.LinkedList;
-
-import java.awt.Graphics;
-import java.awt.Color;
-
-import javax.swing.JFrame;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element; 
-
 import myutil.GraphicLib;
-
-import ui.TAttribute;
-import ui.AvatarSignal;
-import ui.BasicErrorHighlight;
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ErrorHighlight;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.MalformedModelingException;
-import ui.MainGUI;
-import ui.TURTLEPanel;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 import ui.avatarbd.AvatarBDLibraryFunction;
 import ui.window.JDialogSMDLibraryFunctionCall;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+
 /**
 * @version 1.0 04.18.2016
 * @author Florian LUGOU
diff --git a/src/ui/avatarsmd/AvatarSMDPanel.java b/src/ui/avatarsmd/AvatarSMDPanel.java
index bb93faa155ec768888c72507a9afbf1a17a3faa1..512ea7cf25032194fca540035753251cdb171a61 100755
--- a/src/ui/avatarsmd/AvatarSMDPanel.java
+++ b/src/ui/avatarsmd/AvatarSMDPanel.java
@@ -47,14 +47,15 @@
 package ui.avatarsmd;
 
 //import java.awt.*;
+
+import ui.*;
+
 import java.util.*;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarSMDPanel extends TDiagramPanel implements TDPWithAttributes {
     
     public  AvatarSMDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/avatarsmd/AvatarSMDParallel.java b/src/ui/avatarsmd/AvatarSMDParallel.java
index fc6743afdd747cbd28425518de2232746af567bf..620d360f48d2109c742a3eb67093e9cf5ddbc55e 100755
--- a/src/ui/avatarsmd/AvatarSMDParallel.java
+++ b/src/ui/avatarsmd/AvatarSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarSMDParallel extends AvatarSMDBasicComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/avatarsmd/AvatarSMDRandom.java b/src/ui/avatarsmd/AvatarSMDRandom.java
index f61dba44010040600d05d2194e1a7a94815cf6f2..67a797b24f0626aff81187411960e6c8bc6f33bf 100755
--- a/src/ui/avatarsmd/AvatarSMDRandom.java
+++ b/src/ui/avatarsmd/AvatarSMDRandom.java
@@ -46,15 +46,16 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarSMDRandom  extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
index 0f7bf69d8ca39fe76b1cb93fd7999cb8a81f00e9..5098b6f7816e6c5ec99417b0b9a0336ddf87f12a 100644
--- a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDResetTimer.java b/src/ui/avatarsmd/AvatarSMDResetTimer.java
index bfd106d458b157d90117f20e2c13ee954058dc5e..89655cc42517fce94a09da432733fe8e84e796f7 100644
--- a/src/ui/avatarsmd/AvatarSMDResetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDResetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDResetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSendSignal.java b/src/ui/avatarsmd/AvatarSMDSendSignal.java
index 0525f72509dbb5f2b4d8afd9d305ab2c3d1693bf..53ff79352fc76af9fa6ae2e76375c709cefbab2b 100644
--- a/src/ui/avatarsmd/AvatarSMDSendSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDSendSignal.java
@@ -46,15 +46,14 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDSendSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSetTimer.java b/src/ui/avatarsmd/AvatarSMDSetTimer.java
index b302328678da014f6e420231e528cb697b4db926..15f998301da8b8c2f51f80c05632193e8fab8447 100644
--- a/src/ui/avatarsmd/AvatarSMDSetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDSetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDSetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDStartState.java b/src/ui/avatarsmd/AvatarSMDStartState.java
index 6cda1f995dd354b3426eb7ccfde4350e4111c104..dfe2becdf2acac24d68e23367257be994498a658 100644
--- a/src/ui/avatarsmd/AvatarSMDStartState.java
+++ b/src/ui/avatarsmd/AvatarSMDStartState.java
@@ -46,12 +46,12 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarSMDStartState extends AvatarSMDBasicComponent implements EmbeddedComment, PartOfInvariant{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarsmd/AvatarSMDState.java b/src/ui/avatarsmd/AvatarSMDState.java
index 02a8f9bf9c7ba6c773fd2a74fcce31ddd092bc53..f9deccf91b18a77fd38393d9de671726efbe9981 100644
--- a/src/ui/avatarsmd/AvatarSMDState.java
+++ b/src/ui/avatarsmd/AvatarSMDState.java
@@ -46,15 +46,18 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class AvatarSMDState extends TGCScalableWithInternalComponent implements AllowedBreakpoint, CheckableAccessibility, CheckableLatency, CheckableInvariant, SwallowTGComponent, SwallowedTGComponent, PartOfInvariant, PartOfHighInvariant, WithAttributes {
@@ -783,6 +786,7 @@ public class AvatarSMDState extends TGCScalableWithInternalComponent implements
             //TraceManager.addDev("Setting state " + _name + " as info=" + _info);
             securityInformation = _info;
         }
+        // FIXME: does it really work? Name comes in the form "s1__s2__s3" and we compare only to "s1", "s2" and "s3"
         for(int i=0; i<nbInternalTGComponent; i++) {
             if (tgcomponent[i] instanceof AvatarSMDState) {
                 ((AvatarSMDState)tgcomponent[i]).setSecurityInfo(_info, _name);
diff --git a/src/ui/avatarsmd/AvatarSMDStopState.java b/src/ui/avatarsmd/AvatarSMDStopState.java
index 93a7f097e4475359d7196642471811e38d29f8b1..b723fcb7d823a4fb4786a051c2e6c6426dc9077b 100644
--- a/src/ui/avatarsmd/AvatarSMDStopState.java
+++ b/src/ui/avatarsmd/AvatarSMDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarSMDStopState extends AvatarSMDBasicComponent implements EmbeddedComment, AllowedBreakpoint, PartOfInvariant, PartOfHighInvariant {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDToolBar.java b/src/ui/avatarsmd/AvatarSMDToolBar.java
index 0acdbb160a4b370a7fc41a973fd9b371957918fd..1153973756abc99262920aa5d92d3bc0c4cbd10b 100755
--- a/src/ui/avatarsmd/AvatarSMDToolBar.java
+++ b/src/ui/avatarsmd/AvatarSMDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarSMDToolBar extends TToolBar {
     
     
diff --git a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
index d7b5f9ad5d9053f57677620bec9fbda59560cf24..b974a0ca03e0818ba2ecbe883ac881db63f68768 100755
--- a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -47,16 +47,20 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogAvatarTransition;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent {
 
diff --git a/src/ui/cd/TCDActivityDiagramBox.java b/src/ui/cd/TCDActivityDiagramBox.java
index 15a7f0c220c1f806dcd27649766e60962882e811..3be26df1db884e0c9c90a2c27b76f2daffd0155d 100755
--- a/src/ui/cd/TCDActivityDiagramBox.java
+++ b/src/ui/cd/TCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TCDActivityDiagramBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDAttributeBox.java b/src/ui/cd/TCDAttributeBox.java
index b0ef7175908370ef5bd7c8cc199739a1aac5f3cc..7e2607051401fd85686eca5918496329a05ef0c7 100755
--- a/src/ui/cd/TCDAttributeBox.java
+++ b/src/ui/cd/TCDAttributeBox.java
@@ -48,12 +48,13 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
+import ui.*;
+import ui.window.JDialogAttribute;
 
+import java.util.Iterator;
+import java.util.List;
 
 //import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TCDAttributeBox extends TGCAttributeBox {
     
diff --git a/src/ui/cd/TCDAttributeBoxNoConnection.java b/src/ui/cd/TCDAttributeBoxNoConnection.java
index 09455ea4933907e6419f0b6b99377eafce02f54e..76b797c84638cbed29f4ab120f4a37c97f01a08f 100755
--- a/src/ui/cd/TCDAttributeBoxNoConnection.java
+++ b/src/ui/cd/TCDAttributeBoxNoConnection.java
@@ -49,7 +49,7 @@ package ui.cd;
 
 
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TCDAttributeBoxNoConnection extends TCDAttributeBox {
     
diff --git a/src/ui/cd/TCDAttributeGateBox.java b/src/ui/cd/TCDAttributeGateBox.java
index 5dd47780114e8470c51aa042879d63e1233e25f5..c05a2a58fd71c3449a3af579146080d965d520a8 100755
--- a/src/ui/cd/TCDAttributeGateBox.java
+++ b/src/ui/cd/TCDAttributeGateBox.java
@@ -48,9 +48,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TCDAttributeGateBox extends TGCAttributeBox {
     
diff --git a/src/ui/cd/TCDCompositionOperator.java b/src/ui/cd/TCDCompositionOperator.java
index 8966620d74508f01fe569202150f04e64aac89b4..3d4188271d34b7a6d7f8068a28b410005c42eb7b 100755
--- a/src/ui/cd/TCDCompositionOperator.java
+++ b/src/ui/cd/TCDCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TCDCompositionOperator extends TGCWithInternalComponent implements CompositionOperatorInterface {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDCompositionOperatorWithSynchro.java b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
index 59cf62a6932bb1c36e42e6914e77c919d4fbaef0..5fd9693909f2f1839da710b81c4be5eee332dcb8 100755
--- a/src/ui/cd/TCDCompositionOperatorWithSynchro.java
+++ b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
@@ -48,10 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.LinkedList;
+
 public abstract class TCDCompositionOperatorWithSynchro extends TCDCompositionOperator {
 	protected TClassSynchroInterface t1;
 	protected TClassSynchroInterface t2;
diff --git a/src/ui/cd/TCDInvocationOperator.java b/src/ui/cd/TCDInvocationOperator.java
index 8833465d403e2d2bf0b0215265ca6716ddf7c106..9a2f92fb4d7bd4e562fa0f11c69c8e065d46aba2 100755
--- a/src/ui/cd/TCDInvocationOperator.java
+++ b/src/ui/cd/TCDInvocationOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDInvocationOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassSynchroInterface oldt1;
     protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDOperationBox.java b/src/ui/cd/TCDOperationBox.java
index 59773fa6d2d64ed9f5e4974c9cf18b83211ea4d1..29ad5756d2c784790192817d7bff728204fdea08 100755
--- a/src/ui/cd/TCDOperationBox.java
+++ b/src/ui/cd/TCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TCDOperationBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDOperationBoxNoConnection.java b/src/ui/cd/TCDOperationBoxNoConnection.java
index 7f789e5348c084372354292f96f2356a41dd5e92..0d1eade44401fae35ecce64cb7daa1bd1e8ccf58 100755
--- a/src/ui/cd/TCDOperationBoxNoConnection.java
+++ b/src/ui/cd/TCDOperationBoxNoConnection.java
@@ -51,7 +51,11 @@ package ui.cd;
 //import javax.swing.*;
 
 //import myutil.*;
-import ui.*;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TCDOperationBoxNoConnection extends TCDOperationBox {
     
diff --git a/src/ui/cd/TCDParallelOperator.java b/src/ui/cd/TCDParallelOperator.java
index 5e09da1c02821842af479215f5cfdd49c2825d75..fd659353459f318d22b857d85b6d7105ec9506ba 100755
--- a/src/ui/cd/TCDParallelOperator.java
+++ b/src/ui/cd/TCDParallelOperator.java
@@ -50,7 +50,10 @@ package ui.cd;
 //import java.awt.*;
 //import javax.swing.*;
 
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDParallelOperator extends TCDCompositionOperator {
 
diff --git a/src/ui/cd/TCDPreemptionOperator.java b/src/ui/cd/TCDPreemptionOperator.java
index e3fc1475fec8fb99c8321b8d780f2abceab1c78e..369f763f7cc0da1f905b4e9d0c869314379c5525 100755
--- a/src/ui/cd/TCDPreemptionOperator.java
+++ b/src/ui/cd/TCDPreemptionOperator.java
@@ -48,7 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDPreemptionOperator extends TCDCompositionOperator {
 
diff --git a/src/ui/cd/TCDReducedAttributeBox.java b/src/ui/cd/TCDReducedAttributeBox.java
index 0985000b70f8cbc84b581aba2a96e54a371431fc..270c9fc9ff4b1455043bad21f0adb6e496601be5 100755
--- a/src/ui/cd/TCDReducedAttributeBox.java
+++ b/src/ui/cd/TCDReducedAttributeBox.java
@@ -49,13 +49,14 @@ package ui.cd;
 
 //import java.awt.*;
 //import javax.swing.*;
-import java.util.*;
 
-//import org.w3c.dom.*;
+import ui.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.util.List;
 
+//import org.w3c.dom.*;
 //import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TCDReducedAttributeBox extends TGCReducedAttributeBox {
     
diff --git a/src/ui/cd/TCDReducedAttributeGateBox.java b/src/ui/cd/TCDReducedAttributeGateBox.java
index 07aea5e64fde164140310dcd3732c63368f13da4..33b63123fa39a09fb95a3ebfe10bd9f3cefd22de 100755
--- a/src/ui/cd/TCDReducedAttributeGateBox.java
+++ b/src/ui/cd/TCDReducedAttributeGateBox.java
@@ -47,10 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.awt.*;
 
 public class TCDReducedAttributeGateBox extends TGCReducedAttributeBox {
     protected Color myColor;
diff --git a/src/ui/cd/TCDSequenceOperator.java b/src/ui/cd/TCDSequenceOperator.java
index ad8b80dcb907ab3a0c3ce5e75c0eec67664ac320..540440ae6d5546c639dc1126bb636c60865eb122 100755
--- a/src/ui/cd/TCDSequenceOperator.java
+++ b/src/ui/cd/TCDSequenceOperator.java
@@ -48,8 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDSequenceOperator extends TCDCompositionOperator {
     
diff --git a/src/ui/cd/TCDSynchroGateList.java b/src/ui/cd/TCDSynchroGateList.java
index 9dff70c1a68565f584441689e9ce8d7c8b0e7a21..27858ddc6ceede9d10aa1fc6e7c9b593a3975f82 100755
--- a/src/ui/cd/TCDSynchroGateList.java
+++ b/src/ui/cd/TCDSynchroGateList.java
@@ -46,16 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogSynchro;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TCDSynchroGateList extends TGCWithoutInternalComponent {
     protected TClassSynchroInterface t1;
diff --git a/src/ui/cd/TCDSynchroOperator.java b/src/ui/cd/TCDSynchroOperator.java
index 54a4f6a0c12bd03c530cbdec3d728a1f7be1f8a7..3af2fc52d1bd93ae8f539f55399417a5f5c0fd4c 100755
--- a/src/ui/cd/TCDSynchroOperator.java
+++ b/src/ui/cd/TCDSynchroOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDSynchroOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassSynchroInterface oldt1;
     protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDTClass.java b/src/ui/cd/TCDTClass.java
index 69e319ec6a6a3154e2e06cbaf2f0527f1613033a..8ffed2999ea55fb35cae6a902d4cb589a396694b 100755
--- a/src/ui/cd/TCDTClass.java
+++ b/src/ui/cd/TCDTClass.java
@@ -47,16 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.ad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.ad.TActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TCDTClass extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
     public String oldValue;
diff --git a/src/ui/cd/TCDTData.java b/src/ui/cd/TCDTData.java
index ae07cd4cc5acd7ce76c45912d3573ff34b2f0e66..514f523ec81f853595f635bb29e45a95ae905a7d 100755
--- a/src/ui/cd/TCDTData.java
+++ b/src/ui/cd/TCDTData.java
@@ -47,15 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-//import java.awt.event.*;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.util.LinkedList;
 
+//import java.awt.event.*;
 //import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
 //import ui.ad.*;
 //import ui.window.*;
 
diff --git a/src/ui/cd/TCDTObject.java b/src/ui/cd/TCDTObject.java
index 2f9de5566f99cdd2c613b514300ce81ef1bfe744..5a151a97a08e30b0e28e0cefbc7f3410aaef8a93 100755
--- a/src/ui/cd/TCDTObject.java
+++ b/src/ui/cd/TCDTObject.java
@@ -47,17 +47,20 @@
 package ui.cd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.ad.*;
-import ui.window.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.window.JDialogTObjectName;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TCDTObject extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
     public String oldValue;
diff --git a/src/ui/cd/TCDWatchdogGateList.java b/src/ui/cd/TCDWatchdogGateList.java
index 4839322a70e842f3933af06bf83d8d6cece41bf6..d36e404bc6f6616a5c67f224be5db1478b24acf5 100755
--- a/src/ui/cd/TCDWatchdogGateList.java
+++ b/src/ui/cd/TCDWatchdogGateList.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
     protected TClassInterface t1;
diff --git a/src/ui/cd/TCDWatchdogOperator.java b/src/ui/cd/TCDWatchdogOperator.java
index 35a6c0af8e0163a60f029ca31dd6fac2c0f10f86..7d9869fbb8a119ac784b715461c5c9783d92ef47 100755
--- a/src/ui/cd/TCDWatchdogOperator.java
+++ b/src/ui/cd/TCDWatchdogOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDWatchdogOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassInterface oldt1;
     
diff --git a/src/ui/cd/TClassDiagramPanel.java b/src/ui/cd/TClassDiagramPanel.java
index 1b85b89a83e7faf0deaa7dc9c8c78303c02c6179..0ec9383717578e08e208e1929d263340eeef4ba4 100755
--- a/src/ui/cd/TClassDiagramPanel.java
+++ b/src/ui/cd/TClassDiagramPanel.java
@@ -47,13 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
-
-import org.w3c.dom.*;
-
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+
 public class TClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
     
     public  TClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/cd/TClassDiagramToolBar.java b/src/ui/cd/TClassDiagramToolBar.java
index 101263dfd9fc13792c2955d11e52943276d900d6..b70514322c06862811a0cf6208fc38ba73c6c9fd 100755
--- a/src/ui/cd/TClassDiagramToolBar.java
+++ b/src/ui/cd/TClassDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TClassDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/cd/TGCReducedAttributeBox.java b/src/ui/cd/TGCReducedAttributeBox.java
index 5c403d26bc5897d2b14d252adb200be0812287d9..2877bf733b2492a031bd9245a910b4040f6c385a 100755
--- a/src/ui/cd/TGCReducedAttributeBox.java
+++ b/src/ui/cd/TGCReducedAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public abstract class TGCReducedAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/cd/TGConnectingPointAssociation.java b/src/ui/cd/TGConnectingPointAssociation.java
index 80c9ea5c017480773e7d5aa0b5eafd21dfd4265c..4a3a20607d08037668e8c714db17557a68e8ef71 100755
--- a/src/ui/cd/TGConnectingPointAssociation.java
+++ b/src/ui/cd/TGConnectingPointAssociation.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/cd/TGConnectingPointCompositionOperator.java b/src/ui/cd/TGConnectingPointCompositionOperator.java
index ad31bbb22a5a877a791c34d09f97a9336045fb0b..fc81b70f8663499211c0e462aa4efd8e5130039f 100755
--- a/src/ui/cd/TGConnectingPointCompositionOperator.java
+++ b/src/ui/cd/TGConnectingPointCompositionOperator.java
@@ -47,8 +47,9 @@
 package ui.cd;
 
 
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointCompositionOperator extends  TGConnectingPoint{
     
diff --git a/src/ui/cd/TGConnectingPointTClasses.java b/src/ui/cd/TGConnectingPointTClasses.java
index 1d137f64eb8e6d6f7f19032fb0941556544081f7..381cca2880fa891d4bc06f6562b481d8206e945f 100755
--- a/src/ui/cd/TGConnectingPointTClasses.java
+++ b/src/ui/cd/TGConnectingPointTClasses.java
@@ -47,8 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTClasses extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/cd/TGConnectorAssociation.java b/src/ui/cd/TGConnectorAssociation.java
index 5a1f085da4880e5ac3c71444cee6be551739c6a0..6f06e575fc8ee4c813bd5629caab5b378e3f4436 100755
--- a/src/ui/cd/TGConnectorAssociation.java
+++ b/src/ui/cd/TGConnectorAssociation.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
  */
  
 package ui.cd;
-  
+
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TGConnectorAssociation extends TGConnector {
 	protected TGConnectingPointGroup tg;
 
diff --git a/src/ui/cd/TGConnectorAssociationWithNavigation.java b/src/ui/cd/TGConnectorAssociationWithNavigation.java
index 529c6a72418203ff34821a928b2b9b545c190514..0e7adfd3a5ac94c649717c89c64d8306071ea002 100755
--- a/src/ui/cd/TGConnectorAssociationWithNavigation.java
+++ b/src/ui/cd/TGConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorAssociationWithNavigation extends TGConnectorAssociation {
 	protected int arrowLength = 15;
diff --git a/src/ui/dd/TDDArtifact.java b/src/ui/dd/TDDArtifact.java
index 8da5fd0510526e43d255a7a354e5f895616c4ae1..2450b6b8161eebc5984a63b021894cb4a864c746 100755
--- a/src/ui/dd/TDDArtifact.java
+++ b/src/ui/dd/TDDArtifact.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import ui.cd.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TDDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/dd/TDDNode.java b/src/ui/dd/TDDNode.java
index ffc317ceb1cff9ace7bc7003bcaff6b1a1d87611..ff0018cdc80234ccfc3777d03d72042337ee80da 100755
--- a/src/ui/dd/TDDNode.java
+++ b/src/ui/dd/TDDNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TDDNode extends TGCWithInternalComponent implements SwallowTGComponent {
     private int textY1 = 15;
diff --git a/src/ui/dd/TDeploymentDiagramPanel.java b/src/ui/dd/TDeploymentDiagramPanel.java
index e00318d910a3fce201b1a3273bd204df11d6a0b0..479dc96240475f2efc3400138acc28ed89f7143b 100755
--- a/src/ui/dd/TDeploymentDiagramPanel.java
+++ b/src/ui/dd/TDeploymentDiagramPanel.java
@@ -47,10 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 public class TDeploymentDiagramPanel extends TDiagramPanel {
     
     public  TDeploymentDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/dd/TDeploymentDiagramToolBar.java b/src/ui/dd/TDeploymentDiagramToolBar.java
index 193c27c97e01d59389b3e4b47e81448530223778..3933e13cf810dabfb32a055295836e957d453eef 100755
--- a/src/ui/dd/TDeploymentDiagramToolBar.java
+++ b/src/ui/dd/TDeploymentDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TDeploymentDiagramToolBar extends TToolBar {
     
     public TDeploymentDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/dd/TGConnectingPointDD.java b/src/ui/dd/TGConnectingPointDD.java
index 9e10fff1d0318c31a3309666ebe6f0f3493b109f..70ed18e6e8197d8425e5e18d69075f309bea29c6 100755
--- a/src/ui/dd/TGConnectingPointDD.java
+++ b/src/ui/dd/TGConnectingPointDD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointDD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/dd/TGConnectorLinkNode.java b/src/ui/dd/TGConnectorLinkNode.java
index 82ab26309534a5d6242dc84d28a5516c75cb663e..2e7eeeac8a8d7e738349aa09166501369852010d 100755
--- a/src/ui/dd/TGConnectorLinkNode.java
+++ b/src/ui/dd/TGConnectorLinkNode.java
@@ -47,18 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogLinkNode;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorLinkNode extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
index c777c9431f1e74eac3503505e379c73fde2ae0b7..a2750b4ecdec25b7c4df983ccb5c123e8e517257 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.diplodocusmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class DiplodocusMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
index bc591e1dd69840715f9231cde369f0dc6d471687..4b1e8b88ae94a66ef1ca159ca7a595ab07d2715b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.diplodocusmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class DiplodocusMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 102952c4c7e878743ead885b542d54c792874cb2..38360932bc907f5a991075ad28b5f0595ec9192b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -47,12 +47,14 @@
 
 package ui.diplodocusmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     //protected boolean emptyText;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
index da2cd00c4488bde4011c71da9b917b0fac868b9c..3af9ffc572ca07cdf402e66ddd9072077525724a 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
 package ui.diplodocusmethodology;
 
 import org.w3c.dom.Element;
-
 import ui.*;
 
 public class DiplodocusMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
index 46a7f54ccfdbe10bd4e160bd19b954613b88f881..a96642041acf75c7d9dbd7978d339418ec8501c0 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
@@ -49,14 +49,16 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index b70992ba40663ec67e1b88ba606895c2a2c5477b..8b0b8db18dfdead93794b7d6a1ff5d3eeaa8ec97 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -48,15 +48,9 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class DiplodocusMethodologyDiagramReferenceToApplication extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
index f27edfbf1862488173e2188ccdfde68294c0e240..cece2c8b1b4ec5cba150a5caf72261dad124e4d2 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
@@ -48,15 +48,7 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToArchitecture extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
index b1360780e6f8632b92a587f1b7115beb952a02e0..952304e1ba93655215721949c3b015be04269c84 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
@@ -48,15 +48,7 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToCP extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 7de4812802930e5b60d07e67b165d03974203b03..2530ca2f2c36deb0b88c74c1936b6e46c4a3f273 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -48,15 +48,9 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index 0f24bfc46d31960efd16bfecdb9c07ac0b471ec3..0f05ed609c3ae5094af2f8cef345cb133a68548b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToRequirement extends DiplodocusMethodologyDiagramReference  {
    
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
index f45f0ec96af7310d06b6381eed6f03bc2dc17f49..d6359be81d38ee52d2df91aee6343d3f11214b45 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.diplodocusmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
     
     public DiplodocusMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/ebrdd/EBRDDActionState.java b/src/ui/ebrdd/EBRDDActionState.java
index 6604d6985c32b3e8c73dc1776b4e34fbc37804a5..5f352f60a46d0e93036c7cf7be9d87cdde6f71c2 100755
--- a/src/ui/ebrdd/EBRDDActionState.java
+++ b/src/ui/ebrdd/EBRDDActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ebrdd/EBRDDAttributeBox.java b/src/ui/ebrdd/EBRDDAttributeBox.java
index 8ac6fb6785f5b8ec19af56e17360dcb0fd5581d6..c70404c5213e4cdc330901adb23004eea254bcbf 100644
--- a/src/ui/ebrdd/EBRDDAttributeBox.java
+++ b/src/ui/ebrdd/EBRDDAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 //import tmltranslator.*;
 
diff --git a/src/ui/ebrdd/EBRDDChoice.java b/src/ui/ebrdd/EBRDDChoice.java
index 3d72d03537a9c56997801c4ed7893c0a94a7c00d..57f321863e1254572394019574a18739864d99aa 100755
--- a/src/ui/ebrdd/EBRDDChoice.java
+++ b/src/ui/ebrdd/EBRDDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/ebrdd/EBRDDERB.java b/src/ui/ebrdd/EBRDDERB.java
index b2b0c1bc674b55fbb9d1e4ee1c6c57ae680c9eda..7fc375635a533006b6477dc3231e5ddf07b2fca1 100644
--- a/src/ui/ebrdd/EBRDDERB.java
+++ b/src/ui/ebrdd/EBRDDERB.java
@@ -46,16 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogERB;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDERC.java b/src/ui/ebrdd/EBRDDERC.java
index 0b857e847bab02aa72a2b720f96ee8e641678b57..d31bad6e739743b3f023d3f5a945da600731f166 100644
--- a/src/ui/ebrdd/EBRDDERC.java
+++ b/src/ui/ebrdd/EBRDDERC.java
@@ -46,18 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGComponent {
     /*private int textY1 = 15;
diff --git a/src/ui/ebrdd/EBRDDESO.java b/src/ui/ebrdd/EBRDDESO.java
index be5ff92f7be01d19fbe18cc79ae7b9a1d3bb20d0..25ff87caeaf775ad2688551c405f13a59c014641 100644
--- a/src/ui/ebrdd/EBRDDESO.java
+++ b/src/ui/ebrdd/EBRDDESO.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogESO;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private int lineLength = 0;
diff --git a/src/ui/ebrdd/EBRDDForLoop.java b/src/ui/ebrdd/EBRDDForLoop.java
index 676e3cc0840bae0b9a006ba5ccba6cc6f83314d2..aafe5274f30cd40a31e43dd11e15566044c27b15 100755
--- a/src/ui/ebrdd/EBRDDForLoop.java
+++ b/src/ui/ebrdd/EBRDDForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class EBRDDForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDPanel.java b/src/ui/ebrdd/EBRDDPanel.java
index e343c34053ca4aeb878d0083574fb260b82315b9..b76f990e9103df01a0391cc57b8d9566ec01ccaa 100644
--- a/src/ui/ebrdd/EBRDDPanel.java
+++ b/src/ui/ebrdd/EBRDDPanel.java
@@ -47,14 +47,17 @@
 package ui.ebrdd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class EBRDDPanel extends TDiagramPanel {
     
     public  EBRDDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ebrdd/EBRDDSequence.java b/src/ui/ebrdd/EBRDDSequence.java
index 7ecf7a3a6fbf87af78b95a156b67e2b878821a34..e240745ae6dfa4ab51004d48b077256e890a10ae 100644
--- a/src/ui/ebrdd/EBRDDSequence.java
+++ b/src/ui/ebrdd/EBRDDSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class EBRDDSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
 	private int textX, textY;
diff --git a/src/ui/ebrdd/EBRDDStartState.java b/src/ui/ebrdd/EBRDDStartState.java
index c1ed1bfc01d0ffc8b90bbde71976d16417789b31..be841646f3abd0d0ce35e5264cc9b9465f8fd4fc 100755
--- a/src/ui/ebrdd/EBRDDStartState.java
+++ b/src/ui/ebrdd/EBRDDStartState.java
@@ -46,12 +46,12 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/ebrdd/EBRDDStopState.java b/src/ui/ebrdd/EBRDDStopState.java
index 7b66c4718d8b5d801df205e25f36c6d20dbc0921..93243660b2906e6a972013da9197e38c307b991e 100755
--- a/src/ui/ebrdd/EBRDDStopState.java
+++ b/src/ui/ebrdd/EBRDDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class EBRDDStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDToolBar.java b/src/ui/ebrdd/EBRDDToolBar.java
index 86f4bf94b802c7535639cd6f1de20cf8af562588..ce2dad67c0fe20a8dce11dd9ce2c18bf298480ca 100755
--- a/src/ui/ebrdd/EBRDDToolBar.java
+++ b/src/ui/ebrdd/EBRDDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class EBRDDToolBar extends TToolBar {
     
     
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDD.java b/src/ui/ebrdd/TGConnectingPointEBRDD.java
index 294e6670acec3ac7f3ff238e8048da80bfcb4646..2a7046cb8aac5226c6c31cf264ce97ff1cec3878 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDD.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ebrdd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointEBRDD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
index a53245f6e3d7b23cd40fe2e6045307dc16d337cf..90bc03f4972e504ad26780a311576b8982747fe6 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ebrdd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointEBRDDERC extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ebrdd/TGConnectorEBRDD.java b/src/ui/ebrdd/TGConnectorEBRDD.java
index 0abf8dba0fd40a62277a0a87c6fb5d20069dcd0b..04ac08dddd5d368f5dd2dcbd51260841980a8ea3 100755
--- a/src/ui/ebrdd/TGConnectorEBRDD.java
+++ b/src/ui/ebrdd/TGConnectorEBRDD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorEBRDD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/ebrdd/TGConnectorEBRDDERC.java b/src/ui/ebrdd/TGConnectorEBRDDERC.java
index 05dc8c02d123c6058153b9ee0d0621feeafb3797..ae2e05116ac7cfc31f719837c1d676816093e608 100755
--- a/src/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
-import org.w3c.dom.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorEBRDDERC extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/file/AUTFileFilter.java b/src/ui/file/AUTFileFilter.java
index fa5581fc39f708dcef5c8041cb422fdde72c6129..d58803d3b80849364885994774795647fc99429b 100755
--- a/src/ui/file/AUTFileFilter.java
+++ b/src/ui/file/AUTFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class AUTFileFilter extends FileFilter {
diff --git a/src/ui/file/BCGFileFilter.java b/src/ui/file/BCGFileFilter.java
index 9a158b4ab884d5a6078055c965b9ff659d9ac7c0..021a5fb5d1347a4e514b74ee25809b315f10c154 100755
--- a/src/ui/file/BCGFileFilter.java
+++ b/src/ui/file/BCGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class BCGFileFilter extends FileFilter {
diff --git a/src/ui/file/DTAFileFilter.java b/src/ui/file/DTAFileFilter.java
index 9e03a5edd879468081f660ddad9f7d9ad6bfe541..ed6922edbd43d6aaf3f5f6ae6907b49af21f8302 100755
--- a/src/ui/file/DTAFileFilter.java
+++ b/src/ui/file/DTAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class DTAFileFilter extends FileFilter {
diff --git a/src/ui/file/MSCFilter.java b/src/ui/file/MSCFilter.java
index dcb590f5ac7974e2165dd7aadf10bac50a99fe4b..2bda288452696433e5f6bf278e29c7ce65f849b9 100755
--- a/src/ui/file/MSCFilter.java
+++ b/src/ui/file/MSCFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class MSCFilter extends FileFilter {
diff --git a/src/ui/file/PNGFilter.java b/src/ui/file/PNGFilter.java
index c5e7abba0596a5ef4225ea2f63ff40ba07a2a59b..d05dfbb02964b3303315779109e0d2277adcb406 100755
--- a/src/ui/file/PNGFilter.java
+++ b/src/ui/file/PNGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class PNGFilter extends FileFilter {
diff --git a/src/ui/file/RGFileFilter.java b/src/ui/file/RGFileFilter.java
index aefef6dbb1b640e2d14b6f3a3fce71db22408843..004f2c9dbca2b7d59aa29469cf029e4db9dfdec6 100755
--- a/src/ui/file/RGFileFilter.java
+++ b/src/ui/file/RGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class RGFileFilter extends FileFilter {
diff --git a/src/ui/file/RTLFileFilter.java b/src/ui/file/RTLFileFilter.java
index 0daa93022d75195f81ecd39ecbcae32abcc1149d..632b1c857b8b7bd971b6a79a6c60c2ebbe81b45f 100755
--- a/src/ui/file/RTLFileFilter.java
+++ b/src/ui/file/RTLFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class RTLFileFilter extends FileFilter {
diff --git a/src/ui/file/TDotFilter.java b/src/ui/file/TDotFilter.java
index 4366c9b8de0508fc31d3fd3a5e5a4ca6d617fe49..d3317c5ad81d3ce1016a92cdd89b185c5c004dad 100755
--- a/src/ui/file/TDotFilter.java
+++ b/src/ui/file/TDotFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TDotFilter extends FileFilter {
diff --git a/src/ui/file/TFileFilter.java b/src/ui/file/TFileFilter.java
index b54dfbbbece1d0201ecd63c61a5efec76a87b519..d4d5b0640f34556d7db2b0674e13bbd6584a3e33 100755
--- a/src/ui/file/TFileFilter.java
+++ b/src/ui/file/TFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TFileFilter extends FileFilter {
diff --git a/src/ui/file/TImgFilter.java b/src/ui/file/TImgFilter.java
index 1f84bf39f332a0548e2819b150e309b986343af4..6df923a4ee7d32a1a6efaae583bc530c0d7310a4 100755
--- a/src/ui/file/TImgFilter.java
+++ b/src/ui/file/TImgFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TImgFilter extends FileFilter {
diff --git a/src/ui/file/TLSAFileFilter.java b/src/ui/file/TLSAFileFilter.java
index f3fbc8532a72240f045a5c81b23fa942e876ce9c..5cb22fbbc5c98ff08b1edd2da45a2f4bf828aae6 100755
--- a/src/ui/file/TLSAFileFilter.java
+++ b/src/ui/file/TLSAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TLSAFileFilter extends FileFilter {
diff --git a/src/ui/file/TLibFilter.java b/src/ui/file/TLibFilter.java
index af865c62d95876bb515b155ac75d60555cc9c78c..3d5beb269a5c1162156a75ac03f534534da5822b 100755
--- a/src/ui/file/TLibFilter.java
+++ b/src/ui/file/TLibFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TLibFilter extends FileFilter {
diff --git a/src/ui/file/TSVGFilter.java b/src/ui/file/TSVGFilter.java
index 805ff98addd294a293e4fee969c7acd5c3678796..f6c78c2f127885b1a99b517019a66f5d4db9fa65 100755
--- a/src/ui/file/TSVGFilter.java
+++ b/src/ui/file/TSVGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TSVGFilter extends FileFilter {
diff --git a/src/ui/file/TTIFFilter.java b/src/ui/file/TTIFFilter.java
index 1093c9cbedae64e12424442655292876a597c16f..ed3ea3a860e95862574396ad4ff0ac61fa0595d2 100755
--- a/src/ui/file/TTIFFilter.java
+++ b/src/ui/file/TTIFFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TTIFFilter extends FileFilter {
diff --git a/src/ui/graph/AUTBlock.java b/src/ui/graph/AUTBlock.java
index 03160d0dd4e07c914b2297b6253f199e7d4f9493..93ffd7dc5000305dceda3e943e60e8e8815387e8 100755
--- a/src/ui/graph/AUTBlock.java
+++ b/src/ui/graph/AUTBlock.java
@@ -45,9 +45,9 @@
 
 package ui.graph;
 
-import myutil.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 
 public class AUTBlock  implements Comparable<AUTBlock> {
 
diff --git a/src/ui/graph/AUTElement.java b/src/ui/graph/AUTElement.java
index 2bc8c1783dfd9fbe3af544bc209be70569d71dbc..a5bbf0b1a9bd37bbdd8e38f2bdd712ec350e62fd 100755
--- a/src/ui/graph/AUTElement.java
+++ b/src/ui/graph/AUTElement.java
@@ -45,8 +45,6 @@
 
 package ui.graph;
 
-import java.util.*;
-
 public class AUTElement implements Comparable<AUTElement> {
 
     public String value;
diff --git a/src/ui/graph/AUTGraph.java b/src/ui/graph/AUTGraph.java
index bdc4b016141c494327d9575f611d9d0eacd4eeb7..35d2d519fb95fae9b5d5fc5c240202793c29c4e2 100755
--- a/src/ui/graph/AUTGraph.java
+++ b/src/ui/graph/AUTGraph.java
@@ -45,10 +45,13 @@
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
+import myutil.Conversion;
+import myutil.GraphAlgorithms;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.*;
 
 public class AUTGraph implements myutil.Graph {
 
diff --git a/src/ui/graph/AUTGraphDisplay.java b/src/ui/graph/AUTGraphDisplay.java
index bdd7f8938033704cd3706a7de0448b319804ee1c..dd3026e124a758e6afa6807e4e2f822b290cb3b9 100755
--- a/src/ui/graph/AUTGraphDisplay.java
+++ b/src/ui/graph/AUTGraphDisplay.java
@@ -45,31 +45,25 @@
 
 package ui.graph;
 
-import ui.*;
-import ui.file.*;
-import java.util.*;
-import java.io.*;
-
-import java.awt.event.MouseListener;
-import java.awt.event.MouseEvent;
-
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import java.util.logging.*;
-
-
-import myutil.*;
+import myutil.TraceManager;
 import org.graphstream.graph.implementations.*;
+import org.graphstream.graph.implementations.MultiGraph;
 import org.graphstream.ui.view.*;
+import org.graphstream.ui.view.Viewer;
 import org.graphstream.ui.view.Viewer.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.PNGFilter;
 
-import org.graphstream.graph.Graph;
-import org.graphstream.graph.implementations.MultiGraph;
-import org.graphstream.ui.view.Viewer;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.logging.Logger;
 
 
 public class AUTGraphDisplay  implements MouseListener, ViewerListener, Runnable {
diff --git a/src/ui/graph/AUTMappingGraph.java b/src/ui/graph/AUTMappingGraph.java
index c7bdad6ce5cc4a63d7416ff58605b3083e785add..40144402cf0a5900be086370d867cbf7b65352a3 100755
--- a/src/ui/graph/AUTMappingGraph.java
+++ b/src/ui/graph/AUTMappingGraph.java
@@ -46,10 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.graph;
 
 import java.awt.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
+import java.util.ArrayList;
 
 public class AUTMappingGraph  extends AUTGraph {
 	
diff --git a/src/ui/graph/AUTPartition.java b/src/ui/graph/AUTPartition.java
index 4bf62d23ca609eb8f013b33f4145b10b64e79fa6..800383e07edbda7d801d796620c49de5bc486371 100755
--- a/src/ui/graph/AUTPartition.java
+++ b/src/ui/graph/AUTPartition.java
@@ -45,7 +45,8 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 public class AUTPartition  {
 
diff --git a/src/ui/graph/AUTSplitter.java b/src/ui/graph/AUTSplitter.java
index 5e24e7083957d1ce55bd23d6901b3de1bcc4a6e5..d081cd13fc219e68fd2b7bf1d2a7b018c9b38f2b 100755
--- a/src/ui/graph/AUTSplitter.java
+++ b/src/ui/graph/AUTSplitter.java
@@ -45,7 +45,7 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class AUTSplitter  {
 
diff --git a/src/ui/graph/AUTState.java b/src/ui/graph/AUTState.java
index 77f6b7570f575191df059d846ca6260f021a6d34..bd3df194413620dfd42761c75fd7c76883695276 100755
--- a/src/ui/graph/AUTState.java
+++ b/src/ui/graph/AUTState.java
@@ -45,7 +45,9 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Random;
 
 public class AUTState implements Comparable<AUTState> {
 
diff --git a/src/ui/graph/CorePowerConsumption.java b/src/ui/graph/CorePowerConsumption.java
index 85a8c0f47127b8ef03ee1b06b6872e5853fd3798..f505467d5896b7f94d51922d6229f8ae525d4fd0 100755
--- a/src/ui/graph/CorePowerConsumption.java
+++ b/src/ui/graph/CorePowerConsumption.java
@@ -45,12 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import vcd.*;
-
 public class CorePowerConsumption  {
     
 	private int nbOfModes;
diff --git a/src/ui/graph/RG.java b/src/ui/graph/RG.java
index b0e7e1993a93a01b6ee2514a77666046f2689d74..4e9ac075d9847f57a52db54799836d8433c7b646 100755
--- a/src/ui/graph/RG.java
+++ b/src/ui/graph/RG.java
@@ -45,11 +45,6 @@
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-
 public class RG {
 
     public String name;
diff --git a/src/ui/graph/VCDGenerator.java b/src/ui/graph/VCDGenerator.java
index 777db440189560a2a8e8c8a1990a2654cab293ea..bfd817ff990274350aa7f01f0e0a303b2bf5adc3 100755
--- a/src/ui/graph/VCDGenerator.java
+++ b/src/ui/graph/VCDGenerator.java
@@ -45,11 +45,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import vcd.VCDContent;
+import vcd.VCDTimeChange;
+import vcd.VCDVariable;
 
-import myutil.*;
-import vcd.*;
+import java.util.ArrayList;
 
 public class VCDGenerator  {
     
diff --git a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
index 73fe55624bfec40bb2eb8ba9d81088e34dae2ae8..8debc09cb6d491cf7a8149c202325db52095604b 100755
--- a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
+++ b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class BenchmarkCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/BusTableModel.java b/src/ui/interactivesimulation/BusTableModel.java
index 18feb4428c83961fb15bff542f6fbd5741a1619f..5ed5d3d7fec3080f18fe61f3859c3309b904d279 100755
--- a/src/ui/interactivesimulation/BusTableModel.java
+++ b/src/ui/interactivesimulation/BusTableModel.java
@@ -46,11 +46,13 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwBus;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
 
 public class BusTableModel extends AbstractTableModel {
     private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/CPUTableModel.java b/src/ui/interactivesimulation/CPUTableModel.java
index 7ae4d0fb94e2da368a036b0c3970044a77a6d969..f2c605aef853cf91ddc113f071c0e9ba245df19c 100755
--- a/src/ui/interactivesimulation/CPUTableModel.java
+++ b/src/ui/interactivesimulation/CPUTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
 import tmltranslator.*;
 
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
 public class CPUTableModel extends AbstractTableModel {
 	private TMLMapping tmap;
 	ArrayList<HwExecutionNode> cpus;
diff --git a/src/ui/interactivesimulation/FormalVerificationToolBar.java b/src/ui/interactivesimulation/FormalVerificationToolBar.java
index bab8b09d65cb6b9023aabcb0bbabd30fdd25c321..a2f077c594ca70adf275b2589332e30ced3caff7 100755
--- a/src/ui/interactivesimulation/FormalVerificationToolBar.java
+++ b/src/ui/interactivesimulation/FormalVerificationToolBar.java
@@ -47,11 +47,10 @@
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class FormalVerificationToolBar extends InteractiveSimulationBar {
 
 
diff --git a/src/ui/interactivesimulation/GenericTransaction.java b/src/ui/interactivesimulation/GenericTransaction.java
index 771dfaa6d25ac1394a51056d95252001d7ed2b3c..381409da4fb5e64b9847f688cc1ffc18d93ccd37 100755
--- a/src/ui/interactivesimulation/GenericTransaction.java
+++ b/src/ui/interactivesimulation/GenericTransaction.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class GenericTransaction  {
 
     public final static int NOT_DEFINED = 0;
diff --git a/src/ui/interactivesimulation/InteractiveSimulationActions.java b/src/ui/interactivesimulation/InteractiveSimulationActions.java
index c168e0b906515a3238223193bc2d6ed6822e1600..867c72c98a176d3f7ff19f506e3c65caf4536b3a 100755
--- a/src/ui/interactivesimulation/InteractiveSimulationActions.java
+++ b/src/ui/interactivesimulation/InteractiveSimulationActions.java
@@ -46,14 +46,13 @@
 
 package ui.interactivesimulation;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
 
 import javax.swing.*;
 import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class InteractiveSimulationActions extends AbstractAction {
     // Actions
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 3c3d18508b3af3907a99113ea5bad4deb0705c1c..e495b38e70c7bad20a0b0e386895bd54860bc688 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -45,90 +45,35 @@
 
 package ui.interactivesimulation;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Vector;
-import java.util.Collections;
-
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-
-import java.util.Date;
-import java.text.*;
-
-import launcher.LauncherException;
-import launcher.RshClient;
-import myutil.Conversion;
-import myutil.ScrolledJTextArea;
-import myutil.TableSorter;
-import myutil.TraceManager;
 import remotesimulation.CommandParser;
 import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
-import tmltranslator.HwA;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLElement;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLTask;
-import ui.ColorManager;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MainGUI;
-import ui.TGComponent;
+import tmltranslator.*;
+import ui.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.List;
 
 public class JFrameInteractiveSimulation extends JFrame implements ActionListener, Runnable, MouseListener, ItemListener, ChangeListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
 
@@ -422,19 +367,14 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
 
         mainTop.add(commands, c02);
 
-        commandTab = new JTabbedPane();
-        //commandTab.setBackground(ColorManager.InteractiveSimulationBackground);
+        // Issue #41 Ordering of tabbed panes 
+        commandTab = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         // Control commands
         jp01 = new JPanel(new BorderLayout());
-        //jp01.setMinimumSize(new Dimension(375, 400));
-        //gridbag01 = new GridBagLayout();
-        //c01 = new GridBagConstraints();
-        //jp01.setLayout(gridbag01);
 
         commandTab.addTab("Control", null, jp01, "Main control commands");
 
-
         mctb = new MainCommandsToolBar(this);
         jp01.add(mctb, BorderLayout.NORTH);
 
@@ -754,7 +694,8 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
         c02.gridwidth = GridBagConstraints.REMAINDER; //end row
         mainTop.add(infos, c02);
 
-        infoTab = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        infoTab = GraphicLib.createTabbedPane();//new JTabbedPane();
         infoTab.setMinimumSize(new Dimension(300, 250));
         infos.add(infoTab, BorderLayout.NORTH);
 
diff --git a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
index fb7b63a4b18b841513067243af4967f8a392b900..90bce05ea7803e0bfb47844d454f16a085506588 100755
--- a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
@@ -46,27 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 //import java.io.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
 
+import myutil.TraceManager;
+import ui.ColorManager;
+import ui.MainGUI;
 
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
-import tmltranslator.*; 
-
-import launcher.*;
-import remotesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
 
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+//import javax.swing.event.*;
 
 
 public	class JFrameSimulationSDPanel extends JFrame implements ActionListener {
@@ -89,7 +80,6 @@ public	class JFrameSimulationSDPanel extends JFrame implements ActionListener {
     
     public InteractiveSimulationActions [] actions;
 	
-	private Frame f;
 	private MainGUI mgui;
 	private String title;
 	//private String hostSystemC;
@@ -109,7 +99,6 @@ public	class JFrameSimulationSDPanel extends JFrame implements ActionListener {
 	public JFrameSimulationSDPanel(Frame _f, MainGUI _mgui, String _title) {
 		super(_title);
 		
-		f = _f;
 		mgui = _mgui;
 		title = _title;
         
@@ -224,6 +213,12 @@ public	class JFrameSimulationSDPanel extends JFrame implements ActionListener {
             sdpanel.setFileReference(_fileReference);
         }
     }
+
+    public void setFileReference(BufferedReader inputStream) {
+        if (sdpanel != null) {
+            sdpanel.setFileReference(inputStream);
+        }
+    }
 	
 	public void setCurrentTime(long timeValue) {
 		status.setText("time = " + timeValue);
diff --git a/src/ui/interactivesimulation/JPanelBreakPoints.java b/src/ui/interactivesimulation/JPanelBreakPoints.java
index f2b07f7230e443b02f579c49a42cfb37ee4b180c..60ac8e339c1ac207eab5ce5b560293a84a707956 100755
--- a/src/ui/interactivesimulation/JPanelBreakPoints.java
+++ b/src/ui/interactivesimulation/JPanelBreakPoints.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public	class JPanelBreakPoints extends JPanel implements ActionListener, ListSelectionListener  {
 	
diff --git a/src/ui/interactivesimulation/JPanelSetVariables.java b/src/ui/interactivesimulation/JPanelSetVariables.java
index 6fb2681fb32e3112d87fc44577d0312212de88de..2d012ad6c350f135d16f6a29be63b8d00b27dc37 100755
--- a/src/ui/interactivesimulation/JPanelSetVariables.java
+++ b/src/ui/interactivesimulation/JPanelSetVariables.java
@@ -46,27 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 //import java.io.*;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
-import tmltranslator.*; 
-
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
 
 
 public	class JPanelSetVariables extends JPanel implements ActionListener  {
diff --git a/src/ui/interactivesimulation/JPanelTransactions.java b/src/ui/interactivesimulation/JPanelTransactions.java
index 6c1de9601a7e8249c46923f2de8af42864e9f757..e1eabff2257d6862a9e9240cacda6415765ceb3a 100755
--- a/src/ui/interactivesimulation/JPanelTransactions.java
+++ b/src/ui/interactivesimulation/JPanelTransactions.java
@@ -46,27 +46,12 @@
 package ui.interactivesimulation;
 
 //import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
 
-import tmltranslator.*;
+import myutil.TableSorter;
 
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public  class JPanelTransactions extends JPanel  {
diff --git a/src/ui/interactivesimulation/JSimulationSDPanel.java b/src/ui/interactivesimulation/JSimulationSDPanel.java
index 419bc3238cae4c75988d32cbe96d33bc2163273d..694836a0ad2e653d36882727f0af6d3e0b31b643 100644
--- a/src/ui/interactivesimulation/JSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JSimulationSDPanel.java
@@ -48,19 +48,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.ColorManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
 import java.io.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.util.Hashtable;
+import java.util.Vector;
 
 public class JSimulationSDPanel extends JPanel implements MouseMotionListener, Runnable  {
 	
@@ -84,12 +84,13 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 	private int spaceVerticalText = 2;
 	private int spaceHorizontalText = 2;
 	private int spaceStop = 20;
-	private int verticalLink = 7;
+	private int verticalLink = 10;
 	private int lengthAsync = 50;
 	private int spaceBroadcast = 25;
 	
 	// Transactions
-	protected String fileReference;
+        private BufferedReader inputStream;
+        private String fileReference;
 	
 	private int maxNbOfTransactions = 10000;
 	private int drawnTransactions = 10000;
@@ -113,6 +114,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 	
 	private final int NO_MODE = 0;
 	private final int FILE_MODE = 1;
+	private final int STREAM_MODE = 2;
 	private int mode;
 	private boolean go;
 	private Thread t;
@@ -249,7 +251,19 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 				spaceBetweenLifeLines = w+minSpaceBetweenLifeLines;
 			}
 		}
-		
+
+                for (GenericTransaction gt: this.transactions) {
+                    if (gt.type == gt.SYNCHRO) {
+		        String messageName = gt.name + "(" + gt.params + ")";
+                        w = g.getFontMetrics().stringWidth(messageName);
+                        if (w+this.minSpaceBetweenLifeLines > this.spaceBetweenLifeLines)
+                            this.spaceBetweenLifeLines = w+this.minSpaceBetweenLifeLines;
+                    }
+                }
+
+                int m = this.getSize().width / (this.entityNames.size()+1);
+                if (this.spaceBetweenLifeLines > m)
+                    this.spaceBetweenLifeLines = m;
 	}
 	
 	public void setNewSize() {
@@ -434,7 +448,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 		// Putting the message name
 		w = g.getFontMetrics().stringWidth(messageName);
 		int xtmp = (xOf2ndBlock + currentX)/2 - w/2;
-		g.drawString(messageName, xtmp, currentY-2); 
+		g.drawString(messageName, xtmp, currentY-4); 
 		
 		currentY += 10;
 		
@@ -917,25 +931,45 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 	}
 	
 	public void setFileReference(String _fileReference) {
-		fileReference = _fileReference;
-		
-		mode = FILE_MODE;
-		
-		Thread t = new Thread(this);
-		t.start();
+            try {
+                // Open the file that is the first 
+                // command line parameter
+                this.fileReference = _fileReference;
+                this.mode = FILE_MODE;
+                FileInputStream fstream = new FileInputStream(_fileReference);
+                BufferedReader br = new BufferedReader(new InputStreamReader(new DataInputStream(fstream)));
+                // Get the object of DataInputStream
+                this.setFileReference(br, _fileReference);
+            } catch(FileNotFoundException e) {
+                TraceManager.addDev("File " + _fileReference + " not found.");
+            } catch(SecurityException e) {
+                TraceManager.addDev("Reading file Error: " + e.getMessage());
+            }
 	}
+
+        public void setFileReference(BufferedReader inputStream) {
+            this.mode = STREAM_MODE;
+            this.setFileReference(inputStream, "from unnamed input stream");
+        }
+
+        private void setFileReference(BufferedReader inputStream, String fileReference) {
+            getExclu();
+            jfssdp.setStatus("Reading " + fileReference);
+            this.inputStream = inputStream;
+            this.entityNames.clear();
+            this.transactions.clear();
+            this.transactionsOfPoints.clear();
+            this.points.clear();
+            removeExclu();
+            
+            Thread t = new Thread(this);
+            t.start();
+        }
 	
 	public synchronized void refresh() {
-		if (mode == FILE_MODE) {
-			entityNames.clear();
-			transactions.clear();
-			transactionsOfPoints.clear();
-			points.clear();
-			if (t == null) {
-				Thread t = new Thread(this);
-				t.start();
-			}
-		}
+            if (mode == FILE_MODE) {
+                this.setFileReference(this.fileReference);
+            }
 	}
 	
 	public void run() {
@@ -950,31 +984,22 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 			return;
 		}
 		
-		if (mode == FILE_MODE) {
-			// Open the file
+		if ((this.mode == FILE_MODE || this.mode == STREAM_MODE) && this.inputStream != null) {
 			// Read the content of the file
 			// Read line by line
 			// Upate the graphic regularly
 			getExclu();
-			jfssdp.setStatus("Reading " + fileReference);
+
 			try{
-				// Open the file that is the first 
-				// command line parameter
-				FileInputStream fstream = new FileInputStream(fileReference);
-				// Get the object of DataInputStream
-				DataInputStream in = new DataInputStream(fstream);
-				BufferedReader br = new BufferedReader(new InputStreamReader(in));
-				String strLine;
-				//Read File Line By Line
-				while ((strLine = br.readLine()) != null)   {
-					// Print the content on the console
-					//TraceManager.addDev("Computing transaction:" + strLine);
-					addGenericTransaction(strLine);
-				}
+                                String strLine;
+                                //Read File Line By Line
+                                while ((strLine = this.inputStream.readLine()) != null)   {
+                                        addGenericTransaction(strLine);
+                                }
 				//Close the input stream
-				in.close();
+				this.inputStream.close();
 			} catch (Exception e){//Catch exception if any
-				TraceManager.addDev("Reading file Error: " + e.getMessage());
+				TraceManager.addDev("Closing file Error: " + e.getMessage());
 			}
 			
 			if (jfssdp != null) {
@@ -986,6 +1011,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 		} 
 		
 		t = null;
+                this.inputStream = null;
 	}
 	
 	private void updateInfoOnTransactions() {
@@ -1158,9 +1184,13 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 		}
 		
 		String ret = main.substring(index+sel.length(), main.length());
-		index = ret.indexOf(' ');
+                if (ret.charAt(0) == '"') {
+                    ret = ret.substring(1);
+                    index = ret.indexOf('"');
+                } else
+                    index = ret.indexOf(' ');
 		
-		if (index != -1) {
+		if (index >= 0) {
 			ret = ret.substring(0, index);
 		}
 		
@@ -1195,4 +1225,4 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
 		clockDiviser = _clockDiviser;
 		updateInfoOnTransactions();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/ui/interactivesimulation/LatencyTableModel.java b/src/ui/interactivesimulation/LatencyTableModel.java
index 6403531f9c86da2e684b2017073b22ad33389d29..c0b47e90be3c66c155b2f132713d311a506f0f12 100755
--- a/src/ui/interactivesimulation/LatencyTableModel.java
+++ b/src/ui/interactivesimulation/LatencyTableModel.java
@@ -46,11 +46,8 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class LatencyTableModel extends AbstractTableModel {
     private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/interactivesimulation/MainCommandsToolBar.java b/src/ui/interactivesimulation/MainCommandsToolBar.java
index b5bedc78b6211564209fa38224bcaa1aaf4aae97..55076d5592033e0fec260542d4597c86133e2117 100755
--- a/src/ui/interactivesimulation/MainCommandsToolBar.java
+++ b/src/ui/interactivesimulation/MainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class MainCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/MemTableModel.java b/src/ui/interactivesimulation/MemTableModel.java
index 9243cbc95b3358a989ebade68c5c77d350678619..da0b9dd8011ed1f985b5ee209267bc611130c8f0 100755
--- a/src/ui/interactivesimulation/MemTableModel.java
+++ b/src/ui/interactivesimulation/MemTableModel.java
@@ -46,11 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwMemory;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
 
 public class MemTableModel extends AbstractTableModel {
 	private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/SaveCommandsToolBar.java b/src/ui/interactivesimulation/SaveCommandsToolBar.java
index 4a49687d3a4057218568a0b2f518a2794d7323c5..32ece84c9c52846527d6d3c347d2abf03187c599 100755
--- a/src/ui/interactivesimulation/SaveCommandsToolBar.java
+++ b/src/ui/interactivesimulation/SaveCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SaveCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/SimulationLatency.java b/src/ui/interactivesimulation/SimulationLatency.java
index 6a3e0a2b8bdb36334acd54988916eadf98ad374c..4420e801240a4ac21e31d78ae858f385ae303b07 100644
--- a/src/ui/interactivesimulation/SimulationLatency.java
+++ b/src/ui/interactivesimulation/SimulationLatency.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class SimulationLatency  {
 
     public String trans1;
diff --git a/src/ui/interactivesimulation/SimulationTransaction.java b/src/ui/interactivesimulation/SimulationTransaction.java
index 784ab6e8f3c1338ed5a3f27fbe096ef0b235e1cd..f2880707739db22190c832cb80956b5844000cbc 100755
--- a/src/ui/interactivesimulation/SimulationTransaction.java
+++ b/src/ui/interactivesimulation/SimulationTransaction.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class SimulationTransaction  {
 
     public final static int NODE_TYPE_CPU = 0;
diff --git a/src/ui/interactivesimulation/StateCommandsToolBar.java b/src/ui/interactivesimulation/StateCommandsToolBar.java
index 2f298f2f5846e9c3e2a9caf7375d0971983df607..3e0228f943b19d16275863d60bbdb78a584b1b0d 100755
--- a/src/ui/interactivesimulation/StateCommandsToolBar.java
+++ b/src/ui/interactivesimulation/StateCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class StateCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/TaskTableModel.java b/src/ui/interactivesimulation/TaskTableModel.java
index 1f86334b635d424cedef46888ddc97f87b9e0591..11a3a088ab18136b2542f5b5fe564b0e807d32b1 100755
--- a/src/ui/interactivesimulation/TaskTableModel.java
+++ b/src/ui/interactivesimulation/TaskTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
 
 public class TaskTableModel extends AbstractTableModel {
 	private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TaskVariableTableModel.java b/src/ui/interactivesimulation/TaskVariableTableModel.java
index c821905efb7f54fb38578e2e1b896adbdcad7f42..ab73931c3689fa4efe89f7f98c1bae4919064d95 100755
--- a/src/ui/interactivesimulation/TaskVariableTableModel.java
+++ b/src/ui/interactivesimulation/TaskVariableTableModel.java
@@ -46,11 +46,11 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
 
 public class TaskVariableTableModel extends AbstractTableModel {
     private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TransactionTableModel.java b/src/ui/interactivesimulation/TransactionTableModel.java
index ac1c590ca624cda8f7c927bdb3ae6f2326d02ed7..2587282a37b751fc77248ba860bc2d2ca5e6aeaa 100755
--- a/src/ui/interactivesimulation/TransactionTableModel.java
+++ b/src/ui/interactivesimulation/TransactionTableModel.java
@@ -46,11 +46,8 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class TransactionTableModel extends AbstractTableModel {
     private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/iod/IODChoice.java b/src/ui/iod/IODChoice.java
index e89cae1a13080119ecd43037ba85363d7c29c0cb..ab7a4b86a1e0cc3802857cf2ebdf4b8823d8a07f 100755
--- a/src/ui/iod/IODChoice.java
+++ b/src/ui/iod/IODChoice.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class IODChoice extends TGCWithInternalComponent {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/iod/IODJunction.java b/src/ui/iod/IODJunction.java
index 93056ae7b6e86119c5f638fd9eb54a2f173ee03f..9f747fbef2f5630a9acb8afce30a505720bdeee1 100755
--- a/src/ui/iod/IODJunction.java
+++ b/src/ui/iod/IODJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class IODJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/iod/IODParallel.java b/src/ui/iod/IODParallel.java
index ec45a744726a8ad6337456e697d763e425108a1e..48a317db50d390918fcbefe330ce8193c3993121 100755
--- a/src/ui/iod/IODParallel.java
+++ b/src/ui/iod/IODParallel.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODParallel extends TGCWithoutInternalComponent{
 	private int lineLength = 0;
 	//private int textX, textY;
diff --git a/src/ui/iod/IODPreemption.java b/src/ui/iod/IODPreemption.java
index 8281a902e067b39be3cc6dd4a57f644cb5fff5b7..5299d2eb206b7c2e8a1ec23b8848eda5d0dc4859 100755
--- a/src/ui/iod/IODPreemption.java
+++ b/src/ui/iod/IODPreemption.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODPreemption extends TGCWithoutInternalComponent{
     private int lineLength = 0;
     //private int textX, textY;
diff --git a/src/ui/iod/IODRefIOD.java b/src/ui/iod/IODRefIOD.java
index 3f19360a7df3a006e5cb0d4578a0214164cfc2af..d710bb747e4b98f854f39d18cf6e85e78a5acfe2 100755
--- a/src/ui/iod/IODRefIOD.java
+++ b/src/ui/iod/IODRefIOD.java
@@ -46,14 +46,15 @@
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class IODRefIOD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/iod/IODRefSD.java b/src/ui/iod/IODRefSD.java
index f213ced949796309f9cdb43c9813053b2d1a4ed9..980850fe156401599e0276aa2e9754b99e1dd350 100755
--- a/src/ui/iod/IODRefSD.java
+++ b/src/ui/iod/IODRefSD.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class IODRefSD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/iod/IODSequence.java b/src/ui/iod/IODSequence.java
index 86087c5ba3ac9a1eebed294e218811e26288711b..1ffefbdbbb2d5bc19ed18d0af9f95fed72b26631 100755
--- a/src/ui/iod/IODSequence.java
+++ b/src/ui/iod/IODSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODSequence extends TGCWithoutInternalComponent{
     private int lineLength = 0;
     //private int textX, textY;
diff --git a/src/ui/iod/IODStartState.java b/src/ui/iod/IODStartState.java
index 93a2fc5f7f76647321cb46b38d6cb7baca695c0f..10ec9c13e74c25d6f91eeedee9abe12059e73ddd 100755
--- a/src/ui/iod/IODStartState.java
+++ b/src/ui/iod/IODStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class IODStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/iod/IODStopState.java b/src/ui/iod/IODStopState.java
index e34d4a3a724f9a7d94ecf160f72d4120ec148dd8..1543b87dca8904c3ca8d37205219a2b41c204b9f 100755
--- a/src/ui/iod/IODStopState.java
+++ b/src/ui/iod/IODStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/iod/InteractionOverviewDiagramPanel.java b/src/ui/iod/InteractionOverviewDiagramPanel.java
index 2997de2f10f3051794d6ca1687ecacb3a23ee1ab..690db273b3042896470fb6350068134cfb5c6c61 100755
--- a/src/ui/iod/InteractionOverviewDiagramPanel.java
+++ b/src/ui/iod/InteractionOverviewDiagramPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class InteractionOverviewDiagramPanel extends TDiagramPanel {
     
     public  InteractionOverviewDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/iod/InteractionOverviewDiagramToolBar.java b/src/ui/iod/InteractionOverviewDiagramToolBar.java
index 484b2ee82331aceaf07244453f647ea1462fb81f..8025bc4abd007f799cf3c84492e3aefd45756617 100755
--- a/src/ui/iod/InteractionOverviewDiagramToolBar.java
+++ b/src/ui/iod/InteractionOverviewDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class InteractionOverviewDiagramToolBar extends TToolBar {
     
     public InteractionOverviewDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/iod/TGConnectingPointIOD.java b/src/ui/iod/TGConnectingPointIOD.java
index 7f125789b34bef2937019f2a5e64d44c0c704a66..cd1449104a79e8d90085e1ce0957f44a5d9514cb 100755
--- a/src/ui/iod/TGConnectingPointIOD.java
+++ b/src/ui/iod/TGConnectingPointIOD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.iod;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointIOD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/iod/TGConnectorInteraction.java b/src/ui/iod/TGConnectorInteraction.java
index 8adc10a3163d7e8d422df65f06d182c30bcc2b9b..3685d317c80d6c8ae325838ee2b39e82d62b66c2 100755
--- a/src/ui/iod/TGConnectorInteraction.java
+++ b/src/ui/iod/TGConnectorInteraction.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorInteraction extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/ncdd/NCConnectorNode.java b/src/ui/ncdd/NCConnectorNode.java
index 29b87c14a99ae5b3f2c8cef2ee75e30d8f376c9d..0bc21562581b6d93b6e48afd9d5ef7744b19464f 100755
--- a/src/ui/ncdd/NCConnectorNode.java
+++ b/src/ui/ncdd/NCConnectorNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogLinkNCNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  class NCConnectorNode extends TGConnector implements WithAttributes {
     protected int arrowLength = 10;
diff --git a/src/ui/ncdd/NCDiagramPanel.java b/src/ui/ncdd/NCDiagramPanel.java
index 43192c7a23d49ed9ca342b7289020ecf9e5d8fa5..039dcdbae5863c0fcdc19aff77fef89073b8ca7a 100755
--- a/src/ui/ncdd/NCDiagramPanel.java
+++ b/src/ui/ncdd/NCDiagramPanel.java
@@ -47,11 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ncdd;
 
 
-import org.w3c.dom.*;
-import java.util.*;
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
 public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 	
     public  NCDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ncdd/NCDiagramToolBar.java b/src/ui/ncdd/NCDiagramToolBar.java
index 018a345a1d2acf26601c146e3ea2d548d4c58027..af993c5c0997abdd215a47a00d702ebadd9defe3 100755
--- a/src/ui/ncdd/NCDiagramToolBar.java
+++ b/src/ui/ncdd/NCDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class NCDiagramToolBar extends TToolBar {
     
     public NCDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/ncdd/NCEqNode.java b/src/ui/ncdd/NCEqNode.java
index 4f22a9f71786ccf8b6aa1e0fcc8d56449303bb46..8492abf71fdb0535d766cc770a36a2f6cd887a21 100755
--- a/src/ui/ncdd/NCEqNode.java
+++ b/src/ui/ncdd/NCEqNode.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCEqNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class NCEqNode extends TGCWithInternalComponent implements SwallowTGComponent/*, WithAttributes*/ {
diff --git a/src/ui/ncdd/NCNodeConnectingPoint.java b/src/ui/ncdd/NCNodeConnectingPoint.java
index 3ba4ba2c6647f988443790c869f9722ccf34c082..98e443e76354ffbe254f3e74f729d4a0ed789c39 100755
--- a/src/ui/ncdd/NCNodeConnectingPoint.java
+++ b/src/ui/ncdd/NCNodeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ncdd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class NCNodeConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/ncdd/NCRoute.java b/src/ui/ncdd/NCRoute.java
index f3f9ca5c30588b02740f6f1b60873dc82e32112d..a9c9c86d3583bac8f02695c85836b2a33a58711d 100755
--- a/src/ui/ncdd/NCRoute.java
+++ b/src/ui/ncdd/NCRoute.java
@@ -46,17 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-
 public class NCRoute {
     public String inputInterface = "";
 	public String traffic = "";
diff --git a/src/ui/ncdd/NCRouteArtifact.java b/src/ui/ncdd/NCRouteArtifact.java
index 4b00e9c96e856ab31beb2ca2d8941f2bca377802..bee7b1e97cee834d9e2109508781d401a7c14fa7 100755
--- a/src/ui/ncdd/NCRouteArtifact.java
+++ b/src/ui/ncdd/NCRouteArtifact.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCRoute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class NCRouteArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
 	protected int lineLength = 5;
diff --git a/src/ui/ncdd/NCSwitchNode.java b/src/ui/ncdd/NCSwitchNode.java
index 63b2a6695434215cfafb2111dbd173355947f474..74052e6ebef2c93f7cdd5db2688426ebad71a077 100755
--- a/src/ui/ncdd/NCSwitchNode.java
+++ b/src/ui/ncdd/NCSwitchNode.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCSwitchNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGComponent, WithAttributes {
diff --git a/src/ui/ncdd/NCTrafficArtifact.java b/src/ui/ncdd/NCTrafficArtifact.java
index 8fa43ce15d030b4452aa1b19d35bcfd9007167c5..e90e497c0bcfbadd5c1f188a0120d8aaa31471e5 100755
--- a/src/ui/ncdd/NCTrafficArtifact.java
+++ b/src/ui/ncdd/NCTrafficArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCTraffic;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class NCTrafficArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected int lineLength = 5;
diff --git a/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..a96007d3c9f018ce7e51116009b21504a0a80486
--- /dev/null
+++ b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
@@ -0,0 +1,370 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class JDialogNetworkModelPanel
+ * Dialog for managing the loading of network models
+ * Creation: 28/05/2017
+ * @version 1.1 28/05/2017
+ * @author Ludovic APVRILLE
+ * @author Ludovic Apvrille
+ * @see
+ */
+
+package ui.networkmodelloader;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.io.File;
+import java.util.*;
+import javax.swing.*;
+import java.net.*;
+import java.io.*;
+
+import ui.*;
+import myutil.*;
+
+public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements ActionListener, Runnable, LoaderFacilityInterface, CallbackLoaderInterface  {
+
+    public final static String [] FEATURES = {"all",  "diplodocus", "avatar", "sysml-sec", "assumptions", "requirements", "attacktrees", "properties", "partitioning", "analysis", "design", "prototyping", "security protocol"};
+
+    public final static String [] PROPS = {"safety", "security", "performance"};
+    
+    private ArrayList<NetworkModel> listOfModels;
+
+    protected Frame f;
+    protected MainGUI mgui;
+
+    protected final static int NOT_LISTED = 1;
+    protected final static int LISTED = 2;
+    protected final static int SELECTED = 3;
+
+    private int mode;
+
+    //components
+    protected JTextArea jta;
+    private JTextAreaWriter textAreaWriter;
+    protected JButton start;
+    protected JButton stop;
+    protected JComboBox<String> featureList;
+    protected JCheckBox [] props;
+
+    protected JScrollPane jsp;
+
+    private Thread t;
+    private boolean go = false;
+    private boolean hasError = false;
+    protected boolean startProcess = false;
+
+    private String url;
+    private NetworkModelPanel panel;
+    private String filePath;
+
+
+    /** Creates new form  */
+    public JDialogLoadingNetworkModel(Frame _f, MainGUI _mgui, String title, String _url)  {
+        super(title);
+
+        f = _f;
+        mgui = _mgui;
+
+        url = _url;
+
+        listOfModels = new ArrayList<NetworkModel>();
+
+
+        initComponents();
+        myInitComponents();
+        pack();
+        Thread t = new Thread(this);
+        t.start();
+
+
+        //getGlassPane().addMouseListener( new MouseAdapter() {});
+        getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+    }
+
+
+    protected void myInitComponents() {
+        mode = NOT_LISTED;
+        setButtons();
+    }
+
+    protected void initComponents() {
+
+        Container c = getContentPane();
+        setFont(new Font("Helvetica", Font.PLAIN, 14));
+        c.setLayout(new BorderLayout());
+        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+        
+
+	JPanel lowPart = new JPanel(new BorderLayout());
+
+        jta = new ScrolledJTextArea();
+        jta.setEditable(false);
+	jta.setLineWrap(true);
+        jta.setMargin(new Insets(10, 10, 10, 10));
+        jta.setTabSize(3);
+        jta.append("Connecting to " + url + ".\n Please wait ...\n\n");
+        Font f = new Font("Courrier", Font.BOLD, 12);
+        jta.setFont(f);
+        textAreaWriter = new JTextAreaWriter( jta );
+
+        jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+	jsp.setPreferredSize(new Dimension(400, 200));
+
+	JPanel options = new JPanel();
+	featureList = new JComboBox<String>(FEATURES);
+	featureList.addActionListener(this);
+	options.add(featureList);
+
+	props = new JCheckBox[PROPS.length];
+	for (int i=0; i<props.length; i++) {
+	    props[i] = new JCheckBox(PROPS[i]);
+	    props[i].addActionListener(this);
+	    props[i].setSelected(true);
+	    options.add(props[i]);
+	}
+	
+	lowPart.add(options, BorderLayout.NORTH);
+	
+
+        lowPart.add(jsp, BorderLayout.CENTER);
+
+        start = new JButton("Load", IconManager.imgic23);
+        stop = new JButton("Cancel", IconManager.imgic55);
+
+        start.setPreferredSize(new Dimension(200, 30));
+        stop.setPreferredSize(new Dimension(200, 30));
+
+        start.addActionListener(this);
+        stop.addActionListener(this);
+
+        JPanel jp2 = new JPanel();
+        jp2.add(stop);
+        //jp2.add(start);
+
+        lowPart.add(jp2, BorderLayout.SOUTH);
+
+	c.add(lowPart, BorderLayout.SOUTH);
+
+	panel = new NetworkModelPanel(this, listOfModels, this, jta);
+        jsp = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+	panel.setJSP(jsp);
+
+        c.add(jsp, BorderLayout.CENTER);
+    }
+
+    public void actionPerformed(ActionEvent evt)  {
+        //String command = evt.getActionCommand();
+
+        // Compare the action command to the known actions.
+	if (evt.getSource() == stop) {
+            cancel();
+	    return ;
+        } else if (evt.getSource() == featureList) {
+	    featureSelectionMade();
+	    return;
+	}
+
+	for (int i = 0; i<props.length; i++) {
+	    if (evt.getSource() == props[i]) {
+		panel.setProperty(i, props[i].isSelected());
+		return;
+	    }
+	}
+    }
+
+    public void featureSelectionMade() {
+	panel.setFeatureSelectedIndex(featureList.getSelectedIndex());
+    }
+
+    public void cancel() {
+        dispose();
+    }
+
+
+    public void run() {
+        // Loading main file describing models, giving information on this, and filling the array of models
+        // Accsing the main file
+        try {
+	    /*HttpURLConnection connection;
+	    TraceManager.addDev("URL: going to create it to: " + url);
+            URL mainFile = new URL(url);
+	    TraceManager.addDev("URL creation");
+	    connection = (HttpURLConnection)(mainFile.openConnection());
+	    TraceManager.addDev("Connection setup 0");
+	    String redirect = connection.getHeaderField("Location");
+	    if (redirect != null){
+		TraceManager.addDev("Redirection found");
+		connection = (HttpURLConnection)(new URL(redirect).openConnection());
+	    }
+	    //connection.setRequestMethod("GET");
+	    //connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
+	    TraceManager.addDev("Connection setup 1");*/
+	    BufferedReader in = URLManager.getBufferedReader(url);
+            jta.append("Connection established...\n");
+            String inputLine;
+	    NetworkModel nm = null;
+            while ((inputLine = in.readLine()) != null) {
+		if (inputLine.startsWith("#FILE")) {
+		    nm = new NetworkModel(inputLine.substring(5, inputLine.length()).trim());
+		    listOfModels.add(nm);
+		}
+		
+		if (inputLine.startsWith("-FEATURES")) {
+		    if (nm != null) {
+			String tmp = inputLine.substring(9, inputLine.length()).trim().toLowerCase();
+			for (int i=1; i<FEATURES.length; i++) {
+			    nm.features[i] = tmp.indexOf(FEATURES[i]) != -1;
+			}
+			//nm.type = NetworkModel.stringToNetworkModelType(inputLine.substring(5, inputLine.length()).trim());
+		    }
+		}
+
+		if (inputLine.startsWith("-PROPS")) {
+		    if (nm != null) {
+			String tmp = inputLine.substring(6, inputLine.length()).trim().toLowerCase();
+			for (int i=0; i<PROPS.length; i++) {
+			    nm.props[i] = tmp.indexOf(PROPS[i]) != -1;
+			}
+			//nm.type = NetworkModel.stringToNetworkModelType(inputLine.substring(5, inputLine.length()).trim());
+		    }
+		}
+
+		if (inputLine.startsWith("-AUTHOR")) {
+		    if (nm != null) {
+			nm.author = inputLine.substring(7, inputLine.length()).trim();
+		    }
+		}
+	    
+
+		if (inputLine.startsWith("-DESCRIPTION")) {
+		    if (nm != null) {
+			nm.description = inputLine.substring(12, inputLine.length()).trim();
+		    }
+		}
+
+		if (inputLine.startsWith("-IMG")) {
+		    if (nm != null) {
+			nm.image = inputLine.substring(4, inputLine.length()).trim();
+			TraceManager.addDev("Dealing with image:" + nm.image);
+			nm.bi = URLManager.getBufferedImageFromURL(URLManager.getBaseURL(url) + nm.image);
+		    }
+		}
+		
+                //System.out.println(inputLine);
+		
+	    }
+		jta.append("\n" + listOfModels.size() + " remote models found.\nSelect a model to download it locally and open it.\n\n");
+	    mode = LISTED;
+	    panel.preparePanel();
+	    panel.repaint();
+            in.close();
+
+	    // Wait 5seconds before refreshing panel
+	    Thread.sleep(5000);
+	    panel.repaint();
+	    
+        } catch (Exception e) {
+            jta.append("Error: " + e.getMessage() + " when retreiving file " + url );
+        }
+    }
+
+    protected void checkMode() {
+        mode = NOT_LISTED;
+    }
+
+    protected void setButtons() {
+        switch(mode) {
+        case NOT_LISTED:
+            start.setEnabled(false);
+            stop.setEnabled(true);
+            //setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+            getGlassPane().setVisible(false);
+            break;
+        case LISTED:
+            start.setEnabled(false);
+            stop.setEnabled(true);
+            getGlassPane().setVisible(true);
+            //setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            break;
+        case SELECTED:
+        default:
+            start.setEnabled(true);
+            stop.setEnabled(true);
+            getGlassPane().setVisible(false);
+            break;
+        }
+    }
+
+
+    // LoaderFacilityInterface
+    public void load(int index) {
+	String fileName = listOfModels.get(index).fileName;
+	jta.append("Loading model: " + fileName);
+	String urlToLoad = URLManager.getBaseURL(url) + fileName;
+	URLManager urlm = new URLManager();
+	filePath = ConfigurationTTool.FILEPath + "/" + fileName;
+	boolean ok = urlm.downloadFile(ConfigurationTTool.FILEPath + "/" + fileName, urlToLoad,this);
+	if (!ok) {
+	    jta.append("Model transfer failed\nPlease, select another model, or retry\n");
+	    panel.reactivateSelection();
+	}
+    }
+
+    // CallbackLoaderInterface
+    public void loadDone() {
+	jta.append("Model transfered, opening it in TTool\n");
+	this.dispose();
+	mgui.openProjectFromFile(new File(filePath));
+    }
+
+    public void loadFailed() {
+	jta.append("Model transfer failed\nPlease, select another model, or retry\n");
+	panel.reactivateSelection();
+    }
+
+    
+    // JTA manipulation by external objects
+    public void appendOut(String s) {
+        jta.append(s);
+    }
+
+
+}
diff --git a/src/ui/networkmodelloader/NetworkModel.java b/src/ui/networkmodelloader/NetworkModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b12c1c487ba5f4b0beb50377fc1b32ab8833439
--- /dev/null
+++ b/src/ui/networkmodelloader/NetworkModel.java
@@ -0,0 +1,101 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class NetworkModel
+ * Dialog for managing the loading of network models
+ * Creation: 29/05/2017
+ * @version 1.1 29/05/2017
+ * @author Ludovic APVRILLE
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.networkmodelloader;
+
+import javax.swing.*;
+import java.io.File;
+import java.awt.image.*;
+
+
+public class NetworkModel  {
+
+    public String fileName;
+    public boolean [] features;
+    public boolean [] props;
+    public String author = "";
+    public String description = "";
+    public String image;
+    public BufferedImage bi;
+    public BufferedImage scaledImg;
+
+    public int x, y, width, height;
+
+    public NetworkModel(String _fileName) {
+	//super(_fileName);
+	fileName = _fileName;
+	features = new boolean[JDialogLoadingNetworkModel.FEATURES.length];
+	features[0] = true;
+	props = new boolean[JDialogLoadingNetworkModel.PROPS.length];
+    }
+
+    public void update() {
+	
+    }
+
+    /*public static NetworkModelType stringToNetworkModelType(String type) {
+	type = type.toLowerCase();
+	if (type.compareTo("software design") == 0) {
+	    return NetworkModelType.SOFTWARE_DESIGN;
+	}
+
+	if (type.compareTo("partitioning") == 0) {
+	    return NetworkModelType.PARTITIONING;
+	}
+
+	if (type.compareTo("attack tree") == 0) {
+	    return NetworkModelType.ATTACK_TREE;
+	}
+
+	if (type.compareTo("security protocol") == 0) {
+	    return NetworkModelType.SECURITY_PROTOCOL;
+	}
+
+	return NetworkModelType.SOFTWARE_DESIGN;
+	}*/
+
+}
diff --git a/src/ui/networkmodelloader/NetworkModelPanel.java b/src/ui/networkmodelloader/NetworkModelPanel.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cd7769a83a590d171c7ffbf6279234f3547318f
--- /dev/null
+++ b/src/ui/networkmodelloader/NetworkModelPanel.java
@@ -0,0 +1,323 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class NetworkModel
+ * Dialog for managing the loading of network models
+ * Creation: 30/05/2017
+ * @version 1.1 30/05/2017
+ * @author Ludovic APVRILLE
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.networkmodelloader;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import java.util.*;
+
+import myutil.*;
+import ui.*;
+
+
+
+public class NetworkModelPanel extends JPanel implements MouseListener, MouseMotionListener {
+
+    private static int ImgSizeX = 220;
+    private static int ImgSizeY = 120;
+
+    private static int buttonSizeX = 250;
+    private static int buttonSizeY = 150;
+    private static int spaceBetweenButtons = 50;
+    private static int nbOfButtonsPerColumn = 2;
+
+    private static int marginX = 20;
+    private static int marginY = 20;
+
+    private int indexOfSelected = -1;
+    private boolean selectedModel = false;
+
+    private ArrayList<NetworkModel> listOfModels;
+    private ActionListener listener;
+
+    private LoaderFacilityInterface loader;
+
+    private JTextArea jta;
+    private JScrollPane jsp;
+
+    private int featureSelectedIndex = 0;
+    private boolean props[];
+    
+	
+
+    public NetworkModelPanel(LoaderFacilityInterface _loader, ArrayList<NetworkModel> _listOfModels, ActionListener _listener, JTextArea _jta) {
+        loader = _loader;
+        listOfModels = _listOfModels;
+        listener = _listener;
+        jta = _jta;
+
+        //Dimension pSize = new Dimension(500, 400);
+        Dimension mSize = new Dimension(400, 300);
+
+        //setPreferredSize(pSize);
+        setMinimumSize(mSize);
+        setBackground(new java.awt.Color(250, 250, 250));
+        setBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED));
+
+	// properties
+	props = new boolean[JDialogLoadingNetworkModel.PROPS.length];
+	for (int i=0; i<props.length; i++) {
+	    props[i] = true;
+	}
+
+	// Mouse management
+        addMouseMotionListener(this);
+        addMouseListener(this);
+    }
+
+    public void setJSP(JScrollPane _jsp) {
+        jsp = _jsp;
+        jsp.setViewportView(this);
+    }
+
+    public void setFeatureSelectedIndex(int _index) {
+        featureSelectedIndex = _index;
+	indexOfSelected = -1;
+        repaint();
+    }
+
+    public void setProperty(int _index, boolean _mode) {
+	props[_index] = _mode;
+	indexOfSelected = -1;
+	repaint();
+    }
+
+
+    public void preparePanel() {
+        //int cptColumn = 0;
+        //int cptRow = 0;
+        for(NetworkModel button: listOfModels) {
+            //Dimension d = new Dimension(buttonSizeX, buttonSizeY);
+            //button.setPreferredSize(d);
+            //int tmpX = cptColumn * (buttonSizeX + spaceBetweenButtons);
+            //int tmpY = cptRow * (buttonSizeY + spaceBetweenButtons);
+            //TraceManager.addDev("Adding button at x=" + tmpX + "& y=" + tmpY);
+            //button.setBounds(tmpX, tmpY, buttonSizeX, buttonSizeY);
+            /*if (button.description != null) {
+              button.setToolTipText(button.description);
+              }*/
+
+            if (button.bi != null) {
+                TraceManager.addDev("Adding image");
+
+                /*BufferedImage newImage = new BufferedImage(ImgSizeX, ImgSizeY, button.bi.getType());
+                  Graphics g = newImage.createGraphics();
+                  g.drawImage(button.bi, 0, 0, ImgSizeX, ImgSizeY, null);
+                  g.dispose();*/
+                button.scaledImg = ImageManager.getScaledImage(button.bi, ImgSizeX, ImgSizeY);
+            }
+
+            //button.setBorder(BorderFactory.createEmptyBorder());
+            //button.setContentAreaFilled(false);
+            //add(button);
+            /*cptColumn ++;
+              if (cptColumn == nbOfButtonsPerColumn) {
+              cptRow ++;
+              cptColumn = 0;
+              }*/
+        }
+    }
+
+
+    private boolean hasAtLeastOneSelectedProperty(NetworkModel _nm) {
+	for (int i=0; i<props.length; i++) {
+	    if (props[i]) {
+		if (_nm.props[i]) {
+		    return true;
+		}
+	    }
+	}
+	return false;
+    }
+    
+
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        int cptColumn = 0;
+        int cptRow = 0;
+
+        int index = 0;
+        for(NetworkModel button: listOfModels) {
+            if ((button.features[featureSelectedIndex]) && hasAtLeastOneSelectedProperty(button)){
+                Color c = g.getColor();
+                int tmpX = cptColumn * (buttonSizeX + spaceBetweenButtons) + marginX;
+                int tmpY = cptRow * (buttonSizeY + spaceBetweenButtons) + marginY;
+                if (button.scaledImg != null) {
+                    g.drawImage(button.scaledImg, tmpX, tmpY, buttonSizeX, buttonSizeY, null);
+                } else {
+                    g.setColor(ColorManager.AVATAR_BLOCK);
+                    g.fillRect(tmpX, tmpY, buttonSizeX, buttonSizeY);
+                    g.setColor(c);
+                    GraphicLib.centerString(g, "No picture", tmpX, tmpY + buttonSizeY/2, buttonSizeX);
+                }
+
+                GraphicLib.centerString(g, button.fileName, tmpX, tmpY + buttonSizeY + 15, buttonSizeX);
+
+
+
+                cptColumn ++;
+                if (cptColumn == nbOfButtonsPerColumn) {
+                    cptRow ++;
+                    cptColumn = 0;
+                }
+
+                button.x = tmpX;
+                button.y = tmpY;
+                button.width = buttonSizeX;
+                button.height = buttonSizeY + 15;
+
+                // Must draw the rectangle around
+                if (index == indexOfSelected) {
+                    if (selectedModel) {
+                        g.setColor(ColorManager.SELECTED_ELEMENT);
+                    } else {
+                        g.setColor(ColorManager.POINTER_ON_ME_0);
+                    }
+                    Graphics2D g2 = (Graphics2D)g;
+                    Stroke oldStroke = g2.getStroke();
+                    g2.setStroke(new BasicStroke(5));
+                    g2.drawRect(button.x-10, button.y-10, button.width+20, button.height+20);
+                    g2.setStroke(oldStroke);
+                    g.setColor(c);
+                }
+            } else {
+		button.x = -1;
+                button.y = -1;
+                button.width = -1;
+                button.height = -1;
+	    }
+
+            index ++;
+        }
+
+        Dimension currentPSize = getPreferredSize();
+        Dimension pSize = new Dimension(400, Math.max(300, (cptRow+1)*(buttonSizeY +spaceBetweenButtons) + 2* marginY));
+        setPreferredSize(pSize);
+
+        if (!((currentPSize.getWidth() == pSize.getWidth()) && (currentPSize.getHeight() == pSize.getHeight()))) {
+            if (jsp != null) {
+                TraceManager.addDev("repainting jsp");
+                jsp.setViewportView(this);
+                //jsp.revalidate();
+                //jsp.repaint();
+            }
+        }
+
+
+        //g.drawString(listOfModels.size() + " model(s) available", 20, 20);
+        //g.drawRect(200, 200, 200, 200);
+    }
+
+
+    public void mouseDragged(MouseEvent e) {
+
+    }
+
+    public void mouseMoved(MouseEvent e) {
+        if (!selectedModel)  {
+            int previousIndex = indexOfSelected;
+            boolean found = false;;
+            int index = 0;
+            for(NetworkModel button: listOfModels) {
+		if ((button.features[featureSelectedIndex]) && hasAtLeastOneSelectedProperty(button)) {
+		    if ((e.getX() > button.x) && (e.getX() < button.x + button.width) &&  (e.getY() > button.y) && (e.getY() < button.y + button.height)) {
+			indexOfSelected = index;
+			found = true;
+			break;
+		    }
+		}
+                index ++;
+            }
+            if (!found) {
+                indexOfSelected = -1;
+            }
+            if (indexOfSelected != previousIndex) {
+                if (indexOfSelected != -1) {
+                    NetworkModel nm = listOfModels.get(indexOfSelected);
+                    jta.append("\n--- " + nm.fileName + "---\n" + "by: " + nm.author + "\n" + nm.description + "\n-------------\n\n");
+                }
+                repaint();
+            }
+        }
+    }
+
+    public void mousePressed(MouseEvent e) {
+    }
+
+    public void mouseReleased(MouseEvent e) {
+    }
+
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    public void mouseExited(MouseEvent e) {
+    }
+
+    public void mouseClicked(MouseEvent e) {
+        if ((indexOfSelected > -1) && (!selectedModel)) {
+            selectedModel = true;
+            repaint();
+            if (loader != null) {
+                loader.load(indexOfSelected);
+            }
+        }
+    }
+
+    public void reactivateSelection() {
+        indexOfSelected = -1;
+        selectedModel = false;
+        repaint();
+    }
+
+
+
+}
diff --git a/src/ui/networkmodelloader/NetworkModelType.java b/src/ui/networkmodelloader/NetworkModelType.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab6635f3c222801d923d31dc791b08d49a29195d
--- /dev/null
+++ b/src/ui/networkmodelloader/NetworkModelType.java
@@ -0,0 +1,53 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class NetworkModel
+ * Dialog for managing the loading of network models
+ * Creation: 29/05/2017
+ * @version 1.1 29/05/2017
+ * @author Ludovic APVRILLE
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.networkmodelloader;
+
+
+public enum NetworkModelType  {
+    SOFTWARE_DESIGN, PARTITIONING, ATTACK_TREE, SECURITY_PROTOCOL
+}
diff --git a/src/ui/osad/TOSADActionState.java b/src/ui/osad/TOSADActionState.java
index 6d65f9bcdaf333d6e6f0600d6e290faab7e88545..f607c5a3a427ca170d081f7c37e002e0966d7156 100755
--- a/src/ui/osad/TOSADActionState.java
+++ b/src/ui/osad/TOSADActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADActionState extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/osad/TOSADChoice.java b/src/ui/osad/TOSADChoice.java
index 2c05c57606d2af3ebd7ff418c5febdc4bcc33eba..713114fa103663ddab96ea00e75ecedbc04c6aef 100755
--- a/src/ui/osad/TOSADChoice.java
+++ b/src/ui/osad/TOSADChoice.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADChoice extends TGCWithInternalComponent{
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/osad/TOSADConnectingPoint.java b/src/ui/osad/TOSADConnectingPoint.java
index c4ed8c516755d4c856689e4a59e54880b36273af..ff90020a47a5b34a070dbb2579a2dc1cfe0b275b 100755
--- a/src/ui/osad/TOSADConnectingPoint.java
+++ b/src/ui/osad/TOSADConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.osad;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TOSADConnectingPoint extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/osad/TOSADConnector.java b/src/ui/osad/TOSADConnector.java
index f6002a65bb5e176dabbbba4330795727b6a5fad6..256d3003136a9c61d17a7eadcf95bbe1655d94df 100755
--- a/src/ui/osad/TOSADConnector.java
+++ b/src/ui/osad/TOSADConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TOSADConnector extends TGConnector implements TGConnectorBetweenElementsInterface {
     protected int arrowLength = 10;
     
diff --git a/src/ui/osad/TOSADIntTimeInterval.java b/src/ui/osad/TOSADIntTimeInterval.java
index 6522dac62f299b06506a0678f53244264732da44..a24170cbb1e35901d968e605701d59aa13b115cd 100755
--- a/src/ui/osad/TOSADIntTimeInterval.java
+++ b/src/ui/osad/TOSADIntTimeInterval.java
@@ -46,9 +46,12 @@
 
 package ui.osad;
 
-import java.awt.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import ui.*;
+import java.awt.*;
 
 public class TOSADIntTimeInterval extends TOSADTimeInterval {
     private int lineLength = 5;
diff --git a/src/ui/osad/TOSADJunction.java b/src/ui/osad/TOSADJunction.java
index ad588026aad9b9ffba5555ea95aae1f453dcd9d5..042701db5c69d33e824dae53666e614f04e25dec 100755
--- a/src/ui/osad/TOSADJunction.java
+++ b/src/ui/osad/TOSADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TOSADJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/osad/TOSADStartState.java b/src/ui/osad/TOSADStartState.java
index c7c8f8c01db9753dea056caad5325a6f385b91b5..dc7b7086227c8c20ffe4f8f157e93ca187bda1a2 100755
--- a/src/ui/osad/TOSADStartState.java
+++ b/src/ui/osad/TOSADStartState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/osad/TOSADStopState.java b/src/ui/osad/TOSADStopState.java
index 36bd58ae8707fab2087fa19d7919427cf43e2962..2a871495587812a4cc778ad0e1b90d1889ce9678 100755
--- a/src/ui/osad/TOSADStopState.java
+++ b/src/ui/osad/TOSADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/osad/TOSADTimeInterval.java b/src/ui/osad/TOSADTimeInterval.java
index 4d7b3c7a09379d647ce0e7157879a856e6e8a35d..e12b68ff710e6fdc74b21e82c250579c5ede3c9f 100755
--- a/src/ui/osad/TOSADTimeInterval.java
+++ b/src/ui/osad/TOSADTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADTimeInterval extends TGCWithInternalComponent {
     private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
index d09d7d2056a1d13a0576902199aa24d881d2cdf6..d0684c06c70798d26926323b8ccd82147ba85747 100755
--- a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
+++ b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TURTLEOSActivityDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/oscd/TGCTOSAttributeBox.java b/src/ui/oscd/TGCTOSAttributeBox.java
index d7de567256ec6ace2bdae928234ea00d0adad893..85322bb0c86f7e233cceb2243db17da9c2272b1d 100755
--- a/src/ui/oscd/TGCTOSAttributeBox.java
+++ b/src/ui/oscd/TGCTOSAttributeBox.java
@@ -54,7 +54,10 @@ package ui.oscd;
 
 //import myutil.*;
 
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGCAttributeBox;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
 
 //import ui.window.*;
 
diff --git a/src/ui/oscd/TGConnectingPointTOSAssociation.java b/src/ui/oscd/TGConnectingPointTOSAssociation.java
index 23f67db93dc771f40ca0eed8d7d749607c52b363..4c73765da8323c73999cb01126fd6d50b655deee 100755
--- a/src/ui/oscd/TGConnectingPointTOSAssociation.java
+++ b/src/ui/oscd/TGConnectingPointTOSAssociation.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointTOSAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/oscd/TGConnectingPointTOSClasses.java b/src/ui/oscd/TGConnectingPointTOSClasses.java
index 2689f5acb369509caf9cdde92ffea9f360b81044..8726ecc870552c50003a199de50200948cd7fc48 100755
--- a/src/ui/oscd/TGConnectingPointTOSClasses.java
+++ b/src/ui/oscd/TGConnectingPointTOSClasses.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTOSClasses extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
index 43f65bccfcdbe7edda22303e9320f36c46c27b33..9a7faaa892c7c71662f7235508413a0f851a0ac3 100755
--- a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
+++ b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTOSCompositionOperator extends  TGConnectingPoint{
     
diff --git a/src/ui/oscd/TOSCDActivityDiagramBox.java b/src/ui/oscd/TOSCDActivityDiagramBox.java
index 78f2e36b1ec500ef5c352122e6d3d2712f811918..9f0afd8a7c782cb3effbd3bf1164eae0c4ce558f 100755
--- a/src/ui/oscd/TOSCDActivityDiagramBox.java
+++ b/src/ui/oscd/TOSCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCDActivityDiagramBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSCDAttributeBox.java b/src/ui/oscd/TOSCDAttributeBox.java
index d950153535e2893a97af31f4319f2421c2dc9d92..d73f066010411cd0840341fe347bab3e9a78c8e4 100755
--- a/src/ui/oscd/TOSCDAttributeBox.java
+++ b/src/ui/oscd/TOSCDAttributeBox.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TOSCDAttributeBox extends TGCAttributeBox {
     
diff --git a/src/ui/oscd/TOSCDAttributeGateBox.java b/src/ui/oscd/TOSCDAttributeGateBox.java
index 3a1a7cede81a034cb79e01fc9403ac2d157e830d..b225f6753e7dc3ccb317de81df498e8831dc5739 100755
--- a/src/ui/oscd/TOSCDAttributeGateBox.java
+++ b/src/ui/oscd/TOSCDAttributeGateBox.java
@@ -52,8 +52,9 @@ package ui.oscd;
 //import java.util.*;
 
 //import myutil.*;
+
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TOSCDAttributeGateBox extends TGCAttributeBox {
     
diff --git a/src/ui/oscd/TOSCDOperationBox.java b/src/ui/oscd/TOSCDOperationBox.java
index 8a658120628fe8c7e42ece00201acbfa56c97649..ecb082aceda8d90acfeda74b50be717d9af93acc 100755
--- a/src/ui/oscd/TOSCDOperationBox.java
+++ b/src/ui/oscd/TOSCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TOSCDOperationBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSCallInfo.java b/src/ui/oscd/TOSCallInfo.java
index c2a86fbed0e872402bc93d8de62a73d6eb82196b..d1f2b946e00509cb6bdfacb9e85fe43b43899e1e 100755
--- a/src/ui/oscd/TOSCallInfo.java
+++ b/src/ui/oscd/TOSCallInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TOSCallInfo extends TGCWithoutInternalComponent{
     
diff --git a/src/ui/oscd/TOSCallOperator.java b/src/ui/oscd/TOSCallOperator.java
index 002956d0d4827364f6f1e98815c6876bd9f4d6c4..18095c4acbafbe859d8cff90a36b14f1a802e56b 100755
--- a/src/ui/oscd/TOSCallOperator.java
+++ b/src/ui/oscd/TOSCallOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCallOperator extends TOSCompositionOperator {
 
     public TOSCallOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/oscd/TOSClass.java b/src/ui/oscd/TOSClass.java
index 0f1b6efc4341dedc1e085bbccdf2df1277c7e876..3b0da239fc447e0ea5e8a700e8e4e68d71d81d2e 100755
--- a/src/ui/oscd/TOSClass.java
+++ b/src/ui/oscd/TOSClass.java
@@ -47,17 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.osad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.window.JDialogTOSClass;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TOSClass extends TGCWithInternalComponent implements TClassInterface {
     public String oldValue;
diff --git a/src/ui/oscd/TOSCompositionOperator.java b/src/ui/oscd/TOSCompositionOperator.java
index ca8a34acbe0fd927cd752a1b5ffd19f29f811893..228d6d750633c84315788a42ba392afb9ea77cce 100755
--- a/src/ui/oscd/TOSCompositionOperator.java
+++ b/src/ui/oscd/TOSCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCompositionOperator extends TGCWithInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSConnectorAssociation.java b/src/ui/oscd/TOSConnectorAssociation.java
index ff04ff33964f577ce1ee2fd744b0c5b8798a996d..3101db0c343d5fcc12b5d83aa93a924bae22a6c4 100755
--- a/src/ui/oscd/TOSConnectorAssociation.java
+++ b/src/ui/oscd/TOSConnectorAssociation.java
@@ -46,14 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TOSConnectorAssociation extends TGConnector {
 	protected TGConnectingPointGroup tg;
 
diff --git a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
index 9fe65ea78dbbe48c91d8b00c0059a42aeea2bfd1..ac2508ea6a98a334823e8c3f6b7d196560d212aa 100755
--- a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
+++ b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TOSConnectorAssociationWithNavigation extends TOSConnectorAssociation {
 	protected int arrowLength = 15;
diff --git a/src/ui/oscd/TOSConnectorCompositionOperator.java b/src/ui/oscd/TOSConnectorCompositionOperator.java
index 06307c37a0c51e86f53877b18407588d4b05f0be..8c2ce7a2711fdce3b513377063a83df8cfc06798 100755
--- a/src/ui/oscd/TOSConnectorCompositionOperator.java
+++ b/src/ui/oscd/TOSConnectorCompositionOperator.java
@@ -46,12 +46,13 @@
 
 package ui.oscd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TOSConnectorCompositionOperator extends TGConnector {
     
diff --git a/src/ui/oscd/TOSEvtInfo.java b/src/ui/oscd/TOSEvtInfo.java
index 97d1fe2b34d790f193487d0efa029824da3a358e..c97002a49ecaedf685b6cb13568d85e3ed3f5101 100755
--- a/src/ui/oscd/TOSEvtInfo.java
+++ b/src/ui/oscd/TOSEvtInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TOSEvtInfo extends TGCWithoutInternalComponent{
     
diff --git a/src/ui/oscd/TOSEvtOperator.java b/src/ui/oscd/TOSEvtOperator.java
index c18c2a750b8167c7cb7efb0291a3c1d57255b052..7317f1d1f5a72ccb05a3a54acdda00c1384495a2 100755
--- a/src/ui/oscd/TOSEvtOperator.java
+++ b/src/ui/oscd/TOSEvtOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TOSEvtOperator extends TOSCompositionOperator {
 
     public TOSEvtOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramPanel.java b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
index b431b81cbe61011aee6ad376eda9c4a98e564711..0349dffb5b2c4da370d812fc4052d3ae7f50dee8 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramPanel.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
@@ -47,14 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class TURTLEOSClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
     
     public TURTLEOSClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
index 898b5889a17275918d96693d9a66309e2ee03bb9..2e37ec54d3d15013be7bee12af472b820c1bbc18 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TURTLEOSClassDiagramToolBar extends TToolBar {
     
     public TURTLEOSClassDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/procsd/JDialogAttributeProCSD.java b/src/ui/procsd/JDialogAttributeProCSD.java
index fc2cb4245e34298b12bb5e687654e7ad79e09cf8..78106fbd37c9b7ebcbeceea9f611ce0bb33f606c 100644
--- a/src/ui/procsd/JDialogAttributeProCSD.java
+++ b/src/ui/procsd/JDialogAttributeProCSD.java
@@ -46,13 +46,16 @@
 
 package ui.procsd;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAttributeProCSD extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
index 43f01e1bb2107ade90e65b02a9c1c362db860a36..ec6db1b8202a3ee743ba87a150b2b837bacb40d1 100644
--- a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
+++ b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
@@ -1,10 +1,10 @@
 package ui.procsd;
 
-import java.util.Vector;
-
 import ui.MainGUI;
 import ui.TToolBar;
 
+import java.util.Vector;
+
 public class ProActiveCompSpecificationCSDPanel extends ProactiveCSDPanel{
 
 	/*
diff --git a/src/ui/procsd/ProCSDComponent.java b/src/ui/procsd/ProCSDComponent.java
index 8cc762dff569a61899e1422089918212364dbabe..e67c8c770c8843679e3ec76fa2bc469dc36b09c1 100755
--- a/src/ui/procsd/ProCSDComponent.java
+++ b/src/ui/procsd/ProCSDComponent.java
@@ -46,25 +46,25 @@
 
 package ui.procsd;
 
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-
 import ui.prosmd.ProSMDStartState;
 import ui.prosmd.ProSMDStopState;
 import ui.prosmd.ProSMDSubmachine;
 import ui.prosmd.ProactiveSMDPanel;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class ProCSDComponent extends TGCWithInternalComponent implements
 		SwallowTGComponent, SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDDelegatePort.java b/src/ui/procsd/ProCSDDelegatePort.java
index d5e6e3699b7d3ae4db84be845ff76db245d49be3..26cd430ea1b3cdda12b37574aa1d96e94b6b46db 100644
--- a/src/ui/procsd/ProCSDDelegatePort.java
+++ b/src/ui/procsd/ProCSDDelegatePort.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
 
 public class ProCSDDelegatePort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
    // private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDInPort.java b/src/ui/procsd/ProCSDInPort.java
index 742f38275d4ab8f9a8a63d5abdea99f513f015f3..62d6c0167aadaccd18b88221dc11fad8ed60396d 100644
--- a/src/ui/procsd/ProCSDInPort.java
+++ b/src/ui/procsd/ProCSDInPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
 
 
 public class ProCSDInPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDInterface.java b/src/ui/procsd/ProCSDInterface.java
index 6da463049e384c5e83b0464bf500d9a8e5544dd1..088e78f08b84285aa3184c17ff7c8bfb5bfdb3eb 100644
--- a/src/ui/procsd/ProCSDInterface.java
+++ b/src/ui/procsd/ProCSDInterface.java
@@ -44,30 +44,21 @@
  * @see
  */
 package ui.procsd;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
 
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDCompositionOperator;
+import ui.cd.TCDTClass;
 
-import myutil.GraphicLib;
-
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.LinkedList;
-import ui.cd.TCDCompositionOperator;
-import ui.cd.TCDTClass;
-import ui.*;
 
 public class ProCSDInterface extends TCDCompositionOperator implements  ActionListener {
     
diff --git a/src/ui/procsd/ProCSDOutPort.java b/src/ui/procsd/ProCSDOutPort.java
index 6c79dfada495590b8824f8cdead3be2db21b874e..eada46f90d4f6b9820fc9f13897db5f59758f926 100644
--- a/src/ui/procsd/ProCSDOutPort.java
+++ b/src/ui/procsd/ProCSDOutPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
 
 public class ProCSDOutPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
    // private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDPort.java b/src/ui/procsd/ProCSDPort.java
index 96baabad19a49d474f1ab8f2e0ca47280de792ba..a208e6652789944125d58a12f6bedd20c59b8d1f 100644
--- a/src/ui/procsd/ProCSDPort.java
+++ b/src/ui/procsd/ProCSDPort.java
@@ -47,30 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGCWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
-
-import java.awt.Point;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.reflect.Method;
-import java.util.Vector;
-import ui.TAttribute;
 import java.util.List;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.util.Vector;
 
 public abstract class ProCSDPort  extends TGCWithoutInternalComponent implements ActionListener {
 
diff --git a/src/ui/procsd/ProactiveCSDPanel.java b/src/ui/procsd/ProactiveCSDPanel.java
index 4e1e8e4e04d4027f3c44faf823a4ee3b3b96cdc9..a747dd3ac0afc9f51670c07a24eae94705f70932 100755
--- a/src/ui/procsd/ProactiveCSDPanel.java
+++ b/src/ui/procsd/ProactiveCSDPanel.java
@@ -46,13 +46,13 @@
 
 package ui.procsd;
 
+import ui.*;
+
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
-
-import javax.swing.JMenuItem;
-
-import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
     public static int NORMAL_FONT=1;
diff --git a/src/ui/procsd/ProactiveCSDToolBar.java b/src/ui/procsd/ProactiveCSDToolBar.java
index bc3ba46def2847002892e889bc62022f7fb853ef..9fcce872c29f5683a2d7ece35cbf87c94d07583f 100755
--- a/src/ui/procsd/ProactiveCSDToolBar.java
+++ b/src/ui/procsd/ProactiveCSDToolBar.java
@@ -46,9 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class ProactiveCSDToolBar extends TToolBar {
     
diff --git a/src/ui/procsd/TGConnectingPointAssociationProCSD.java b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
index 04c975421f0b453ce65a500770b187e5dc439203..aff90b80e48b43506b07040598e20c3ccd33e525 100755
--- a/src/ui/procsd/TGConnectingPointAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
@@ -48,7 +48,8 @@ package ui.procsd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointAssociationProCSD extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/procsd/TGConnectingPointProCSD.java b/src/ui/procsd/TGConnectingPointProCSD.java
index 734b171651f6aebe76bfee780168822e0258cafb..91efeaf2c07ca16209978982dd9580b48a752dc9 100644
--- a/src/ui/procsd/TGConnectingPointProCSD.java
+++ b/src/ui/procsd/TGConnectingPointProCSD.java
@@ -47,7 +47,10 @@
 package ui.procsd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointProCSD extends  TGConnectingPointWidthHeight{
     private TGComponent myOwnerComp;
diff --git a/src/ui/procsd/TGConnectorAssociationProCSD.java b/src/ui/procsd/TGConnectorAssociationProCSD.java
index 7aa44aa11ae9610139532d4b93864ce0ef0655a5..75b8dc526023ad9b1dd2dc5783fdced15be051d4 100644
--- a/src/ui/procsd/TGConnectorAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectorAssociationProCSD.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
  */
  
 package ui.procsd;
-  
+
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TGConnectorAssociationProCSD extends TGConnector {
 	protected TGConnectingPointGroup tg;
 	// Added by Solange
diff --git a/src/ui/procsd/TGConnectorDelegateProCSD.java b/src/ui/procsd/TGConnectorDelegateProCSD.java
index 4ab22ac293003a1c32ef138b925ab10c98ad5949..896fde9a48137bb0a5088267df3e154d44f2fc5f 100644
--- a/src/ui/procsd/TGConnectorDelegateProCSD.java
+++ b/src/ui/procsd/TGConnectorDelegateProCSD.java
@@ -51,13 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.cd.TGConnectorAssociation;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorDelegateProCSD extends TGConnectorProCSD {
     protected int arrowLength = 10;
diff --git a/src/ui/procsd/TGConnectorPortInterface.java b/src/ui/procsd/TGConnectorPortInterface.java
index 516441b25fa2aa553f62993b05b778bcb1e6683f..2a1b046fa0a0b2644bb5967c57cf7a904b45702d 100644
--- a/src/ui/procsd/TGConnectorPortInterface.java
+++ b/src/ui/procsd/TGConnectorPortInterface.java
@@ -1,18 +1,12 @@
 package ui.procsd;
 
-import java.awt.Point;
-import java.util.Vector;
-
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import ui.*;
 
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
+import java.awt.*;
+import java.util.Vector;
 
 public class TGConnectorPortInterface extends TGConnectorAttribute{
 
diff --git a/src/ui/procsd/TGConnectorProCSD.java b/src/ui/procsd/TGConnectorProCSD.java
index 12b8ca574a4cfafd3d15f340f9c050d7a47bdeb9..a4b6dd743cff6b27ea11fbd6f31d9cff51b1e333 100644
--- a/src/ui/procsd/TGConnectorProCSD.java
+++ b/src/ui/procsd/TGConnectorProCSD.java
@@ -51,17 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.JPopupMenu;
-
-import myutil.*;
-import ui.*;
-import ui.cd.TGConnectorAssociation;
+import java.util.Vector;
 
 //this is a binding 
 //from a port to another port
diff --git a/src/ui/prosmd/ProSMDAction.java b/src/ui/prosmd/ProSMDAction.java
index 0e9ead789edf2aed99233d3d041cdcb4661e93aa..b05b00ebd734727511bf475e88e09ec911872ade 100644
--- a/src/ui/prosmd/ProSMDAction.java
+++ b/src/ui/prosmd/ProSMDAction.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 public class   ProSMDAction extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDChoice.java b/src/ui/prosmd/ProSMDChoice.java
index 1b35b976ccd42ac3745375f85e57eb08601a7158..e6938e02c8e139bf166f980238123ad67d637033 100644
--- a/src/ui/prosmd/ProSMDChoice.java
+++ b/src/ui/prosmd/ProSMDChoice.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDChoice extends TGCWithInternalComponent {
     protected int lineLength = 0;
diff --git a/src/ui/prosmd/ProSMDGetMsg.java b/src/ui/prosmd/ProSMDGetMsg.java
index 87245fac8e8d54393e7bfc6a68ddc29bb78c0aff..41e758b0827dd86bb56d00bfce339b7fd7b7e35e 100755
--- a/src/ui/prosmd/ProSMDGetMsg.java
+++ b/src/ui/prosmd/ProSMDGetMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ProSMDGetMsg extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/prosmd/ProSMDJunction.java b/src/ui/prosmd/ProSMDJunction.java
index d5ef0ada19fd67f1291b2afda290648b62d1315f..98576d802d223c0f85ba584465ed2dc8ce70d065 100644
--- a/src/ui/prosmd/ProSMDJunction.java
+++ b/src/ui/prosmd/ProSMDJunction.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDJunction extends TGCWithoutInternalComponent {
     protected int lineLength = 10;
diff --git a/src/ui/prosmd/ProSMDParallel.java b/src/ui/prosmd/ProSMDParallel.java
index 91af2528af9b0ab5f32c867d188d9ffdfd2438c8..255ff64517a5b6d43e36ad74c53ff58f82209ca7 100644
--- a/src/ui/prosmd/ProSMDParallel.java
+++ b/src/ui/prosmd/ProSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDParallel extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/prosmd/ProSMDSendMsg.java b/src/ui/prosmd/ProSMDSendMsg.java
index 9286354e47063d3c0c3ecc6c7325bfbcd0b0eb3e..3ac3656625c025744a980a8dc6210289a08475a7 100755
--- a/src/ui/prosmd/ProSMDSendMsg.java
+++ b/src/ui/prosmd/ProSMDSendMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ProSMDSendMsg extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/prosmd/ProSMDStartState.java b/src/ui/prosmd/ProSMDStartState.java
index 0b5b9652b6d433179b6b1903c2387bfab96181db..72e5649c5b7b605bbf507c45b54323c82eb34002 100755
--- a/src/ui/prosmd/ProSMDStartState.java
+++ b/src/ui/prosmd/ProSMDStartState.java
@@ -46,11 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDStartState extends TGCWithoutInternalComponent{
     private int lineLength = 5;
     
diff --git a/src/ui/prosmd/ProSMDState.java b/src/ui/prosmd/ProSMDState.java
index ef8c5a8bc329c5799bea53d9be448aee86217592..5ea204d1a1405c491208e5d0021bea34f0d73e7c 100644
--- a/src/ui/prosmd/ProSMDState.java
+++ b/src/ui/prosmd/ProSMDState.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDState extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDStopState.java b/src/ui/prosmd/ProSMDStopState.java
index b30f6675c8ae3c09d4804b8fb08bfd406efaf4d8..f4030c04de4b1e8ffd375ce1d492952fb29be411 100755
--- a/src/ui/prosmd/ProSMDStopState.java
+++ b/src/ui/prosmd/ProSMDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDStopState extends TGCWithoutInternalComponent{
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDSubmachine.java b/src/ui/prosmd/ProSMDSubmachine.java
index 63a1cc45478ca6675c9f32617c8b6d45644bed0e..25f0d8776178aff581de62ecd6c99685888e78ae 100644
--- a/src/ui/prosmd/ProSMDSubmachine.java
+++ b/src/ui/prosmd/ProSMDSubmachine.java
@@ -46,20 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.procsd.ProActiveCompSpecificationCSDPanel;
-import ui.window.*;
+import java.util.Vector;
 
 public class  ProSMDSubmachine extends TGCOneLineText implements ActionListener {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProactiveSMDPanel.java b/src/ui/prosmd/ProactiveSMDPanel.java
index f3caeba0d0f2edbe3c8ce99748ce7c7b1d071c8b..07d4cb17a33ca186a98deaebcbbe0f9afce70831 100755
--- a/src/ui/prosmd/ProactiveSMDPanel.java
+++ b/src/ui/prosmd/ProactiveSMDPanel.java
@@ -46,17 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
 import fr.inria.oasis.vercors.cttool.model.Behaviour;
-
-import javax.xml.parsers.*;
-
-import ui.*;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TToolBar;
 
 public class ProactiveSMDPanel extends TDiagramPanel implements Behaviour {
     
diff --git a/src/ui/prosmd/ProactiveSMDToolBar.java b/src/ui/prosmd/ProactiveSMDToolBar.java
index ccf516172278daefc5c088ef5d8cb0cd1854c3b1..022fc87a66cc33e8b0dec8d7f6060a2d90a6eb77 100755
--- a/src/ui/prosmd/ProactiveSMDToolBar.java
+++ b/src/ui/prosmd/ProactiveSMDToolBar.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class ProactiveSMDToolBar extends TToolBar {
     
diff --git a/src/ui/prosmd/TGConnectingPointProSMD.java b/src/ui/prosmd/TGConnectingPointProSMD.java
index 97cf5ab3146642a0cb50ed7a8fe71567d7c5fffb..6d3f67fb664e36a06ff70aa8389d9c399b3327ab 100755
--- a/src/ui/prosmd/TGConnectingPointProSMD.java
+++ b/src/ui/prosmd/TGConnectingPointProSMD.java
@@ -46,8 +46,9 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointProSMD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/prosmd/TGConnectorProSMD.java b/src/ui/prosmd/TGConnectorProSMD.java
index 501100b7174252aa904f1697a7db22a7ef277cc8..ba33f06b3402083dac26c52455dea27fc5f9eba6 100755
--- a/src/ui/prosmd/TGConnectorProSMD.java
+++ b/src/ui/prosmd/TGConnectorProSMD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorProSMD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/prosmd/util/CorrespondanceSMDManager.java b/src/ui/prosmd/util/CorrespondanceSMDManager.java
index 037fc30b449e92a635e1c0d4a7ad649303f1a736..199c1970c8d9d5383f60bcf8a65fece9fc126458 100644
--- a/src/ui/prosmd/util/CorrespondanceSMDManager.java
+++ b/src/ui/prosmd/util/CorrespondanceSMDManager.java
@@ -1,13 +1,13 @@
 package ui.prosmd.util;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
 import translator.ADComponent;
 import ui.TGComponent;
 import ui.prosmd.ProSMDState;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 public class CorrespondanceSMDManager {
 
 	List <CorrespondanceSMDElement> elements;
diff --git a/src/ui/req/EBRDDObserver.java b/src/ui/req/EBRDDObserver.java
index 40ed7b5f2af59d5baf50d32590aa646f9de36aab..be3a7789b471bee9ec098dd2fbb3ba5c61a0736d 100755
--- a/src/ui/req/EBRDDObserver.java
+++ b/src/ui/req/EBRDDObserver.java
@@ -47,15 +47,11 @@
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class EBRDDObserver extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/Requirement.java b/src/ui/req/Requirement.java
index c3d03f6d77aaec044c4bea559b17d4799acc29dc..1255bbb5984b2b4166d1da2c88cacac88694817d 100755
--- a/src/ui/req/Requirement.java
+++ b/src/ui/req/Requirement.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class Requirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/RequirementDiagramPanel.java b/src/ui/req/RequirementDiagramPanel.java
index e96317eaf841d1d16b02c3487b8bd15a2b0564ca..8772dc870f58ad9b4f3e94559d2daef6b71cc033 100755
--- a/src/ui/req/RequirementDiagramPanel.java
+++ b/src/ui/req/RequirementDiagramPanel.java
@@ -46,10 +46,12 @@
 
 package ui.req;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
+
 public class RequirementDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     
 	public Vector<Requirement> validated, ignored;
diff --git a/src/ui/req/RequirementDiagramToolBar.java b/src/ui/req/RequirementDiagramToolBar.java
index db4f8ff146104e1b2f5bc569f189fea0bbfee8eb..8a8512e76c215e9635075ed87bb26bc2f4e6303d 100755
--- a/src/ui/req/RequirementDiagramToolBar.java
+++ b/src/ui/req/RequirementDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.req;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class RequirementDiagramToolBar extends TToolBar {
     
     public RequirementDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/req/RequirementObserver.java b/src/ui/req/RequirementObserver.java
index c22d6e319618fa4bf3628362997cd7dca9c9a569..194cd71246421220a3aec1c5fdee75ceda55904e 100755
--- a/src/ui/req/RequirementObserver.java
+++ b/src/ui/req/RequirementObserver.java
@@ -47,15 +47,17 @@
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class RequirementObserver extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/TAttributeObserver.java b/src/ui/req/TAttributeObserver.java
index b7e0f2bde67d7a40a82856e88e47f598bc78b952..04c2e4aa5978a7d61fa53b78a5407c72ae9b5a86 100755
--- a/src/ui/req/TAttributeObserver.java
+++ b/src/ui/req/TAttributeObserver.java
@@ -46,15 +46,16 @@
 
 package ui.req;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TAttributeObserver extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/req/TAttributeRequirement.java b/src/ui/req/TAttributeRequirement.java
index 2dded69a8e731ac8ed3079b21b9fbc0604c6471f..619103f7f6b8d59c9730afecc6ee360aa6649562 100755
--- a/src/ui/req/TAttributeRequirement.java
+++ b/src/ui/req/TAttributeRequirement.java
@@ -46,15 +46,15 @@
 
 package ui.req;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TAttributeRequirement extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/req/TGConnectingPointDerive.java b/src/ui/req/TGConnectingPointDerive.java
index 63b54d1950dba0032712a53076c1f44f40f54217..9605b52adf3d3a4c1d0a3b23b82286867049e855 100755
--- a/src/ui/req/TGConnectingPointDerive.java
+++ b/src/ui/req/TGConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.req;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointDerive extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/req/TGConnectingPointVerify.java b/src/ui/req/TGConnectingPointVerify.java
index f2dfb145251b3adb67a62197d7e31fbd945942fc..5f0597491ffacb4f88836a9348314df98872f6c2 100755
--- a/src/ui/req/TGConnectingPointVerify.java
+++ b/src/ui/req/TGConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.req;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointVerify extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/req/TGConnectorComposition.java b/src/ui/req/TGConnectorComposition.java
index ee6e4005c6a18412d169982acce036664e413d24..135ca6bd2add16f707c7b6e769d0fe9306670d9f 100755
--- a/src/ui/req/TGConnectorComposition.java
+++ b/src/ui/req/TGConnectorComposition.java
@@ -47,13 +47,12 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorComposition extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorCopy.java b/src/ui/req/TGConnectorCopy.java
index 3986d28cb3cf7d0d7bd27e3473f0f978c62e50e8..0b9a87d14003b0df25b4c53a555ff103a570830f 100755
--- a/src/ui/req/TGConnectorCopy.java
+++ b/src/ui/req/TGConnectorCopy.java
@@ -46,13 +46,13 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorCopy extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorDerive.java b/src/ui/req/TGConnectorDerive.java
index 7ef414a3a652911ee865421d51a46be62d0afe8e..24cfd95d3f014b5d6d0a733d3b49dd26677f6795 100755
--- a/src/ui/req/TGConnectorDerive.java
+++ b/src/ui/req/TGConnectorDerive.java
@@ -46,13 +46,13 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorDerive extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorVerify.java b/src/ui/req/TGConnectorVerify.java
index 8c73759c6fcce9a19a1e9663fe486654bfc489d3..d13b2829a0befbbecfa1a6c5920ee42164dc0331 100755
--- a/src/ui/req/TGConnectorVerify.java
+++ b/src/ui/req/TGConnectorVerify.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorVerify extends TGConnector {
     int w, h;
diff --git a/src/ui/sd/SDAbsoluteTimeConstraint.java b/src/ui/sd/SDAbsoluteTimeConstraint.java
index 77a3f5a01e4502338cb41e46e3cf4a221430d537..38f69473fd769f572f9559cbe73c19e0162c4e59 100755
--- a/src/ui/sd/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDAbsoluteTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String minConstraint = "0";
diff --git a/src/ui/sd/SDActionState.java b/src/ui/sd/SDActionState.java
index 33bd5acdf26a69733150ac9203bf40488db59a64..70c9b0fd82e3a145d003e36b439037d7d697a287 100755
--- a/src/ui/sd/SDActionState.java
+++ b/src/ui/sd/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDActionState extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd/SDCoregion.java b/src/ui/sd/SDCoregion.java
index 28f9f02a16c6282c8e4dc110d1bf8b460d7145ab..fd4364a83e7a448726e793bb4b810ff7ed751a17 100755
--- a/src/ui/sd/SDCoregion.java
+++ b/src/ui/sd/SDCoregion.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDCoregion extends TGCOneLineText implements SwallowedTGComponent {
     
     public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd/SDGuard.java b/src/ui/sd/SDGuard.java
index a9a35a5d7c34986213d0b0eb0984b814e6b8190d..19f9e845fd6a8deb6ce038e9299f423267d699da 100755
--- a/src/ui/sd/SDGuard.java
+++ b/src/ui/sd/SDGuard.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDGuard extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd/SDInstance.java b/src/ui/sd/SDInstance.java
index 0f9c38a8ed1d28ece77a6fa15b5403391785604c..672654728c522206bee98056d46ff88fb4e49080 100755
--- a/src/ui/sd/SDInstance.java
+++ b/src/ui/sd/SDInstance.java
@@ -47,13 +47,15 @@
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd/SDRelativeTimeConstraint.java b/src/ui/sd/SDRelativeTimeConstraint.java
index 23796a4fec0b9f27680ba367d9fd67c1021ea3c0..7f86175ab8411b0099ec4b499ea78aca2eac1e5e 100755
--- a/src/ui/sd/SDRelativeTimeConstraint.java
+++ b/src/ui/sd/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDRelativeTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     
     public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd/SDTimeInterval.java b/src/ui/sd/SDTimeInterval.java
index 3f5c483c2971c1689e29bb563de108bc07226457..39d1c12e47ff41ab0dff13576a9415d9dd47905f 100755
--- a/src/ui/sd/SDTimeInterval.java
+++ b/src/ui/sd/SDTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
     private int textX, textY;
     private int incrementY = 3;
diff --git a/src/ui/sd/SDTimerCancellation.java b/src/ui/sd/SDTimerCancellation.java
index 3a74047b5cf6d3e80e8472e455087570160ac39d..d3834ee42afdf6885d6f16e56e001b80b7ae2f1b 100755
--- a/src/ui/sd/SDTimerCancellation.java
+++ b/src/ui/sd/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerCancellation extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerExpiration.java b/src/ui/sd/SDTimerExpiration.java
index 0c8fbefbf123bebc00b3000ec856a1610a12049d..db255c072bab8fcc4ea1da7bb8daae540923886e 100755
--- a/src/ui/sd/SDTimerExpiration.java
+++ b/src/ui/sd/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerExpiration extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerSetting.java b/src/ui/sd/SDTimerSetting.java
index beae54e76458a3f407397e77ec5524d2a487875e..3a1b2d024b1e2ef50b75b5f0e8d738d02b70d7cd 100755
--- a/src/ui/sd/SDTimerSetting.java
+++ b/src/ui/sd/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDTimerSetting extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
diff --git a/src/ui/sd/SequenceDiagramPanel.java b/src/ui/sd/SequenceDiagramPanel.java
index 687ebe8a9f8173e0acd5fa0b71df86d976884858..da37d99bb8887f968413f4d931e461498e4824ba 100755
--- a/src/ui/sd/SequenceDiagramPanel.java
+++ b/src/ui/sd/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.sd;
 
-import myutil.*;
+import ui.*;
 
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.*;
 
 public class SequenceDiagramPanel extends TDiagramPanel{
 
diff --git a/src/ui/sd/SequenceDiagramToolBar.java b/src/ui/sd/SequenceDiagramToolBar.java
index 0c05a8376b8098cd95bf2937fca4dbb3e1489722..4429e696c77b43b0c23ff1a6e2adc611c60f54d0 100755
--- a/src/ui/sd/SequenceDiagramToolBar.java
+++ b/src/ui/sd/SequenceDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SequenceDiagramToolBar extends TToolBar {
     
     public SequenceDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/sd/TGConnectingPointMessageSD.java b/src/ui/sd/TGConnectingPointMessageSD.java
index b3a68496060e7b56ea63f304de545abf550bd35a..acdb1d0d8aabdb8b71910b2e5631de697cdd279b 100755
--- a/src/ui/sd/TGConnectingPointMessageSD.java
+++ b/src/ui/sd/TGConnectingPointMessageSD.java
@@ -48,7 +48,9 @@ package ui.sd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointMessageSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd/TGConnectingPointTimeConstraintSD.java b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
index f18a28c95714391849df546c6463ed85129c1274..de40e34caf5c2ac5d64c4a41869a24fb50c0904f 100755
--- a/src/ui/sd/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTimeConstraintSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
index cf570321285b40785cba827ab3bc98f528e9cc87..f9ab23508333438ea2ff7a6a0edef0e9d2a6544c 100755
--- a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
@@ -47,13 +47,13 @@
 package ui.sd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncOrSyncSD extends TGConnectorMessageSD {
     public boolean isAsync;
diff --git a/src/ui/sd/TGConnectorMessageAsyncSD.java b/src/ui/sd/TGConnectorMessageAsyncSD.java
index 0f05d0570cd0447e302263ed16c1c556d72f81da..a305ed6de4183550c1ec5a878cdc24b9646afc8d 100755
--- a/src/ui/sd/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
 package ui.sd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
 
diff --git a/src/ui/sd/TGConnectorMessageSD.java b/src/ui/sd/TGConnectorMessageSD.java
index 50d01fa9dd1991ce37d5e968c9ab185b95105c92..653d1974f6c6949b976b5885594b08e3653cbdb3 100755
--- a/src/ui/sd/TGConnectorMessageSD.java
+++ b/src/ui/sd/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
 package ui.sd;
 
 
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
 
-import java.awt.event.*;
-//import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public abstract class TGConnectorMessageSD extends TGConnector {
     public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd/TGConnectorMessageSyncSD.java b/src/ui/sd/TGConnectorMessageSyncSD.java
index ac6d3d43a64eac25e3f0736ecb7ed052a64fdb66..d22179906a7d2a075f662b76562788ba63485acf 100755
--- a/src/ui/sd/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
 
 package ui.sd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
     protected int arrowLength = 10;
 
diff --git a/src/ui/sd/TGConnectorRelativeTimeSD.java b/src/ui/sd/TGConnectorRelativeTimeSD.java
index a416c5e8b630362de8eef86d072441e96f88d0a8..c4db1fa6951316c763bcfd8779087e41aff306da 100755
--- a/src/ui/sd/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorRelativeTimeSD extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/sd2/SDAbsoluteTimeConstraint.java b/src/ui/sd2/SDAbsoluteTimeConstraint.java
index 9a3aba780a1551eae2005fb94b6163f41be9a66a..102b4dbfba0a33e3f38ada0bc69d1e6789356f93 100755
--- a/src/ui/sd2/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd2/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDAbsoluteTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String minConstraint = "0";
diff --git a/src/ui/sd2/SDActionState.java b/src/ui/sd2/SDActionState.java
index 3b704f946c9c529d6fac4bc21d16af29e1ed6a21..aba112b6420820aca6c0fd820a2af689084f25cd 100755
--- a/src/ui/sd2/SDActionState.java
+++ b/src/ui/sd2/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDActionState extends TGCScalableOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd2/SDCoregion.java b/src/ui/sd2/SDCoregion.java
index 99050c05b7045b0512588b46c90b7ae47fd14bd0..a6aa1261d30f3f534e803669c6dec18f0fafe3f6 100755
--- a/src/ui/sd2/SDCoregion.java
+++ b/src/ui/sd2/SDCoregion.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDCoregion extends TGCScalableOneLineText implements SwallowedTGComponent {
 
     public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd2/SDGuard.java b/src/ui/sd2/SDGuard.java
index 94b385a97d4320105ab96693bc0b60c9f6d9bbb9..399c3766d4823cdd46d22b6fb18cf224501c8432 100755
--- a/src/ui/sd2/SDGuard.java
+++ b/src/ui/sd2/SDGuard.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDGuard extends TGCScalableOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd2/SDInstance.java b/src/ui/sd2/SDInstance.java
index dfe342ae99fd8baa047f6d66b4a5d28242ce4a41..1f981748b8b8f3b4ce332a75806e215c000c0d8f 100755
--- a/src/ui/sd2/SDInstance.java
+++ b/src/ui/sd2/SDInstance.java
@@ -47,13 +47,16 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd2/SDPortForMessage.java b/src/ui/sd2/SDPortForMessage.java
index 0a5f94472b1113d31a5de9db8e4babaf20c41081..73c6c6c03d715eab0ddecb39cdebe7c11aecc688 100755
--- a/src/ui/sd2/SDPortForMessage.java
+++ b/src/ui/sd2/SDPortForMessage.java
@@ -47,13 +47,10 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd2/SDRelativeTimeConstraint.java b/src/ui/sd2/SDRelativeTimeConstraint.java
index 29a1ee80029cdf47a50fe297cd586fc59f5a479d..ce802a83b3c2f5dfa6fcf6f80c75c93f8a92df42 100755
--- a/src/ui/sd2/SDRelativeTimeConstraint.java
+++ b/src/ui/sd2/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDRelativeTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
 
     public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd2/SDTimeInterval.java b/src/ui/sd2/SDTimeInterval.java
index 5b43e9a1b34d3d62efaf342b33f01a4286770b22..969d7a5ddc3c60f747364820c869ea75ab4c5d01 100755
--- a/src/ui/sd2/SDTimeInterval.java
+++ b/src/ui/sd2/SDTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
     private int textX, textY;
     private int incrementY = 3;
diff --git a/src/ui/sd2/SDTimerCancellation.java b/src/ui/sd2/SDTimerCancellation.java
index 78026027f8fca14ffb7c89d8d61eded76d68b587..4af5ae45e0cf149fffd701b3e5a76f84ecfdffb0 100755
--- a/src/ui/sd2/SDTimerCancellation.java
+++ b/src/ui/sd2/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerCancellation extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerExpiration.java b/src/ui/sd2/SDTimerExpiration.java
index fe4ab461431f90c5c90db7b4777685e62e59da6e..76c8a195d7fcc29973a49f6b1897df17c4467198 100755
--- a/src/ui/sd2/SDTimerExpiration.java
+++ b/src/ui/sd2/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerExpiration extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerSetting.java b/src/ui/sd2/SDTimerSetting.java
index 576ec89d4a8982166f2045ac51957fe398b5cef1..dbda903cbdac9d0baa1ec9732706a3f3f2eab6ae 100755
--- a/src/ui/sd2/SDTimerSetting.java
+++ b/src/ui/sd2/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDTimerSetting extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
diff --git a/src/ui/sd2/SequenceDiagramPanel.java b/src/ui/sd2/SequenceDiagramPanel.java
index 3f17dde1bd192886593e64cd71c875e1cc113bf7..26ffe3cb2dce307c4679d512413e09768af1d16b 100755
--- a/src/ui/sd2/SequenceDiagramPanel.java
+++ b/src/ui/sd2/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.sd2;
 
-import myutil.*;
+import ui.*;
 
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.*;
 
 public class SequenceDiagramPanel extends TDiagramPanel {
 
diff --git a/src/ui/sd2/SequenceDiagramToolBar.java b/src/ui/sd2/SequenceDiagramToolBar.java
index 0b3513ec124f12588644383af827dc72bb4173c3..2ce7ea997e7632e4b36d83fc80bbade02d8f69e1 100755
--- a/src/ui/sd2/SequenceDiagramToolBar.java
+++ b/src/ui/sd2/SequenceDiagramToolBar.java
@@ -46,9 +46,11 @@
 
 package ui.sd2;
 
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class SequenceDiagramToolBar extends TToolBar {
 
diff --git a/src/ui/sd2/TGConnectingPointMessageSD.java b/src/ui/sd2/TGConnectingPointMessageSD.java
index a15c6e0baf2185dfadcca6227c4947c2a7e04343..e9c42c049cf62fca842f0b620f1d1a2c690da605 100755
--- a/src/ui/sd2/TGConnectingPointMessageSD.java
+++ b/src/ui/sd2/TGConnectingPointMessageSD.java
@@ -48,9 +48,9 @@ package ui.sd2;
 
 //import java.awt.*;
 
-import ui.*;
-
-import myutil.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointMessageSD extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
index b856937c3bd35a618f15b16d75ec93bb5a5f80a8..37cfa5e79f7db941a974dfabb4fa47da9f63bc4e 100755
--- a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd2;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTimeConstraintSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd2/TGConnectorMessageAsyncSD.java b/src/ui/sd2/TGConnectorMessageAsyncSD.java
index 7e7ac3afa682de8c86ae2ffc12e5ae9e423977a1..7d5119a9cdeefbbd0b0baa7d3b9c0550661c683d 100755
--- a/src/ui/sd2/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
 package ui.sd2;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
 
diff --git a/src/ui/sd2/TGConnectorMessageSD.java b/src/ui/sd2/TGConnectorMessageSD.java
index 5ecbcbe51838be3a8cdc7deab74e4e21ea6fe329..01e881332c737632fcb5ef1617f0b7fc8231dcc4 100755
--- a/src/ui/sd2/TGConnectorMessageSD.java
+++ b/src/ui/sd2/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
 package ui.sd2;
 
 
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
 
-import java.awt.event.*;
-//import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public abstract class TGConnectorMessageSD extends TGConnector {
     public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd2/TGConnectorMessageSyncSD.java b/src/ui/sd2/TGConnectorMessageSyncSD.java
index 67a46993c294caedafeae3e2f2d56495fa71ed87..2f69db6b4d104ee7c09cb2e7b017cfd051cb5ab9 100755
--- a/src/ui/sd2/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
     protected int arrowLength = 10;
 
diff --git a/src/ui/sd2/TGConnectorRelativeTimeSD.java b/src/ui/sd2/TGConnectorRelativeTimeSD.java
index d1892ea0c0912c092ba10702e1cda492ec98d7fd..02af51598de26cf89bc10d09bd89bfac668e77e7 100755
--- a/src/ui/sd2/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd2/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorRelativeTimeSD extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
index 8b4ff183900199f4ca6ba62d305c90331bdaa5c5..c13ea2847e29ca29b0b1e90741db65382c94dc35 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.sysmlsecmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class SysmlsecMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
index dc95b9e027e865bf362fceadcfbc8add4e8d75e5..933c5c39254bf086d77a08a871fa681d9a718aaa 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.sysmlsecmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class SysmlsecMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
index 571793a95b41c4f1c9e3eb24650feb12969880b9..41dae503b390a9aeb907ceffe886f5f3c3a5b46d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
@@ -47,12 +47,14 @@
 
 package ui.sysmlsecmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class SysmlsecMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     //protected boolean emptyText;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
index e5a824631fa1761d414a9297b32fac183e11f835..c0b7281b8699c2f04bb130dc76e005abc9e14e05 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
@@ -46,11 +46,9 @@
 
 package ui.sysmlsecmethodology;
 
-import ui.*;
-
+import myutil.TraceManager;
 import org.w3c.dom.Element;
-
-import myutil.*;
+import ui.*;
 
 public class SysmlsecMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     //public Vector validated, ignored;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
index fe6cc995c4a2ae70e5cd34a88bf0c460256a90ad..fad16bcc122a87f9bcbd2ab3879ade527c66258c 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
index 0485b44b0bd52118a8a3b6920ec4013016db3622..d7341bf91ed821381eb1fbdd9dacf1e6bff54254 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@
 
 package ui.sysmlsecmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SysmlsecMethodologyDiagramToolbar extends TToolBar {
 
     public SysmlsecMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
index b9478b4fefe806935816d3071b3945d3903a03a0..cae9d4773e88160fae35d4845ace4e08532929fc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAnalysis extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
index 4011a64625be335cf98d9f184424b6b8eb7ba8d9..e3ea50c797110d1c79ac40cafba990ed70f81c5e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
@@ -48,15 +48,9 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
index a61ea4c84d51ce15d71420b5ddf4314f8cf9fe13..63d2678fbcd7bf824f21781754f46e1fdb77f60a 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToArchitecture extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
index 70f1053cf5c288704bf2d90891b637f93dbd7fff..c75a964cb3975441758deda1ab82ea1b295431ce 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAssumptions extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
index 71a0522921ebaf8d29219d0b8b68693ca3b91b66..e6b5402683a20193d514a71c981de8d4397086cc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAttack extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
index fafde7816c80be4cddc05b16154f08d8d73a9167..243fd37445073a10d55da29f98ede28bf081e7ee 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToCP extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
index dc1ab7f4f7d7b4b48f6c65b22eabf07b5f1f62cf..7b9651504d3cab862350edceee059e65fa910c7d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToDesign extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
index 364c562017924cb60edb018e91e81708d5a9d9d5..d0f700fba3b174c88111ce46103c4b3df46afa6d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
@@ -48,15 +48,9 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class SysmlsecMethodologyReferenceToMapping extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
index a1a8bac6aa5584831f52818d6e5852570415fb81..bc3b02aefc7204664699d595c0a533cb3f5cae7e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToProperties extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
index 2c0df38c048024e84671e435b2fd9f63e7e126b9..e59bf578a8a025445699dd24af5070e53a7ebf8a 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToPrototype extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
index a68809e14b3779bdb85d22d1018f8ddb17bd1650..804ff79c98ae31b92c91ada36fbfdd250d0ce35b 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToRequirement extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/tmlad/TGConnectingPointTMLAD.java b/src/ui/tmlad/TGConnectingPointTMLAD.java
index afe80aceb7dc6c7ea934d41af153ba5d16e32451..59837d40399db466343b2a6418135ced369e4b7b 100755
--- a/src/ui/tmlad/TGConnectingPointTMLAD.java
+++ b/src/ui/tmlad/TGConnectingPointTMLAD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlad;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLAD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/tmlad/TGConnectorTMLAD.java b/src/ui/tmlad/TGConnectorTMLAD.java
index 291b36d8fb2dade011d4cd0f07303bf2fa514835..982929ced51e9e21e43c943e96e6c00f5f4dace1 100755
--- a/src/ui/tmlad/TGConnectorTMLAD.java
+++ b/src/ui/tmlad/TGConnectorTMLAD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorTMLAD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/tmlad/TMLADActionState.java b/src/ui/tmlad/TMLADActionState.java
index 70c35adedc789f459b7218582e40759bd622f00f..78e54d65b3b3c2ee939825387e04043a0a49e9fb 100755
--- a/src/ui/tmlad/TMLADActionState.java
+++ b/src/ui/tmlad/TMLADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlad/TMLADChoice.java b/src/ui/tmlad/TMLADChoice.java
index 23a536434a6a3df9c6a06e53131997d9032e4002..2a22b76d67d11d09981d476044bf4b1841375425 100755
--- a/src/ui/tmlad/TMLADChoice.java
+++ b/src/ui/tmlad/TMLADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADDecrypt.java b/src/ui/tmlad/TMLADDecrypt.java
index 06512ea0ffc901be334d1f5a5749f2490485f108..dd7c551786e22e37c0dc1f126d440dc496a39c8a 100755
--- a/src/ui/tmlad/TMLADDecrypt.java
+++ b/src/ui/tmlad/TMLADDecrypt.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADDecrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADDelay.java b/src/ui/tmlad/TMLADDelay.java
index 8a448675a5b72a484aa5eef75001e8568d0e8763..b9e82d22937661abe52b3c85532c076f6db65667 100755
--- a/src/ui/tmlad/TMLADDelay.java
+++ b/src/ui/tmlad/TMLADDelay.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADDelay extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {    private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/tmlad/TMLADDelayInterval.java b/src/ui/tmlad/TMLADDelayInterval.java
index ddd8ba9d650c852affb0feec30af315ec716fe4c..dc3ad45152ddb95edf1400e14a9abbc064b5ec0d 100755
--- a/src/ui/tmlad/TMLADDelayInterval.java
+++ b/src/ui/tmlad/TMLADDelayInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADDelayInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADEncrypt.java b/src/ui/tmlad/TMLADEncrypt.java
index f79128e1d9a0936e8bb97b4499d9e7fca82c64ea..4b1320879013e6abc4861257428618c6fca01bd6 100755
--- a/src/ui/tmlad/TMLADEncrypt.java
+++ b/src/ui/tmlad/TMLADEncrypt.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogCryptographicConfiguration;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADEncrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecC.java b/src/ui/tmlad/TMLADExecC.java
index e3116be6537cd2ebc6d6565d23df2602bfb29e18..dd8b566992e1a99e7918af609c46da376c1bb282 100755
--- a/src/ui/tmlad/TMLADExecC.java
+++ b/src/ui/tmlad/TMLADExecC.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecC extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecCInterval.java b/src/ui/tmlad/TMLADExecCInterval.java
index 06a35375ef9be832d23f8b638f8e939ae5923726..4f706afe7c942c56aaedc5fd5ee4e08825c5f6c9 100755
--- a/src/ui/tmlad/TMLADExecCInterval.java
+++ b/src/ui/tmlad/TMLADExecCInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecCInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecI.java b/src/ui/tmlad/TMLADExecI.java
index 30c673149112b67e3f069eafb2994063b1e60d58..7229e1aadbd19071a0b9798f46af389dcc00ead7 100755
--- a/src/ui/tmlad/TMLADExecI.java
+++ b/src/ui/tmlad/TMLADExecI.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecI extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecIInterval.java b/src/ui/tmlad/TMLADExecIInterval.java
index 96253ca21358b15355808f66caa5caaecfbf4533..e53f54e22aabb51869e01cf082956e71bf2ae9c1 100755
--- a/src/ui/tmlad/TMLADExecIInterval.java
+++ b/src/ui/tmlad/TMLADExecIInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecIInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForEverLoop.java b/src/ui/tmlad/TMLADForEverLoop.java
index bf19be6ea947dcb400967be550e2995c1f0e31d0..e5c5c2c5cd65e3dd4d9fb2a2a912363e59cb915e 100755
--- a/src/ui/tmlad/TMLADForEverLoop.java
+++ b/src/ui/tmlad/TMLADForEverLoop.java
@@ -46,15 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForEverLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForLoop.java b/src/ui/tmlad/TMLADForLoop.java
index cf10bbbdfbfdb1f96d7463f22357b31bc46b2f62..3263b7926bff148cbec99529252b97afa951dca5 100755
--- a/src/ui/tmlad/TMLADForLoop.java
+++ b/src/ui/tmlad/TMLADForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
 
diff --git a/src/ui/tmlad/TMLADForStaticLoop.java b/src/ui/tmlad/TMLADForStaticLoop.java
index 8065058ee8cc80dc2faa90e0a260d0cb08dc7e12..c0e1c2dac21a9ce5876eb2ce6fe7f9a1778a2c92 100755
--- a/src/ui/tmlad/TMLADForStaticLoop.java
+++ b/src/ui/tmlad/TMLADForStaticLoop.java
@@ -46,15 +46,12 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForStaticLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private final static String IN_LOOP = "inside loop";
diff --git a/src/ui/tmlad/TMLADNotifiedEvent.java b/src/ui/tmlad/TMLADNotifiedEvent.java
index 388d35905548703b1c263d8c0299c974ac952f48..012b955333f676624b09ced60a12ccb71f3db0e7 100755
--- a/src/ui/tmlad/TMLADNotifiedEvent.java
+++ b/src/ui/tmlad/TMLADNotifiedEvent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADNotifiedEvent extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADRandom.java b/src/ui/tmlad/TMLADRandom.java
index c84467dcc66b151075ac2d40328b22cb1100c7a7..fa58d8be9ebd97bb5b419cca5ec144eb21598d5c 100755
--- a/src/ui/tmlad/TMLADRandom.java
+++ b/src/ui/tmlad/TMLADRandom.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADRandom extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadChannel.java b/src/ui/tmlad/TMLADReadChannel.java
index eea3d30256442068da1f1262ab1d8f3db330a917..c9f1df43b9c7509745185a2b0dd92dc470bc8ea3 100755
--- a/src/ui/tmlad/TMLADReadChannel.java
+++ b/src/ui/tmlad/TMLADReadChannel.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADReadChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadRequestArg.java b/src/ui/tmlad/TMLADReadRequestArg.java
index ec8fb33a2b6b7657f5f45985272beaf9dd3df88c..4bc663fa855965ae5d4a481c3cfd818c0116fe02 100755
--- a/src/ui/tmlad/TMLADReadRequestArg.java
+++ b/src/ui/tmlad/TMLADReadRequestArg.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADReadRequestArg extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSelectEvt.java b/src/ui/tmlad/TMLADSelectEvt.java
index cbac4a263f8fba1e62b840b6cdbe7204e53e7608..8fbba0df97fb658aca5b5c26f2af6d2f456cdce6 100755
--- a/src/ui/tmlad/TMLADSelectEvt.java
+++ b/src/ui/tmlad/TMLADSelectEvt.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADSelectEvt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADSendEvent.java b/src/ui/tmlad/TMLADSendEvent.java
index 2f6761a9ffb08b2fcf66a1b4e62c1119c24a2189..60de946f9b08f7a04d38f01d0532899fecd9b876 100755
--- a/src/ui/tmlad/TMLADSendEvent.java
+++ b/src/ui/tmlad/TMLADSendEvent.java
@@ -46,17 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADSendEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSendRequest.java b/src/ui/tmlad/TMLADSendRequest.java
index 3b79c3fa65fcbd72a443538773089fe89508c579..82ae9777fa397c03d87ad4ab8ae97b3058a84e27 100755
--- a/src/ui/tmlad/TMLADSendRequest.java
+++ b/src/ui/tmlad/TMLADSendRequest.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADSendRequest extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSequence.java b/src/ui/tmlad/TMLADSequence.java
index 9993058e628a8b5adabe4103df4b89d598bfb7da..02afcdca0c976d6132dbf24a5eeb49ac47e53435 100755
--- a/src/ui/tmlad/TMLADSequence.java
+++ b/src/ui/tmlad/TMLADSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
   private int textX, textY;
diff --git a/src/ui/tmlad/TMLADStartState.java b/src/ui/tmlad/TMLADStartState.java
index 1f0c8c6a274d7673561ea1553e14ea47db3be884..1074981e6011f119309c51f067ba063c04932d53 100755
--- a/src/ui/tmlad/TMLADStartState.java
+++ b/src/ui/tmlad/TMLADStartState.java
@@ -46,12 +46,12 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/tmlad/TMLADStopState.java b/src/ui/tmlad/TMLADStopState.java
index f0518affe1870c5ea9543e8b8f8290b1c487e1a6..0c9959ba5a61a2bb697bf5e3e608971e3c4216d8 100755
--- a/src/ui/tmlad/TMLADStopState.java
+++ b/src/ui/tmlad/TMLADStopState.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADUnorderedSequence.java b/src/ui/tmlad/TMLADUnorderedSequence.java
index d0578a0805215863669644b028f04e7e4705826e..c7204def0f8f08910ab3565ecdb9d2d2ad5506f3 100755
--- a/src/ui/tmlad/TMLADUnorderedSequence.java
+++ b/src/ui/tmlad/TMLADUnorderedSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADUnorderedSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
   private int textX, textY;
diff --git a/src/ui/tmlad/TMLADWaitEvent.java b/src/ui/tmlad/TMLADWaitEvent.java
index 169e1e7380fdcc6049963961a1d6b824f62bc323..ed59de9e52b347f0557f39bf5a6bdff9bf28fd92 100755
--- a/src/ui/tmlad/TMLADWaitEvent.java
+++ b/src/ui/tmlad/TMLADWaitEvent.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADWaitEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADWriteChannel.java b/src/ui/tmlad/TMLADWriteChannel.java
index 97b7cd14a0752379cac3740536d502153bb9f3de..ebef1a88c953c9ff9cb5d9b1accdb9ec9c29f194 100755
--- a/src/ui/tmlad/TMLADWriteChannel.java
+++ b/src/ui/tmlad/TMLADWriteChannel.java
@@ -46,16 +46,18 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADWriteChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLActivityDiagramPanel.java b/src/ui/tmlad/TMLActivityDiagramPanel.java
index 42cc4acb529ae84090f6a353f307db7e7d362b04..3fcd606c108975793b9aec9456da27aba0b32d94 100755
--- a/src/ui/tmlad/TMLActivityDiagramPanel.java
+++ b/src/ui/tmlad/TMLActivityDiagramPanel.java
@@ -47,14 +47,18 @@
 package ui.tmlad;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class TMLActivityDiagramPanel extends TDiagramPanel {
     
     public  TMLActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
@@ -112,11 +116,11 @@ public class TMLActivityDiagramPanel extends TDiagramPanel {
         // Position correctly guards of choice
     }
     
-        public void enhance() {
+    public void enhance() {
         //System.out.println("enhance");
-        Vector v = new Vector();
-        Object o;
-        Iterator iterator = componentList.listIterator();
+        Vector<TGComponent> v = new Vector<TGComponent>();
+        TGComponent o;
+        Iterator<TGComponent> iterator = componentList.iterator();
         
         while(iterator.hasNext()) {
             o = iterator.next();
@@ -129,7 +133,7 @@ public class TMLActivityDiagramPanel extends TDiagramPanel {
         repaint();
     }
     
-    public void enhance(Vector v, TGComponent tgc) {
+    public void enhance(Vector<TGComponent> v, TGComponent tgc) {
         TGComponent tgc1;
         TGConnector tgcon;
         int i;
@@ -169,46 +173,54 @@ public class TMLActivityDiagramPanel extends TDiagramPanel {
 	public boolean hasAutoConnect() {
 		return true;
 	}
-    public ArrayList<String> getAllCryptoConfig(){
-	ArrayList<String> cc=new ArrayList<String>();
-	LinkedList<TGComponent> comps= getAllComponentList();
-	for (TGComponent c: comps){
-	    if (c instanceof TMLADEncrypt){
-		TMLADEncrypt en= (TMLADEncrypt) c;
-		if (!en.securityContext.isEmpty()){
-		    cc.add(en.securityContext);
+	
+    public List<String> getAllCryptoConfig(){
+		List<String> cc = new ArrayList<String>();
+		List<TGComponent> comps = getAllComponentList();
+		
+		for (TGComponent c: comps){
+		    if (c instanceof TMLADEncrypt){
+		    	TMLADEncrypt en= (TMLADEncrypt) c;
+		    	
+		    	if (!en.securityContext.isEmpty()){
+		    		cc.add(en.securityContext);
+		    	}
+		    }
 		}
-	    }
-	}
-	return cc;
+		
+		return cc;
     }
 
-    public ArrayList<String> getAllNonce(){
-	ArrayList<String> ns=new ArrayList<String>();
-	LinkedList<TGComponent> comps= getAllComponentList();
-	for (TGComponent c: comps){
-	    if (c instanceof TMLADEncrypt){
-		TMLADEncrypt en= (TMLADEncrypt) c;
-		if (!en.securityContext.isEmpty() && en.type.equals("Nonce")){
-		     ns.add(en.securityContext);
-		}
-	    }
-	}
-	return ns;
+    public List<String> getAllNonce(){
+    	List<String> ns=new ArrayList<String>();
+    	List<TGComponent> comps= getAllComponentList();
+    	
+    	for (TGComponent c: comps){
+    		if (c instanceof TMLADEncrypt){
+    			TMLADEncrypt en= (TMLADEncrypt) c;
+    			if (!en.securityContext.isEmpty() && en.type.equals("Nonce")){
+    				ns.add(en.securityContext);
+    			}
+    		}
+    	}
+    	
+    	return ns;
     }
 
-    public ArrayList<String> getAllKeys(){
-	ArrayList<String> ns=new ArrayList<String>();
-	LinkedList<TGComponent> comps= getAllComponentList();
-	for (TGComponent c: comps){
-	    if (c instanceof TMLADEncrypt){
-		TMLADEncrypt en= (TMLADEncrypt) c;
-		if (!en.securityContext.isEmpty() && (en.type.equals("Symmetric Encryption") || en.type.equals("Asymmetric Encryption") ||  en.type.equals("MAC"))){
-		    ns.add(en.securityContext);
-		}
-	    }
-	}
-	return ns;
+    public List<String> getAllKeys(){
+    	List<String> ns=new ArrayList<String>();
+    	List<TGComponent> comps= getAllComponentList();
+    	
+    	for (TGComponent c: comps){
+    		if (c instanceof TMLADEncrypt){
+    			TMLADEncrypt en= (TMLADEncrypt) c;
+    			if (!en.securityContext.isEmpty() && (en.type.equals("Symmetric Encryption") || en.type.equals("Asymmetric Encryption") ||  en.type.equals("MAC"))){
+    				ns.add(en.securityContext);
+    			}
+    		}
+    	}
+    	
+    	return ns;
     }
 
 }
diff --git a/src/ui/tmlad/TMLActivityDiagramToolBar.java b/src/ui/tmlad/TMLActivityDiagramToolBar.java
index f8718c6f9e9c6c0920e4d6c343706a4ac3cc1007..57c8d2cc11c863337f3e753c7d911a5553fba452 100755
--- a/src/ui/tmlad/TMLActivityDiagramToolBar.java
+++ b/src/ui/tmlad/TMLActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TMLActivityDiagramToolBar extends TToolBar {
     
     
diff --git a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
index 227e38f94e786d08fb93544999251d5b61c30f69..bc1635da8a8c51a45669582334359af83adde3ae 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointTMLAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
index 0434caf568938418163b0ab696ec0138e4d7164b..8212a68fda8c2ff75e2e42e031f08e96cbed7a92 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTMLCompositionOperator extends  TGConnectingPoint{
 
diff --git a/src/ui/tmlcd/TGConnectingPointTMLTask.java b/src/ui/tmlcd/TGConnectingPointTMLTask.java
index fdc64f1d80e43b2a438c27848d3b74bb3ea80d5b..f6888389952885c03bfe99b8fd33d98d5960a0c8 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLTask.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLTask.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLTask extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
index 00bc4413d237c230c6e04ee3523ea0ca1e4c9233..660c7ec70119b6232abe261934c574665a6f4151 100755
--- a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
+++ b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
@@ -46,14 +46,15 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public  class TGConnectorTMLAssociationNav extends TGConnector {
     protected int arrowLength = 15;
     protected TGConnectingPointGroup tg;
diff --git a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
index c978e8136150a3aed245c8d33746224f8d7c5539..cd9f4194b4d7a5d9f367bbbc7cf0b0cd7de58bee 100755
--- a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
@@ -46,12 +46,13 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorTMLCompositionOperator extends TGConnector {
     
diff --git a/src/ui/tmlcd/TMLActivityDiagramBox.java b/src/ui/tmlcd/TMLActivityDiagramBox.java
index 7afa9fc64c904a2c8b7b1a6a1f4a23111aeae131..d2a20ddf3d790449ea354cc3c785b5ade27d01f1 100755
--- a/src/ui/tmlcd/TMLActivityDiagramBox.java
+++ b/src/ui/tmlcd/TMLActivityDiagramBox.java
@@ -48,11 +48,11 @@
 package ui.tmlcd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLActivityDiagramBox extends TGCWithoutInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLAttributeBox.java b/src/ui/tmlcd/TMLAttributeBox.java
index 8afe88fd4cf4170e90786414237f1607f719e90e..3be09d67f9c3328f7dfbe265b4bd74a31d86e426 100755
--- a/src/ui/tmlcd/TMLAttributeBox.java
+++ b/src/ui/tmlcd/TMLAttributeBox.java
@@ -47,15 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class TMLAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/tmlcd/TMLChannelOperator.java b/src/ui/tmlcd/TMLChannelOperator.java
index 9cc61207b7a0458740cd6b440f0a4b4f0ee66299..bf2dc2dfc7dc3df76098cd97e35f9bf62fcdb630 100755
--- a/src/ui/tmlcd/TMLChannelOperator.java
+++ b/src/ui/tmlcd/TMLChannelOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLChannelOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLChannelProperties.java b/src/ui/tmlcd/TMLChannelProperties.java
index fe8e524557c7ad173b3cd5ce28ffb2fb63917a26..599334d9b0e3aa2df9f59798de60b7f2b245e492 100755
--- a/src/ui/tmlcd/TMLChannelProperties.java
+++ b/src/ui/tmlcd/TMLChannelProperties.java
@@ -46,16 +46,18 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogChannel;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TMLChannelProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLCompositionOperator.java b/src/ui/tmlcd/TMLCompositionOperator.java
index a3e8a2a93afa971b819d4a0a8b317074b79aca11..efd98b8dcc480014814422a9a288994974f5865b 100755
--- a/src/ui/tmlcd/TMLCompositionOperator.java
+++ b/src/ui/tmlcd/TMLCompositionOperator.java
@@ -47,12 +47,11 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLDataFlowType.java b/src/ui/tmlcd/TMLDataFlowType.java
index 252f620eb6dc8d2b79fa4c9835316325facda201..c9581163037e38894c210335f51b1e8b089052db 100755
--- a/src/ui/tmlcd/TMLDataFlowType.java
+++ b/src/ui/tmlcd/TMLDataFlowType.java
@@ -46,16 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
 public abstract class TMLDataFlowType	{
 
     public static final String UINT_16 = "uint_16";
diff --git a/src/ui/tmlcd/TMLEventOperator.java b/src/ui/tmlcd/TMLEventOperator.java
index daa0c68a99d047f8ae41a7f9d3a9bdf5d760b0c4..460db46a2679941b1795dd181c7f3f4a46261cd1 100755
--- a/src/ui/tmlcd/TMLEventOperator.java
+++ b/src/ui/tmlcd/TMLEventOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLEventOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLEventProperties.java b/src/ui/tmlcd/TMLEventProperties.java
index 283a2ddc0b5bf2184b6f0e0fb0d3776e65651d98..2b5b02c04a1daefbb01dbb9150f33f76de0816dd 100755
--- a/src/ui/tmlcd/TMLEventProperties.java
+++ b/src/ui/tmlcd/TMLEventProperties.java
@@ -46,14 +46,15 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogParamFIFO;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLEventProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLOperationBox.java b/src/ui/tmlcd/TMLOperationBox.java
index 4ff5a403dd86594d999e4dd5d816939a811a0b34..6ab091a7ce12ec7a021ad6f0fd474276a9b4d5a1 100755
--- a/src/ui/tmlcd/TMLOperationBox.java
+++ b/src/ui/tmlcd/TMLOperationBox.java
@@ -47,12 +47,12 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TMLOperationBox extends TGCWithoutInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLRequestOperator.java b/src/ui/tmlcd/TMLRequestOperator.java
index 3df64ce9210d5fa8370180e66ca725143bbb6249..cbd48d1f55e823c08fe4867f2a9e7e78150af59c 100755
--- a/src/ui/tmlcd/TMLRequestOperator.java
+++ b/src/ui/tmlcd/TMLRequestOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLRequestOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLRequestProperties.java b/src/ui/tmlcd/TMLRequestProperties.java
index 656670ede0fca86a0dc85cb310e4c270faaec2e8..0a1172f70dc6364ca128161b79f9fe55b1fb6fe1 100755
--- a/src/ui/tmlcd/TMLRequestProperties.java
+++ b/src/ui/tmlcd/TMLRequestProperties.java
@@ -46,16 +46,18 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogParam;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TMLRequestProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLTaskDiagramPanel.java b/src/ui/tmlcd/TMLTaskDiagramPanel.java
index 1eedf34beb7a0bd6afeba22468390c17c9bb154b..6a32aa53128fbc9f0f1887d4e5b8ebe9884a7781 100755
--- a/src/ui/tmlcd/TMLTaskDiagramPanel.java
+++ b/src/ui/tmlcd/TMLTaskDiagramPanel.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcd;
 
 
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
 import ui.*;
-import ui.tmldd.*;
-import ui.tmlcd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 public class TMLTaskDiagramPanel extends TDiagramPanel {
     
diff --git a/src/ui/tmlcd/TMLTaskDiagramToolBar.java b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
index a4508e6db8f9b229c9e56dbfca8b040b460cec04..ece88c8fe444eb54679adc9dc073acd447b1a3c3 100755
--- a/src/ui/tmlcd/TMLTaskDiagramToolBar.java
+++ b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TMLTaskDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/tmlcd/TMLTaskOperator.java b/src/ui/tmlcd/TMLTaskOperator.java
index 0b26f80838eadd839841671312621554d3f8ba73..d5f1d1c950885e222c0d42855186c47e17b8ac24 100755
--- a/src/ui/tmlcd/TMLTaskOperator.java
+++ b/src/ui/tmlcd/TMLTaskOperator.java
@@ -47,16 +47,18 @@
 package ui.tmlcd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.tmlad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.tmlad.TMLActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTaskInterface {
     public String oldValue;
diff --git a/src/ui/tmlcompd/TMLCChannelFacility.java b/src/ui/tmlcompd/TMLCChannelFacility.java
index 5455961f763196e4a443eea1acfa438baf5c450b..96a177d758bb13232d931a6ab16cda0dd2017bde 100755
--- a/src/ui/tmlcompd/TMLCChannelFacility.java
+++ b/src/ui/tmlcompd/TMLCChannelFacility.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public abstract class TMLCChannelFacility extends TGCScalableWithInternalComponent {
     protected Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCChannelOutPort.java b/src/ui/tmlcompd/TMLCChannelOutPort.java
index a2d206535cb4885b0a5e3a602c92595c2caca601..6822fe562c573636a16c186ead7c76888b912388 100755
--- a/src/ui/tmlcompd/TMLCChannelOutPort.java
+++ b/src/ui/tmlcompd/TMLCChannelOutPort.java
@@ -46,17 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCChannelOutPort extends TMLCPrimitivePort {
 	
diff --git a/src/ui/tmlcompd/TMLCCompositeComponent.java b/src/ui/tmlcompd/TMLCCompositeComponent.java
index fc91b5ad81c9404873fe6dda2e4320d070926cff..ad40b71e44369929965e0eae16e5dadd976bd2c5 100755
--- a/src/ui/tmlcompd/TMLCCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+
 public class TMLCCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, HiddenInternalComponents {
 	private int maxFontSize = 20;
 	private int minFontSize = 4;
diff --git a/src/ui/tmlcompd/TMLCCompositePort.java b/src/ui/tmlcompd/TMLCCompositePort.java
index 12744bf26122fc03812f907f4a2fb627ee558ec6..a0eff4ba596daa2cc8abfe4b6547a0e6eead5c1a 100755
--- a/src/ui/tmlcompd/TMLCCompositePort.java
+++ b/src/ui/tmlcompd/TMLCCompositePort.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedTGComponent, WithAttributes {
 	//private Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCFork.java b/src/ui/tmlcompd/TMLCFork.java
index 877aa4f35f692dc0ca510ab81c4a051e70de0f5c..11c42b00b821172926c33722e49f0439c53fd996 100755
--- a/src/ui/tmlcompd/TMLCFork.java
+++ b/src/ui/tmlcompd/TMLCFork.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCFork extends TMLCChannelFacility implements WithAttributes {
     protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCJoin.java b/src/ui/tmlcompd/TMLCJoin.java
index 921a23e95d9c93616fc7ce360f267caf7b7fe399..3ed5daeb447b7834773f49da3eeb6498df32cc0a 100755
--- a/src/ui/tmlcompd/TMLCJoin.java
+++ b/src/ui/tmlcompd/TMLCJoin.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCJoin extends TMLCChannelFacility implements WithAttributes {
     protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCPath.java b/src/ui/tmlcompd/TMLCPath.java
index 917e4f4825b24ad26946607b172b4b15ae06aea5..305e8ecbbfc9376f67ec4a20a50bc6d5b41414ad 100755
--- a/src/ui/tmlcompd/TMLCPath.java
+++ b/src/ui/tmlcompd/TMLCPath.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.TGComponent;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class TMLCPath  {
 
diff --git a/src/ui/tmlcompd/TMLCPortConnectingPoint.java b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
index cfb609b723e762779200ab0a4f20b889a78ed12c..ccd237b984d4054ad93084fb0cb27df5b6e42ce3 100755
--- a/src/ui/tmlcompd/TMLCPortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcompd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TMLCPortConnectingPoint extends TGConnectingPointWidthHeight{
     public TMLCPrimitivePort port;
diff --git a/src/ui/tmlcompd/TMLCPortConnector.java b/src/ui/tmlcompd/TMLCPortConnector.java
index 2c3df9b8291bc232bbbb45550d4df6d670884ed0..d9eb9f0282e23e04720a5fb11649b4f83a811bf6 100755
--- a/src/ui/tmlcompd/TMLCPortConnector.java
+++ b/src/ui/tmlcompd/TMLCPortConnector.java
@@ -47,17 +47,10 @@
 package ui.tmlcompd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
 
 public  class TMLCPortConnector extends TGConnector implements ScalableTGComponent, SpecificActionAfterAdd,  SpecificActionAfterMove{
     //protected int arrowLength = 10;
diff --git a/src/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
index 2843b2159b6466e1bd418f8ddf2fd257d992ac86..0d068e8398783c5a2c29e5e6dd8263e15e737c07 100755
--- a/src/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -46,15 +46,19 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
     private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCPrimitivePort.java b/src/ui/tmlcompd/TMLCPrimitivePort.java
index b09f2061ef4d2eec46b702eaddbf98e746b22084..6a6fd9229e47dfe4d10bba60a57baeab7e0ff9cb 100755
--- a/src/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/ui/tmlcompd/TMLCPrimitivePort.java
@@ -46,15 +46,17 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCompositePort;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected Color myColor;
diff --git a/src/ui/tmlcompd/TMLCRecordComponent.java b/src/ui/tmlcompd/TMLCRecordComponent.java
index f31f4d2cc0fb2e357ad60e0084b1f85592326e30..95421cda33bff724102b3e386460bd3c25dad19f 100755
--- a/src/ui/tmlcompd/TMLCRecordComponent.java
+++ b/src/ui/tmlcompd/TMLCRecordComponent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class TMLCRecordComponent extends TGCScalableWithInternalComponent implements SwallowedTGComponent {
 	private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
index 8de4fe9e312d48d95a00cd437366d1bcf5c40a14..cc20c2f4c1f98444c36da912c509c0453a3fc7a1 100755
--- a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcompd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
 
 public class TMLCReferencePortConnectingPoint extends TMLCPortConnectingPoint{
     
diff --git a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
index e234ac11bf61d11c33ecfac3b504c151e5b23671..65da41344f361a86d92734894b400ad9f7f7466a 100755
--- a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLRemoteCompositeComponent;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
 	private int maxFontSize = 20;
diff --git a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
index aa3b24e5e316ad2c7b29a158ca1203a654b30644..73837a26e17284bb97066f9deb689992e2a3ff6c 100644
--- a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
@@ -46,13 +46,11 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCRemotePortCompositeComponent extends TGCWithInternalComponent implements SwallowedTGComponent, WithAttributes {
     private TMLCCompositePort port;
 	TMLCReferencePortConnectingPoint point;
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index 4860d8cd513c013a2374e3d28fec84955f11ef16..db47f3614839693dfce3101f3596b59757c25f40 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -48,13 +48,12 @@
 package ui.tmlcompd;
 
 
-import org.w3c.dom.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
-import ui.tmldd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import myutil.*;
+import java.util.*;
 
 public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
index eecb34aa86c927677c5f4ba616c5bc60f7aca974..dd1c72f47b57422268ea11611a0f049df04abd46 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TMLComponentTaskDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/tmlcp/TGConnectingPointTMLCP.java b/src/ui/tmlcp/TGConnectingPointTMLCP.java
index 03056539a2513d0ea1b3e0874608a28d792d0327..b7ed057de91cb68b27cc679df7ce4475f5ce2a75 100755
--- a/src/ui/tmlcp/TGConnectingPointTMLCP.java
+++ b/src/ui/tmlcp/TGConnectingPointTMLCP.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcp;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLCP extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/tmlcp/TGConnectorTMLCP.java b/src/ui/tmlcp/TGConnectorTMLCP.java
index d3e6a7c9a5518a5de155af84790e7487f53a8554..57ea9326e4fe0c1673e13a1905a820a3392cd641 100755
--- a/src/ui/tmlcp/TGConnectorTMLCP.java
+++ b/src/ui/tmlcp/TGConnectorTMLCP.java
@@ -46,14 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public class TGConnectorTMLCP extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/tmlcp/TMLCPChoice.java b/src/ui/tmlcp/TMLCPChoice.java
index f9996540764421a4a19dd58d478fef41a7bd0f47..9861d9ebce72e161ad6ec82ef9a07d1b17fa4777 100755
--- a/src/ui/tmlcp/TMLCPChoice.java
+++ b/src/ui/tmlcp/TMLCPChoice.java
@@ -47,13 +47,13 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
+
 public class TMLCPChoice extends TGCWithInternalComponent {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlcp/TMLCPForLoop.java b/src/ui/tmlcp/TMLCPForLoop.java
index bd8658e60f7e3b0195026cd480edd49698084193..ce9b37d33f0e3af52e831a2ec23254ccf2f95f4e 100755
--- a/src/ui/tmlcp/TMLCPForLoop.java
+++ b/src/ui/tmlcp/TMLCPForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLCPForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPFork.java b/src/ui/tmlcp/TMLCPFork.java
index f8a660906b0bdb955397bf552dd5c4745384d3d2..969c166c03ec7088f907b3de74f73a34b5379b61 100755
--- a/src/ui/tmlcp/TMLCPFork.java
+++ b/src/ui/tmlcp/TMLCPFork.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPFork extends TGCWithoutInternalComponent{
 	
 	private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJoin.java b/src/ui/tmlcp/TMLCPJoin.java
index 5f21cc41acc4599f488eed824343a08d9f335db9..61a06c50fc7e3b4b0bf8ce4b7d3ba01195ea8938 100755
--- a/src/ui/tmlcp/TMLCPJoin.java
+++ b/src/ui/tmlcp/TMLCPJoin.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPJoin extends TGCWithoutInternalComponent{
 
 	private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJunction.java b/src/ui/tmlcp/TMLCPJunction.java
index f0e75a53eb970d5f102c9f7ed9e823bbaf65a6cd..270dc78ffa8b124c916ea2fd362e65cbbc1e1355 100755
--- a/src/ui/tmlcp/TMLCPJunction.java
+++ b/src/ui/tmlcp/TMLCPJunction.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TMLCPJunction extends TGCWithoutInternalComponent {
 
diff --git a/src/ui/tmlcp/TMLCPPanel.java b/src/ui/tmlcp/TMLCPPanel.java
index 6010937cb9d4fb31f5dc0a9d4675a751edddacf2..b97257a7052aa953f76352e6f4ca6d35d3d3bc1b 100755
--- a/src/ui/tmlcp/TMLCPPanel.java
+++ b/src/ui/tmlcp/TMLCPPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class TMLCPPanel extends TDiagramPanel {
     
     public  TMLCPPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlcp/TMLCPRefAD.java b/src/ui/tmlcp/TMLCPRefAD.java
index 490bee270cc60baf4eb9420f6d6cd094a4cd2d50..024717bfe8c4ba6e0e0c284110d5788b7525f234 100755
--- a/src/ui/tmlcp/TMLCPRefAD.java
+++ b/src/ui/tmlcp/TMLCPRefAD.java
@@ -47,14 +47,15 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class TMLCPRefAD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlcp/TMLCPRefSD.java b/src/ui/tmlcp/TMLCPRefSD.java
index 0f0308677b5b5a046571a09d6b916a7a532f451a..d6c6d86732918f862a1a3e7dca55425dd9b18d73 100755
--- a/src/ui/tmlcp/TMLCPRefSD.java
+++ b/src/ui/tmlcp/TMLCPRefSD.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
+import ui.tmlsd.TMLSDPanel;
 
-import ui.tmlsd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
 
 public class TMLCPRefSD extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPStartState.java b/src/ui/tmlcp/TMLCPStartState.java
index 9c48cbb7b37388540b90ca6e41bdd5d7114f5e6d..f2018df4edb6f1d18fb92148f3684746889565b6 100755
--- a/src/ui/tmlcp/TMLCPStartState.java
+++ b/src/ui/tmlcp/TMLCPStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLCPStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/tmlcp/TMLCPStopState.java b/src/ui/tmlcp/TMLCPStopState.java
index 5cefc70c880a03b3a96765e7acdbf9607c838594..2e0319eb2f3b1c4f624f1f61a07e991b5b6479ca 100755
--- a/src/ui/tmlcp/TMLCPStopState.java
+++ b/src/ui/tmlcp/TMLCPStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPToolBar.java b/src/ui/tmlcp/TMLCPToolBar.java
index 75bf1c216bba47bb3c36bc11473bfea7346636ce..73bd394d9a438cabbfeaf6b42f995fc540562882 100755
--- a/src/ui/tmlcp/TMLCPToolBar.java
+++ b/src/ui/tmlcp/TMLCPToolBar.java
@@ -47,12 +47,15 @@
 
 package ui.tmlcp;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TMLCPToolBar extends TToolBar {
 
     public TMLCPToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmldd/TMLArchiArtifact.java b/src/ui/tmldd/TMLArchiArtifact.java
index 0887f068d7c5e0050dbad6fcd3839689e5872c95..793c9b4747d891533688a8cb2c9ad37fa0d7c133 100755
--- a/src/ui/tmldd/TMLArchiArtifact.java
+++ b/src/ui/tmldd/TMLArchiArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogTMLTaskArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiTaskInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiBUSNode.java b/src/ui/tmldd/TMLArchiBUSNode.java
index 6f303dbfbfb5840910ea7720cf67567c9af46ccf..397096e58aad757ee5ba5add396fdcd7b5dedd3f 100755
--- a/src/ui/tmldd/TMLArchiBUSNode.java
+++ b/src/ui/tmldd/TMLArchiBUSNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogBUSNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiBUSNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiBridgeNode.java b/src/ui/tmldd/TMLArchiBridgeNode.java
index 4a3f9aba4176789a017d9f596c3e3fdf9411d6d0..2c6504ac42405fcdebf7054fed2526ba1ecab4fa 100755
--- a/src/ui/tmldd/TMLArchiBridgeNode.java
+++ b/src/ui/tmldd/TMLArchiBridgeNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBridge;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogBridgeNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiBridgeNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPNode.java b/src/ui/tmldd/TMLArchiCPNode.java
index 9f8861642a368605df53dab197f07ba8b4aa43ce..0343a108f93da87a3aad4e4a3fc92fc5d42a03cc 100755
--- a/src/ui/tmldd/TMLArchiCPNode.java
+++ b/src/ui/tmldd/TMLArchiCPNode.java
@@ -46,17 +46,22 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.modelcompiler.CpuMemoryCopyMEC;
+import tmltranslator.modelcompiler.DoubleDmaMEC;
+import tmltranslator.modelcompiler.SingleDmaMEC;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommPatternMapping;
 
-import tmltranslator.modelcompiler.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TMLArchiCPNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiCPInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 13c73292359f6dfe274f977e7f32c00058b591e9..fd71988ea29169c2b442b46746f32df8454e605d 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -46,34 +46,19 @@
 
 package ui.tmldd;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Polygon;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
 import tmltranslator.HwCPU;
 import tmltranslator.modelcompiler.ArchUnitMEC;
-import ui.ColorManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.WithAttributes;
+import ui.*;
 import ui.window.JDialogCPUNode;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
+
 public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
     private int textY2 = 30;
@@ -457,12 +442,12 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
         removeInternalComponent(tgc);
     }
 
-
-    public Vector getArtifactList() {
-        Vector v = new Vector();
+    public Vector<TMLArchiArtifact> getArtifactList() {
+        Vector<TMLArchiArtifact> v = new Vector<TMLArchiArtifact>();
+        
         for(int i=0; i<nbInternalTGComponent; i++) {
             if (tgcomponent[i] instanceof TMLArchiArtifact) {
-                v.add(tgcomponent[i]);
+                v.add( (TMLArchiArtifact) tgcomponent[i] );
             }
         }
         return v;
diff --git a/src/ui/tmldd/TMLArchiCommunicationArtifact.java b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
index c6145723ea5aad35aee17f495105a469878b5dce..20b9c31f217ef0f2a8ae73d42ac204fcb40d23d8 100755
--- a/src/ui/tmldd/TMLArchiCommunicationArtifact.java
+++ b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
@@ -46,14 +46,15 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommunicationArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiCommunicationArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiChannelInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiCommunicationNode.java b/src/ui/tmldd/TMLArchiCommunicationNode.java
index d1b4da2f97a136d3d7bfc114e9f0bfe52b74047c..817f063558bde28d115e685fd4463fccba3f14e8 100755
--- a/src/ui/tmldd/TMLArchiCommunicationNode.java
+++ b/src/ui/tmldd/TMLArchiCommunicationNode.java
@@ -47,17 +47,12 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.SwallowTGComponent;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements SwallowTGComponent {
 
diff --git a/src/ui/tmldd/TMLArchiConnectingPoint.java b/src/ui/tmldd/TMLArchiConnectingPoint.java
index 51d583dc905a12c89296a44cbdfcd6b14f7211f3..3755b74440052cb052fbec77b0527ee27443a01b 100755
--- a/src/ui/tmldd/TMLArchiConnectingPoint.java
+++ b/src/ui/tmldd/TMLArchiConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmldd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TMLArchiConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/tmldd/TMLArchiConnectorNode.java b/src/ui/tmldd/TMLArchiConnectorNode.java
index 464b17201ef4e0594600c8d7b9a8e153eddac0c7..00cb3a59049225741306261b5d5481814a541dae 100755
--- a/src/ui/tmldd/TMLArchiConnectorNode.java
+++ b/src/ui/tmldd/TMLArchiConnectorNode.java
@@ -46,31 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
-import myutil.TraceManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnector;
-import ui.WithAttributes;
+import ui.*;
 import ui.window.JDialogTMLConnectorNode;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public  class TMLArchiConnectorNode extends TGConnector implements WithAttributes {
     protected int arrowLength = 10;
     protected int widthValue, heightValue, maxWidthValue, h;
diff --git a/src/ui/tmldd/TMLArchiCrossbarNode.java b/src/ui/tmldd/TMLArchiCrossbarNode.java
index ec8eef3276442bcb75ee43862a19298e0b77f185..fc786c30b7786e03c08a3e0862e96636f5d49e94 100755
--- a/src/ui/tmldd/TMLArchiCrossbarNode.java
+++ b/src/ui/tmldd/TMLArchiCrossbarNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCrossbarNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiCrossbarNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDMANode.java b/src/ui/tmldd/TMLArchiDMANode.java
index c191b60301ad34f304b7beef5b87d30a63fe3afd..f891cff9bb93889437661abe2bbbbd8a506dd9a3 100755
--- a/src/ui/tmldd/TMLArchiDMANode.java
+++ b/src/ui/tmldd/TMLArchiDMANode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwDMA;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogDMANode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiDMANode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDiagramPanel.java b/src/ui/tmldd/TMLArchiDiagramPanel.java
index 45a86cc8ed0855851b5377de999ca4b309020d90..ef95665964d361c460c0db4703e198c4ba03c464 100755
--- a/src/ui/tmldd/TMLArchiDiagramPanel.java
+++ b/src/ui/tmldd/TMLArchiDiagramPanel.java
@@ -47,12 +47,15 @@
 
 package ui.tmldd;
 
-import myutil.*;
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 
     public static final int VIEW_ALL = 0;
@@ -212,36 +215,38 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
       return true;
       }*/
 
-    public LinkedList getListOfNodes() {
-        LinkedList ll = new LinkedList();
+    public List<TMLArchiNode> getListOfNodes() {
+        List<TMLArchiNode> ll = new LinkedList<TMLArchiNode>();
         TGComponent tgc;
-        Iterator iterator = componentList.listIterator();
+        Iterator<TGComponent> iterator = componentList.listIterator();
 
         while(iterator.hasNext()) {
-            tgc = (TGComponent)(iterator.next());
+            tgc = iterator.next();
+            
             if (tgc instanceof TMLArchiCPUNode) {
-                ll.add(tgc);
+                ll.add( (TMLArchiCPUNode) tgc );
             }
 
             if (tgc instanceof TMLArchiHWANode) {
-                ll.add(tgc);
+                ll.add( (TMLArchiHWANode) tgc );
             }
 
             if (tgc instanceof TMLArchiCommunicationNode) {
-                ll.add(tgc);
+                ll.add( (TMLArchiCommunicationNode) tgc );
             }
         }
 
         return ll;
     }
 
-    public LinkedList getListOfLinks() {
-        LinkedList ll = new LinkedList();
+    public List<TGComponent> getListOfLinks() {
+        List<TGComponent> ll = new LinkedList<TGComponent> ();
         TGComponent tgc;
-        Iterator iterator = componentList.listIterator();
+        Iterator<TGComponent> iterator = componentList.listIterator();
 
         while(iterator.hasNext()) {
-            tgc = (TGComponent)(iterator.next());
+            tgc = iterator.next();
+            
             if (tgc instanceof TMLArchiConnectorNode) {
                 ll.add(tgc);
             }
@@ -251,19 +256,22 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
     }
 
     public boolean isMapped(String _ref, String _name) {
-        ListIterator iterator = getListOfNodes().listIterator();
+        Iterator<TMLArchiNode> iterator = getListOfNodes().listIterator();
         TMLArchiNode node;
-        Vector v;
+        Vector<TMLArchiArtifact> v;
         TMLArchiArtifact artifact;
         int i;
         String name = _ref + "::" + _name;
 
         while(iterator.hasNext()) {
-            node = (TMLArchiNode)(iterator.next());
+            node = iterator.next();
+            
             if (node instanceof TMLArchiCPUNode) {
-                v =  ((TMLArchiCPUNode)(node)).getArtifactList();
+                v =  ((TMLArchiCPUNode) node ).getArtifactList();
+                
                 for(i=0; i<v.size(); i++) {
-                    artifact = (TMLArchiArtifact)(v.get(i));
+                    artifact = v.get(i);
+                    
                     if (artifact.getValue().equals(name)) {
                         return true;
                     }
@@ -275,19 +283,18 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
     }
 
     public void renameMapping(String oldName, String newName) {
-        ListIterator iterator = getListOfNodes().listIterator();
+        Iterator<TMLArchiNode> iterator = getListOfNodes().listIterator();
         TMLArchiNode node;
-        Vector v;
+        Vector<TMLArchiArtifact> v;
         TMLArchiArtifact artifact;
-        ArrayList<TMLArchiCommunicationArtifact> ChannelList;
-        ArrayList<TMLArchiEventArtifact> EventList;
+        List<TMLArchiCommunicationArtifact> ChannelList;
+        List<TMLArchiEventArtifact> EventList;
         int i;
 
         while(iterator.hasNext()) {
-            node = (TMLArchiNode)(iterator.next());
+            node = iterator.next();
 
             // Task mapping
-
             if ((node instanceof TMLArchiCPUNode) || (node instanceof TMLArchiHWANode)) {
                 if (node instanceof TMLArchiCPUNode) {
                     v =  ((TMLArchiCPUNode)(node)).getArtifactList();
@@ -298,7 +305,7 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
                 }
 
                 for(i=0; i<v.size(); i++) {
-                    artifact = (TMLArchiArtifact)(v.get(i));
+                    artifact = v.get(i);
                     if (artifact.getReferenceTaskName().compareTo(oldName) == 0) {
                         artifact.setReferenceTaskName(newName);
                     }
@@ -325,14 +332,13 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
     }
 
     public void setPriority( String _name, int _priority ) {
-
-        ListIterator iterator = getListOfNodes().listIterator();
+        Iterator<TMLArchiNode> iterator = getListOfNodes().iterator();
         TMLArchiNode node;
-        Vector v;
-        TMLArchiArtifact artifact;
-        ArrayList<TMLArchiCommunicationArtifact> ChannelList;
-        ArrayList<TMLArchiEventArtifact> EventList;
-        int i;
+        //Vector v;
+       // TMLArchiArtifact artifact;
+        List<TMLArchiCommunicationArtifact> ChannelList;
+        List<TMLArchiEventArtifact> EventList;
+       // int i;
 
         while(iterator.hasNext()) {
             node = (TMLArchiNode)(iterator.next());
@@ -359,13 +365,13 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
 
     public int getMaxPriority( String _name ) {
 
-        ListIterator iterator = getListOfNodes().listIterator();
+        Iterator<TMLArchiNode> iterator = getListOfNodes().iterator();
         TMLArchiNode node;
-        Vector v;
-        TMLArchiArtifact artifact;
-        ArrayList<TMLArchiCommunicationArtifact> ChannelList;
-        ArrayList<TMLArchiEventArtifact> EventList;
-        int i;
+       // Vector v;
+        //TMLArchiArtifact artifact;
+        List<TMLArchiCommunicationArtifact> ChannelList;
+        List<TMLArchiEventArtifact> EventList;
+        //int i;
         int prio = 0;
 
         while(iterator.hasNext()) {
@@ -387,34 +393,34 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
                 }
             }
         }
+        
         return prio;
     }
 
     public void setCurrentView(int _index) {
-	TraceManager.addDev("SelectedView=" + _index);
-	view = _index;
-	repaint();
+		TraceManager.addDev("SelectedView=" + _index);
+		view = _index;
+		repaint();
     }
 
     public boolean inCurrentView(TGComponent tgc) {
-	switch(view) {
-	case VIEW_ALL:
-	    return true;
-	case VIEW_ARCHITECTURE_ONLY:
-	    return (tgc instanceof TMLArchiElementInterface);
-	case VIEW_TASK_MAPPING:
-	    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiTaskInterface);
-	case VIEW_CHANNEL_MAPPING:
-	    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiChannelInterface);
-	case VIEW_COMM_PATTERN:
-	    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface);
-	case VIEW_COMM_PATTERN_MAPPING:
-	    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface) ||  (tgc instanceof TMLArchiPortInterface);
-	case VIEW_SECURITY_MAPPING:
-	    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiSecurityInterface) || (tgc instanceof TMLArchiTaskInterface);
-	default:
-	    return true;
-	}
+		switch(view) {
+		case VIEW_ALL:
+		    return true;
+		case VIEW_ARCHITECTURE_ONLY:
+		    return (tgc instanceof TMLArchiElementInterface);
+		case VIEW_TASK_MAPPING:
+		    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiTaskInterface);
+		case VIEW_CHANNEL_MAPPING:
+		    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiChannelInterface);
+		case VIEW_COMM_PATTERN:
+		    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface);
+		case VIEW_COMM_PATTERN_MAPPING:
+		    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface) ||  (tgc instanceof TMLArchiPortInterface);
+		case VIEW_SECURITY_MAPPING:
+		    return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiSecurityInterface) || (tgc instanceof TMLArchiTaskInterface);
+		default:
+		    return true;
+		}
     }
-
 }//End of class
diff --git a/src/ui/tmldd/TMLArchiDiagramToolBar.java b/src/ui/tmldd/TMLArchiDiagramToolBar.java
index 5d3fa9beb335729ba9e5cb8b1ad025b50ef1771f..0e68e3868e387fac7ae8cd12ffadc1a1b384dccc 100755
--- a/src/ui/tmldd/TMLArchiDiagramToolBar.java
+++ b/src/ui/tmldd/TMLArchiDiagramToolBar.java
@@ -47,12 +47,14 @@
 
 package ui.tmldd;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class TMLArchiDiagramToolBar extends TToolBar  implements ActionListener {
 
@@ -142,15 +144,15 @@ public class TMLArchiDiagramToolBar extends TToolBar  implements ActionListener
             button = this.add(mgui.actions[TGUIAction.TMLARCHI_EVENT_ARTIFACT]);
             button.addMouseListener(mgui.mouseHandler);
         }
-		button = this.add(mgui.actions[TGUIAction.TMLARCHI_COMMUNICATION_ARTIFACT]);
+        button = this.add(mgui.actions[TGUIAction.TMLARCHI_COMMUNICATION_ARTIFACT]);
         button.addMouseListener(mgui.mouseHandler);
-		button = this.add(mgui.actions[TGUIAction.TMLARCHI_PORT_ARTIFACT]);
+        button = this.add(mgui.actions[TGUIAction.TMLARCHI_PORT_ARTIFACT]);
         button.addMouseListener(mgui.mouseHandler);
-		button = this.add(mgui.actions[TGUIAction.TMLARCHI_KEY]);
+        button = this.add(mgui.actions[TGUIAction.TMLARCHI_KEY]);
         button.addMouseListener(mgui.mouseHandler);
-		this.addSeparator();
-		
-		button = this.add(mgui.actions[TGUIAction.ACT_TOGGLE_ATTR]);
+        this.addSeparator();
+
+        button = this.add(mgui.actions[TGUIAction.ACT_TOGGLE_ATTR]);
         button = this.add(mgui.actions[TGUIAction.TMLARCHI_COMMUNICATION_ARTIFACT]);
         button.addMouseListener(mgui.mouseHandler);
         button = this.add(mgui.actions[TGUIAction.TMLARCHI_PORT_ARTIFACT]);
@@ -166,32 +168,32 @@ public class TMLArchiDiagramToolBar extends TToolBar  implements ActionListener
 
         button = this.add(mgui.actions[TGUIAction.ACT_TOGGLE_DIPLO_ID]);
         button.addMouseListener(mgui.mouseHandler);
-		
-		this.addSeparator();
-		
-		button = this.add(mgui.actions[TGUIAction.ACT_TOGGLE_DIPLO_ID]);
+
+        this.addSeparator();
+
+        button = this.add(mgui.actions[TGUIAction.ACT_TOGGLE_DIPLO_ID]);
         button.addMouseListener(mgui.mouseHandler);
 
-	this.addSeparator();
-	if (viewInfos == null) {
-	    TraceManager.addDev("null viewInfos");   
-	}
-	box = new JComboBox(viewInfos);
-	this.add(box);
-	box.addActionListener(this);
+        this.addSeparator();
+        if (viewInfos == null) {
+            TraceManager.addDev("null viewInfos");
+        }
+        box = new JComboBox(viewInfos);
+        this.add(box);
+        box.addActionListener(this);
     }
 
     public void setPanel(TMLArchiDiagramPanel _panel) {
-	panel = _panel;
+        panel = _panel;
     }
 
-    
+
     public void actionPerformed(ActionEvent e) {
-	if (e.getSource() == box) {
-	    if (panel != null) {
-		panel.setCurrentView(box.getSelectedIndex());
-	    }
-	}
+        if (e.getSource() == box) {
+            if (panel != null) {
+                panel.setCurrentView(box.getSelectedIndex());
+            }
+        }
     }
-    
+
 } // Class
diff --git a/src/ui/tmldd/TMLArchiEventArtifact.java b/src/ui/tmldd/TMLArchiEventArtifact.java
index 6485f64abab7f587c36d2120245fa21f958c73ff..d858b08b1d2f17e27db31b4b577e2bb56d525179 100755
--- a/src/ui/tmldd/TMLArchiEventArtifact.java
+++ b/src/ui/tmldd/TMLArchiEventArtifact.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogEventArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiEventArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
 	protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiFirewallNode.java b/src/ui/tmldd/TMLArchiFirewallNode.java
index 8d3044ffa66e074c213e8842f2174bb3b0eb04ce..152e050edd2b7b39b393bbc487c76a0e2f1d0de0 100644
--- a/src/ui/tmldd/TMLArchiFirewallNode.java
+++ b/src/ui/tmldd/TMLArchiFirewallNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogFirewallNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiHWANode.java b/src/ui/tmldd/TMLArchiHWANode.java
index 2facd8976a1c937343cf864d474a6059458283e7..35d3a55f2f48a9d892d105d378c41d57ce7232a4 100755
--- a/src/ui/tmldd/TMLArchiHWANode.java
+++ b/src/ui/tmldd/TMLArchiHWANode.java
@@ -46,17 +46,17 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwCPU;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogHwANode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiKey.java b/src/ui/tmldd/TMLArchiKey.java
index 8da759fc78b8a68096ee68de0fcfc007481544d5..7671bc65705584a9db6d6c0a13a4130f22491051 100755
--- a/src/ui/tmldd/TMLArchiKey.java
+++ b/src/ui/tmldd/TMLArchiKey.java
@@ -46,14 +46,15 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArchiKey;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiKey extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiSecurityInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiMemoryNode.java b/src/ui/tmldd/TMLArchiMemoryNode.java
index 22b2742e4b43d30b069ec0a03825f8effe6e47ed..a2d324a294865fbd1effeb1a4a54c25a83d46c09 100755
--- a/src/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/ui/tmldd/TMLArchiMemoryNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMemoryNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
 
diff --git a/src/ui/tmldd/TMLArchiNode.java b/src/ui/tmldd/TMLArchiNode.java
index 4a041faf35bd1840ba43f34797441b73424d30f3..9b86ac1ab051b473644f64b3e7db8267ff3402dc 100755
--- a/src/ui/tmldd/TMLArchiNode.java
+++ b/src/ui/tmldd/TMLArchiNode.java
@@ -46,8 +46,6 @@
 
 package ui.tmldd;
 
-import java.util.ArrayList;
-
 import tmltranslator.HwNode;
 import tmltranslator.modelcompiler.ArchUnitMEC;
 import tmltranslator.modelcompiler.CpuMEC;
@@ -56,6 +54,8 @@ import ui.TDiagramPanel;
 import ui.TGCWithInternalComponent;
 import ui.TGComponent;
 
+import java.util.ArrayList;
+
 public abstract class TMLArchiNode extends TGCWithInternalComponent implements SwallowTGComponent {
     protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
 
diff --git a/src/ui/tmldd/TMLArchiPortArtifact.java b/src/ui/tmldd/TMLArchiPortArtifact.java
index fc484a44c9ffd2b768844842dc219e7bcd6331f3..7fed235656caffdb8a4699e2c0ff3788984eacbf 100644
--- a/src/ui/tmldd/TMLArchiPortArtifact.java
+++ b/src/ui/tmldd/TMLArchiPortArtifact.java
@@ -46,16 +46,20 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogPortArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiPortInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiVGMNNode.java b/src/ui/tmldd/TMLArchiVGMNNode.java
index b258f634bde9f5536eecda24fa3a361ade6b3cac..a234fb5bfe98da072f321cd4c4fab04c1000a24c 100755
--- a/src/ui/tmldd/TMLArchiVGMNNode.java
+++ b/src/ui/tmldd/TMLArchiVGMNNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogVGMNNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiVGMNNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmlsd/TGConnectingPointTMLSD.java b/src/ui/tmlsd/TGConnectingPointTMLSD.java
index a0fea910d0b84d468fa72601c6cc3dc74fafcc6f..41476c22428afbb9c1fc51d98fcac136c8f96765 100755
--- a/src/ui/tmlsd/TGConnectingPointTMLSD.java
+++ b/src/ui/tmlsd/TGConnectingPointTMLSD.java
@@ -48,7 +48,9 @@ package ui.tmlsd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTMLSD extends  TGConnectingPoint{
     
diff --git a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
index ffef9251c3f3170d4a635af7c97b980a1f50aa46..cb9fdecd389b4ffe2ab261548e6eaf2758b9124a 100755
--- a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
@@ -47,14 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlsd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import tmltranslator.tmlcp.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public class TGConnectorMessageAsyncTMLSD extends TGConnectorMessageTMLSD {
 
diff --git a/src/ui/tmlsd/TGConnectorMessageTMLSD.java b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
index 3b2a1bb01f6976cc98e597d431eb177c8b82760e..17ae5c36ac674bab474d99d15ee570a6126709f1 100755
--- a/src/ui/tmlsd/TGConnectorMessageTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.*;
-
-import java.awt.Point;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import org.w3c.dom.*;
+import ui.window.JDialogMultiStringCP;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public abstract class TGConnectorMessageTMLSD extends TGConnector {
 	protected int arrowLength = 10;
diff --git a/src/ui/tmlsd/TMLSDActionState.java b/src/ui/tmlsd/TMLSDActionState.java
index dab73d32029d51ca768fa29b93e46fdbcada0c13..1157d89eb964191560314ea6148725cacad13a04 100755
--- a/src/ui/tmlsd/TMLSDActionState.java
+++ b/src/ui/tmlsd/TMLSDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLSDActionState extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlsd/TMLSDControllerInstance.java b/src/ui/tmlsd/TMLSDControllerInstance.java
index afb59ce2a90386530271d0dc40824b512ea73d79..69c68c3aee742256e1b0e39bab521838f555eb35 100755
--- a/src/ui/tmlsd/TMLSDControllerInstance.java
+++ b/src/ui/tmlsd/TMLSDControllerInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.JFrame;
-
 import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
 import ui.window.JDialogTMLCPControllerInstance;
 
+import javax.swing.*;
+
 public class TMLSDControllerInstance extends TMLSDInstance implements SwallowTGComponent {
 
     public TMLSDControllerInstance(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDInstance.java b/src/ui/tmlsd/TMLSDInstance.java
index 7c7dc494b6d4a3292641fd3a7819f71a4ff3bafb..8ead775a2f33a650799c68d834666554b934bc67 100755
--- a/src/ui/tmlsd/TMLSDInstance.java
+++ b/src/ui/tmlsd/TMLSDInstance.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-import java.awt.event.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+
 //Abstract class, getType() and editOndoubleClick( JFrame ) are abstract
 public abstract class TMLSDInstance extends TGCWithInternalComponent implements SwallowTGComponent {
 
diff --git a/src/ui/tmlsd/TMLSDPanel.java b/src/ui/tmlsd/TMLSDPanel.java
index 685d44347fb9c846988b8778b7207bf802398a17..8bdd728a8a40589932be186ad1d426f1bf651bea 100755
--- a/src/ui/tmlsd/TMLSDPanel.java
+++ b/src/ui/tmlsd/TMLSDPanel.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlsd;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
+import java.util.Iterator;
+
 public class TMLSDPanel extends TDiagramPanel {
     
     public  TMLSDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlsd/TMLSDStorageInstance.java b/src/ui/tmlsd/TMLSDStorageInstance.java
index 37e6b4191524549de5a5ba4392517d8c333f60b4..e2a92987fa12affb1b7c38d4d8353d0a4187a576 100755
--- a/src/ui/tmlsd/TMLSDStorageInstance.java
+++ b/src/ui/tmlsd/TMLSDStorageInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.JFrame;
-
 import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
 import ui.window.JDialogTMLCPStorageInstance;
 
+import javax.swing.*;
+
 public class TMLSDStorageInstance extends TMLSDInstance implements SwallowTGComponent {
 	
     public TMLSDStorageInstance( int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDToolBar.java b/src/ui/tmlsd/TMLSDToolBar.java
index 3112f28b3e0a12606ffe4dad66c2816ad42f1ae5..b1a3c45ee93d6d0d382c7952a68b7d73accc610a 100755
--- a/src/ui/tmlsd/TMLSDToolBar.java
+++ b/src/ui/tmlsd/TMLSDToolBar.java
@@ -48,13 +48,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-import myutil.*;
-
 public class TMLSDToolBar extends TToolBar {
     
     public TMLSDToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmlsd/TMLSDTransferInstance.java b/src/ui/tmlsd/TMLSDTransferInstance.java
index 6a34ab6aa3152d05ebdd47daed931e9a20e2f2f5..f3e1336176513f616d4a8b60afc39906d6493e92 100755
--- a/src/ui/tmlsd/TMLSDTransferInstance.java
+++ b/src/ui/tmlsd/TMLSDTransferInstance.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.*;
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCPTransferInstance;
+
+import javax.swing.*;
 
 public class TMLSDTransferInstance extends TMLSDInstance implements SwallowTGComponent {
 
diff --git a/src/ui/tree/CorrespondanceValidationDataTree.java b/src/ui/tree/CorrespondanceValidationDataTree.java
index 81a04c284f0dfb52dc75ac025e7122650cf3f4f1..2efa79e331339b92028375c667b2f049389b3fd1 100755
--- a/src/ui/tree/CorrespondanceValidationDataTree.java
+++ b/src/ui/tree/CorrespondanceValidationDataTree.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import translator.*;
-import myutil.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
 
 public class CorrespondanceValidationDataTree implements GenericTree {
     	
diff --git a/src/ui/tree/DiagramTreeModel.java b/src/ui/tree/DiagramTreeModel.java
index 501d4e7db495e58ee38bcff50acaff442f55634e..9f4423ce13292a1cfd92d07bff103181881f4ebd 100755
--- a/src/ui/tree/DiagramTreeModel.java
+++ b/src/ui/tree/DiagramTreeModel.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.Vector;
-
-import translator.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
 import ui.*;
-import myutil.*;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDDataType;
 
-import ui.avatarbd.*;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import java.util.Vector;
 
 public class DiagramTreeModel implements TreeModel {
     private MainGUI mgui;
diff --git a/src/ui/tree/DiagramTreeRenderer.java b/src/ui/tree/DiagramTreeRenderer.java
index 7c05cab39bf4254e93e352ec7eb0202e17baad77..29ca54c8af52ef5dbda7644dceb51fc86ff210b8 100755
--- a/src/ui/tree/DiagramTreeRenderer.java
+++ b/src/ui/tree/DiagramTreeRenderer.java
@@ -46,49 +46,42 @@
 
 package ui.tree;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
-
-import translator.*;
+import translator.GroupOfGates;
 import ui.*;
-import ui.ad.*;
-import ui.atd.*;
-import ui.cd.*;
-import ui.iod.*;
-import ui.ebrdd.*;
-import ui.req.*;
-import ui.sd.*;
-import ui.dd.*;
-import ui.ucd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.tmlcompd.*;
-import ui.tmlcp.*;
-import ui.tmlsd.*;
-
-import ui.ncdd.*;
-
-import ui.graph.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.cd.TClassDiagramPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.ncdd.NCDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.req.RequirementDiagramPanel;
+import ui.sd.SequenceDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmlsd.TMLSDPanel;
+import ui.ucd.UseCaseDiagramPanel;
 
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.avatarbd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarmad.*;
-import ui.avatarad.*;
-import ui.avatarcd.*;
-import ui.avatardd.*;
-
-import ui.diplodocusmethodology.*;
-import ui.avatarmethodology.*;
-import ui.sysmlsecmethodology.*;
-
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import java.awt.*;
 
 
 
diff --git a/src/ui/tree/GraphTree.java b/src/ui/tree/GraphTree.java
index 4162b83936e04a111e95bb5411b021327d9d6519..c7425b72c2ff2ec584c07d0268536cf9684ca9ae 100755
--- a/src/ui/tree/GraphTree.java
+++ b/src/ui/tree/GraphTree.java
@@ -45,11 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
-import ui.graph.*;
+import myutil.GenericTree;
+import ui.MainGUI;
+import ui.graph.RG;
 
-import java.util.*;
+import java.util.List;
 
 public class GraphTree implements GenericTree {
     
diff --git a/src/ui/tree/InvariantDataTree.java b/src/ui/tree/InvariantDataTree.java
index 4fc05e02869dcd8db0fc5baef8b0525044a43dc6..9a53a729606093c6a09bcdaa34894624611e2fb4 100755
--- a/src/ui/tree/InvariantDataTree.java
+++ b/src/ui/tree/InvariantDataTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.Invariant;
+import ui.MainGUI;
 
-import java.util.*;
+import java.util.List;
 
 public class InvariantDataTree implements GenericTree {
     
diff --git a/src/ui/tree/JDiagramTree.java b/src/ui/tree/JDiagramTree.java
index 4ef494e32b7ccf6d169ba4b94676908cb3e4f19e..95d7485b5c645fc08ace6e482061bc81db9ffa5c 100755
--- a/src/ui/tree/JDiagramTree.java
+++ b/src/ui/tree/JDiagramTree.java
@@ -47,16 +47,26 @@
 package ui.tree;
 
 //import java.awt.*;
-import java.awt.event.*;
+
+import ui.*;
+import ui.graph.RG;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 //import translator.*;
-import ui.*;
-import ui.graph.*;
-import myutil.*;
 
 
 public class JDiagramTree extends javax.swing.JTree implements ActionListener, MouseListener, TreeExpansionListener, TreeSelectionListener, Runnable   {
diff --git a/src/ui/tree/SearchTree.java b/src/ui/tree/SearchTree.java
index 45c6548ab0a7ad4293662306840c711694980055..a45ae633a60b352bb4543d156458f4e2626cb8b9 100755
--- a/src/ui/tree/SearchTree.java
+++ b/src/ui/tree/SearchTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class SearchTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisErrorTree.java b/src/ui/tree/SyntaxAnalysisErrorTree.java
index 7f4028540a38b1d299581de7505d43047a4e5dd3..abceff4841aca969d771e4a5b6d721085e8e05b3 100755
--- a/src/ui/tree/SyntaxAnalysisErrorTree.java
+++ b/src/ui/tree/SyntaxAnalysisErrorTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.List;
 
 public class SyntaxAnalysisErrorTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisTree.java b/src/ui/tree/SyntaxAnalysisTree.java
index 1b111a39eb983920c654b736886a85fb5838b1f3..cfe75fb398977c17a3d17c99c901ea54b3e6c598 100755
--- a/src/ui/tree/SyntaxAnalysisTree.java
+++ b/src/ui/tree/SyntaxAnalysisTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 public class SyntaxAnalysisTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisWarningTree.java b/src/ui/tree/SyntaxAnalysisWarningTree.java
index 6f7278b9eb505c671c17239e77447b74384b0415..a2d6c08cd326bbb4a76ea7149e4bf0441ade5160 100755
--- a/src/ui/tree/SyntaxAnalysisWarningTree.java
+++ b/src/ui/tree/SyntaxAnalysisWarningTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.List;
 
 public class SyntaxAnalysisWarningTree implements GenericTree {
     
diff --git a/src/ui/tree/TClassesValidationDataTree.java b/src/ui/tree/TClassesValidationDataTree.java
index a5d4e4b907a37367fce4ff1b6f748420b440d8ad..e72e60d9dd8a3d049f1265c6ebfc58eda9588429 100755
--- a/src/ui/tree/TClassesValidationDataTree.java
+++ b/src/ui/tree/TClassesValidationDataTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 
 public class TClassesValidationDataTree<T> implements GenericTree {
diff --git a/src/ui/tree/ValidationDataTree.java b/src/ui/tree/ValidationDataTree.java
index b33fc53d2fa703b9106f170aedb52acffd7ce66c..2d798135ce5778ef1e11327c0c5752f8bc9d3a3d 100755
--- a/src/ui/tree/ValidationDataTree.java
+++ b/src/ui/tree/ValidationDataTree.java
@@ -45,8 +45,8 @@
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 public class ValidationDataTree implements GenericTree {
 
diff --git a/src/ui/ucd/TGConnectingPointActorUCD.java b/src/ui/ucd/TGConnectingPointActorUCD.java
index 5f2802cb8ba03edcf30fbb8c0ba65baa10439c71..9c4f366b8e8f7f038999403aeb9b5d392c7b497f 100755
--- a/src/ui/ucd/TGConnectingPointActorUCD.java
+++ b/src/ui/ucd/TGConnectingPointActorUCD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointActorUCD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ucd/TGConnectingPointUCD.java b/src/ui/ucd/TGConnectingPointUCD.java
index a614eb2ac39f9e076290c8c9f3250df492c96898..cb282490329579b100c912cddb2c2fd4033a25fc 100755
--- a/src/ui/ucd/TGConnectingPointUCD.java
+++ b/src/ui/ucd/TGConnectingPointUCD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ucd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointUCD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ucd/TGConnectorExtend.java b/src/ui/ucd/TGConnectorExtend.java
index f0f09e7c2296506b49848e810ad99481d8d8a3a0..dd4f8ebf171ad947f09ca7bbb2154a02b63513ff 100755
--- a/src/ui/ucd/TGConnectorExtend.java
+++ b/src/ui/ucd/TGConnectorExtend.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.util.*;
-
-
 import ui.*;
 
+import java.util.Vector;
+
 public  class TGConnectorExtend extends TGConnectorUC {
     
     public TGConnectorExtend(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorInclude.java b/src/ui/ucd/TGConnectorInclude.java
index f7da1580234e0c9ddf1e038b92c0c8242e0c23e8..7d512a47b75bc1a3c791d81f631aea68b9b2a15c 100755
--- a/src/ui/ucd/TGConnectorInclude.java
+++ b/src/ui/ucd/TGConnectorInclude.java
@@ -46,10 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Vector;
+
 public  class TGConnectorInclude extends TGConnectorUC {
     
     public TGConnectorInclude(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorSpecialization.java b/src/ui/ucd/TGConnectorSpecialization.java
index ac83ff85bd25a2cc16962cb215363ac6ef7c5380..8bb40f4a00ea29a8983a980774c7a4a730039d83 100755
--- a/src/ui/ucd/TGConnectorSpecialization.java
+++ b/src/ui/ucd/TGConnectorSpecialization.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class TGConnectorSpecialization extends TGConnector {
     
     public TGConnectorSpecialization(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorUC.java b/src/ui/ucd/TGConnectorUC.java
index 5c5fcade5201bcdf5fdaea694ada9c214ff7e688..b87548bfb2516f7142f3fdbba6f195375f788014 100755
--- a/src/ui/ucd/TGConnectorUC.java
+++ b/src/ui/ucd/TGConnectorUC.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.TGConnector;
 
-import ui.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  abstract class TGConnectorUC extends TGConnector {
     int w, h;
diff --git a/src/ui/ucd/TGConnectorUseCase.java b/src/ui/ucd/TGConnectorUseCase.java
index 919e45c1f85b97edde8e1b1f232d48727843afe0..1421a04845ddd3343a0f13482e26be05c9c8952d 100755
--- a/src/ui/ucd/TGConnectorUseCase.java
+++ b/src/ui/ucd/TGConnectorUseCase.java
@@ -46,12 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class TGConnectorUseCase extends TGConnector {
     
     public TGConnectorUseCase(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/UCDActor.java b/src/ui/ucd/UCDActor.java
index 7f6eca4790d9100544153cba7df176b2ebcbbdd9..1649bf69788a6ca784ef58579440e68df9d7aa56 100755
--- a/src/ui/ucd/UCDActor.java
+++ b/src/ui/ucd/UCDActor.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ucd/UCDActorBox.java b/src/ui/ucd/UCDActorBox.java
index 8808c4f8e09d5525567ef7cb459b1b4d5101091d..7732107026c0722323d47c87da91403c8fbc299d 100755
--- a/src/ui/ucd/UCDActorBox.java
+++ b/src/ui/ucd/UCDActorBox.java
@@ -46,11 +46,11 @@
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDActorBox extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
       protected int textX =  5;
diff --git a/src/ui/ucd/UCDBorder.java b/src/ui/ucd/UCDBorder.java
index 944b43e4a8b95dcfe48ad208d8716878fa9b97b0..8535ebf79a6e6db11db52c7441e6ab9aef55d16e 100755
--- a/src/ui/ucd/UCDBorder.java
+++ b/src/ui/ucd/UCDBorder.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDBorder extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ucd/UCDUseCase.java b/src/ui/ucd/UCDUseCase.java
index 6f36d1146536fa027b65c0c7a73ad8378e6c9441..da64012039d7f94cf42ddd915bf8ea68f1871023 100755
--- a/src/ui/ucd/UCDUseCase.java
+++ b/src/ui/ucd/UCDUseCase.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.window.JDialogUseCase;
 
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class UCDUseCase extends TGCScalableWithoutInternalComponent {
     protected int lineLength = 5;
diff --git a/src/ui/ucd/UseCaseDiagramPanel.java b/src/ui/ucd/UseCaseDiagramPanel.java
index e4002e0755f08acd22a89f904cc22e12c620a880..e9c38786f79a7ca8779786b2d2c93b351a424875 100755
--- a/src/ui/ucd/UseCaseDiagramPanel.java
+++ b/src/ui/ucd/UseCaseDiagramPanel.java
@@ -46,10 +46,10 @@
 
 package ui.ucd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.ListIterator;
+
 public class UseCaseDiagramPanel extends TDiagramPanel {
 
     public  UseCaseDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ucd/UseCaseDiagramToolBar.java b/src/ui/ucd/UseCaseDiagramToolBar.java
index f41cb1035960dfd46b9e72b80d81e37bb9b5ab74..4dfa23ba65e5abfc1989e964c91da95f1223ec08 100755
--- a/src/ui/ucd/UseCaseDiagramToolBar.java
+++ b/src/ui/ucd/UseCaseDiagramToolBar.java
@@ -46,11 +46,12 @@
 
 package ui.ucd;
 
-import javax.swing.*;
-
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
 
 public class UseCaseDiagramToolBar extends TToolBar {
 
diff --git a/src/ui/window/DeadlockItem.java b/src/ui/window/DeadlockItem.java
index accc4b8d2a96378d5f075e21f48e80796f79d760..cb46ab476243fba30d3d358334d724272df87c55 100755
--- a/src/ui/window/DeadlockItem.java
+++ b/src/ui/window/DeadlockItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import java.util.*;
+import java.util.Vector;
 
 public class DeadlockItem implements Comparable {
     private String name;
diff --git a/src/ui/window/DeadlockTableModel.java b/src/ui/window/DeadlockTableModel.java
index 05dafb21f9200335576dbc2c9928d462f32bdf91..8109a9d7a2b6551dc492be2351949c80407675fd 100755
--- a/src/ui/window/DeadlockTableModel.java
+++ b/src/ui/window/DeadlockTableModel.java
@@ -46,11 +46,14 @@
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import ui.graph.*;
+import myutil.DijkstraState;
+import myutil.GraphAlgorithms;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.Collections;
+import java.util.Vector;
 
 public class DeadlockTableModel extends AbstractTableModel {
     Vector deadlockData;
diff --git a/src/ui/window/EquipmentsNCTableModel.java b/src/ui/window/EquipmentsNCTableModel.java
index a203d7aefa70b670cfe79231578d7fb87ea54406..bd824e1644c690aa67a2cf24808c03c706bbc84f 100755
--- a/src/ui/window/EquipmentsNCTableModel.java
+++ b/src/ui/window/EquipmentsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCEquipment;
+import nc.NCPath;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class EquipmentsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/GateSimulationTrace.java b/src/ui/window/GateSimulationTrace.java
index 73c55388f1e04316ffb506a042414709a45452a5..6468afcc55d68c68aaa80aee16ac6f3ea175feff 100755
--- a/src/ui/window/GateSimulationTrace.java
+++ b/src/ui/window/GateSimulationTrace.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import java.util.*;
+import translator.Gate;
+import translator.GroupOfGates;
 
-import translator.*;
+import java.util.Vector;
 
 
 public class GateSimulationTrace extends Vector {
diff --git a/src/ui/window/GeneralInfoNCTableModel.java b/src/ui/window/GeneralInfoNCTableModel.java
index d22dda1fb1febce4fe86ee43a5e4b6bcce8032b6..d40f5d915c2e91e61d33d39acc089b4d7cbd6bc1 100755
--- a/src/ui/window/GeneralInfoNCTableModel.java
+++ b/src/ui/window/GeneralInfoNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class GeneralInfoNCTableModel extends AbstractTableModel {
 	
diff --git a/src/ui/window/JBirdPanel.java b/src/ui/window/JBirdPanel.java
index 09f07cb169683ecd3c9a8a82afcc144778cbf872..9c9c5a4b53e47bfb0e5b09e651f3acad355aa1c6 100755
--- a/src/ui/window/JBirdPanel.java
+++ b/src/ui/window/JBirdPanel.java
@@ -46,11 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.ColorManager;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 
 
 public class JBirdPanel extends JPanel implements MouseListener, MouseMotionListener {
diff --git a/src/ui/window/JDialogADConnector.java b/src/ui/window/JDialogADConnector.java
index ede7dbd539a79e7aecdc857ae56ab069edf98751..530e6a583a239074ceb5b26bde8458cc2d76ec8c 100755
--- a/src/ui/window/JDialogADConnector.java
+++ b/src/ui/window/JDialogADConnector.java
@@ -47,17 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.IconManager;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
 
-public class JDialogADConnector extends javax.swing.JDialog implements ActionListener  {
+public class JDialogADConnector extends JDialog {//implements ActionListener  {
     
-  //private Vector<String> actions;
+	//private Vector<String> actions;
 	private String guard;//, afterMin, afterMax, computeMin, computeMax; 
 	/*private Vector myAttributes, myMethods;
 	private Vector<String> allElements, insertElements;
@@ -68,17 +66,17 @@ public class JDialogADConnector extends javax.swing.JDialog implements ActionLis
 	private boolean cancelled = false;
     
   private JPanel panel1;
-	private JPanel panel2;
+	//private JPanel panel2;
     
     // Panel1
-	private JTextField guardT, afterMinT, afterMaxT, computeMinT, computeMaxT;
-	private JTextArea actionsT;
-	private JComboBox elements;
-	private JButton insertElement;
+	private JTextField guardT;//, afterMinT, afterMaxT, computeMinT, computeMaxT;
+	//private JTextArea actionsT;
+	//private JComboBox<String> elements;
+	//private JButton insertElement;
     
     // Main Panel
-  private JButton closeButton;
-  private JButton cancelButton;
+	private JButton closeButton;
+	private JButton cancelButton;
 	
 	// Panel of code and files
 	protected JTextArea jtaCode, jtaFiles;
@@ -138,15 +136,15 @@ public class JDialogADConnector extends javax.swing.JDialog implements ActionLis
 	}
     
     private void initComponents() {
-		int i;
+		//int i;
 		
         Container c = getContentPane();
         GridBagLayout gridbag0 = new GridBagLayout();
         GridBagLayout gridbag1 = new GridBagLayout();
-		GridBagLayout gridbag2 = new GridBagLayout();
+		//GridBagLayout gridbag2 = new GridBagLayout();
         GridBagConstraints c0 = new GridBagConstraints();
         GridBagConstraints c1 = new GridBagConstraints();
-		GridBagConstraints c2 = new GridBagConstraints();
+	//	GridBagConstraints c2 = new GridBagConstraints();
         
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(gridbag0);
@@ -282,9 +280,8 @@ public class JDialogADConnector extends javax.swing.JDialog implements ActionLis
         c0.weightx = 1.0;
         c0.gridwidth = GridBagConstraints.REMAINDER; //end row
         
-		
-        
-		JTabbedPane jtp = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+		JTabbedPane jtp = GraphicLib.createTabbedPane();//new JTabbedPane();
 		jtp.add("General", panel1);
 		//jtp.add("Prototyping", panel2);
         c.add(jtp, c0);
@@ -296,29 +293,29 @@ public class JDialogADConnector extends javax.swing.JDialog implements ActionLis
         //closeButton.setPreferredSize(new Dimension(600, 50));
 		
 		
-        closeButton.addActionListener(this);
+       // closeButton.addActionListener(this);
         c.add(closeButton, c0);
         c0.gridwidth = GridBagConstraints.REMAINDER; //end row
         cancelButton = new JButton("Cancel", IconManager.imgic27);
-        cancelButton.addActionListener(this);
+      //  cancelButton.addActionListener(this);
         c.add(cancelButton, c0);
     }
-    
-    public void	actionPerformed(ActionEvent evt)  {
-        //String command = evt.getActionCommand();
-        int fake = 0;
-        // Compare the action command to the known actions.
-        if (evt.getSource() == closeButton)  {
-            //closeDialog();
-						fake++;
-        } else if (evt.getSource() == cancelButton)  {
-            //cancelDialog();
-						fake++;
-        } else if (evt.getSource() == insertElement)  {
-            //insertElements();
-						fake++;
-        } 
-    }
+//    
+//    public void	actionPerformed(ActionEvent evt)  {
+//        //String command = evt.getActionCommand();
+//      //  int fake = 0;
+//        // Compare the action command to the known actions.
+//        if (evt.getSource() == closeButton)  {
+//            //closeDialog();
+//						fake++;
+//        } else if (evt.getSource() == cancelButton)  {
+//            //cancelDialog();
+//						fake++;
+//        } else if (evt.getSource() == insertElement)  {
+//            //insertElements();
+//						fake++;
+//        } 
+//    }
 	
 	/*public void insertElements() {
 		int index = elements.getSelectedIndex();
diff --git a/src/ui/window/JDialogADDBusNode.java b/src/ui/window/JDialogADDBusNode.java
index ff4f324d9ec749a42618c29056aa3140287d2070..3730f0b123a8ae510281a744dbb6c8a13c01824a 100755
--- a/src/ui/window/JDialogADDBusNode.java
+++ b/src/ui/window/JDialogADDBusNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDBusNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDBusNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDCPUNode.java b/src/ui/window/JDialogADDCPUNode.java
index 2c419665d1690a0dcc55f0d6c3234a0ce6dedc85..895a8ef4fd44143b00caeec291af8dd952ddf479 100755
--- a/src/ui/window/JDialogADDCPUNode.java
+++ b/src/ui/window/JDialogADDCPUNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCPUNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCPUNode extends javax.swing.JDialog implements ActionListener {
 	 private static String[] tracemodeTab = {"VCI logger"};
diff --git a/src/ui/window/JDialogADDCoproMWMRNode.java b/src/ui/window/JDialogADDCoproMWMRNode.java
index 1250fa265fc1f25b8e9c7710c1050247f408b7d5..a47431d943c7f47e799ca3f81ba0728b09d2ff80 100755
--- a/src/ui/window/JDialogADDCoproMWMRNode.java
+++ b/src/ui/window/JDialogADDCoproMWMRNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCoproMWMRNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCoproMWMRNode extends javax.swing.JDialog implements ActionListener  {
 		
diff --git a/src/ui/window/JDialogADDCrossbarNode.java b/src/ui/window/JDialogADDCrossbarNode.java
index 2347d60857242ecb1dcbbb61bd7c49ddabe94bc1..c3d6ce66e6b9d47c76d39c6be61ec35c8a9a02d6 100755
--- a/src/ui/window/JDialogADDCrossbarNode.java
+++ b/src/ui/window/JDialogADDCrossbarNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCrossbarNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCrossbarNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDICUNode.java b/src/ui/window/JDialogADDICUNode.java
index 748a81703b5d175061e0b486b85fb1b5425c5d7c..1d4b622d91dcc2b7d6fe33a3cd76af47e8c9f9db 100755
--- a/src/ui/window/JDialogADDICUNode.java
+++ b/src/ui/window/JDialogADDICUNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDICUNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDICUNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDMemoryNode.java b/src/ui/window/JDialogADDMemoryNode.java
index 67c1f9b3792c1d0e6111cab8e074d089a3f3907b..3408d4a1268494be0348fd7f05624f056f8d28e5 100755
--- a/src/ui/window/JDialogADDMemoryNode.java
+++ b/src/ui/window/JDialogADDMemoryNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDMemoryNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogADDTTYNode.java b/src/ui/window/JDialogADDTTYNode.java
index 74274b02deb830404ef5493a8713e5f8228265fd..dea4ed1004da86fc3ac25221bae0b5199fc84800 100755
--- a/src/ui/window/JDialogADDTTYNode.java
+++ b/src/ui/window/JDialogADDTTYNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTTYNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDTTYNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDTimerNode.java b/src/ui/window/JDialogADDTimerNode.java
index 2d70c47a20bfa4a571a51f4ed0313ffca2aea6d2..12945249f362c497075dccb20a7b4a244bd772c6 100755
--- a/src/ui/window/JDialogADDTimerNode.java
+++ b/src/ui/window/JDialogADDTimerNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTimerNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDTimerNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDVgmnNode.java b/src/ui/window/JDialogADDVgmnNode.java
index 5adfbd23b8f5daf4aab9b98fbc2fa68f5368cc46..ccef5877539bb093f3d78a514daafa2aaf66956f 100755
--- a/src/ui/window/JDialogADDVgmnNode.java
+++ b/src/ui/window/JDialogADDVgmnNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDVgmnNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDVgmnNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogArchiKey.java b/src/ui/window/JDialogArchiKey.java
index 273a3054f0394a97d10d989c470144ce081ad04c..fd9c71a89aa3b61e05369aa05adf2880164427c0 100644
--- a/src/ui/window/JDialogArchiKey.java
+++ b/src/ui/window/JDialogArchiKey.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiKey;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogArchiKey extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogArrayGet.java b/src/ui/window/JDialogArrayGet.java
index 53957c2bbae0014da5d681dca7b3a26017b41829..ed417d2e2bebfef3e6731839e36a261030d50226 100755
--- a/src/ui/window/JDialogArrayGet.java
+++ b/src/ui/window/JDialogArrayGet.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArrayGet extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogArraySet.java b/src/ui/window/JDialogArraySet.java
index cc8ae45a031833494046e946e5ddce474a620282..e889b1c22940aa835982dcda36b06a037df087bc 100755
--- a/src/ui/window/JDialogArraySet.java
+++ b/src/ui/window/JDialogArraySet.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArraySet extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogArtifact.java b/src/ui/window/JDialogArtifact.java
index 9257f847a0bad996798c613bce368719e0366b5b..5e649f594fbb53145a3a360020686ad058e67b8d 100755
--- a/src/ui/window/JDialogArtifact.java
+++ b/src/ui/window/JDialogArtifact.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArtifact extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogAssumption.java b/src/ui/window/JDialogAssumption.java
index d994ff78be99249860a627be9fd11193d06cffa4..9dd99ee4b2b45cab3b55116cf76a9e8a2937e3db 100755
--- a/src/ui/window/JDialogAssumption.java
+++ b/src/ui/window/JDialogAssumption.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatarmad.AvatarMADAssumption;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.avatarmad.*;
-
 
 public class JDialogAssumption extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogAttack.java b/src/ui/window/JDialogAttack.java
index 536a613107d3366580d63bbfc92dc57d14dca8ed..e648c6802a3c48510cdc24e29e281dfacbe50c54 100755
--- a/src/ui/window/JDialogAttack.java
+++ b/src/ui/window/JDialogAttack.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.atd.ATDAttack;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAttack extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAttribute.java b/src/ui/window/JDialogAttribute.java
index dfd97f61ec66d4d91c8915226df85d238143d1e2..499a6755a901faa88b3ab7b2f672584ba9b291ad 100755
--- a/src/ui/window/JDialogAttribute.java
+++ b/src/ui/window/JDialogAttribute.java
@@ -46,13 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogAvatarBlock.java b/src/ui/window/JDialogAvatarBlock.java
index c26b6d5ffc184351005f9a72a974906e7e9f9529..f7fb1130bc967d972cfcdc314037dd126459e05b 100755
--- a/src/ui/window/JDialogAvatarBlock.java
+++ b/src/ui/window/JDialogAvatarBlock.java
@@ -46,14 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
@@ -80,7 +86,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
     private String attrib; // "Attributes", "Gates", etc.
 
     // Panel1
-    private JComboBox accessBox, typeBox;
+    private JComboBox<String> accessBox, typeBox;
     private JTextField identifierText;
     private JTextField initialValue;
     private JButton addButton;
@@ -105,7 +111,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
     // Signals
     private boolean hasSignals = true;
     private JPanel panel5, panel6;
-    private JComboBox signalInOutBox;
+    private JComboBox<String> signalInOutBox;
     private JTextField signalText;
     private JButton addSignalButton;
     private JList<AvatarSignal> listSignal;
@@ -175,7 +181,9 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
     }
 
     private void initComponents() {
-        JTabbedPane tabbedPane = new JTabbedPane();
+
+    	// Issue #41 Ordering of tabbed panes 
+        JTabbedPane tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         Container c = getContentPane();
 
         JPanel panelAttr = new JPanel(new BorderLayout());
@@ -186,7 +194,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
         GridBagLayout gridbag1 = new GridBagLayout();
         GridBagLayout gridbag2 = new GridBagLayout();
         GridBagLayout gridbag3 = new GridBagLayout();
-        GridBagLayout gridbag4 = new GridBagLayout();
+       // GridBagLayout gridbag4 = new GridBagLayout();
         GridBagLayout gridbag5 = new GridBagLayout();
         GridBagLayout gridbag6 = new GridBagLayout();
         GridBagLayout gridbag7 = new GridBagLayout();
@@ -243,7 +251,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
         c1.gridwidth = 1;
         c1.fill = GridBagConstraints.HORIZONTAL;
         c1.anchor = GridBagConstraints.CENTER;
-        accessBox = new JComboBox();
+        accessBox = new JComboBox<String>();
         panel1.add(accessBox, c1);
         identifierText = new JTextField();
         identifierText.setColumns(15);
@@ -261,7 +269,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
 
         panel1.add(new JLabel(" : "), c1);
         c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        typeBox = new JComboBox();
+        typeBox = new JComboBox<String>();
         typeBox.addActionListener(this);
         panel1.add(typeBox, c1);
 
@@ -443,7 +451,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
         String[] v = new String[2];
         v[0] = "in";
         v[1] = "out";
-        signalInOutBox = new JComboBox(v);
+        signalInOutBox = new JComboBox<String>(v);
         panel5.add(signalInOutBox, c5);
         signalText = new JTextField();
         signalText.setColumns(50);
@@ -955,11 +963,11 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
             TAttribute a = attributes.get (i);
             identifierText.setText(a.getId());
             initialValue.setText(a.getInitialValue());
-            select(accessBox, a.getStringAccess(a.getAccess()));
+            select(accessBox, TAttribute.getStringAccess(a.getAccess()));
             if (a.getType() == TAttribute.OTHER) {
                 select(typeBox, a.getTypeOther());
             } else {
-                select(typeBox, a.getStringAvatarType(a.getType()));
+                select(typeBox, TAttribute.getStringAvatarType(a.getType()));
             }
             removeButton.setEnabled(true);
             if (i > 0) {
@@ -1024,7 +1032,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
         }
     }
 
-    public void select(JComboBox jcb, String text) {
+    public void select(JComboBox<String> jcb, String text) {
         String s;
         for(int i=0; i<jcb.getItemCount(); i++) {
             s = (String)(jcb.getItemAt(i));
diff --git a/src/ui/window/JDialogAvatarBlockArtifact.java b/src/ui/window/JDialogAvatarBlockArtifact.java
index 48de272178150c84b6925134539a5a967e0700bb..81d8a6207dd41bd1250704a47843a22465d92789 100755
--- a/src/ui/window/JDialogAvatarBlockArtifact.java
+++ b/src/ui/window/JDialogAvatarBlockArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDBlockArtifact;
+import ui.avatardd.ADDDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.avatardd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAvatarBlockArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAvatarChannelArtifact.java b/src/ui/window/JDialogAvatarChannelArtifact.java
index baa9659a20a78230e41d15ef2923afd8d92cd41a..ceb60637cdf2129e9a0832b952d6dd54db3f3835 100755
--- a/src/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/ui/window/JDialogAvatarChannelArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDChannelArtifact;
+import ui.avatardd.ADDDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.avatardd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
index e499c7fb3f16e586917fc8642714aaaf6608177b..67b366cf11fc214b0dca9ef589462432ce2a717d 100644
--- a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
@@ -47,48 +47,26 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import avatartranslator.AvatarSpecification;
 import avatartranslator.toexecutable.AVATAR2CPOSIX;
 import launcher.LauncherException;
 import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
+import ui.ConfigurationTTool;
 import ui.IconManager;
 import ui.JTextAreaWriter;
 import ui.MainGUI;
 import ui.interactivesimulation.JFrameSimulationSDPanel;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
 public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
 
-	private static String[] unitTab = {"usec", "msec", "sec"};
+    private static String[] unitTab = {"usec", "msec", "sec"};
 
     protected Frame f;
     protected MainGUI mgui;
@@ -103,9 +81,9 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
     private String textSysC8 = "Show trace from file:";
     private String textSysC9 = "Show trace from soclib file:";
 
-   // private static String unitCycle = "1";
+    // private static String unitCycle = "1";
+
 
-    
     private static String[] codes = {"AVATAR CPOSIX"};
     private static int selectedItem = 0;
     private static int selectedRun = 1;
@@ -128,9 +106,7 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
     protected final static int STARTED = 2;
     protected final static int STOPPED = 3;
 
-    private static
-
-        int mode;
+    private static int mode;
 
     //components
     protected JTextArea jta;
@@ -222,7 +198,8 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
         c.setLayout(new BorderLayout());
         //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -292,7 +269,7 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
 
         jp01.add(new JLabel("1 time unit ="), c01);
 
-        units = new JComboBox(unitTab);
+        units = new JComboBox<String>(unitTab);
         units.setSelectedIndex(selectedUnit);
         units.addActionListener(this);
         jp01.add(units, c01);
@@ -576,7 +553,7 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
     public void run() {
         String cmd;
         String list/*, data*/;
-      //  int cycle = 0;
+        //  int cycle = 0;
 
         hasError = false;
 
@@ -624,7 +601,7 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
                     if (avspec == null) {
                         jta.append("Error: No AVATAR specification\n");
                     } else {
-                        AVATAR2CPOSIX avatartocposix = new AVATAR2CPOSIX(avspec);
+                        AVATAR2CPOSIX avatartocposix = new AVATAR2CPOSIX(avspec, ConfigurationTTool.PLUGIN_JAVA_CODE_GENERATOR );
                         avatartocposix.includeUserCode(putUserCode.isSelected());
                         avatartocposix.setTimeUnit(selectedUnit);
                         avatartocposix.generateCPOSIX(debugmode.isSelected(), tracemode.isSelected());
@@ -634,7 +611,7 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
                         try {
                             jta.append("Saving code in files\n");
                             pathCode = code1.getText();
-			    //gene.avatartocposix.saveInFiles(pathCode);//DG 27.11.
+                            //gene.avatartocposix.saveInFiles(pathCode);//DG 27.11.
                             avatartocposix.saveInFiles(pathCode);
                             //tml2systc.saveFile(pathCode, "appmodel");
                             jta.append("Code saved\n");
@@ -717,152 +694,152 @@ public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame im
             }
 
             //enleve 06.02.2017
-	    /*  if (selectedItem == 1) {
-                // Code generation
-                if (jp1.getSelectedIndex() == 0) {
-                    jta.append("Generating executable code (SOCLIB version)\n");
-
-                    if (removeCFiles.isSelected()) {
-
-                        jta.append("Removing all .h files\n");
-                        //list = FileUtils.deleteFiles(code1.getText() +  AVATAR2SOCLIB.getGeneratedPath(), ".h");
-	list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGeneratedPath(), ".h");
-                        if (list.length() == 0) {
-                            jta.append("No files were deleted\n");
-                        } else {
-                            jta.append("Files deleted:\n" + list + "\n");
-                        }
-                        jta.append("Removing all  .c files\n");
-list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGeneratedPath(), ".c");
-                        //list = FileUtils.deleteFiles(code1.getText() +  AVATAR2SOCLIB.getGeneratedPath(), ".c");
-                        if (list.length() == 0) {
-                            jta.append("No files were deleted\n");
-                        } else {
-                            jta.append("Files deleted:\n" + list + "\n");
-                        }
-                    }
-
-                    if (removeXFiles.isSelected()) {
-                        jta.append("Removing all .x files\n");
-                        list = FileUtils.deleteFiles(code1.getText() , ".x");
-                        if (list.length() == 0) {
-                            jta.append("No files were deleted\n");
-                        } else {
-                            jta.append("Files deleted:\n" + list + "\n");
-                        }
-                    }
-
-                    testGo();
-
-                    selectedUnit = units.getSelectedIndex();
-                    //System.out.println("Selected item=" + selectedItem);
-                    AvatarSpecification avspec = mgui.gtm.getAvatarSpecification();
-
-                    // Generating code
-                    if (avspec == null) {
-                        jta.append("Error: No AVATAR specification\n");
-                    } else {
-			//AVATAR2SOCLIB avatartocposix = new AVATAR2SOCLIB(avspec);
-                      //  avatartocposix.includeUserCode(putUserCode.isSelected());
-                       // avatartocposix.setTimeUnit(selectedUnit);
-                       // avatartocposix.generateCPOSIX(debugmode.isSelected(), tracemode.isSelected());
-		      // julien -----------------------------------------
-                      ADDDiagramPanel deploymentDiagramPanel = mgui.getFirstAvatarDeploymentPanelFound();
-                      AvatarDeploymentPanelTranslator avdeploymenttranslator = new AvatarDeploymentPanelTranslator(deploymentDiagramPanel);
-                      AvatarddSpecification avddspec = avdeploymenttranslator.getAvatarddSpecification();	
-                    			  
-		      TasksAndMainGenerator gene = new TasksAndMainGenerator(avddspec,avspec);
-		      gene.includeUserCode(putUserCode.isSelected());
-		      gene.setTimeUnit(selectedUnit);
-		      gene.generateSoclib(debugmode.isSelected(), tracemode.isSelected());
-                 
-                    // ----------end addition julien ----------------------------------------
+            /*  if (selectedItem == 1) {
+            // Code generation
+            if (jp1.getSelectedIndex() == 0) {
+            jta.append("Generating executable code (SOCLIB version)\n");
+
+            if (removeCFiles.isSelected()) {
+
+            jta.append("Removing all .h files\n");
+            //list = FileUtils.deleteFiles(code1.getText() +  AVATAR2SOCLIB.getGeneratedPath(), ".h");
+            list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGeneratedPath(), ".h");
+            if (list.length() == 0) {
+            jta.append("No files were deleted\n");
+            } else {
+            jta.append("Files deleted:\n" + list + "\n");
+            }
+            jta.append("Removing all  .c files\n");
+            list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGeneratedPath(), ".c");
+            //list = FileUtils.deleteFiles(code1.getText() +  AVATAR2SOCLIB.getGeneratedPath(), ".c");
+            if (list.length() == 0) {
+            jta.append("No files were deleted\n");
+            } else {
+            jta.append("Files deleted:\n" + list + "\n");
+            }
+            }
 
-                        testGo();
-                        jta.append("Generation of C-SOCLIB executable code: done\n");
-                        //t2j.printJavaClasses();
-                        try {
-                            jta.append("Saving code in files\n");
-                            pathCode = code1.getText();
-                         gene.saveInFiles(pathCode);//DG 27.11.
-//avatartocposix.saveInFiles(pathCode);
-                            //tml2systc.saveFile(pathCode, "appmodel");
-                            jta.append("Code saved\n");
-                        } catch (Exception e) {
-                            jta.append("Could not generate files\n");
-                        }
-                    }
-                }
+            if (removeXFiles.isSelected()) {
+            jta.append("Removing all .x files\n");
+            list = FileUtils.deleteFiles(code1.getText() , ".x");
+            if (list.length() == 0) {
+            jta.append("No files were deleted\n");
+            } else {
+            jta.append("Files deleted:\n" + list + "\n");
+            }
+            }
 
-                testGo();
+            testGo();
 
-                // Compilation
-                if (jp1.getSelectedIndex() == 1) {
+            selectedUnit = units.getSelectedIndex();
+            //System.out.println("Selected item=" + selectedItem);
+            AvatarSpecification avspec = mgui.gtm.getAvatarSpecification();
 
-                    if (selectedCompile == 0) {
-                        cmd = compiler1.getText();
-                    } else {
-                        cmd = compiler2.getText();
-                    }
+            // Generating code
+            if (avspec == null) {
+            jta.append("Error: No AVATAR specification\n");
+            } else {
+            //AVATAR2SOCLIB avatartocposix = new AVATAR2SOCLIB(avspec);
+            //  avatartocposix.includeUserCode(putUserCode.isSelected());
+            // avatartocposix.setTimeUnit(selectedUnit);
+            // avatartocposix.generateCPOSIX(debugmode.isSelected(), tracemode.isSelected());
+            // julien -----------------------------------------
+            ADDDiagramPanel deploymentDiagramPanel = mgui.getFirstAvatarDeploymentPanelFound();
+            AvatarDeploymentPanelTranslator avdeploymenttranslator = new AvatarDeploymentPanelTranslator(deploymentDiagramPanel);
+            AvatarddSpecification avddspec = avdeploymenttranslator.getAvatarddSpecification();
+
+            TasksAndMainGenerator gene = new TasksAndMainGenerator(avddspec,avspec);
+            gene.includeUserCode(putUserCode.isSelected());
+            gene.setTimeUnit(selectedUnit);
+            gene.generateSoclib(debugmode.isSelected(), tracemode.isSelected());
+
+            // ----------end addition julien ----------------------------------------
+
+            testGo();
+            jta.append("Generation of C-SOCLIB executable code: done\n");
+            //t2j.printJavaClasses();
+            try {
+            jta.append("Saving code in files\n");
+            pathCode = code1.getText();
+            gene.saveInFiles(pathCode);//DG 27.11.
+            //avatartocposix.saveInFiles(pathCode);
+            //tml2systc.saveFile(pathCode, "appmodel");
+            jta.append("Code saved\n");
+            } catch (Exception e) {
+            jta.append("Could not generate files\n");
+            }
+            }
+            }
 
-                    jta.append("Compiling executable code with command: \n" + cmd + "\n");
+            testGo();
 
-                    rshc = new RshClient(hostExecute);
-               
-                    try {
-                        processCmd(cmd, jta);
-                        //data = processCmd(cmd);
-                        //jta.append(data);
-                        jta.append("Compilation done\n");
-                    } catch (LauncherException le) {
-                        jta.append("Error: " + le.getMessage() + "\n");
-                        mode =  STOPPED;
-                        setButtons();
-                        return;
-                    } catch (Exception e) {
-                        mode =  STOPPED;
-                        setButtons();
-                        return;
-                    }
-                }
+            // Compilation
+            if (jp1.getSelectedIndex() == 1) {
 
-                if (jp1.getSelectedIndex() == 2) {
-                    try {
-                        if (selectedRun == 0) {
-                            cmd = exe2.getText();
-                        } else {
-                            if (selectedRun == 1) {
-                                cmd = exe3.getText();
-                            } else {
-                                cmd = exe4.getText();
-                            }
-                        }
+            if (selectedCompile == 0) {
+            cmd = compiler1.getText();
+            } else {
+            cmd = compiler2.getText();
+            }
 
-                        jta.append("Executing code with command: \n" + cmd + "\n");
+            jta.append("Compiling executable code with command: \n" + cmd + "\n");
+
+            rshc = new RshClient(hostExecute);
+
+            try {
+            processCmd(cmd, jta);
+            //data = processCmd(cmd);
+            //jta.append(data);
+            jta.append("Compilation done\n");
+            } catch (LauncherException le) {
+            jta.append("Error: " + le.getMessage() + "\n");
+            mode =  STOPPED;
+            setButtons();
+            return;
+            } catch (Exception e) {
+            mode =  STOPPED;
+            setButtons();
+            return;
+            }
+            }
 
-                        rshc = new RshClient(hostExecute);
-                        // Assume data are on the remote host
-                        // Command
+            if (jp1.getSelectedIndex() == 2) {
+            try {
+            if (selectedRun == 0) {
+            cmd = exe2.getText();
+            } else {
+            if (selectedRun == 1) {
+            cmd = exe3.getText();
+            } else {
+            cmd = exe4.getText();
+            }
+            }
 
-                        processCmd(cmd, jta);
-                        //jta.append(data);
-                        jta.append("Execution done\n");
-                    } catch (LauncherException le) {
-                        jta.append("Error: " + le.getMessage() + "\n");
-                        mode =  STOPPED;
-                        setButtons();
-                        return;
-                    } catch (Exception e) {
-                        mode =  STOPPED;
-                        setButtons();
-                        return;
-                    }
-                }
+            jta.append("Executing code with command: \n" + cmd + "\n");
+
+            rshc = new RshClient(hostExecute);
+            // Assume data are on the remote host
+            // Command
+
+            processCmd(cmd, jta);
+            //jta.append(data);
+            jta.append("Execution done\n");
+            } catch (LauncherException le) {
+            jta.append("Error: " + le.getMessage() + "\n");
+            mode =  STOPPED;
+            setButtons();
+            return;
+            } catch (Exception e) {
+            mode =  STOPPED;
+            setButtons();
+            return;
+            }
+            }
 
-                if ((hasError == false) && (jp1.getSelectedIndex() < 2)) {
-                    jp1.setSelectedIndex(jp1.getSelectedIndex() + 1);
-                }
-	     } */
+            if ((hasError == false) && (jp1.getSelectedIndex() < 2)) {
+            jp1.setSelectedIndex(jp1.getSelectedIndex() + 1);
+            }
+            } */
 
             //fin ajoute DG
 
@@ -883,7 +860,7 @@ list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGenerat
         rshc.setCmd(cmd);
         rshc.sendExecuteCommandRequest();
         rshc.writeCommandMessages( textAreaWriter );
-        
+
         return;
     }
 
@@ -932,7 +909,7 @@ list = FileUtils.deleteFiles(code1.getText() +  TasksAndMainGenerator.getGenerat
     public void showSimulationTrace() {
         JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(f, mgui, "Simulation trace of " + simulationTraceFile.getText());
         jfssdp.setIconImage(IconManager.img8);
-       // jfssdp.setSize(600, 600);
+        // jfssdp.setSize(600, 600);
         GraphicLib.centerOnParent(jfssdp, 600, 600);
         if (selectedViewTrace == 0) {
             jfssdp.setFileReference(simulationTraceFile.getText());
diff --git a/src/ui/window/JDialogAvatarFirewall.java b/src/ui/window/JDialogAvatarFirewall.java
index e975ef4ae303e1dffab1c3c70da2acc6c39c0d33..fd7980edf27a88c20304fb82c72ebe7f049d5945 100644
--- a/src/ui/window/JDialogAvatarFirewall.java
+++ b/src/ui/window/JDialogAvatarFirewall.java
@@ -46,18 +46,23 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDFirewall;
+import ui.avatarbd.AvatarBDPanel;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatarbd.*;
-
 
 public class JDialogAvatarFirewall extends javax.swing.JDialog implements ActionListener,ListSelectionListener  {
     
diff --git a/src/ui/window/JDialogAvatarLibraryFunction.java b/src/ui/window/JDialogAvatarLibraryFunction.java
index 70bdbf79440456894c52f739bfe42e91958b9dc4..41dec4c4b37b8b4c43541194f730b3f5c3027d69 100755
--- a/src/ui/window/JDialogAvatarLibraryFunction.java
+++ b/src/ui/window/JDialogAvatarLibraryFunction.java
@@ -38,38 +38,21 @@
 
 package ui.window;
 
-import java.util.LinkedList;
-import java.util.Collections;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
 
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JOptionPane;
-import javax.swing.event.ListSelectionListener;
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.Color;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarMethod;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
+import java.util.Collections;
+import java.util.LinkedList;
 
 /**
  * Dialog for managing parameters, return values, attributes, methods and signals of Avatar Library Functions
@@ -554,7 +537,8 @@ public class JDialogAvatarLibraryFunction extends javax.swing.JDialog implements
         this.setDefaultCloseOperation (JFrame.DISPOSE_ON_CLOSE);
 
         // Add the tabs panel
-        this.tabbedPane = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        this.tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         tabbedPane.addTab ("Parameters", this.initParametersTab ());            // Parameters Tab
         tabbedPane.addTab ("Signals", this.initSignalsTab ());                  // Signals Tab
diff --git a/src/ui/window/JDialogAvatarModelChecker.java b/src/ui/window/JDialogAvatarModelChecker.java
index e60729abcb97a4faf01f4c36991dfa9030ac25ee..dc5f0339232603f87c73c3642ba1a49a2fd3cf06 100644
--- a/src/ui/window/JDialogAvatarModelChecker.java
+++ b/src/ui/window/JDialogAvatarModelChecker.java
@@ -46,30 +46,31 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.AvatarStateMachineElement;
+import avatartranslator.modelchecker.AvatarModelChecker;
+import avatartranslator.modelchecker.SpecificationReachability;
+import avatartranslator.modelchecker.SpecificationReachabilityType;
+import myutil.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.TGComponent;
+import ui.graph.RG;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Timer;
 import java.util.TimerTask;
-import java.io.*;
-
-import java.text.*;
-
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.modelchecker.*;
-import ui.*;
 import java.util.concurrent.TimeUnit;
 
-import ui.graph.*;
-
-
-
 public class JDialogAvatarModelChecker extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
-    public final static String [] INFOS = {"Not started", "Running", "Stopped by user", "Finished"};
-    public final static Color []  COLORS = {Color.darkGray, Color.magenta, Color.red, Color.blue};
+    private final static String [] INFOS = {"Not started", "Running", "Stopped by user", "Finished"};
+    private final static Color []  COLORS = {Color.darkGray, Color.magenta, Color.red, Color.blue};
 
 
     public final static int REACHABILITY_ALL        = 1;
@@ -142,7 +143,7 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
 
     private Thread t;
     private boolean go = false;
-    private boolean hasError = false;
+  //  private boolean hasError = false;
     private java.util.Timer timer;
     //protected boolean startProcess = false;
 
@@ -163,7 +164,7 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
             graphDirDot = _graphDir + File.separator + "rgavatar$.dot";
         }
 
-	showLiveness = _showLiveness;
+        showLiveness = _showLiveness;
 	
         initComponents();
         myInitComponents();
@@ -190,7 +191,8 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
         c.setLayout(new BorderLayout());
         //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -470,14 +472,14 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
     }
 
     public void run() {
-        String cmd;
-        String list, data;
-        int cycle = 0;
+ //       String cmd;
+   //     String list, data;
+     //   int cycle = 0;
 
-        hasError = false;
+     //   hasError = false;
 
         TraceManager.addDev("Thread started");
-        File testFile;
+     //   File testFile;
         try {
             reinitValues();
             jta.append("Starting the model checker\n");
@@ -715,8 +717,9 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
         jta.append(s);
     }
 
+    @Override
     public void setError() {
-        hasError = true;
+//        hasError = true;
     }
 
     public void updateValues() {
@@ -757,8 +760,8 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
                                          duration
                                          );
 
-                long diffInSeconds = TimeUnit.MILLISECONDS.toSeconds(duration);
-                long diffInMinutes = TimeUnit.MILLISECONDS.toMinutes(duration);
+//                long diffInSeconds = TimeUnit.MILLISECONDS.toSeconds(duration);
+//                long diffInMinutes = TimeUnit.MILLISECONDS.toMinutes(duration);
                 //long diffInMs = TimeUnit.MILLISECONDS.toMilliseconds(duration);
                 elapsedTime.setText(t);
                 long diff = 0;
diff --git a/src/ui/window/JDialogAvatarProperty.java b/src/ui/window/JDialogAvatarProperty.java
index 1a2fafd5e6bfd87aea33ef52923a6b3b34ebe43e..acd66a81f2a6a66968b95d463c92bbe53a7c0b0e 100755
--- a/src/ui/window/JDialogAvatarProperty.java
+++ b/src/ui/window/JDialogAvatarProperty.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarProperty extends javax.swing.JDialog implements ActionListener  {
     private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarPropertyConnector.java b/src/ui/window/JDialogAvatarPropertyConnector.java
index 8c269c2150e6cf9446f0e9a57b18f88e61f3ee22..51b1ac19d7c27dfbc62de469e7cddac34bc5fc66 100755
--- a/src/ui/window/JDialogAvatarPropertyConnector.java
+++ b/src/ui/window/JDialogAvatarPropertyConnector.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarPropertyConnector extends javax.swing.JDialog implements ActionListener  {
     private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarSignal.java b/src/ui/window/JDialogAvatarSignal.java
index 65090fc8186b3f16fbd4e432c325041386972164..5052b7413be3bee5856d70363d5ca8c655879765 100755
--- a/src/ui/window/JDialogAvatarSignal.java
+++ b/src/ui/window/JDialogAvatarSignal.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.AvatarSignal;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogAvatarSignal extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogAvatarState.java b/src/ui/window/JDialogAvatarState.java
index 6bb32ea4be99c3e539673e3ddd282b6f8fbcf4d3..8c0f0ca6702a9d1c9eb6326a939764588141a20e 100755
--- a/src/ui/window/JDialogAvatarState.java
+++ b/src/ui/window/JDialogAvatarState.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.IconManager;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarState extends javax.swing.JDialog implements ActionListener  {
     
@@ -197,10 +198,9 @@ public class JDialogAvatarState extends javax.swing.JDialog implements ActionLis
         c0.weightx = 1.0;
         c0.gridwidth = GridBagConstraints.REMAINDER; //end row
         
-		
-        
-		JTabbedPane jtp = new JTabbedPane();
-		jtp.setPreferredSize(new Dimension(400, 450));
+        // Issue #41 Ordering of tabbed panes 
+		JTabbedPane jtp = GraphicLib.createTabbedPane();//new JTabbedPane();
+		jtp.setPreferredSize( new Dimension( 400, 450 ) );
 		jtp.add("General", panel11);
 		jtp.add("Prototyping", panel2);
         c.add(jtp, c0);
diff --git a/src/ui/window/JDialogAvatarTimer.java b/src/ui/window/JDialogAvatarTimer.java
index 7837524131727ac7c3eac7bd349a06df2d7d40af..af1d74410ca336b3370bd2b57768e8b6a0b3fa06 100755
--- a/src/ui/window/JDialogAvatarTimer.java
+++ b/src/ui/window/JDialogAvatarTimer.java
@@ -46,12 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogAvatarTimer extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogAvatarTransition.java b/src/ui/window/JDialogAvatarTransition.java
index 3d7e6b62b688f153d8815ac6230b7fd0ee733b82..637a1c00076836a6a54c8b8d1077bae0543bd7a8 100755
--- a/src/ui/window/JDialogAvatarTransition.java
+++ b/src/ui/window/JDialogAvatarTransition.java
@@ -46,13 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.IconManager;
+import ui.TAttribute;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class JDialogAvatarTransition extends javax.swing.JDialog implements ActionListener  {
 
@@ -73,7 +78,7 @@ public class JDialogAvatarTransition extends javax.swing.JDialog implements Acti
     // Panel1
     private JTextField guardT, afterMinT, afterMaxT, computeMinT, computeMaxT;
     private JTextArea actionsT;
-    private JComboBox elements;
+    private JComboBox<String> elements;
     private JButton insertElement;
 
     // Main Panel
@@ -106,12 +111,12 @@ public class JDialogAvatarTransition extends javax.swing.JDialog implements Acti
         makeElements();
 
         initComponents();
-        myInitComponents();
+    //    myInitComponents();
         pack();
     }
 
     private void makeElements() {
-        int i;
+       // int i;
 
         allElements = new Vector<String>();
         insertElements = new Vector<String>();
@@ -127,184 +132,184 @@ public class JDialogAvatarTransition extends javax.swing.JDialog implements Acti
         }
     }
 
-
-    private void myInitComponents() {
-    }
-
+//
+//    private void myInitComponents() {
+//    }
+//
     private void initComponents() {
-        int i;
-
-        Container c = getContentPane();
-        GridBagLayout gridbag0 = new GridBagLayout();
-        GridBagLayout gridbag1 = new GridBagLayout();
-        GridBagLayout gridbag2 = new GridBagLayout();
-        GridBagConstraints c0 = new GridBagConstraints();
-        GridBagConstraints c1 = new GridBagConstraints();
-        GridBagConstraints c2 = new GridBagConstraints();
-
-        setFont(new Font("Helvetica", Font.PLAIN, 14));
-        //c.setLayout(gridbag0);
-	c.setLayout(new BorderLayout());
-
-        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-        panel1 = new JPanel();
-        panel1.setLayout(gridbag1);
-
-        panel1.setBorder(new javax.swing.border.TitledBorder("Transition parameters"));
-
-        //panel1.setPreferredSize(new Dimension(350, 350));
-
-        // guard
-        c1.weighty = 1.0;
-        c1.weightx = 1.0;
-        c1.gridwidth = 1;
-        c1.gridheight = 1;
-        c1.fill = GridBagConstraints.BOTH;
-        c1.gridheight = 1;
-        panel1.add(new JLabel("guard = "), c1);
-        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        guardT = new JTextField(guard);
-        panel1.add(guardT, c1);
-
-        // After
-        c1.gridwidth = 1;
-        c1.gridheight = 1;
-        c1.weighty = 1.0;
-        c1.weightx = 1.0;
-        panel1.add(new JLabel("after ("), c1);
-        afterMinT = new JTextField(afterMin, 10);
-        panel1.add(afterMinT, c1);
-        panel1.add(new JLabel(","), c1);
-        afterMaxT = new JTextField(afterMax, 10);
-        panel1.add(afterMaxT, c1);
-        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        panel1.add(new JLabel(")"), c1);
-
-        // Compute
-        c1.gridwidth = 1;
-        c1.gridheight = 1;
-        c1.weighty = 1.0;
-        c1.weightx = 1.0;
-        panel1.add(new JLabel("compute for ("), c1);
-        computeMinT = new JTextField(computeMin, 10);
-        panel1.add(computeMinT, c1);
-        panel1.add(new JLabel(","), c1);
-        computeMaxT = new JTextField(computeMax, 10);
-        panel1.add(computeMaxT, c1);
-        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        panel1.add(new JLabel(")"), c1);
-
-
-        // actions
-
-        elements = new JComboBox(allElements);
-        panel1.add(elements, c1);
-
-        insertElement = new JButton("Insert");
-        insertElement.setEnabled(allElements.size() > 0);
-        insertElement.addActionListener(this);
-        panel1.add(insertElement, c1);
-
-        c1.gridheight = 10;
-        c1.weighty = 10.0;
-        c1.weightx = 10.0;
-        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        c1.fill = GridBagConstraints.BOTH;
-        actionsT = new JTextArea();
-        actionsT.setEditable(true);
-        actionsT.setMargin(new Insets(10, 10, 10, 10));
-        actionsT.setTabSize(3);
-        actionsT.setFont(new Font("times", Font.PLAIN, 12));
-        //actionsT.setPreferredSize(new Dimension(350, 250));
-        JScrollPane jsp = new JScrollPane(actionsT, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        for(i=0; i<actions.size(); i++) {
-            actionsT.append(actions.get(i) + "\n");
-        }
-        panel1.add(jsp, c1);
-
-
-        panel2 = new JPanel();
-        panel2.setLayout(gridbag2);
-
-        panel2.setBorder(new javax.swing.border.TitledBorder("Code"));
-        // guard
-        c2.weighty = 1.0;
-        c2.weightx = 1.0;
-        c2.gridwidth = 1;
-        c2.gridheight = 1;
-        c2.fill = GridBagConstraints.BOTH;
-        c2.gridwidth = GridBagConstraints.REMAINDER;
-        c2.gridheight = 1;
-        panel2.add(new JLabel("Files to include:"), c2);
-        jtaFiles = new JTextArea();
-        jtaFiles.setEditable(true);
-        jtaFiles.setMargin(new Insets(10, 10, 10, 10));
-        jtaFiles.setTabSize(3);
-        String files = "";
-        if (filesToInclude != null) {
-            for(i=0; i<filesToInclude.length; i++) {
-                files += filesToInclude[i] + "\n";
-            }
-        }
-        jtaFiles.append(files);
-        jtaFiles.setFont(new Font("times", Font.PLAIN, 12));
-        jsp = new JScrollPane(jtaFiles, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        //jsp.setPreferredSize(new Dimension(300, 300));
-        panel2.add(jsp, c2);
-        panel2.add(new JLabel("Code to execute at the end of the transition"), c2);
-        jtaCode = new JTextArea();
-        jtaCode.setEditable(true);
-        jtaCode.setMargin(new Insets(10, 10, 10, 10));
-        jtaCode.setTabSize(3);
-        String code = "";
-        if (codeToInclude != null) {
-            for(i=0; i<codeToInclude.length; i++) {
-                code += codeToInclude[i] + "\n";
-            }
-        }
-        jtaCode.append(code);
-        jtaCode.setFont(new Font("times", Font.PLAIN, 12));
-        jsp = new JScrollPane(jtaCode, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        //jsp.setPreferredSize(new Dimension(300, 300));
-        panel2.add(jsp, c2);
-
-
-        // button panel;
-        c0.gridwidth = 1;
-        c0.gridheight = 10;
-        c0.weighty = 1.0;
-        c0.weightx = 1.0;
-        c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-
-
-
-        JTabbedPane jtp = new JTabbedPane();
-        jtp.add("General", panel1);
-        //jtp.add("Prototyping", panel2);
-        //c.add(jtp, c0);
-	c.add(jtp, BorderLayout.CENTER);
-
-	JPanel buttons = new JPanel();
-	buttons.setLayout(gridbag0);
-
-        c0.gridwidth = 1;
-        c0.gridheight = 1;
-        c0.fill = GridBagConstraints.HORIZONTAL;
-        closeButton = new JButton("Save and Close", IconManager.imgic25);
-        //closeButton.setPreferredSize(new Dimension(600, 50));
-
-
-        closeButton.addActionListener(this);
-        buttons.add(closeButton, c0);
-        c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-        cancelButton = new JButton("Cancel", IconManager.imgic27);
-        cancelButton.addActionListener(this);
-        buttons.add(cancelButton, c0);
-
-	c.add(buttons, BorderLayout.SOUTH);
+    	int i;
+
+    	Container c = getContentPane();
+    	GridBagLayout gridbag0 = new GridBagLayout();
+    	GridBagLayout gridbag1 = new GridBagLayout();
+    	GridBagLayout gridbag2 = new GridBagLayout();
+    	GridBagConstraints c0 = new GridBagConstraints();
+    	GridBagConstraints c1 = new GridBagConstraints();
+    	GridBagConstraints c2 = new GridBagConstraints();
+
+    	setFont(new Font("Helvetica", Font.PLAIN, 14));
+    	//c.setLayout(gridbag0);
+    	c.setLayout(new BorderLayout());
+
+    	setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+    	panel1 = new JPanel();
+    	panel1.setLayout(gridbag1);
+
+    	panel1.setBorder(new javax.swing.border.TitledBorder("Transition parameters"));
+
+    	//panel1.setPreferredSize(new Dimension(350, 350));
+
+    	// guard
+    	c1.weighty = 1.0;
+    	c1.weightx = 1.0;
+    	c1.gridwidth = 1;
+    	c1.gridheight = 1;
+    	c1.fill = GridBagConstraints.BOTH;
+    	c1.gridheight = 1;
+    	panel1.add(new JLabel("guard = "), c1);
+    	c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	guardT = new JTextField(guard);
+    	panel1.add(guardT, c1);
+
+    	// After
+    	c1.gridwidth = 1;
+    	c1.gridheight = 1;
+    	c1.weighty = 1.0;
+    	c1.weightx = 1.0;
+    	panel1.add(new JLabel("after ("), c1);
+    	afterMinT = new JTextField(afterMin, 10);
+    	panel1.add(afterMinT, c1);
+    	panel1.add(new JLabel(","), c1);
+    	afterMaxT = new JTextField(afterMax, 10);
+    	panel1.add(afterMaxT, c1);
+    	c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	panel1.add(new JLabel(")"), c1);
+
+    	// Compute
+    	c1.gridwidth = 1;
+    	c1.gridheight = 1;
+    	c1.weighty = 1.0;
+    	c1.weightx = 1.0;
+    	panel1.add(new JLabel("compute for ("), c1);
+    	computeMinT = new JTextField(computeMin, 10);
+    	panel1.add(computeMinT, c1);
+    	panel1.add(new JLabel(","), c1);
+    	computeMaxT = new JTextField(computeMax, 10);
+    	panel1.add(computeMaxT, c1);
+    	c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	panel1.add(new JLabel(")"), c1);
+
+
+    	// actions
+
+    	elements = new JComboBox<String>(allElements);
+    	panel1.add(elements, c1);
+
+    	insertElement = new JButton("Insert");
+    	insertElement.setEnabled(allElements.size() > 0);
+    	insertElement.addActionListener(this);
+    	panel1.add(insertElement, c1);
+
+    	c1.gridheight = 10;
+    	c1.weighty = 10.0;
+    	c1.weightx = 10.0;
+    	c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	c1.fill = GridBagConstraints.BOTH;
+    	actionsT = new JTextArea();
+    	actionsT.setEditable(true);
+    	actionsT.setMargin(new Insets(10, 10, 10, 10));
+    	actionsT.setTabSize(3);
+    	actionsT.setFont(new Font("times", Font.PLAIN, 12));
+    	//actionsT.setPreferredSize(new Dimension(350, 250));
+    	JScrollPane jsp = new JScrollPane(actionsT, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+    	for(i=0; i<actions.size(); i++) {
+    		actionsT.append(actions.get(i) + "\n");
+    	}
+    	panel1.add(jsp, c1);
+
+
+    	panel2 = new JPanel();
+    	panel2.setLayout(gridbag2);
+
+    	panel2.setBorder(new javax.swing.border.TitledBorder("Code"));
+    	// guard
+    	c2.weighty = 1.0;
+    	c2.weightx = 1.0;
+    	c2.gridwidth = 1;
+    	c2.gridheight = 1;
+    	c2.fill = GridBagConstraints.BOTH;
+    	c2.gridwidth = GridBagConstraints.REMAINDER;
+    	c2.gridheight = 1;
+    	panel2.add(new JLabel("Files to include:"), c2);
+    	jtaFiles = new JTextArea();
+    	jtaFiles.setEditable(true);
+    	jtaFiles.setMargin(new Insets(10, 10, 10, 10));
+    	jtaFiles.setTabSize(3);
+    	String files = "";
+    	if (filesToInclude != null) {
+    		for(i=0; i<filesToInclude.length; i++) {
+    			files += filesToInclude[i] + "\n";
+    		}
+    	}
+    	jtaFiles.append(files);
+    	jtaFiles.setFont(new Font("times", Font.PLAIN, 12));
+    	jsp = new JScrollPane(jtaFiles, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+    	//jsp.setPreferredSize(new Dimension(300, 300));
+    	panel2.add(jsp, c2);
+    	panel2.add(new JLabel("Code to execute at the end of the transition"), c2);
+    	jtaCode = new JTextArea();
+    	jtaCode.setEditable(true);
+    	jtaCode.setMargin(new Insets(10, 10, 10, 10));
+    	jtaCode.setTabSize(3);
+    	String code = "";
+    	if (codeToInclude != null) {
+    		for(i=0; i<codeToInclude.length; i++) {
+    			code += codeToInclude[i] + "\n";
+    		}
+    	}
+    	jtaCode.append(code);
+    	jtaCode.setFont(new Font("times", Font.PLAIN, 12));
+    	jsp = new JScrollPane(jtaCode, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+    	//jsp.setPreferredSize(new Dimension(300, 300));
+    	panel2.add(jsp, c2);
+
+
+    	// button panel;
+    	c0.gridwidth = 1;
+    	c0.gridheight = 10;
+    	c0.weighty = 1.0;
+    	c0.weightx = 1.0;
+    	c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+    	// Issue #41 Ordering of tabbed panes 
+    	JTabbedPane jtp = GraphicLib.createTabbedPane();//new JTabbedPane();
+    	jtp.add("General", panel1);
+    	//jtp.add("Prototyping", panel2);
+    	//c.add(jtp, c0);
+    	c.add(jtp, BorderLayout.CENTER);
+
+    	JPanel buttons = new JPanel();
+    	buttons.setLayout(gridbag0);
+
+    	c0.gridwidth = 1;
+    	c0.gridheight = 1;
+    	c0.fill = GridBagConstraints.HORIZONTAL;
+    	closeButton = new JButton("Save and Close", IconManager.imgic25);
+    	//closeButton.setPreferredSize(new Dimension(600, 50));
+
+
+    	closeButton.addActionListener(this);
+    	buttons.add(closeButton, c0);
+    	c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	cancelButton = new JButton("Cancel", IconManager.imgic27);
+    	cancelButton.addActionListener(this);
+    	buttons.add(cancelButton, c0);
+
+    	c.add(buttons, BorderLayout.SOUTH);
     }
 
+    @Override
     public void actionPerformed(ActionEvent evt)  {
         //String command = evt.getActionCommand();
 
diff --git a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
index edc1e1c48fce2580b0107b8ea48bda7b41325df9..1627c93ce147859993a33643302c1b0406be8b0d 100755
--- a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
@@ -48,23 +48,27 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
-
+import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
+import launcher.LauncherException;
+import launcher.RshClient;
 import myutil.*;
-import ui.*;
-
-
-import avatartranslator.*;
-import launcher.*;
+import ui.AvatarDeploymentPanelTranslator;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.avatardd.ADDDiagramPanel;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
 
-import ui.interactivesimulation.*;
-import ddtranslatorSoclib.toSoclib.*;
-import ddtranslatorSoclib.toTopCell.*;
-import ddtranslatorSoclib.*;
-import ui.avatardd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.StringWriter;
+import java.io.Writer;
 
 public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
 
@@ -117,7 +121,7 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
     protected JTabbedPane jp1;
     protected JScrollPane jsp;
     protected JCheckBox removeCFiles, removeXFiles, debugmode, tracemode, optimizemode, putUserCode;
-    protected JComboBox versionCodeGenerator, units;
+    protected JComboBox<String> versionCodeGenerator, units;
     protected JButton showSimulationTrace,showOverflowStatus;
 
     private static int selectedUnit = 2;
@@ -132,7 +136,7 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
     private boolean hasError = false;
     protected boolean startProcess = false;
 
-    private AvatarRelation FIFO;
+  //  private AvatarRelation FIFO;
 
     private String hostExecute;
 
@@ -188,9 +192,9 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -267,14 +271,14 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
 
         jp01.add(new JLabel("1 time unit ="), c01);
 
-        units = new JComboBox(unitTab);
+        units = new JComboBox<String>(unitTab);
         units.setSelectedIndex(selectedUnit);
         units.addActionListener(this);
         jp01.add(units, c01);
 
         jp01.add(new JLabel("Code generator used:"), c01);
 
-        versionCodeGenerator = new JComboBox(codes);
+        versionCodeGenerator = new JComboBox<String>(codes);
 	// versionCodeGenerator.setSelectedIndex(selectedItem);
         versionCodeGenerator.addActionListener(this);
         jp01.add(versionCodeGenerator, c01);
@@ -799,11 +803,14 @@ public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame
 
 /*idealement il faudrait inclure un moyen de detecter l'OS sur lequel l'application est lancé car le script utilise la commande "acroread" qui ne fonctionne que sur linux.
 Ainsi ajouter un paramètre avec l'OS permetterais de générer la commande appropriée sur windows ou mac*/
-	    
+	    // Use System.getProperty( "os.name" );
 	    ProcessBuilder pb = new ProcessBuilder(commande);//Letitia Runtime.runtimexec()
 	    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
 	    Process p = pb.start();
+
+	    // FIXME: Should the return code be tested?
 	    int exitStatus = p.waitFor();
+	    
 	} catch (InterruptedException e) {
 	    e.printStackTrace();
 	} catch (Exception e) {
diff --git a/src/ui/window/JDialogBUSNode.java b/src/ui/window/JDialogBUSNode.java
index b50cff438fd82991ec6ee999d949bb3dbb414368..14a751fc73642331ef4ecfbcc65c2bff7ab4527d 100755
--- a/src/ui/window/JDialogBUSNode.java
+++ b/src/ui/window/JDialogBUSNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBUSNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogBUSNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogBisimulation.java b/src/ui/window/JDialogBisimulation.java
index fdd23b3288929dee740b6bdfe6b9a3b7fe57037d..6dd36637559e93484680eada7380f307a8df07b9 100755
--- a/src/ui/window/JDialogBisimulation.java
+++ b/src/ui/window/JDialogBisimulation.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public class JDialogBisimulation extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogBisimulationBisimulator.java b/src/ui/window/JDialogBisimulationBisimulator.java
index 2d60e96d5b400b129e8d8c98bdc5d3c00db7dd3f..8e2aa686f461de1a60ecd207d0adc46c60544310 100755
--- a/src/ui/window/JDialogBisimulationBisimulator.java
+++ b/src/ui/window/JDialogBisimulationBisimulator.java
@@ -46,15 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.file.BCGFileFilter;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public class JDialogBisimulationBisimulator extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogBridgeNode.java b/src/ui/window/JDialogBridgeNode.java
index e8309cac608106c9144c8f417b3892d44b7b5245..182b95454e1d84f85fd27e3edde2635dc281455a 100755
--- a/src/ui/window/JDialogBridgeNode.java
+++ b/src/ui/window/JDialogBridgeNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBridgeNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogBridgeNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogCCodeGeneration.java b/src/ui/window/JDialogCCodeGeneration.java
index e99422a1b00e6d14ca517dcf714973de384c276e..1fcd7576da90532192f22ca6c01a2dcabfb184d9 100755
--- a/src/ui/window/JDialogCCodeGeneration.java
+++ b/src/ui/window/JDialogCCodeGeneration.java
@@ -47,36 +47,6 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import launcher.LauncherException;
 import launcher.RshClient;
 import myutil.FileUtils;
@@ -87,6 +57,17 @@ import ui.GTURTLEModeling;
 import ui.IconManager;
 import ui.MainGUI;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 
 public class JDialogCCodeGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener  {
 
@@ -207,7 +188,8 @@ public class JDialogCCodeGeneration extends javax.swing.JDialog implements Actio
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
 
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
diff --git a/src/ui/window/JDialogCPUNode.java b/src/ui/window/JDialogCPUNode.java
index fd67aa1470c00b1f4319d6e3a1a4df22b2dfd719..102f326ef376735e5ef236e32d44fab823a4fc88 100755
--- a/src/ui/window/JDialogCPUNode.java
+++ b/src/ui/window/JDialogCPUNode.java
@@ -46,39 +46,38 @@
 
 package ui.window;
 
+import myutil.GraphicLib;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import ui.ColorManager;
+import ui.IconManager;
+import ui.interactivesimulation.SimulationTransaction;
+import ui.tmldd.TMLArchiCPUNode;
+
+import javax.swing.*;
 import java.awt.*;
-import java.math.*;
 import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
-import ui.tmlcd.*;
+import java.math.BigDecimal;
 import java.util.*;
-import tmltranslator.modelcompiler.*;
-import ui.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
-
-import myutil.*;
 
 public class JDialogCPUNode extends javax.swing.JDialog implements ActionListener  {
     //private static String[] tracemodeTab = {"vcd trace", "VCI logger", "VCI stats"};
-    private static String[] tracemodeTab = {"VCI logger"};
+//    private static String[] tracemodeTab = {"VCI logger"};
     private boolean regularClose;
 
     private JPanel panel2, panel4, panel5;
-    private Frame frame;
+ //   private Frame frame;
     private TMLArchiCPUNode node;
 
     private ArchUnitMEC MECType;
 
-    protected JComboBox tracemode;
-    private static int selectedTracemode = 0;
+    protected JComboBox<String> tracemode;
+ //   private static int selectedTracemode = 0;
     // Panel1
     protected JTextField nodeName;
 
     // Panel2
     protected JTextField sliceTime, nbOfCores, byteDataSize, pipelineSize, goIdleTime, maxConsecutiveIdleCycles, taskSwitchingTime, branchingPredictionPenalty, cacheMiss, clockRatio, execiTime, execcTime, monitored;
-    protected JComboBox schedulingPolicy, MECTypeCB, encryption;
+    protected JComboBox<String> schedulingPolicy, MECTypeCB, encryption;
 
     // Tabbed pane for panel1 and panel2
     private JTabbedPane tabbedPane;
@@ -90,17 +89,17 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
     /** Creates new form  */
     public JDialogCPUNode(Frame _frame, String _title, TMLArchiCPUNode _node, ArchUnitMEC _MECType, ArrayList<SimulationTransaction> _transactions) {
         super(_frame, _title, true);
-        frame = _frame;
+      //  frame = _frame;
         node = _node;
         MECType = _MECType;
         transactions = _transactions;
         initComponents();
-        myInitComponents();
+   //     myInitComponents();
         pack();
     }
-
-    private void myInitComponents() {
-    }
+//
+//    private void myInitComponents() {
+//    }
 
     private void initComponents() {
         Container c = getContentPane();
@@ -123,7 +122,8 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
         panel2.setBorder(new javax.swing.border.TitledBorder("CPU attributes"));
         panel2.setPreferredSize(new Dimension(400, 300));
 
-        tabbedPane = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         c2.gridwidth = 1;
         c2.gridheight = 1;
@@ -145,7 +145,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
         panel2.add(new JLabel("Scheduling policy:"), c2);
 
         c2.gridwidth = GridBagConstraints.REMAINDER; //end row
-        schedulingPolicy = new JComboBox();
+        schedulingPolicy = new JComboBox<String>();
         schedulingPolicy.addItem("Round Robin");
         schedulingPolicy.addItem("Round Robin - Priority Based");
         schedulingPolicy.setSelectedIndex(node.getSchedulingPolicy());
@@ -255,7 +255,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
           c4.anchor = GridBagConstraints.CENTER;*/
         panel4.add(new JLabel("Encryption:"), c4);
         c4.gridwidth = GridBagConstraints.REMAINDER;
-        encryption = new JComboBox();
+        encryption = new JComboBox<String>();
         encryption.addItem("None");
         encryption.addItem("Software Encryption");
         encryption.addItem("Hardware Security Module");
@@ -264,7 +264,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
         c4.gridwidth = 1;
         panel4.add(new JLabel("CPU Extension Construct:"), c4);
         c4.gridwidth = GridBagConstraints.REMAINDER; //end row
-        MECTypeCB = new JComboBox( ArchUnitMEC.stringTypes );
+        MECTypeCB = new JComboBox<String>( ArchUnitMEC.stringTypes );
         if( MECType == null )   {
             MECTypeCB.setSelectedIndex( 0 );
         }
@@ -319,9 +319,9 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
            return;
            }*/
 
-        if (evt.getSource() == tracemode) {
-            selectedTracemode = tracemode.getSelectedIndex();
-        }
+//        if (evt.getSource() == tracemode) {
+//            selectedTracemode = tracemode.getSelectedIndex();
+//        }
 
         String command = evt.getActionCommand();
 
@@ -431,6 +431,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
             return false;
         }
     }
+    
     class MyFrame extends JPanel implements MouseMotionListener, MouseListener{
         Map<Range, String> toolMap = new HashMap<Range, String>();
         public MyFrame(){
@@ -439,26 +440,41 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
             addMouseMotionListener(this);
             addMouseListener(this);
         }
+        
+        @Override
         public void mouseDragged(MouseEvent e) {
             //do something
         }
+
+        @Override
         public void mouseMoved(MouseEvent e){
             drawToolTip(e);
         }
+
+        @Override
         public void mouseClicked(MouseEvent e) {
             drawToolTip(e);
         }
+
+        @Override
         public void mousePressed(MouseEvent e) {
             drawToolTip(e);
         }
+
+        @Override
         public void mouseExited(MouseEvent e){
             ///
         }
+
+        @Override
         public void mouseReleased(MouseEvent e){
             ///
         }
+
+        @Override
         public void mouseEntered(MouseEvent e){
         }
+
         public void drawToolTip(MouseEvent e){
 
             setToolTipText(null);
@@ -480,7 +496,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
             int i=0;
             java.util.List<String> tasks=new ArrayList<String>();
             Map<String, java.util.List<SimulationTransaction>> tasktrans = new HashMap<String, java.util.List<SimulationTransaction>>();
-            double incr=0.0;
+           // double incr=0.0;
             BigDecimal maxtime = new BigDecimal("0");
             BigDecimal mintime=new BigDecimal("9999999999999999999999999999");
             //Colors
diff --git a/src/ui/window/JDialogCancel.java b/src/ui/window/JDialogCancel.java
index fea8cdb7ebc89ee268585cabc3592886792fe27c..bce7f468fb990b24750841a1c1d02307cc920fc1 100755
--- a/src/ui/window/JDialogCancel.java
+++ b/src/ui/window/JDialogCancel.java
@@ -46,11 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
+import ui.StoppableGUIElement;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogCancel extends javax.swing.JDialog implements ActionListener, Runnable  {
 
diff --git a/src/ui/window/JDialogChannel.java b/src/ui/window/JDialogChannel.java
index 8dc40d2cc0bed5649f2584d6dac9464b4bb6ddbc..8d80e2a7207df460be5b40a9d21610e827b64151 100755
--- a/src/ui/window/JDialogChannel.java
+++ b/src/ui/window/JDialogChannel.java
@@ -46,13 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcd.TMLChannelProperties;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogChannel extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogCode.java b/src/ui/window/JDialogCode.java
index cea37c71e5112f3e2e23470f3e4e909ddd97c042..6e3dd479a471431da676a74010f7e5d5764116f9 100755
--- a/src/ui/window/JDialogCode.java
+++ b/src/ui/window/JDialogCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogCode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCommPatternMapping.java b/src/ui/window/JDialogCommPatternMapping.java
index 812dd6b991047470f59561fbb309ab5ed66d898f..a239ccc2826e4eb2d95950cc345fda2698834b3a 100644
--- a/src/ui/window/JDialogCommPatternMapping.java
+++ b/src/ui/window/JDialogCommPatternMapping.java
@@ -47,21 +47,29 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLCP;
+import tmltranslator.TMLType;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.tmlcp.TMLCPSequenceDiagram;
+import ui.*;
+import ui.tmldd.TMLArchiCPNode;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
-import java.util.Collections;
-
-import ui.*;
-import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.modelcompiler.*;
-import tmltranslator.tmlcp.*;
-import tmltranslator.*;
-import myutil.*;
 
 public class JDialogCommPatternMapping extends JDialog /* implements ActionListener, ListSelectionListener*/  {
 	
@@ -253,17 +261,9 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
 		pnlManageAttributes = new JPanel();
 		pnlManageAttributes.setLayout( new GridBagLayout() );
 		pnlManageAttributes.setBorder(new TitledBorder("Managing Attributes"));
-		//pnlManageAttributes.setPreferredSize(new Dimension(325, 250));
 
-		tabbedPane = new JTabbedPane();
-		
-		// first line panel1
-//		c1.weighty = 1.0;
-//		c1.weightx = 1.0;
-//		c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-//		c1.fill = GridBagConstraints.BOTH;
-//		c1.gridheight = 3;
-		//pnlComPatternStruct.add(new JLabel(" "), c1);
+        // Issue #41 Ordering of tabbed panes 
+		tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 		
 		// second line panel1
 		final int defaultMargin = 3;
@@ -272,7 +272,6 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
 
 		final GridBagConstraints c1 = new GridBagConstraints();
 		c1.gridwidth = GridBagConstraints.REMAINDER;
-		//c1.gridheight = 1;
 		c1.weighty = 0.0;
 		c1.weightx = 1.0;
 		c1.anchor = GridBagConstraints.CENTER;
@@ -611,15 +610,9 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
 		c3.insets = lblInsets;
 		pnlAttributeValues.add( new JLabel("Address Value"), c3 );
 		addressValue_TF = new JTextField( "", 5 );
-//		addressValue_TF.setPreferredSize( new Dimension(150, 30) );
 		c3.insets = tfdInsets;
 		pnlAttributeValues.add( addressValue_TF, c3 );
 
-		//c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-		//c3.fill = GridBagConstraints.BOTH;
-	//	c3.gridheight = 3;
-		//pnlComPatternValues.add( new JLabel(" "), c3 );	//adds some vertical space in between two JLabels
-
 		addressButton = new JButton("Assign Address Value");
 		addressButton.addActionListener( new ActionListener() {
 			
diff --git a/src/ui/window/JDialogCommunicationArtifact.java b/src/ui/window/JDialogCommunicationArtifact.java
index f1d12ed2f87bb5cde16c4506f35381e23fa21842..57deaf1ca55bb7437639c90b25be8c1428dfe9ba 100755
--- a/src/ui/window/JDialogCommunicationArtifact.java
+++ b/src/ui/window/JDialogCommunicationArtifact.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCommunicationArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogCommunicationArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogConstraint.java b/src/ui/window/JDialogConstraint.java
index 3daf7cbb947c2fed68e74de329d37bab238b4a61..394b3958bdee6a9213e64b0e3c5243919bfd3fe3 100755
--- a/src/ui/window/JDialogConstraint.java
+++ b/src/ui/window/JDialogConstraint.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogConstraint extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogConstraintText.java b/src/ui/window/JDialogConstraintText.java
index 9ee1986e608656982e5cebbddb9221c77f95abc4..cbd95c16ee9231b59826e2fe8b1d9fee53f86c98 100755
--- a/src/ui/window/JDialogConstraintText.java
+++ b/src/ui/window/JDialogConstraintText.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogConstraintText extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogCrossbarNode.java b/src/ui/window/JDialogCrossbarNode.java
index d1475899248ca95c8f1464d065113601f267f6d8..c689fd6f9522caaa9fe0f928266f2b4d192522de 100755
--- a/src/ui/window/JDialogCrossbarNode.java
+++ b/src/ui/window/JDialogCrossbarNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCrossbarNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogCrossbarNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogCryptographicConfiguration.java b/src/ui/window/JDialogCryptographicConfiguration.java
index 187b3c3e90552b46fe4b4d43471c69bc6856ee42..ac0ec4d7cd8a37c501dfaa8b6d5739b743d2f57a 100644
--- a/src/ui/window/JDialogCryptographicConfiguration.java
+++ b/src/ui/window/JDialogCryptographicConfiguration.java
@@ -46,12 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.Arrays;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
 public class JDialogCryptographicConfiguration extends javax.swing.JDialog implements ActionListener  {
@@ -115,7 +115,7 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
 
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-  	if (values[1].contains("Encryption") || values[1].isEmpty()){
+  	if (values[1].contains("Encryption") || values[1].equals("MAC") || values[1].isEmpty()){
 	    panel1= new EncryptPanel(this);
 	}
 	else {
diff --git a/src/ui/window/JDialogDMANode.java b/src/ui/window/JDialogDMANode.java
index 7fcd842d3409478d66b3239f14c60202a6e12bc3..1131fc588283a6d410d681cc2c9203924ef63efc 100644
--- a/src/ui/window/JDialogDMANode.java
+++ b/src/ui/window/JDialogDMANode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDMANode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogDMANode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogDSE.java b/src/ui/window/JDialogDSE.java
index 9dbddb35af11c69f4d2c8946d37535e9b150406d..18258cb70c24e60c55c41ef91a655cf895d7d38e 100644
--- a/src/ui/window/JDialogDSE.java
+++ b/src/ui/window/JDialogDSE.java
@@ -36,7 +36,7 @@
  * knowledge of the CeCILL license and that you accept its terms.
  *
  * /**
- * Class JDialogProVerifGeneration
+ * Class JDialogDSE
  * Dialog for managing the generation of ProVerif code and execution of
  * ProVerif
  * Creation: 10/09/2010
@@ -47,29 +47,28 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import dseengine.DSEConfiguration;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import tmltranslator.TMLMapping;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
-import java.io.*;
-
-import ui.*;
-import ui.tmldd.*;
-
-import myutil.*;
-import avatartranslator.*;
-import tmltranslator.*;
-import ui.*;
-import dseengine.*;
-import launcher.*;
-
 
 public class JDialogDSE extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable  {
 
     protected MainGUI mgui;
 
-
     protected static String pathCode;
     protected static String pathExecute;
 
@@ -92,13 +91,13 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
     protected JCheckBox autoConf, autoWeakAuth, autoStrongAuth, autoMapKeys, custom, outputTXT, outputHTML, addHSM;
 
     protected JTextField encTime, decTime, secOverhead;
-	protected JComboBox addtoCPU;
+	protected JComboBox<String> addtoCPU;
     protected JTextField tmlDirectory, mappingFile, modelFile, simulationThreads, resultsDirectory, simulationCycles, minCPU, maxCPU, simulationsPerMapping;
     protected JTextArea outputText;
     protected String output = "";
     protected JCheckBox secAnalysis;
     protected JTextField encTime2, decTime2, secOverhead2;
-	HashMap<JCheckBox, ArrayList<JCheckBox>> cpuTaskObjs = new HashMap<JCheckBox, ArrayList<JCheckBox>>();
+	Map<JCheckBox, ArrayList<JCheckBox>> cpuTaskObjs = new HashMap<JCheckBox, ArrayList<JCheckBox>>();
     protected JSlider JSMinSimulationDuration, JSAverageSimulationDuration, JSMaxSimulationDuration, JSArchitectureComplexity, JSMinCPUUsage, JSAverageCPUUsage, JSMaxCPUUsage, JSMinBusUsage, JSAverageBusUsage, JSMaxBusUsage, JSMinBusContention, JSAverageBusContention, JSMaxBusContention;
     DSEConfiguration config;
 
@@ -129,10 +128,10 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
 	JPanel listPanel;
     private Thread t;
     private boolean go = false;
-    private boolean hasError = false;
+ //   private boolean hasError = false;
     //protected boolean startProcess = false;
 	JList<String> contraints;
-    private String hostProVerif;
+   // private String hostProVerif;
 
     protected RshClient rshc;
 
@@ -172,8 +171,9 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        jp1 = new JTabbedPane();
+
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -469,7 +469,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMinSimulationDuration = new JSlider(-10,10);
         JSMinSimulationDuration.setMinorTickSpacing(5);
         JSMinSimulationDuration.setMajorTickSpacing(1);
-        Hashtable labelTable = new Hashtable();
+        Dictionary<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -488,7 +488,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSAverageSimulationDuration = new JSlider(-10,10);
         JSAverageSimulationDuration.setMinorTickSpacing(5);
         JSAverageSimulationDuration.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -506,7 +506,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMaxSimulationDuration = new JSlider(-10,10);
         JSMaxSimulationDuration.setMinorTickSpacing(5);
         JSMaxSimulationDuration.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -524,7 +524,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSArchitectureComplexity = new JSlider(-10,10);
         JSArchitectureComplexity.setMinorTickSpacing(5);
         JSArchitectureComplexity.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -542,7 +542,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMinCPUUsage = new JSlider(-10,10);
         JSMinCPUUsage.setMinorTickSpacing(5);
         JSMinCPUUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -560,7 +560,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSAverageCPUUsage = new JSlider(-10,10);
         JSAverageCPUUsage.setMinorTickSpacing(5);
         JSAverageCPUUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -578,7 +578,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMaxCPUUsage = new JSlider(-10,10);
         JSMaxCPUUsage.setMinorTickSpacing(5);
         JSMaxCPUUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -595,7 +595,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMinBusUsage = new JSlider(-10,10);
         JSMinBusUsage.setMinorTickSpacing(5);
         JSMinBusUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -613,7 +613,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSAverageBusUsage = new JSlider(-10,10);
         JSAverageBusUsage.setMinorTickSpacing(5);
         JSAverageBusUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -631,7 +631,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMaxBusUsage = new JSlider(-10,10);
         JSMaxBusUsage.setMinorTickSpacing(5);
         JSMaxBusUsage.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -648,7 +648,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSMinBusContention = new JSlider(-10,10);
         JSMinBusContention.setMinorTickSpacing(5);
         JSMinBusContention.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -665,7 +665,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         JSAverageBusContention = new JSlider(-10,10);
         JSAverageBusContention.setMinorTickSpacing(5);
         JSAverageBusContention.setMajorTickSpacing(1);
-        labelTable = new Hashtable();
+        labelTable = new Hashtable<Integer, JLabel>();
         labelTable.put(new Integer(-10), new JLabel("-1.0"));
         labelTable.put(new Integer(-5), new JLabel("-0.5"));
         labelTable.put(new Integer(0), new JLabel("0.0"));
@@ -883,20 +883,20 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         go = true;
         t.start();
     }
-
-    private void testGo() throws InterruptedException {
-        if (go == false) {
-            throw new InterruptedException("Stopped by user");
-        }
-    }
+//
+//    private void testGo() throws InterruptedException {
+//        if (go == false) {
+//            throw new InterruptedException("Stopped by user");
+//        }
+//    }
 
     public void run() {
-        String cmd;
-        String list, data;
-        int cycle = 0;
+  //      String cmd;
+    //    String list, data;
+      //  int cycle = 0;
         output="";
 
-        hasError = false;
+      //  hasError = false;
         //try {
         mapFile = mappingFile.getText();
         modFile = modelFile.getText();
@@ -908,7 +908,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
         NbMaxCPU = maxCPU.getText();
         Nbsim = simulationsPerMapping.getText();
         TraceManager.addDev("Thread started");
-        File testFile;
+     //   File testFile;
         if (jp1.getSelectedIndex() == 0){
             encCC=encTime.getText();
             decCC=decTime.getText();
@@ -926,7 +926,8 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
 			
 			//	ArrayList<String> comps = new ArrayList<String>();
 			//	comps.add(addToComp.getText());
-				HashMap<String, ArrayList<String>> selectedCpuTasks = new HashMap<String, ArrayList<String>>();
+				Map<String, java.util.List<String>> selectedCpuTasks = new HashMap<String, java.util.List<String>>();
+				
 				for (String task: selectedTasks){
 					String cpu = taskCpuMap.get(task);
 					if (selectedCpuTasks.containsKey(cpu)){
@@ -969,7 +970,7 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
             config.decComp = decCC;
 
             config.mainGUI = mgui;
-            TMLMapping map = mgui.gtm.getTMLMapping();
+           // TMLMapping map = mgui.gtm.getTMLMapping();
 
             if (config.setModelPath(tmlDir) != 0) {
                 TraceManager.addDev("TML Directory file at " + tmlDir + " error");
@@ -1157,10 +1158,9 @@ public class JDialogDSE extends javax.swing.JDialog implements ActionListener, L
     public boolean hasToContinue() {
         return (go == true);
     }
-
-
-    public void setError() {
-        hasError = true;
-    }
-
+//
+//    public void setError() {
+//        hasError = true;
+//    }
+//
 }
diff --git a/src/ui/window/JDialogERB.java b/src/ui/window/JDialogERB.java
index 7e15c9a2019f1d27e096a2347b59e8ec40e7883f..2ffd199cc3856c36481298d4800a21021f9379e0 100644
--- a/src/ui/window/JDialogERB.java
+++ b/src/ui/window/JDialogERB.java
@@ -46,17 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDERB;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogERB extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogESO.java b/src/ui/window/JDialogESO.java
index aca4dbe202caacf70f0d4443d14f945b131617b0..650ae42ccaf8849391d4db5bda8e870ae5f6050a 100644
--- a/src/ui/window/JDialogESO.java
+++ b/src/ui/window/JDialogESO.java
@@ -46,17 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDESO;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogESO extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogEventArtifact.java b/src/ui/window/JDialogEventArtifact.java
index 98b31ea819594f47f4eb93c22b13345c8f94713c..cd382f4aa666d50d241b2b584a27430896249199 100755
--- a/src/ui/window/JDialogEventArtifact.java
+++ b/src/ui/window/JDialogEventArtifact.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiEventArtifact;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogEventArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogFirewallNode.java b/src/ui/window/JDialogFirewallNode.java
index 138518a7a462a756990732d44c8a6e65ad22654a..74b7f27314eb63ca7c3a3e9fc9b1c53f815795a9 100644
--- a/src/ui/window/JDialogFirewallNode.java
+++ b/src/ui/window/JDialogFirewallNode.java
@@ -46,18 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiFirewallNode;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogFirewallNode extends javax.swing.JDialog implements ActionListener,ListSelectionListener  {
     
diff --git a/src/ui/window/JDialogFormalValidation.java b/src/ui/window/JDialogFormalValidation.java
index 1cba38a02d08a90848f036bb1ab9c2e9e35d48cf..4f7c600588ab32060de26970a318b5b3c5862da8 100755
--- a/src/ui/window/JDialogFormalValidation.java
+++ b/src/ui/window/JDialogFormalValidation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogFormalValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
     private static boolean makeDTAChecked, makeRGChecked, makeRGAutChecked, makeTLSAChecked = false;
diff --git a/src/ui/window/JDialogGenAUT.java b/src/ui/window/JDialogGenAUT.java
index b068398d94cbf3849d6db05fb11c01be05319bfc..ea2f3644d373e1db4c31ed88ac026c167516809d 100755
--- a/src/ui/window/JDialogGenAUT.java
+++ b/src/ui/window/JDialogGenAUT.java
@@ -46,16 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
 import java.util.List;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-
 public class JDialogGenAUT extends javax.swing.JDialog implements ActionListener, Runnable  {
     
     private static String path = "";
diff --git a/src/ui/window/JDialogGenAUTS.java b/src/ui/window/JDialogGenAUTS.java
index 826b4859a826562fc6f4ad2505278bb8820e544f..5ea7c349658457b1eec59c3e78823039dfcc9f6e 100755
--- a/src/ui/window/JDialogGenAUTS.java
+++ b/src/ui/window/JDialogGenAUTS.java
@@ -46,15 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Iterator;
 
 public class JDialogGenAUTS extends javax.swing.JDialog implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogGraphModification.java b/src/ui/window/JDialogGraphModification.java
index 4b906e947bf7c9d0491eddbc9696bb8f0df564a7..d0234c72f0e23d377ee22db4879708d81a6a118e 100755
--- a/src/ui/window/JDialogGraphModification.java
+++ b/src/ui/window/JDialogGraphModification.java
@@ -46,16 +46,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTMappingGraph;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogGraphModification extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogHwANode.java b/src/ui/window/JDialogHwANode.java
index 91a8a4505e2be290d9609351ef9a0ca02625ad47..026db27d4f2c257e6e7de94099b38ce330982e65 100755
--- a/src/ui/window/JDialogHwANode.java
+++ b/src/ui/window/JDialogHwANode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiHWANode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogHwANode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogInvariantAnalysis.java b/src/ui/window/JDialogInvariantAnalysis.java
index e47595492f95fe7d06da761e82c28d97fae3d5cf..c4ca79ed5224ec983d016635ee0eaa3e238a054f 100644
--- a/src/ui/window/JDialogInvariantAnalysis.java
+++ b/src/ui/window/JDialogInvariantAnalysis.java
@@ -47,20 +47,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
 import myutil.*;
-import avatartranslator.totpn.*;
-import avatartranslator.*;
-import tpndescription.*;
+import tpndescription.TPN;
 import ui.*;
-import ui.avatarsmd.*;
-import launcher.*;
-//import frompipe.*;
+import ui.avatarsmd.AvatarSMDReceiveSignal;
+import ui.avatarsmd.AvatarSMDSendSignal;
+import ui.avatarsmd.AvatarSMDStartState;
+import ui.avatarsmd.AvatarSMDState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.BitSet;
 
 
 public class JDialogInvariantAnalysis extends javax.swing.JDialog implements ActionListener, Runnable  {
@@ -92,7 +93,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
     
     private Thread t;
     private boolean go = false;
-    private boolean hasError = false;
+//    private boolean hasError = false;
 	protected boolean startProcess = false;
     private IntMatrix im;
     
@@ -123,9 +124,9 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         Font f = new Font("Courrier", Font.BOLD, 12);
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
         
         JPanel panelCompute = new JPanel(new BorderLayout());
         JPanel panelCheck = new JPanel(new BorderLayout());
@@ -491,7 +492,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
     	 	 	 percS = String.format("%.2f", perc/100);
     	 	 	 //TraceManager.addDev("PercS=" + percS);
     	 	 	 info.setText(percS+" %, matrix:" + im.sizeRow + "x" + im.sizeColumn);
-    	 	 	 Thread.currentThread().sleep(100);
+    	 	 	 Thread.sleep(100);
     	 	 	 if (im.isFinished()) {
     	 	 	 	 cont = false;
     	 	 	 }
@@ -534,12 +535,12 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
             AvatarBlock ab = null;
             AvatarBlock ab1, ab2;
             Object o;
-            int state;
+         //   int state;
             int valToken = 0;
             
             boolean sameBlock;
             AvatarBlock prevBlock, prevBlock1;
-            int ignored = 0;
+         //   int ignored = 0;
             TGComponent tgc1, tgc2;
             
             int valLine;
@@ -586,7 +587,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
             	
             	// Putting components
 
-            	state = 0;
+            //	state = 0;
             	for(int j=0; j<elts.length; j++) {
             		
             		tmp = elts[j].trim();
@@ -736,7 +737,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
 					} else {
 						//TraceManager.addDev("Invariant ignored " + inv);
 						jtainvariants.append("Ignored invariant: " + inv + "\n");
-						ignored ++;
+					//	ignored ++;
 					}
             	}
             	
@@ -745,7 +746,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
     
     public void run() {
     	TPN tpn;
-        hasError = false;
+      //  hasError = false;
 		
         
 		TraceManager.addDev("Thread started");
@@ -771,7 +772,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
             
             jta.append("Computing incidence matrix\n");
             im = tpn.getIncidenceMatrix();
-            int nbOfColumn = im.sizeColumn;
+         //   int nbOfColumn = im.sizeColumn;
             if ((im.sizeRow < 100) && (im.sizeColumn<100)) {
     	 		jtamatrix.append("Incidence matrix: " + im.sizeRow + "x" + im.sizeColumn +"\n" + im.toString() + "\n\n");
             } else {
@@ -879,8 +880,8 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
     public boolean hasToContinue() {
     	return (go == true);
     }
-    
-    public void setError() {
-    	hasError = true;
-    }
+//    
+//    public void setError() {
+//    	hasError = true;
+//    }
 }
diff --git a/src/ui/window/JDialogJavaGeneration.java b/src/ui/window/JDialogJavaGeneration.java
index 3058debb3ba17177584c795c6f54b72071ffaf06..10ca4927aa64fe98b665abe294d71a1bd4cbdf58 100755
--- a/src/ui/window/JDialogJavaGeneration.java
+++ b/src/ui/window/JDialogJavaGeneration.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tojava.TURTLE2Java;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import myutil.*;
-import translator.tojava.*;
-import ui.*;
-
 
 public class JDialogJavaGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
     
@@ -154,9 +157,9 @@ public class JDialogJavaGeneration extends javax.swing.JDialog implements Action
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         
-        jp1 = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
         
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -470,10 +473,10 @@ public class JDialogJavaGeneration extends javax.swing.JDialog implements Action
                 pt = new ProcessThread(cmd, this);
                 pt.start();
                 
-                Thread.currentThread().sleep(250);
+                Thread.sleep(250);
                 
                 while(pt.isStarted() == true) {
-                    Thread.currentThread().sleep(250);
+                    Thread.sleep(250);
                 }
                 jta.append("Compilation done\n");
                 
@@ -489,10 +492,10 @@ public class JDialogJavaGeneration extends javax.swing.JDialog implements Action
                 pt = new ProcessThread(cmd, this);
                 pt.start();
                 
-                Thread.currentThread().sleep(250);
+                Thread.sleep(250);
                 
                 while(pt.isStarted() == true) {
-                    Thread.currentThread().sleep(250);
+                    Thread.sleep(250);
                 }
                 
                 jta.append("Execution done\n");
diff --git a/src/ui/window/JDialogJavaSimulation.java b/src/ui/window/JDialogJavaSimulation.java
index d1088719d1a67fbb41ee246cc598efffc976a9fe..23721968cc4f815b1d1ff64a566b82bf97fb92dc 100755
--- a/src/ui/window/JDialogJavaSimulation.java
+++ b/src/ui/window/JDialogJavaSimulation.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tosimujava.TURTLE2SimuJava;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import myutil.*;
-import translator.tosimujava.*;
-import ui.*;
-
 
 public class JDialogJavaSimulation extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
     
@@ -147,9 +150,8 @@ public class JDialogJavaSimulation extends javax.swing.JDialog implements Action
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         
-        jp1 = new JTabbedPane();
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
         
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -157,12 +159,6 @@ public class JDialogJavaSimulation extends javax.swing.JDialog implements Action
         jp01.setLayout(gridbag01);
         jp01.setBorder(new javax.swing.border.TitledBorder("Code generation"));
         
-        //JPanel jp02 = new JPanel();
-        //GridBagLayout gridbag02 = new GridBagLayout();
-        //GridBagConstraints c02 = new GridBagConstraints();
-        //jp02.setLayout(gridbag02);
-        //jp02.setBorder(new javax.swing.border.TitledBorder("Compilation"));
-        
         JPanel jp03 = new JPanel();
         GridBagLayout gridbag03 = new GridBagLayout();
         GridBagConstraints c03 = new GridBagConstraints();
@@ -418,10 +414,10 @@ public class JDialogJavaSimulation extends javax.swing.JDialog implements Action
                 pt = new ProcessThread(cmd, this);
                 pt.start();
                 
-                Thread.currentThread().sleep(250);
+                Thread.sleep(250);
                 
                 while(pt.isStarted() == true) {
-                    Thread.currentThread().sleep(250);
+                    Thread.sleep(250);
                 }
                 jta.append("Simluation environment compiled\n");
                 
@@ -437,10 +433,10 @@ public class JDialogJavaSimulation extends javax.swing.JDialog implements Action
                 pt = new ProcessThread(cmd, this);
                 pt.start();
                 
-                Thread.currentThread().sleep(250);
+                Thread.sleep(250);
                 
                 while(pt.isStarted() == true) {
-                    Thread.currentThread().sleep(250);
+                    Thread.sleep(250);
                 }
                 
                 jta.append("Simulation done\n");
diff --git a/src/ui/window/JDialogLOTOSAnalysis.java b/src/ui/window/JDialogLOTOSAnalysis.java
index dcfc4080ab43d494445114092394955720f9dfe6..c64a23742e984831601d059bb14f8e1bb31a589c 100755
--- a/src/ui/window/JDialogLOTOSAnalysis.java
+++ b/src/ui/window/JDialogLOTOSAnalysis.java
@@ -45,14 +45,18 @@
    */
   
   package ui.window;
-  
-  import java.awt.*;
-  import java.awt.event.*;
+
+  import launcher.LauncherException;
+  import launcher.RshClient;
+  import myutil.FileUtils;
+  import myutil.ScrolledJTextArea;
+  import ui.IconManager;
+  import ui.MainGUI;
+
   import javax.swing.*;
-  
-  import launcher.*;
-  import myutil.*;
-  import ui.*;
+  import java.awt.*;
+  import java.awt.event.ActionEvent;
+  import java.awt.event.ActionListener;
   
   public class JDialogLOTOSAnalysis extends javax.swing.JDialog implements ActionListener, Runnable  {
       private static boolean warningChecked = false;
diff --git a/src/ui/window/JDialogLOTOSValidation.java b/src/ui/window/JDialogLOTOSValidation.java
index 0abd1ba6190a5839e8c41a1210e6c3aa4bb45e17..ac05766e7187b8b8e4f9da01838f3ac3043a0952 100755
--- a/src/ui/window/JDialogLOTOSValidation.java
+++ b/src/ui/window/JDialogLOTOSValidation.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogLOTOSValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
 	private static boolean verboseChecked, monitorChecked, safetyChecked, gradualChecked, v3v4Checked, fc2Checked, distributorChecked, autChecked = true, dotChecked=true, bcgChecked = false;
diff --git a/src/ui/window/JDialogLinkNCNode.java b/src/ui/window/JDialogLinkNCNode.java
index 54c41f7b2646c5c7a2a52b9916b81688763f4671..dfbeb91fe30946aacd79bc13df41ede0a57c08ff 100755
--- a/src/ui/window/JDialogLinkNCNode.java
+++ b/src/ui/window/JDialogLinkNCNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogLinkNode.java b/src/ui/window/JDialogLinkNode.java
index 6d2908609d0cd5b181a4c5ca8b7df1cda4097216..bc2485c0231af769f024ee6756883f83ef967ec6 100755
--- a/src/ui/window/JDialogLinkNode.java
+++ b/src/ui/window/JDialogLinkNode.java
@@ -46,19 +46,25 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.ArtifactTClassGate;
+import ui.IconManager;
+import ui.LRArtifactTClassGate;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogLinkNode extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     
     private String delay, lossRate;
     private int implementation, oport, dport;
-    private Vector lothers, rothers, associations;
+    private Vector<ArtifactTClassGate> lothers, rothers;
+    private Vector<LRArtifactTClassGate> associations;
     private boolean cancel = false;
     
     private JPanel panel1, panel2, panel3, panel4, panel5;
@@ -68,13 +74,13 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
     
     // Panels2
     String[] impStrings = { "None", "UDP", "TCP", "RMI" };
-    JComboBox jimp;
+    JComboBox<String> jimp;
     JTextField joport, jdport;
     
     // Panels 3, 4 and 5
-    JComboBox gatesBox1, gatesBox2;
+    JComboBox<ArtifactTClassGate> gatesBox1, gatesBox2;
     JButton addButton, upButton, downButton, removeButton;
-    JList listGates;
+    JList<LRArtifactTClassGate> listGates;
     
     
     // Main Panel
@@ -84,7 +90,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
     //private String id1, id2;
     
     /** Creates new form  */
-    public JDialogLinkNode(Frame f, String _delay, String _lossRate, int _implementation, int _oport, int _dport, Vector _lothers, Vector _rothers, Vector _associations) {
+    public JDialogLinkNode(Frame f, String _delay, String _lossRate, int _implementation, int _oport, int _dport, Vector<ArtifactTClassGate> _lothers, Vector<ArtifactTClassGate> _rothers, Vector<LRArtifactTClassGate> _associations) {
         
         super(f, "Setting link's properties", true);
        
@@ -95,9 +101,9 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         dport = _dport;
         
         // Danger -> vectors should be duplicated
-        lothers = new Vector(_lothers);
-        rothers = new Vector(_rothers);
-        associations = new Vector(_associations);
+        lothers = new Vector<ArtifactTClassGate>(_lothers);
+        rothers = new Vector<ArtifactTClassGate>(_rothers);
+        associations = new Vector<LRArtifactTClassGate>(_associations);
         
         initComponents();
         myInitComponents();
@@ -111,8 +117,9 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
     }
     
     private void initComponents() {
-        JTabbedPane tabbedPane = new JTabbedPane();
-        //tabbedPane.setPreferredSize(new Dimension(550, 400));
+        
+    	// Issue #41 Ordering of tabbed panes 
+    	JTabbedPane tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         
         Container c = getContentPane();
         GridBagLayout gridbag0 = new GridBagLayout();
@@ -120,13 +127,11 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         GridBagLayout gridbag2 = new GridBagLayout();
         GridBagLayout gridbag3 = new GridBagLayout();
         GridBagLayout gridbag4 = new GridBagLayout();
-        //GridBagLayout gridbag5 = new GridBagLayout();
         GridBagConstraints c0 = new GridBagConstraints();
         GridBagConstraints c1 = new GridBagConstraints();
         GridBagConstraints c2 = new GridBagConstraints();
         GridBagConstraints c3 = new GridBagConstraints();
         GridBagConstraints c4 = new GridBagConstraints();
-        //GridBagConstraints c5 = new GridBagConstraints();
         
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(gridbag0);
@@ -197,7 +202,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         c2.fill = GridBagConstraints.HORIZONTAL;
         panel2.add(new JLabel("Implementation = "), c2);
         c2.gridwidth = GridBagConstraints.REMAINDER; //end row
-        jimp = new JComboBox(impStrings);
+        jimp = new JComboBox<String>(impStrings);
         jimp.setSelectedIndex(implementation);
         jimp.addActionListener(this);
         panel2.add(jimp, c1);
@@ -256,13 +261,13 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         c3.fill = GridBagConstraints.HORIZONTAL;
         c3.anchor = GridBagConstraints.CENTER;
         
-        gatesBox1 = new JComboBox();
+        gatesBox1 = new JComboBox<ArtifactTClassGate>();
         panel3.add(gatesBox1, c3);
         c3.gridwidth = 1;
         panel3.add(new JLabel(" = "), c3);
         
         c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-        gatesBox2 = new JComboBox();
+        gatesBox2 = new JComboBox<ArtifactTClassGate>();
         panel3.add(gatesBox2, c3);
         
         // third line panel3
@@ -279,7 +284,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         panel3.add(addButton, c3);
         
         // 1st line panel4
-        listGates = new JList(associations);
+        listGates = new JList<LRArtifactTClassGate>(associations);
         listGates.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         listGates.addListSelectionListener(this);
         JScrollPane scrollPane = new JScrollPane(listGates);
@@ -426,7 +431,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
     public void downSynchro() {
         int i = listGates.getSelectedIndex();
         if ((i!= -1) && (i != associations.size() - 1)) {
-            Object o = associations.elementAt(i);
+            LRArtifactTClassGate o = associations.elementAt(i);
             associations.removeElementAt(i);
             associations.insertElementAt(o, i+1);
             listGates.setListData(associations);
@@ -437,7 +442,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
     public void upSynchro() {
         int i = listGates.getSelectedIndex();
         if (i > 0) {
-            Object o = associations.elementAt(i);
+        	LRArtifactTClassGate o = associations.elementAt(i);
             associations.removeElementAt(i);
             associations.insertElementAt(o, i-1);
             listGates.setListData(associations);
@@ -492,7 +497,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
         return dport;
     }
     
-    public Vector getAssociations() {
+    public Vector<LRArtifactTClassGate> getAssociations() {
         return associations;
     }
     
diff --git a/src/ui/window/JDialogManageListOfString.java b/src/ui/window/JDialogManageListOfString.java
index 658a2fec63e5855131d27ac1b3d2cb9341a094cc..6493479827ff6b5c7483b830b1d572223c354b8a 100755
--- a/src/ui/window/JDialogManageListOfString.java
+++ b/src/ui/window/JDialogManageListOfString.java
@@ -46,13 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogManageListOfString extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index e8b2f12c296b2f7e7e2c02efc3e89f602c7c1d36..9c535041bb3c48fa6302abaffffed73ec8586b27 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -46,15 +46,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.GraphicLib;
+import tmltranslator.modelcompiler.Buffer;
+import ui.IconManager;
+import ui.tmldd.TMLArchiMemoryNode;
+
 import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.Vector;
 
-import ui.*;
-import ui.tmldd.*;
-import tmltranslator.modelcompiler.*;
+//import javax.swing.event.*;
 
 
 public class JDialogMemoryNode extends javax.swing.JDialog implements ActionListener  {
@@ -64,10 +68,10 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
     private boolean regularClose;
 
     private JPanel panel2, panel3;
-    private Frame frame;
+ //   private Frame frame;
     private TMLArchiMemoryNode node;
 
-    protected JComboBox tracemode;
+    protected JComboBox<String> tracemode;
     private static int selectedTracemode = 0;
 
     // Panel1
@@ -78,7 +82,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
 
     //Panel3: code generation
     protected int bufferType = 0;       //it is the index in the ArrayList of String
-    protected JComboBox bufferTypesCB;
+    protected JComboBox<String> bufferTypesCB;
 
     private JTabbedPane tabbedPane;
 
@@ -89,7 +93,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
     /** Creates new form  */
     public JDialogMemoryNode( Frame _frame, String _title, TMLArchiMemoryNode _node, int _bufferType ) {
         super(_frame, _title, true);
-        frame = _frame;
+      //  frame = _frame;
         node = _node;
         bufferType = _bufferType;
 
@@ -104,7 +108,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
     private void initComponents() {
         Container c = getContentPane();
         GridBagLayout gridbag0 = new GridBagLayout();
-        GridBagLayout gridbag1 = new GridBagLayout();
+       // GridBagLayout gridbag1 = new GridBagLayout();
         GridBagLayout gridbag2 = new GridBagLayout();
         GridBagLayout gridbag3 = new GridBagLayout();
         GridBagConstraints c0 = new GridBagConstraints();
@@ -117,7 +121,8 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
 
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        tabbedPane = new JTabbedPane();
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         panel2 = new JPanel();
         panel2.setLayout(gridbag2);
@@ -154,9 +159,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
 
         c2.gridwidth = 1;
         panel2.add(new JLabel("Monitored:"), c2);
-        //c2.gridwidth = GridBagConstraints.REMAINDER; //end row
-        //monitored = new JTextField(""+node.getMonitored(), 15);//DG 19.04.
-	tracemode = new JComboBox(tracemodeTab);
+        tracemode = new JComboBox<String>(tracemodeTab);
         tracemode.setSelectedIndex(selectedTracemode);
         tracemode.addActionListener(this);
         panel2.add(tracemode, c2);
@@ -177,7 +180,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
         c3.weightx = 1.0;
         panel3.add(new JLabel("<html>Memory Extension<br>Construct:</html>"), c3);
         c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-        bufferTypesCB = new JComboBox( new Vector<String>( Arrays.asList( Buffer.memoryTypesList ) ) );
+        bufferTypesCB = new JComboBox<String>( new Vector<String>( Arrays.asList( Buffer.memoryTypesList ) ) );
         bufferTypesCB.setSelectedIndex( bufferType  );
         panel3.add( bufferTypesCB, c3 );
 
diff --git a/src/ui/window/JDialogModelChecking.java b/src/ui/window/JDialogModelChecking.java
index 7236c11c467921208e29a10713746212bb875338..2bf14117f0f63a684ed22ec3be637dd73d61e05e 100755
--- a/src/ui/window/JDialogModelChecking.java
+++ b/src/ui/window/JDialogModelChecking.java
@@ -46,13 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TClassInterface;
+import ui.TGComponent;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class JDialogModelChecking extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public static java.util.List<TClassInterface> validated, ignored;
diff --git a/src/ui/window/JDialogMultiString.java b/src/ui/window/JDialogMultiString.java
index 496f7b67e066a364170df96d54ce8d4c0a97f1e5..280382577757cc8b39ead3c7c205d6f7669f6936 100755
--- a/src/ui/window/JDialogMultiString.java
+++ b/src/ui/window/JDialogMultiString.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
 public class JDialogMultiString extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogMultiStringCP.java b/src/ui/window/JDialogMultiStringCP.java
index 82c778683dee12a8509ac5b2cfbdfbd8716b6161..a667030e13d49c28d1834c44de0e0e585a74912b 100755
--- a/src/ui/window/JDialogMultiStringCP.java
+++ b/src/ui/window/JDialogMultiStringCP.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogMultiStringCP extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogNCEqNode.java b/src/ui/window/JDialogNCEqNode.java
index fc2cd4256e8103eaa5fd5f4ef96f8bc4ef3653de..a53cac74496e245077a1678f71e7c39bcf4a900a 100755
--- a/src/ui/window/JDialogNCEqNode.java
+++ b/src/ui/window/JDialogNCEqNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNCRoute.java b/src/ui/window/JDialogNCRoute.java
index 840553e1f7c4262e30bdfd135c9a4284d69237dc..fa9e47282db44b78f6ade4f1deb646d66c34d5be 100755
--- a/src/ui/window/JDialogNCRoute.java
+++ b/src/ui/window/JDialogNCRoute.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.ncdd.NCRoute;
 
-import ui.*;
-import ui.ncdd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class JDialogNCRoute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogNCSwitchNode.java b/src/ui/window/JDialogNCSwitchNode.java
index 44f3eff14bcc34220e2262a14caad41b81a372a5..1fc75aee928f6c9a780bc8e5f7090da48d612b6e 100755
--- a/src/ui/window/JDialogNCSwitchNode.java
+++ b/src/ui/window/JDialogNCSwitchNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNCTraffic.java b/src/ui/window/JDialogNCTraffic.java
index 5cd185b57eaea6a586d0fcdf64d1c0fafc651ff3..c92c32fa74d3b195173a57b2ff27cf4a6f35f27e 100755
--- a/src/ui/window/JDialogNCTraffic.java
+++ b/src/ui/window/JDialogNCTraffic.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNote.java b/src/ui/window/JDialogNote.java
index c64293ff7c404fbd0ac8c4d1a3f5b28a96b83aec..285cb909430f222dcc5be5823e5d6142c33d1728 100755
--- a/src/ui/window/JDialogNote.java
+++ b/src/ui/window/JDialogNote.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogNote extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogObserver.java b/src/ui/window/JDialogObserver.java
index ef51690d1a27d887feb3d869b222cb9ac25f6364..4ee4f2eac8df79aa5f53641b4c3653e614cc8c5c 100755
--- a/src/ui/window/JDialogObserver.java
+++ b/src/ui/window/JDialogObserver.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogObserver extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogParam.java b/src/ui/window/JDialogParam.java
index 47d4683bd53ddcd111c5fbd101bc737ca52974fa..b75f30a2870ce02d6ef4c9c6601b01e2dba0a9c0 100755
--- a/src/ui/window/JDialogParam.java
+++ b/src/ui/window/JDialogParam.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogParam extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogParamFIFO.java b/src/ui/window/JDialogParamFIFO.java
index 1f6586e2d014ffa8f6dbcc2d25083e59ffa77ff3..b8a45aacf5576ffbf35cdaefc09bde944268c7cf 100755
--- a/src/ui/window/JDialogParamFIFO.java
+++ b/src/ui/window/JDialogParamFIFO.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogPortArtifact.java b/src/ui/window/JDialogPortArtifact.java
index 792787025f91b8b1fede7184dba37b24b5fb0c70..c6e6081bc1ada9c9bb2e889cdaa3efdd9fa1ea56 100755
--- a/src/ui/window/JDialogPortArtifact.java
+++ b/src/ui/window/JDialogPortArtifact.java
@@ -48,17 +48,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-import java.util.List;
-
-import ui.*;
-import ui.tmldd.*;
 import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiMemoryNode;
+import ui.tmldd.TMLArchiPortArtifact;
 
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 
 public class JDialogPortArtifact extends javax.swing.JDialog implements ActionListener  {
@@ -71,20 +73,20 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
     private TMLArchiPortArtifact artifact;
     private String mappedMemory = "VOID"; 
 
-	protected JComboBox mappedPortCB, memoryCB;
+	protected JComboBox<String> mappedPortCB, memoryCB;
 	protected JTextField baseAddressTF, numSamplesTF, bitsPerSymbolTF;
 	protected String baseAddress, mappedPort, sampleLength, numSamples, bitsPerSymbol;
 	protected String bank, dataType, symmetricalValue;
-	protected JComboBox dataTypeCB, bankCB, symmetricalValueCB;
+	protected JComboBox<String> dataTypeCB, bankCB, symmetricalValueCB;
 
 	//Intl Data In
 	protected JTextField widthIntl_TF, bitInOffsetIntl_TF, inputOffsetIntl_TF;
 	protected String widthIntl, bitInOffsetIntl, inputOffsetIntl, packedBinaryInIntl;
-	protected JComboBox packedBinaryInIntl_CB;
+	protected JComboBox<String> packedBinaryInIntl_CB;
 
 	//Intl Data Out
 	protected JTextField bitOutOffsetIntl_TF, outputOffsetIntl_TF;
-	protected JComboBox packedBinaryOutIntl_CB;
+	protected JComboBox<String> packedBinaryOutIntl_CB;
 	protected String packedBinaryOutIntl, bitOutOffsetIntl, outputOffsetIntl;
 
 	//Intl Perm
@@ -94,7 +96,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 	//Mapper Data In
 	protected JTextField baseAddressDataInMapp_TF, numSamplesDataInMapp_TF, bitsPerSymbolDataInMapp_TF;
 	protected String baseAddressDataInMapp, numSamplesDataInMapp, bitsPerSymbolDataInMapp, symmetricalValueDataInMapp;
-	protected JComboBox symmetricalValueDataInMapp_CB;
+	protected JComboBox<String> symmetricalValueDataInMapp_CB;
 	//Mapper Data Out
 	protected JTextField baseAddressDataOutMapp_TF;
 	protected String baseAddressDataOutMapp;
@@ -107,11 +109,11 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
     private JButton cancelButton;
 
 	//Code generation
-	private JPanel panel3, panel4, panel5;
-	private JTabbedPane tabbedPane;
+	private JPanel panel3;//, panel4, panel5;
+	//private JTabbedPane tabbedPane;
 	private String HALUnitName = "";
 	private Vector<String> portsList;
-	private String appName = "";
+	//private String appName = "";
     
     /** Creates new form  */
     public JDialogPortArtifact(Frame _frame, String _title, TMLArchiPortArtifact _artifact, String _mappedMemory, Vector<String> _portsList, String _mappedPort ) {
@@ -121,7 +123,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 		mappedMemory = _mappedMemory;
 		portsList = _portsList;
 		mappedPort = _mappedPort;
-		appName = mappedPort.split("::")[0];
+		//appName = mappedPort.split("::")[0];
 		initComponents();
 		pack();
     }
@@ -130,7 +132,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 
         Container c = getContentPane();
         GridBagLayout gridbag0 = new GridBagLayout();
-        GridBagLayout gridbag1 = new GridBagLayout();
+        //GridBagLayout gridbag1 = new GridBagLayout();
         GridBagLayout gridbag2 = new GridBagLayout();
         GridBagConstraints c0 = new GridBagConstraints();
         GridBagConstraints c1 = new GridBagConstraints();
@@ -151,9 +153,10 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
         panel3.setBorder(new javax.swing.border.TitledBorder("Code generation: memory configuration"));
         panel3.setPreferredSize(new Dimension(650, 350));
 
-        tabbedPane = new JTabbedPane();
-        panel4 = new JPanel();
-        panel5 = new JPanel();
+    	// Issue #41 Ordering of tabbed panes 
+       // tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+        //panel4 = new JPanel();
+     //   panel5 = new JPanel();
         
 		c1.gridwidth = 1;
         c1.gridheight = 1;
@@ -170,14 +173,14 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
             mappedPortIndex = portsList.indexOf( mappedPort );
         }
 		
-        mappedPortCB = new JComboBox( portsList );
+        mappedPortCB = new JComboBox<String>( portsList );
         mappedPortCB.setSelectedIndex( mappedPortIndex );
         panel2.add( new JLabel( "Port:" ), c2 );
 		mappedPortCB.addActionListener(this);
 		panel2.add( mappedPortCB, c1 );
 		
 		//Make the list of memories that are available for being mapped
-		List componentList = artifact.getTDiagramPanel().getComponentList();
+		List<TGComponent> componentList = artifact.getTDiagramPanel().getComponentList();
 		Vector<String> memoryList = new Vector<String>();
 		for( int k = 0; k < componentList.size(); k++ )	{
 			if( componentList.get(k) instanceof TMLArchiMemoryNode )	{
@@ -188,7 +191,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
             memoryList.add( "No available memory" );              
         }
 
-		memoryCB = new JComboBox( memoryList );
+		memoryCB = new JComboBox<String>( memoryList );
 		if( !mappedMemory.equals( "VOID" ) && !mappedMemory.equals( "" ) )	{
 			memoryCB.setSelectedIndex( memoryList.indexOf( mappedMemory ) );
 		}
@@ -222,8 +225,8 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 
 	private String getBufferTypeFromSelectedMemory( String mappedMemory )	{
 		
-		List componentList = artifact.getTDiagramPanel().getComponentList();
-		Vector<String> list = new Vector<String>();
+		List<TGComponent> componentList = artifact.getTDiagramPanel().getComponentList();
+		//Vector<String> list = new Vector<String>();
 		
 		for( int k = 0; k < componentList.size(); k++ )	{
 			if( componentList.get(k) instanceof TMLArchiMemoryNode )	{
@@ -249,66 +252,66 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
           cancelDialog();
       }
 	}
-
-	private void updateBufferPanel()	{
-
-		GridBagConstraints c1 = new GridBagConstraints();
-		GridBagConstraints c2 = new GridBagConstraints();
-
-		c1.gridwidth = 1;
-		c1.gridheight = 1;
-		c1.weighty = 1.0;
-		c1.weightx = 1.0;
-		c1.fill = GridBagConstraints.HORIZONTAL;
-    c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-		
-		//flushBuffersStrings();
-		HALUnitName = getBufferTypeFromSelectedMemory( (String)memoryCB.getItemAt( memoryCB.getSelectedIndex() ) );
-		ArrayList<JPanel> panelsList;
-
-		switch( HALUnitName )	{
-			case "FEP_BUFFER":
-				tabbedPane.removeAll();
-				panelsList = FepBuffer.makePanel( c1, c2 );
-				panel3 = panelsList.get(0);
-				tabbedPane.addTab( "Data", panel3 );
-				break;
-			case "MAPPER_BUFFER":
-				tabbedPane.removeAll();
-				panelsList = MapperBuffer.makePanel( c1, c2 );
-				tabbedPane.addTab( "Data In", panelsList.get(0) );
-				tabbedPane.addTab( "Data Out", panelsList.get(1) );
-				tabbedPane.addTab( "Look Up Table", panelsList.get(2) );
-				tabbedPane.setSelectedIndex(0);
-				break;
-			case "ADAIF_BUFFER":
-				tabbedPane.removeAll();
-				panelsList = AdaifBuffer.makePanel( c1, c2 );
-				panel3 = panelsList.get(0);
-				tabbedPane.addTab( "Data", panel3 );
-				break;
-			case "INTERLEAVER_BUFFER":
-				tabbedPane.removeAll();
-				panelsList = InterleaverBuffer.makePanel( c1, c2 );
-				tabbedPane.addTab( "Data In", panelsList.get(0) );
-				tabbedPane.addTab( "Data Out", panelsList.get(1) );
-				tabbedPane.addTab( "Permutation Table", panelsList.get(2) );
-				tabbedPane.setSelectedIndex(0);
-				break;
-			case "MAIN_MEMORY_BUFFER":
-				tabbedPane.removeAll();
-				panelsList = MMBuffer.makePanel( c1, c2 );
-				panel3 = panelsList.get(0);
-				tabbedPane.addTab( "Data", panel3 );
-				break;
-			default:	//the main memory buffer 
-				tabbedPane.removeAll();
-				panelsList = FepBuffer.makePanel( c1, c2 );
-				panel3 = panelsList.get(0);
-				tabbedPane.addTab( "Data", panel3 );
-				break;
-		}
-	}
+//
+//	private void updateBufferPanel()	{
+//
+//		GridBagConstraints c1 = new GridBagConstraints();
+//		GridBagConstraints c2 = new GridBagConstraints();
+//
+//		c1.gridwidth = 1;
+//		c1.gridheight = 1;
+//		c1.weighty = 1.0;
+//		c1.weightx = 1.0;
+//		c1.fill = GridBagConstraints.HORIZONTAL;
+//    c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+//		
+//		//flushBuffersStrings();
+//		HALUnitName = getBufferTypeFromSelectedMemory( (String)memoryCB.getItemAt( memoryCB.getSelectedIndex() ) );
+//		ArrayList<JPanel> panelsList;
+//
+//		switch( HALUnitName )	{
+//			case "FEP_BUFFER":
+//				tabbedPane.removeAll();
+//				panelsList = FepBuffer.makePanel( c1, c2 );
+//				panel3 = panelsList.get(0);
+//				tabbedPane.addTab( "Data", panel3 );
+//				break;
+//			case "MAPPER_BUFFER":
+//				tabbedPane.removeAll();
+//				panelsList = MapperBuffer.makePanel( c1, c2 );
+//				tabbedPane.addTab( "Data In", panelsList.get(0) );
+//				tabbedPane.addTab( "Data Out", panelsList.get(1) );
+//				tabbedPane.addTab( "Look Up Table", panelsList.get(2) );
+//				tabbedPane.setSelectedIndex(0);
+//				break;
+//			case "ADAIF_BUFFER":
+//				tabbedPane.removeAll();
+//				panelsList = AdaifBuffer.makePanel( c1, c2 );
+//				panel3 = panelsList.get(0);
+//				tabbedPane.addTab( "Data", panel3 );
+//				break;
+//			case "INTERLEAVER_BUFFER":
+//				tabbedPane.removeAll();
+//				panelsList = InterleaverBuffer.makePanel( c1, c2 );
+//				tabbedPane.addTab( "Data In", panelsList.get(0) );
+//				tabbedPane.addTab( "Data Out", panelsList.get(1) );
+//				tabbedPane.addTab( "Permutation Table", panelsList.get(2) );
+//				tabbedPane.setSelectedIndex(0);
+//				break;
+//			case "MAIN_MEMORY_BUFFER":
+//				tabbedPane.removeAll();
+//				panelsList = MMBuffer.makePanel( c1, c2 );
+//				panel3 = panelsList.get(0);
+//				tabbedPane.addTab( "Data", panel3 );
+//				break;
+//			default:	//the main memory buffer 
+//				tabbedPane.removeAll();
+//				panelsList = FepBuffer.makePanel( c1, c2 );
+//				panel3 = panelsList.get(0);
+//				tabbedPane.addTab( "Data", panel3 );
+//				break;
+//		}
+//	}
 
     public void closeDialog() {
 
@@ -449,21 +452,21 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 		}
 		return params;
 	}
-
-	private void cleanPanels()	{
-		panel3.removeAll();
-		panel4.removeAll();
-		panel5.removeAll();
-		tabbedPane.removeAll();
-	}
-
-	private void revalidateAndRepaintPanels()	{
-		panel3.revalidate();
-		panel3.repaint();
-		panel4.revalidate();
-		panel4.repaint();
-		panel5.revalidate();
-		panel5.repaint();
-	}
+//
+//	private void cleanPanels()	{
+//		panel3.removeAll();
+//		panel4.removeAll();
+//		panel5.removeAll();
+//		tabbedPane.removeAll();
+//	}
+
+//	private void revalidateAndRepaintPanels()	{
+//		panel3.revalidate();
+//		panel3.repaint();
+//		panel4.revalidate();
+//		panel4.repaint();
+//		panel5.revalidate();
+//		panel5.repaint();
+//	}
 
 }	//End of class
diff --git a/src/ui/window/JDialogPragma.java b/src/ui/window/JDialogPragma.java
index acc9bfe2b07633f7a516b2a65bbb3fbf8134a835..15342889c7fadc32c18c2979e5307c0e3ff201a4 100755
--- a/src/ui/window/JDialogPragma.java
+++ b/src/ui/window/JDialogPragma.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
-import java.util.regex.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class JDialogPragma extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogProVerifGeneration.java b/src/ui/window/JDialogProVerifGeneration.java
deleted file mode 100644
index d507aa886b32816d3d9b5617c4b87750d311bd0d..0000000000000000000000000000000000000000
--- a/src/ui/window/JDialogProVerifGeneration.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- *
- * ludovic.apvrille AT enst.fr
- *
- * This software is a computer program whose purpose is to allow the
- * edition of TURTLE analysis, design and deployment diagrams, to
- * allow the generation of RT-LOTOS or Java code from this diagram,
- * and at last to allow the analysis of formal validation traces
- * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
- * This software is governed by the CeCILL  license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- *
- * /**
- * Class JDialogProVerifGeneration
- * Dialog for managing the generation of ProVerif code and execution of
- * ProVerif
- * Creation: 10/09/2010
- * @version 1.1 10/09/2010
- * @author Ludovic APVRILLE
- * @see
- */
-
-package ui.window;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import avatartranslator.toproverif.*;
-import avatartranslator.*;
-import proverifspec.*;
-import ui.*;
-
-import launcher.*;
-
-
-public class JDialogProVerifGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
-
-    protected MainGUI mgui;
-
-    private String textC1 = "Generate ProVerif code in";
-    private String textC2 = "Execute ProVerif as";
-
-    protected static String pathCode;
-    protected static String pathExecute;
-
-
-    protected final static int NOT_STARTED = 1;
-    protected final static int STARTED = 2;
-    protected final static int STOPPED = 3;
-
-    public final static int REACHABILITY_ALL        = 1;
-    public final static int REACHABILITY_SELECTED   = 2;
-    public final static int REACHABILITY_NONE       = 3;
-
-    int mode;
-
-    //components
-    protected JTextArea jta;
-    protected JButton start;
-    protected JButton stop;
-    protected JButton close;
-
-    protected JRadioButton exe, exeint;
-    protected ButtonGroup exegroup;
-    protected JLabel gen, comp;
-    protected JTextField code1, code2, unitcycle, compiler1, exe1, exe2, exe3, exe2int, loopLimit;
-    protected JTabbedPane jp1;
-    protected JScrollPane jsp;
-    protected JCheckBox outputOfProVerif, typedLanguage;
-    protected JRadioButton stateReachabilityAll, stateReachabilitySelected, stateReachabilityNone;
-    protected ButtonGroup stateReachabilityGroup;
-    protected JComboBox versionSimulator;
-
-    private Thread t;
-    private boolean go = false;
-    private boolean hasError = false;
-    //protected boolean startProcess = false;
-
-    private String hostProVerif;
-
-    protected RshClient rshc;
-
-
-    /** Creates new form  */
-    public JDialogProVerifGeneration(Frame f, MainGUI _mgui, String title, String _hostProVerif, String _pathCode, String _pathExecute) {
-        super(f, title, true);
-
-        mgui = _mgui;
-
-        if (pathCode == null) {
-            pathCode = _pathCode;
-        }
-
-        if (pathExecute == null)
-            pathExecute = _pathExecute;
-
-
-        hostProVerif = _hostProVerif;
-
-        initComponents();
-        myInitComponents();
-        pack();
-
-        //getGlassPane().addMouseListener( new MouseAdapter() {});
-        getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-    }
-
-    protected void myInitComponents() {
-        mode = NOT_STARTED;
-        setButtons();
-    }
-
-    protected void initComponents() {
-
-        Container c = getContentPane();
-        setFont(new Font("Helvetica", Font.PLAIN, 14));
-        c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-        jp1 = new JTabbedPane();
-
-        JPanel jp01 = new JPanel();
-        GridBagLayout gridbag01 = new GridBagLayout();
-        GridBagConstraints c01 = new GridBagConstraints();
-        jp01.setLayout(gridbag01);
-        jp01.setBorder(new javax.swing.border.TitledBorder("Code generation"));
-
-        JPanel jp03 = new JPanel();
-        GridBagLayout gridbag03 = new GridBagLayout();
-        GridBagConstraints c03 = new GridBagConstraints();
-        jp03.setLayout(gridbag03);
-        jp03.setBorder(new javax.swing.border.TitledBorder("Execution"));
-
-
-        c01.weighty = 1.0;
-        c01.weightx = 1.0;
-        c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-        c01.fill = GridBagConstraints.BOTH;
-        c01.gridheight = 1;
-
-        gen = new JLabel(textC1);
-        //genJava.addActionListener(this);
-        jp01.add(gen, c01);
-
-        code1 = new JTextField(pathCode, 100);
-        jp01.add(code1, c01);
-
-        jp01.add(new JLabel(" "), c01);
-        c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-
-
-        c01.gridx = 0;
-        c01.gridy = 3;
-        c01.gridwidth = 1;
-        jp01.add(new JLabel("Compute state reachability: "), c01);
-
-        stateReachabilityGroup = new ButtonGroup ();
-
-        c01.gridx = 1;
-        stateReachabilityAll = new JRadioButton("all");
-        jp01.add(stateReachabilityAll, c01);
-
-        c01.gridx = 2;
-        stateReachabilitySelected = new JRadioButton("selected");
-        jp01.add(stateReachabilitySelected, c01);
-
-        c01.gridx = 3;
-        c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-        stateReachabilityNone = new JRadioButton("none");
-        jp01.add(stateReachabilityNone, c01);
-
-        stateReachabilityGroup.add (stateReachabilityAll);
-        stateReachabilityGroup.add (stateReachabilitySelected);
-        stateReachabilityGroup.add (stateReachabilityNone);
-        stateReachabilityAll.setSelected(true);
-
-        c01.gridx = GridBagConstraints.RELATIVE;
-        c01.gridy = GridBagConstraints.RELATIVE;
-        typedLanguage = new JCheckBox("Generate typed Pi calculus");
-        typedLanguage.setSelected(true);
-        jp01.add(typedLanguage, c01);
-	jp01.add(new JLabel("Limit on loop iterations"));
-	c01.gridwidth= GridBagConstraints.REMAINDER;
-        loopLimit = new JTextField("1", 3);
-	jp01.add(loopLimit,c01);
-        /*optimizemode = new JCheckBox("Optimize code");
-          optimizemode.setSelected(optimizeModeSelected);
-          jp01.add(optimizemode, c01);
-
-          jp01.add(new JLabel("Simulator used:"), c01);
-
-          versionSimulator = new JComboBox(simus);
-          versionSimulator.setSelectedIndex(selectedItem);
-          versionSimulator.addActionListener(this);
-          jp01.add(versionSimulator, c01);
-        //System.out.println("selectedItem=" + selectedItem);
-
-        //devmode = new JCheckBox("Development version of the simulator");
-        //devmode.setSelected(true);
-        //jp01.add(devmode, c01);*/
-
-        jp01.add(new JLabel(" "), c01);
-
-        jp1.add("Generate code", jp01);
-
-
-        // Panel 03
-        c03.gridheight = 1;
-        c03.weighty = 1.0;
-        c03.weightx = 1.0;
-        c03.gridwidth = GridBagConstraints.REMAINDER; //end row
-        c03.fill = GridBagConstraints.BOTH;
-        c03.gridheight = 1;
-
-        exegroup = new ButtonGroup();
-        exe = new JRadioButton(textC2, true);
-        exe.addActionListener(this);
-        exegroup.add(exe);
-        //exeJava.addActionListener(this);
-        jp03.add(exe, c03);
-
-        exe2 = new JTextField(pathExecute +  " -in pi ", 100);
-        jp03.add(exe2, c03);
-
-        jp03.add(new JLabel(" "), c03);
-
-        outputOfProVerif = new JCheckBox("Show output of ProVerif");
-        outputOfProVerif.setSelected(false);
-        jp03.add(outputOfProVerif, c03);
-
-
-        jp1.add("Execute", jp03);
-
-        c.add(jp1, BorderLayout.NORTH);
-
-
-        jta = new ScrolledJTextArea();
-        jta.setEditable(false);
-        jta.setMargin(new Insets(10, 10, 10, 10));
-        jta.setTabSize(3);
-        jta.append("Select options and then, click on 'start' to launch ProVerif code generation / compilation\n");
-        Font f = new Font("Courrier", Font.BOLD, 12);
-        jta.setFont(f);
-        jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-	jsp.setPreferredSize(new Dimension(300,300));
-        c.add(jsp, BorderLayout.CENTER);
-
-        start = new JButton("Start", IconManager.imgic53);
-        stop = new JButton("Stop", IconManager.imgic55);
-        close = new JButton("Close", IconManager.imgic27);
-
-        start.setPreferredSize(new Dimension(100, 30));
-        stop.setPreferredSize(new Dimension(100, 30));
-        close.setPreferredSize(new Dimension(120, 30));
-
-        start.addActionListener(this);
-        stop.addActionListener(this);
-        close.addActionListener(this);
-
-        JPanel jp2 = new JPanel();
-        jp2.add(start);
-        jp2.add(stop);
-        jp2.add(close);
-
-        c.add(jp2, BorderLayout.SOUTH);
-
-    }
-
-    public void actionPerformed(ActionEvent evt)  {
-        String command = evt.getActionCommand();
-
-        if (command.equals("Start"))  {
-            startProcess();
-        } else if (command.equals("Stop")) {
-            stopProcess();
-        } else if (command.equals("Close")) {
-            closeDialog();
-        }
-    }
-
-    public void closeDialog() {
-        if (mode == STARTED) {
-            stopProcess();
-        }
-        dispose();
-    }
-
-    public void stopProcess() {
-        if (rshc != null ){
-            try {
-                rshc.stopCommand();
-            } catch (LauncherException le) {
-            }
-        }
-        rshc = null;
-        mode =  STOPPED;
-        setButtons();
-        go = false;
-    }
-
-    public void startProcess() {
-        t = new Thread(this);
-        mode = STARTED;
-        setButtons();
-        go = true;
-        t.start();
-    }
-
-    private void testGo() throws InterruptedException {
-        if (go == false) {
-            throw new InterruptedException("Stopped by user");
-        }
-    }
-
-    public void run() {
-        String cmd;
-        String list, data;
-        int cycle = 0;
-
-        hasError = false;
-
-        TraceManager.addDev("Thread started");
-        File testFile;
-        try {
-            // Code generation
-            if (jp1.getSelectedIndex() == 0) {
-                jta.append("Generating ProVerif code\n");
-
-                testGo();
-                pathCode = code1.getText().trim ();
-
-                if (pathCode.isEmpty()){
-                    pathCode="pvspec";
-                }
-
-                testFile = new File(pathCode);
-
-                if (testFile.isDirectory()){
-                    if (!pathCode.endsWith (File.separator)){
-                        pathCode += File.separator;
-                    }
-                    pathCode += "pvspec";
-                    testFile = new File(pathCode);
-                }
-                
-                if (testFile.exists()){
-                    // FIXME Raise error
-                    System.out.println("FILE EXISTS!!!");
-                }
-                if (mgui.gtm.generateProVerifFromAVATAR(pathCode, stateReachabilityAll.isSelected () ? REACHABILITY_ALL : stateReachabilitySelected.isSelected () ? REACHABILITY_SELECTED : REACHABILITY_NONE, typedLanguage.isSelected(), loopLimit.getText())) {
-                    jta.append("ProVerif code generation done\n");
-                } else {
-		    setError();
-                    jta.append("Could not generate proverif code\n");
-                }
-
-                if (typedLanguage.isSelected()){
-                    exe2.setText(pathExecute +  " -in pitype ");		
-                }
-                else {
-                    exe2.setText(pathExecute +  " -in pi ");	
-                }
-                exe2.setText(exe2.getText()+pathCode);
-                //if (mgui.gtm.getCheckingWarnings().size() > 0) {
-                jta.append("" +  mgui.gtm.getCheckingWarnings().size() + " warning(s)\n");
-                //}
-            }
-            testGo();
-            // Execute
-            if (jp1.getSelectedIndex() == 1) {
-                try {
-
-                    cmd = exe2.getText();
-
-                    jta.append("Executing ProVerif code with command: \n" + cmd + "\n");
-
-                    rshc = new RshClient(hostProVerif);
-                    // Assuma data are on the remote host
-                    // Command
-
-                    data = processCmd(cmd);
-
-
-                    if (outputOfProVerif.isSelected()) {
-                        jta.append(data);
-                    }
-
-                    ProVerifOutputAnalyzer pvoa = mgui.gtm.getProVerifOutputAnalyzer ();
-                    pvoa.analyzeOutput(data, typedLanguage.isSelected());
-
-                    if (pvoa.getErrors().size() != 0) {
-                        jta.append("\nErrors found in the generated code:\n----------------\n");
-                        for(String error: pvoa.getErrors()) {
-                            jta.append(error+"\n");
-                        }
-
-                    } else {
-
-                        jta.append("\nReachable states:\n----------------\n");
-                        for(String re: pvoa.getReachableEvents()) {
-                            jta.append(re+"\n");
-                        }
-
-                        jta.append("\nNon reachable states:\n----------------\n");
-                        for(String re: pvoa.getNonReachableEvents()) {
-                            jta.append(re+"\n");
-                        }
-
-                        jta.append("\nConfidential Data:\n----------------\n");
-                        for(AvatarAttribute attr: pvoa.getSecretTerms()) {
-                            jta.append(attr.getBlock ().getName () + "." + attr.getName () + "\n");
-                        }
-
-                        jta.append("\nNon Confidential Data:\n----------------\n");
-                        for(AvatarAttribute attr: pvoa.getNonSecretTerms()) {
-                            jta.append(attr.getBlock ().getName () + "." + attr.getName () + "\n");
-                        }
-
-                        jta.append("\nSatisfied Strong Authenticity:\n----------------\n");
-                        for(String re: pvoa.getSatisfiedAuthenticity()) {
-                            jta.append(re+"\n");
-                        }
-
-                        jta.append("\nSatisfied Weak Authenticity:\n----------------\n");
-                        for(String re: pvoa.getSatisfiedWeakAuthenticity()) {
-                            jta.append(re+"\n");
-                        }
-
-                        jta.append("\nNon Satisfied Strong Authenticity:\n----------------\n");
-                        for(String re: pvoa.getNonSatisfiedAuthenticity()) {
-                            jta.append(re+"\n");
-                        }
-
-                        jta.append("\nNon proved queries:\n----------------\n");
-                        for(String re: pvoa.getNotProved()) {
-                            jta.append(re+"\n");
-                        }
-                    }
-
-                    mgui.modelBacktracingProVerif(pvoa);
-
-                    jta.append("\nAll done\n");
-                } catch (LauncherException le) {
-                    jta.append("Error: " + le.getMessage() + "\n");
-                    mode =      STOPPED;
-                    setButtons();
-                    return;
-                } catch (Exception e) {
-                    mode =      STOPPED;
-                    setButtons();
-                    return;
-                }
-            }
-
-            if ((hasError == false) && (jp1.getSelectedIndex() < 1)) {
-                jp1.setSelectedIndex(jp1.getSelectedIndex() + 1);
-            }
-
-        } catch (InterruptedException ie) {
-            jta.append("Interrupted\n");
-        }
-
-        jta.append("\n\nReady to process next command\n");
-
-        checkMode();
-        setButtons();
-
-        //System.out.println("Selected item=" + selectedItem);
-    }
-
-    protected String processCmd(String cmd) throws LauncherException {
-        rshc.setCmd(cmd);
-        String s = null;
-        rshc.sendExecuteCommandRequest();
-        s = rshc.getDataFromProcess();
-        return s;
-    }
-
-    protected void checkMode() {
-        mode = NOT_STARTED;
-    }
-
-    protected void setButtons() {
-        switch(mode) {
-            case NOT_STARTED:
-                start.setEnabled(true);
-                stop.setEnabled(false);
-                close.setEnabled(true);
-                //setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-                getGlassPane().setVisible(false);
-                break;
-            case STARTED:
-                start.setEnabled(false);
-                stop.setEnabled(true);
-                close.setEnabled(false);
-                getGlassPane().setVisible(true);
-                //setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                break;
-            case STOPPED:
-            default:
-                start.setEnabled(false);
-                stop.setEnabled(false);
-                close.setEnabled(true);
-                getGlassPane().setVisible(false);
-                break;
-        }
-    }
-
-    public boolean hasToContinue() {
-        return (go == true);
-    }
-
-    public void appendOut(String s) {
-        jta.append(s);
-    }
-
-    public void setError() {
-        hasError = true;
-    }
-}
diff --git a/src/ui/window/JDialogProjection.java b/src/ui/window/JDialogProjection.java
index 079f67913acc121e0b4b9f12419fcaa1607c7b62..054dfe65a602ad04fa400e0dc6ef0f73f3829d9f 100755
--- a/src/ui/window/JDialogProjection.java
+++ b/src/ui/window/JDialogProjection.java
@@ -46,17 +46,23 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import launcher.*;
-import myutil.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
 import translator.*;
 import ui.*;
-import ui.cd.*;
+import ui.cd.TClassDiagramPanel;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class JDialogProjection extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable  {
diff --git a/src/ui/window/JDialogProverifVerification.java b/src/ui/window/JDialogProverifVerification.java
index 4c28cd41768b78175ab1af3454b4092b20b9c91e..e15c8aba148dedbfb2075a3d40d0b0fe83e9460c 100644
--- a/src/ui/window/JDialogProverifVerification.java
+++ b/src/ui/window/JDialogProverifVerification.java
@@ -7,8 +7,7 @@
  * allow the generation of RT-LOTOS or Java code from this diagram,
  * and at last to allow the analysis of formal validation traces
  * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- * from INRIA Rhone-Alpes.
- *
+ * from INRIA Rhone-Alpes.  *
  * This software is governed by the CeCILL  license under French law and
  * abiding by the rules of distribution of free software.  You can  use,
  * modify and/ or redistribute the software under the terms of the CeCILL
@@ -47,27 +46,45 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarPragma;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.MasterProcessInterface;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import proverifspec.ProVerifResultTraceStep;
+import ui.AvatarDesignPanel;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.*;
+import java.util.HashMap;
+import java.util.LinkedList;
 
-import myutil.*;
-import avatartranslator.toproverif.*;
-import avatartranslator.*;
-import proverifspec.*;
-import ui.*;
 
-import launcher.*;
-
-
-public class JDialogProverifVerification extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
+public class JDialogProverifVerification extends javax.swing.JDialog implements ActionListener, ListSelectionListener, MouseListener, Runnable, MasterProcessInterface  {
 
     private static final Insets insets = new Insets(0, 0, 0, 0);
-    
+    private static final Insets WEST_INSETS = new Insets(0, 0, 0, 0);
+    private static final Insets EAST_INSETS = new Insets(0, 0, 0, 0);
+
     protected MainGUI mgui;
+    private AvatarDesignPanel adp;
 
     private String textC1 = "Generate ProVerif code in: ";
     private String textC2 = "Execute ProVerif as: ";
@@ -87,23 +104,45 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
     int mode;
 
     //components
-    protected JTextArea jta;
+    protected JPanel jta;
     protected JButton start;
     protected JButton stop;
     protected JButton close;
+    protected JPopupMenu popup;
+
+    private class MyMenuItem extends JMenuItem {
+        AvatarPragma pragma;
+        ProVerifQueryResult result;
+
+        public MyMenuItem(String text)
+        {
+            super(text);
+        }
+    };
+    protected MyMenuItem menuItem;
+
 
-    
     //protected JRadioButton exe, exeint;
     //protected ButtonGroup exegroup;
     protected JLabel gen, comp, exe;
     protected JTextField code1, code2, unitcycle, compiler1, exe1, exe2, exe3, exe2int, loopLimit;
     //protected JTabbedPane jp1;
     protected JScrollPane jsp;
-    protected JCheckBox outputOfProVerif, typedLanguage;
+    protected JCheckBox typedLanguage;
     protected JRadioButton stateReachabilityAll, stateReachabilitySelected, stateReachabilityNone;
     protected ButtonGroup stateReachabilityGroup;
     protected JComboBox versionSimulator;
 
+    private JList<AvatarPragma> reachableEventsList;
+    private JList<AvatarPragma> nonReachableEventsList;
+    private JList<AvatarPragma> secretTermsList;
+    private JList<AvatarPragma> nonSecretTermsList;
+    private JList<AvatarPragma> satisfiedStrongAuthList;
+    private JList<AvatarPragma> satisfiedWeakAuthList;
+    private JList<AvatarPragma> nonSatisfiedAuthList;
+    private JList<AvatarPragma> nonProvedList;
+    private HashMap<AvatarPragma, ProVerifQueryResult> results;
+
     private Thread t;
     private boolean go = false;
     private boolean hasError = false;
@@ -113,12 +152,26 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
 
     protected RshClient rshc;
 
+    private class ProVerifVerificationException extends Exception {
+        private String message;
+
+        public ProVerifVerificationException(String message)
+        {
+            this.message = message;
+        }
+
+        public String getMessage()
+        {
+            return this.message;
+        }
+    };
 
     /** Creates new form  */
-    public JDialogProverifVerification(Frame f, MainGUI _mgui, String title, String _hostProVerif, String _pathCode, String _pathExecute) {
-        super(f, title, true);
+    public JDialogProverifVerification(Frame f, MainGUI _mgui, String title, String _hostProVerif, String _pathCode, String _pathExecute, AvatarDesignPanel adp) {
+        super(f, title, Dialog.ModalityType.DOCUMENT_MODAL);
 
         mgui = _mgui;
+        this.adp = adp;
 
         if (pathCode == null) {
             pathCode = _pathCode;
@@ -134,8 +187,7 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
         myInitComponents();
         pack();
 
-        //getGlassPane().addMouseListener( new MouseAdapter() {});
-        getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        // getGlassPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
     }
 
     protected void myInitComponents() {
@@ -144,10 +196,27 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
     }
 
     private void addComponent(Container container, Component component, int gridx, int gridy,
-			      int gridwidth, int gridheight, int anchor, int fill) {
-	GridBagConstraints gbc = new GridBagConstraints(gridx, gridy, gridwidth, gridheight, 1.0, 1.0,
-							anchor, fill, insets, 0, 0);
-	container.add(component, gbc);
+            int gridwidth, int gridheight, int anchor, int fill) {
+        GridBagConstraints gbc = new GridBagConstraints(gridx, gridy, gridwidth, gridheight, 1.0, 1.0,
+                anchor, fill, insets, 0, 0);
+        container.add(component, gbc);
+    }
+
+    private GridBagConstraints createGbc(int x, int y) {
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridx = x;
+        gbc.gridy = y;
+        gbc.gridwidth = 1;
+        gbc.gridheight = 1;
+
+        gbc.anchor = (x == 0) ? GridBagConstraints.WEST : GridBagConstraints.EAST;
+        gbc.fill = (x == 0) ? GridBagConstraints.BOTH
+            : GridBagConstraints.HORIZONTAL;
+
+        gbc.insets = (x == 0) ? WEST_INSETS : EAST_INSETS;
+        gbc.weightx = (x == 0) ? 0.1 : 1.0;
+        gbc.weighty = 1.0;
+        return gbc;
     }
 
     protected void initComponents() {
@@ -155,146 +224,65 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-        //jp1 = new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
-        //GridBagConstraints c01 = new GridBagConstraints();
         jp01.setLayout(gridbag01);
         jp01.setBorder(new javax.swing.border.TitledBorder("Verification options"));
 
-        
+
         gen = new JLabel(textC1);
-	addComponent(jp01, gen, 0, 0, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-        //genJava.addActionListener(this);
-        //jp01.add(gen, c01);
+        addComponent(jp01, gen, 0, 0, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
-	//c01.gridwidth = GridBagConstraints.REMAINDER; //end row
         code1 = new JTextField(pathCode, 100);
-	addComponent(jp01, code1, 1, 0, 3, 1, GridBagConstraints.EAST, GridBagConstraints.BOTH);
-        //jp01.add(code1, c01);
-
-	
-        //jp01.add(new JLabel(" "), c01);
-        //c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-
-	exe = new JLabel(textC2);
-	//jp01.add(exe, c01);
-	addComponent(jp01, exe, 0, 1, 1, 1, GridBagConstraints.EAST, GridBagConstraints.BOTH);
+        addComponent(jp01, code1, 1, 0, 3, 1, GridBagConstraints.EAST, GridBagConstraints.BOTH);
 
-        exe2 = new JTextField(pathExecute +  " -in pi ", 100);
-	addComponent(jp01, exe2, 1, 1, 3, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
- 
+        exe = new JLabel(textC2);
+        addComponent(jp01, exe, 0, 1, 1, 1, GridBagConstraints.EAST, GridBagConstraints.BOTH);
 
-        //jp01.add(new JLabel(" "), c01);
+        exe2 = new JTextField(pathExecute, 100);
+        addComponent(jp01, exe2, 1, 1, 3, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
-	    //c01.gridx = 0;
-	//        //c01.gridy = 3;
-        //c01.gridwidth = 1;
-	//c01.gridwidth = GridBagConstraints.REMAINDER; //end row
+        addComponent(jp01, new JLabel("Compute state reachability: "), 0, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
 
-        //jp01.add(new JLabel("Compute state reachability: "), c01);
-	  addComponent(jp01, new JLabel("Compute state reachability: "), 0, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-	  //c01.gridwidth = GridBagConstraints.REMAINDER; //end row
 
-	//jp01.add(new JLabel("hi there: "), c01);
-	//jp01.add(new JLabel("hi hi there: "), c01);
-
-	
-	
         stateReachabilityGroup = new ButtonGroup ();
 
-	//c01.gridy = 5;
-        //c01.gridx = 1;
 
-	/*JPanel bl1 = new JPanel();
-	
-	//c01.gridwidth = 1;*/
         stateReachabilityAll = new JRadioButton("all");
-        //bl1.add(stateReachabilityAll);
-	addComponent(jp01, stateReachabilityAll, 1, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-	
+        addComponent(jp01, stateReachabilityAll, 1, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+
 
-        //c01.gridx = 2;
         stateReachabilitySelected = new JRadioButton("selected");
-        //bl1.add(stateReachabilitySelected);
-	addComponent(jp01, stateReachabilitySelected, 2, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+        addComponent(jp01, stateReachabilitySelected, 2, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
-        //c01.gridx = 3;
-        //c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-	stateReachabilityNone = new JRadioButton("none");
-	addComponent(jp01, stateReachabilityNone, 3, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-        //bl1.add(stateReachabilityNone);
-	//jp01.add(bl1, c01);
+        stateReachabilityNone = new JRadioButton("none");
+        addComponent(jp01, stateReachabilityNone, 3, 3, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
         stateReachabilityGroup.add (stateReachabilityAll);
         stateReachabilityGroup.add (stateReachabilitySelected);
         stateReachabilityGroup.add (stateReachabilityNone);
         stateReachabilityAll.setSelected(true);
 
-        //c01.gridx = GridBagConstraints.RELATIVE;
-        //c01.gridy = GridBagConstraints.RELATIVE;
         typedLanguage = new JCheckBox("Generate typed Pi calculus");
         typedLanguage.setSelected(true);
-        //jp01.add(typedLanguage, c01);
-	addComponent(jp01, typedLanguage, 0, 4, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-
-	/*c01.gridwidth= 1;
-	//c01.gridwidth = GridBagConstraints.REMAINDER; //end row
-	//JPanel pan1 = new JPanel();*/
-	addComponent(jp01, new JLabel("Limit on loop iterations:"), 0, 5, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-	//jp01.add(new JLabel("Limit on loop iterations:"), c01);
-	//c01.gridwidth= GridBagConstraints.REMAINDER;
-        loopLimit = new JTextField("1", 3);
-	addComponent(jp01, loopLimit, 1, 5, 2, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-	//jp01.add(loopLimit, c01);
-	//jp01.add(pan1, c01);*/
-        /*optimizemode = new JCheckBox("Optimize code");
-          optimizemode.setSelected(optimizeModeSelected);
-          jp01.add(optimizemode, c01);
+        addComponent(jp01, typedLanguage, 0, 4, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
-          jp01.add(new JLabel("Simulator used:"), c01);
-
-          versionSimulator = new JComboBox(simus);
-          versionSimulator.setSelectedIndex(selectedItem);
-          versionSimulator.addActionListener(this);
-          jp01.add(versionSimulator, c01);
-        //System.out.println("selectedItem=" + selectedItem);
-
-        //devmode = new JCheckBox("Development version of the simulator");
-        //devmode.setSelected(true);
-        //jp01.add(devmode, c01);
-
-        //jp01.add(new JLabel(" "), c01);
-
-        //jp1.add("Generate code", jp01);*/
-
-
-        	
-
-        outputOfProVerif = new JCheckBox("Show output of ProVerif");
-        outputOfProVerif.setSelected(false);
-        //jp01.add(outputOfProVerif, c01);*/
-	addComponent(jp01, outputOfProVerif, 0, 6, 2, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-
-
-        //jp1.add("Execute", jp03);
+        addComponent(jp01, new JLabel("Limit on loop iterations:"), 0, 5, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+        loopLimit = new JTextField("1", 3);
+        addComponent(jp01, loopLimit, 1, 5, 2, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH);
 
         c.add(jp01, BorderLayout.NORTH);
 
 
-        jta = new ScrolledJTextArea();
-        jta.setEditable(false);
-        jta.setMargin(new Insets(10, 10, 10, 10));
-        jta.setTabSize(3);
-        jta.append("Select options and then, click on 'start' to launch ProVerif code generation / compilation\n");
+        jta = new JPanel();
+        jta.setLayout(new GridBagLayout());
+        jta.setBorder(new javax.swing.border.TitledBorder("Verification results"));
         Font f = new Font("Courrier", Font.BOLD, 12);
         jta.setFont(f);
-        jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-	jsp.setPreferredSize(new Dimension(300,300));
+        jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        jsp.setPreferredSize(new Dimension(300,300));
         c.add(jsp, BorderLayout.CENTER);
 
         start = new JButton("Start", IconManager.imgic53);
@@ -316,6 +304,10 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
 
         c.add(jp2, BorderLayout.SOUTH);
 
+        this.popup = new JPopupMenu();
+        this.menuItem = new MyMenuItem("Show trace");
+        this.menuItem.addActionListener(this);
+        popup.add(this.menuItem);
     }
 
     public void actionPerformed(ActionEvent evt)  {
@@ -327,6 +319,39 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
             stopProcess();
         } else if (command.equals("Close")) {
             closeDialog();
+        } else if (command.equals("Show trace")) {
+            if (evt.getSource() == this.menuItem)
+            {
+                PipedOutputStream pos = new PipedOutputStream();
+                try {
+                    PipedInputStream pis = new PipedInputStream(pos, 4096);
+                    BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(pos));
+
+                    JFrameSimulationSDPanel jfssdp = new JFrameSimulationSDPanel(null, this.mgui, this.menuItem.pragma.toString());
+                    jfssdp.setIconImage(IconManager.img8);
+                    GraphicLib.centerOnParent(jfssdp, 600, 600);
+                    jfssdp.setFileReference(new BufferedReader(new InputStreamReader(pis)));
+                    jfssdp.setVisible(true);
+                    jfssdp.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+                    jfssdp.toFront();
+
+                    // TraceManager.addDev("\n--- Trace ---");
+                    int i=0;
+                    for (ProVerifResultTraceStep step: this.menuItem.result.getTrace().getTrace()) {
+                        step.describeAsSDTransaction(this.adp, bw, i);
+                        i++;
+                        // TraceManager.addDev(step.describeAsString(this.adp));
+                    }
+                    bw.close();
+                } catch(IOException e) {
+                    TraceManager.addDev("Error when writing trace step SD transaction");
+                } finally {
+                    try {
+                        pos.close();
+                    } catch(IOException e) {}
+                }
+                // TraceManager.addDev("");
+            }
         }
     }
 
@@ -364,190 +389,229 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
         }
     }
 
+    class ProVerifResultSection {
+        String title;
+        LinkedList<AvatarPragma> results;
+        JList<AvatarPragma> jlist;
+
+        ProVerifResultSection(String title, LinkedList<AvatarPragma> results, JList<AvatarPragma> jlist)
+        {
+            this.title = title;
+            this.results = results;
+            this.jlist = jlist;
+        }
+    };
+
     public void run() {
-        String cmd;
-        String list, data;
+        String list;
         int cycle = 0;
 
         hasError = false;
 
         TraceManager.addDev("Thread started");
+        this.jta.removeAll();
         File testFile;
         try {
-            // Code generation
-            //if (jp1.getSelectedIndex() == 0) {
-                jta.append("Generating ProVerif code\n");
-
-                testGo();
-                pathCode = code1.getText().trim ();
-
-                if (pathCode.isEmpty()){
-                    pathCode="pvspec";
-                } /*else {
-		    
-		    if (!FileUtils.checkPath(pathCode)) {
-			jta.append("Error: invalid directory: " + pathCode + "\n");
-			mode =      STOPPED;
-			setButtons();
-			return;
-		    }
-		    }*/
-
-                testFile = new File(pathCode);
-
-		File dir = testFile.getParentFile();
-		if (!dir.exists()) {
-		    jta.append("Error: invalid directory: " + pathCode + "\n");
-			mode =      STOPPED;
-			setButtons();
-			return;
-		}
-
-		
-
-                if (testFile.isDirectory()){
-                    if (!pathCode.endsWith (File.separator)){
-                        pathCode += File.separator;
-                    }
-                    pathCode += "pvspec";
-                    testFile = new File(pathCode);
-                }
-                
-                if (testFile.exists()){
-                    // FIXME Raise error
-                    System.out.println("FILE EXISTS!!!");
-                }
-                if (mgui.gtm.generateProVerifFromAVATAR(pathCode, stateReachabilityAll.isSelected () ? REACHABILITY_ALL : stateReachabilitySelected.isSelected () ? REACHABILITY_SELECTED : REACHABILITY_NONE, typedLanguage.isSelected(), loopLimit.getText())) {
-                    jta.append("ProVerif code generation done\n");
-                } else {
-		    setError();
-                    jta.append("Could not generate proverif code\n");
-                }
 
-                if (typedLanguage.isSelected()){
-                    exe2.setText(pathExecute +  " -in pitype ");		
-                }
-                else {
-                    exe2.setText(pathExecute +  " -in pi ");	
-                }
-                exe2.setText(exe2.getText()+pathCode);
-                //if (mgui.gtm.getCheckingWarnings().size() > 0) {
-                jta.append("" +  mgui.gtm.getCheckingWarnings().size() + " warning(s)\n");
-                //}
-		//}
             testGo();
-            // Execute
-            //if (jp1.getSelectedIndex() == 1) {
-                try {
+            pathCode = code1.getText().trim ();
 
-                    cmd = exe2.getText();
-
-                    jta.append("Executing ProVerif code with command: \n" + cmd + "\n");
-
-                    rshc = new RshClient(hostProVerif);
-                    // Assuma data are on the remote host
-                    // Command
+            if (pathCode.isEmpty() || pathCode.endsWith(File.separator)) {
+                pathCode += "pvspec";
+            }
 
-                    data = processCmd(cmd);
+            testFile = new File(pathCode);
 
+            if (testFile != null && testFile.isDirectory()){
+                pathCode += File.separator;
+                pathCode += "pvspec";
+                testFile = new File(pathCode);
+            }
 
-                    if (outputOfProVerif.isSelected()) {
-                        jta.append(data);
-                    }
+            File dir = null;
+            if (testFile != null)
+            {
+                dir = testFile.getParentFile();
+            }
 
-                    ProVerifOutputAnalyzer pvoa = mgui.gtm.getProVerifOutputAnalyzer ();
-                    pvoa.analyzeOutput(data, typedLanguage.isSelected());
+            if (testFile == null || dir == null || !dir.exists()) {
+                mode = STOPPED;
+                setButtons();
+                throw new ProVerifVerificationException("Error: invalid file: " + pathCode);
+            }
 
-                    if (pvoa.getErrors().size() != 0) {
-                        jta.append("\nErrors found in the generated code:\n----------------\n");
-                        for(String error: pvoa.getErrors()) {
-                            jta.append(error+"\n");
-                        }
 
-                    } else {
+            if (testFile.exists()){
+                // FIXME Raise error if modified since last
+                System.out.println("FILE EXISTS!!!");
+            }
 
-                        jta.append("\nReachable states:\n----------------\n");
-                        for(String re: pvoa.getReachableEvents()) {
-                            jta.append(re+"\n");
-                        }
+            if (
+                    mgui.gtm.generateProVerifFromAVATAR(
+                        pathCode,
+                        stateReachabilityAll.isSelected () ? REACHABILITY_ALL : stateReachabilitySelected.isSelected () ? REACHABILITY_SELECTED : REACHABILITY_NONE,
+                        typedLanguage.isSelected(),
+                        loopLimit.getText())
+               ) {
+            } else {
+                this.hasError = true;
+                throw new ProVerifVerificationException("Could not generate proverif code");
+            }
 
-                        jta.append("\nNon reachable states:\n----------------\n");
-                        for(String re: pvoa.getNonReachableEvents()) {
-                            jta.append(re+"\n");
-                        }
+            String cmd = exe2.getText().trim();
 
-                        jta.append("\nConfidential Data:\n----------------\n");
-                        for(AvatarAttribute attr: pvoa.getSecretTerms()) {
-                            jta.append(attr.getBlock ().getName () + "." + attr.getName () + "\n");
-                        }
+            if (this.typedLanguage.isSelected())
+            {
+                cmd += " -in pitype ";
+            }
+            else
+            {
+                cmd += " -in pi ";
+            }
 
-                        jta.append("\nNon Confidential Data:\n----------------\n");
-                        for(AvatarAttribute attr: pvoa.getNonSecretTerms()) {
-                            jta.append(attr.getBlock ().getName () + "." + attr.getName () + "\n");
-                        }
+            cmd += pathCode;
+            //jta.append("" +  mgui.gtm.getCheckingWarnings().size() + " warning(s)\n");
+            testGo();
 
-                        jta.append("\nSatisfied Strong Authenticity:\n----------------\n");
-                        for(String re: pvoa.getSatisfiedAuthenticity()) {
-                            jta.append(re+"\n");
+            rshc = new RshClient(hostProVerif);
+            rshc.setCmd(cmd);
+            rshc.sendExecuteCommandRequest();
+            String data = rshc.getDataFromProcess();
+
+            ProVerifOutputAnalyzer pvoa = mgui.gtm.getProVerifOutputAnalyzer ();
+            pvoa.analyzeOutput(data, typedLanguage.isSelected());
+
+            if (pvoa.getErrors().size() != 0) {
+                int y = 0;
+
+                JLabel label = new JLabel("Errors found in the generated code:");
+                label.setAlignmentX(Component.LEFT_ALIGNMENT);
+                this.jta.add(label, this.createGbc(0, y++));
+                label = new JLabel("----------------");
+                label.setAlignmentX(Component.LEFT_ALIGNMENT);
+                this.jta.add(label, this.createGbc(0, y++));
+                this.jta.add(Box.createRigidArea(new Dimension(0,5)), this.createGbc(0, y++));
+                for(String error: pvoa.getErrors()) {
+                    label = new JLabel(error);
+                    label.setAlignmentX(Component.LEFT_ALIGNMENT);
+                    this.jta.add(label,this.createGbc(0, y++));
+                }
+            } else {
+                LinkedList<AvatarPragma> reachableEvents = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> nonReachableEvents = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> secretTerms = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> nonSecretTerms = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> satisfiedStrongAuth = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> satisfiedWeakAuth = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> nonSatisfiedAuth = new LinkedList<AvatarPragma> ();
+                LinkedList<AvatarPragma> nonProved = new LinkedList<AvatarPragma> ();
+
+                this.results = pvoa.getResults();
+                for (AvatarPragma pragma: this.results.keySet())
+                {
+                    if (pragma instanceof AvatarPragmaReachability)
+                    {
+                        ProVerifQueryResult r = this.results.get(pragma);
+                        if (r.isProved())
+                        {
+                            if (r.isSatisfied())
+                                reachableEvents.add(pragma);
+                            else
+                                nonReachableEvents.add(pragma);
                         }
+                        else
+                            nonProved.add(pragma);
+                    }
 
-                        jta.append("\nSatisfied Weak Authenticity:\n----------------\n");
-                        for(String re: pvoa.getSatisfiedWeakAuthenticity()) {
-                            jta.append(re+"\n");
+                    else if (pragma instanceof AvatarPragmaSecret)
+                    {
+                        ProVerifQueryResult r = this.results.get(pragma);
+                        if (r.isProved())
+                        {
+                            if (r.isSatisfied())
+                                secretTerms.add(pragma);
+                            else
+                                nonSecretTerms.add(pragma);
                         }
+                        else
+                            nonProved.add(pragma);
+                    }
 
-                        jta.append("\nNon Satisfied Strong Authenticity:\n----------------\n");
-                        for(String re: pvoa.getNonSatisfiedAuthenticity()) {
-                            jta.append(re+"\n");
+                    else if (pragma instanceof AvatarPragmaAuthenticity)
+                    {
+                        ProVerifQueryAuthResult r = (ProVerifQueryAuthResult) this.results.get(pragma);
+                        if (!r.isWeakProved())
+                        {
+                            nonProved.add(pragma);
                         }
-
-                        jta.append("\nNon proved queries:\n----------------\n");
-                        for(String re: pvoa.getNotProved()) {
-                            jta.append(re+"\n");
+                        else
+                        {
+                            if (!r.isProved())
+                                nonProved.add(pragma);
+                            if (r.isProved() && r.isSatisfied())
+                                satisfiedStrongAuth.add(pragma);
+                            else if (r.isWeakSatisfied())
+                                satisfiedWeakAuth.add(pragma);
+                            else
+                                nonSatisfiedAuth.add(pragma);
                         }
                     }
+                }
 
-                    mgui.modelBacktracingProVerif(pvoa);
-
-                    jta.append("\nAll done\n");
-                } catch (LauncherException le) {
-                    jta.append("Error: " + le.getMessage() + "\n");
-                    mode =      STOPPED;
-                    setButtons();
-                    return;
-                } catch (Exception e) {
-                    mode =      STOPPED;
-                    setButtons();
-                    return;
+                LinkedList<ProVerifResultSection> sectionsList = new LinkedList<ProVerifResultSection> ();
+                sectionsList.add(new ProVerifResultSection("Reachable states:", reachableEvents, this.reachableEventsList));
+                sectionsList.add(new ProVerifResultSection("Non reachable states:", nonReachableEvents, this.nonReachableEventsList));
+                sectionsList.add(new ProVerifResultSection("Confidential Data:", secretTerms, this.secretTermsList));
+                sectionsList.add(new ProVerifResultSection("Non confidential Data:", nonSecretTerms, this.nonSecretTermsList));
+                sectionsList.add(new ProVerifResultSection("Satisfied Strong Authenticity:", satisfiedStrongAuth, this.satisfiedStrongAuthList));
+                sectionsList.add(new ProVerifResultSection("Satisfied Weak Authenticity:", satisfiedWeakAuth, this.satisfiedWeakAuthList));
+                sectionsList.add(new ProVerifResultSection("Non Satisfied Authenticity:", nonSatisfiedAuth, this.nonSatisfiedAuthList));
+                sectionsList.add(new ProVerifResultSection("Not Proved Queries:", nonProved, this.nonProvedList));
+
+                int y = 0;
+
+                for (ProVerifResultSection section: sectionsList)
+                {
+                    if (!section.results.isEmpty())
+                    {
+                        JLabel label = new JLabel(section.title);
+                        label.setAlignmentX(Component.LEFT_ALIGNMENT);
+                        this.jta.add(label, this.createGbc(0, y++));
+                        this.jta.add(Box.createRigidArea(new Dimension(0,5)), this.createGbc(0, y++));
+                        section.jlist = new JList<AvatarPragma> (section.results.toArray (new AvatarPragma[0]));
+                        section.jlist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                        section.jlist.addMouseListener(this);
+                        section.jlist.setAlignmentX(Component.LEFT_ALIGNMENT);
+                        this.jta.add(section.jlist, this.createGbc(0, y++));
+                        this.jta.add(Box.createRigidArea(new Dimension(0,10)), this.createGbc(0, y++));
+                    }
                 }
-		//}
+            }
 
-		/*if ((hasError == false) && (jp1.getSelectedIndex() < 1)) {
-                jp1.setSelectedIndex(jp1.getSelectedIndex() + 1);
-		}*/
+            mgui.modelBacktracingProVerif(pvoa);
 
+            mode = NOT_STARTED;
+
+        } catch (LauncherException le) {
+            JLabel label = new JLabel("Error: " + le.getMessage());
+            label.setAlignmentX(Component.LEFT_ALIGNMENT);
+            this.jta.add(label, this.createGbc(0, 0));
+            mode = STOPPED;
         } catch (InterruptedException ie) {
-            jta.append("Interrupted\n");
+            mode = NOT_STARTED;
+        } catch (ProVerifVerificationException pve) {
+            JLabel label = new JLabel("Error: " + pve.getMessage());
+            label.setAlignmentX(Component.LEFT_ALIGNMENT);
+            this.jta.add(label, this.createGbc(0, 0));
+            mode = STOPPED;
+        } catch (Exception e) {
+            mode = STOPPED;
+            throw e;
         }
 
-        jta.append("\n\nReady to process next command\n");
 
-        checkMode();
         setButtons();
 
-        //System.out.println("Selected item=" + selectedItem);
-    }
-
-    protected String processCmd(String cmd) throws LauncherException {
-        rshc.setCmd(cmd);
-        String s = null;
-        rshc.sendExecuteCommandRequest();
-        s = rshc.getDataFromProcess();
-        return s;
-    }
-
-    protected void checkMode() {
-        mode = NOT_STARTED;
     }
 
     protected void setButtons() {
@@ -556,7 +620,6 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
                 start.setEnabled(true);
                 stop.setEnabled(false);
                 close.setEnabled(true);
-                //setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
                 getGlassPane().setVisible(false);
                 break;
             case STARTED:
@@ -564,7 +627,6 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
                 stop.setEnabled(true);
                 close.setEnabled(false);
                 getGlassPane().setVisible(true);
-                //setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                 break;
             case STOPPED:
             default:
@@ -576,15 +638,68 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
         }
     }
 
-    public boolean hasToContinue() {
-        return (go == true);
+    @Override
+    public void setError()
+    {
+        this.hasError = true;
     }
 
-    public void appendOut(String s) {
-        jta.append(s);
+    @Override
+    public void appendOut(String s)
+    {
+    }
+
+    @Override
+    public boolean hasToContinue()
+    {
+        return this.go;
+    }
+
+    @Override
+    public void mouseClicked(MouseEvent e)
+    {
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e)
+    {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e)
+    {
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e)
+    {
+        this.maybeShowPopup(e);
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e)
+    {
+        this.maybeShowPopup(e);
+    }
+
+    private void maybeShowPopup(MouseEvent e)
+    {
+        if (e.isPopupTrigger() && e.getComponent() instanceof JList)
+        {
+            JList<AvatarPragma> curList = (JList<AvatarPragma>) e.getComponent();
+            int row = curList.locationToIndex(e.getPoint());
+            curList.clearSelection();
+            curList.setSelectedIndex(row);
+            this.menuItem.pragma = curList.getModel().getElementAt(row);
+            this.menuItem.result = this.results.get(this.menuItem.pragma);
+            this.menuItem.setEnabled(this.adp != null && this.menuItem.result.getTrace() != null);
+            popup.show(e.getComponent(), e.getX(), e.getY());
+        }
     }
 
-    public void setError() {
-        hasError = true;
+    @Override
+    public void valueChanged(ListSelectionEvent e)
+    {
+        // TODO: unselect the other lists
     }
 }
diff --git a/src/ui/window/JDialogReducedAttribute.java b/src/ui/window/JDialogReducedAttribute.java
index 550232057a1d4961ecac26d8afcf2a3a006d2fce..6f1c9065ee62e9a87ed030ece047898ba369609d 100755
--- a/src/ui/window/JDialogReducedAttribute.java
+++ b/src/ui/window/JDialogReducedAttribute.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogReducedAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     private java.util.List<TAttribute> attributesPar, setList, unsetList, tclassAttributes;
diff --git a/src/ui/window/JDialogRequirement.java b/src/ui/window/JDialogRequirement.java
index 2a674d24d342bd820a23767d2c968e977ca74d49..c53a120e3862ff7e246b9cf772cfbb7a2b0d3542 100755
--- a/src/ui/window/JDialogRequirement.java
+++ b/src/ui/window/JDialogRequirement.java
@@ -46,14 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
 
 public class JDialogRequirement extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogRequirementTable.java b/src/ui/window/JDialogRequirementTable.java
index bc03f41716b529138993a4a2e3342403bb007db3..4408b8595716eb52719396aa046bfa2e24dafb29 100755
--- a/src/ui/window/JDialogRequirementTable.java
+++ b/src/ui/window/JDialogRequirementTable.java
@@ -46,12 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogRequirementTable extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogSDInstance.java b/src/ui/window/JDialogSDInstance.java
index c00aab5f30eb835d7e0f4d8a7cf38ba96e3862c4..c408bf8dbac5a47ab409b4637fa5c0ca3b384aef 100644
--- a/src/ui/window/JDialogSDInstance.java
+++ b/src/ui/window/JDialogSDInstance.java
@@ -47,13 +47,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogSDInstance extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogSMDLibraryFunctionCall.java b/src/ui/window/JDialogSMDLibraryFunctionCall.java
index d3938e71b03392b67753519a11792043d84601ec..61a911f9563a8b34393f851ec4adceb5e840e296 100644
--- a/src/ui/window/JDialogSMDLibraryFunctionCall.java
+++ b/src/ui/window/JDialogSMDLibraryFunctionCall.java
@@ -38,35 +38,21 @@
 
 package ui.window;
 
-import java.util.LinkedList;
-import java.util.Collections;
-import java.util.Arrays;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
+import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
 
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.event.ListSelectionListener;
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
-
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
 
 /**
 * Dialog for managing Avatar library function calls in State Machine Diagrams.
diff --git a/src/ui/window/JDialogSafetyPragma.java b/src/ui/window/JDialogSafetyPragma.java
index bccf317349a79b13167c3fb453503b4743defab6..21e7ef0d90edbf6a76193415e651aa3a14872aae 100644
--- a/src/ui/window/JDialogSafetyPragma.java
+++ b/src/ui/window/JDialogSafetyPragma.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class JDialogSafetyPragma extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogScheduling.java b/src/ui/window/JDialogScheduling.java
index 35ed2d31966327649f9af4b8f0be86cbe8a34a84..f3bf9607a8901eabfaeca4eb58895e7f94751703 100755
--- a/src/ui/window/JDialogScheduling.java
+++ b/src/ui/window/JDialogScheduling.java
@@ -46,30 +46,16 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import myutil.ProcessThread;
 import myutil.ScrolledJTextArea;
 import ui.IconManager;
 import ui.MainGUI;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 public class JDialogScheduling extends javax.swing.JDialog implements ActionListener, Runnable  {
 	
 	private static boolean sampleChecked=false, channelChecked= false, eventChecked = false, requestChecked = false, execChecked = false, busTransferChecked = false, schedulingChecked = false, taskStateChecked = false, channelStateChecked = false, branchingChecked = false, terminateCPUChecked = false, terminateCPUsChecked = true, clockedChecked = false, clockedEndChecked = false, countTickChecked=false, maxCountTickChecked=false, randomTaskChecked = true;
diff --git a/src/ui/window/JDialogSearchBox.java b/src/ui/window/JDialogSearchBox.java
index 3cafd3ff7ac317e642f6dc28fa0bf872ff8e89fe..17743c30b67e9b5dd6dd57a02dcd942b1da77447 100644
--- a/src/ui/window/JDialogSearchBox.java
+++ b/src/ui/window/JDialogSearchBox.java
@@ -46,38 +46,32 @@
 
 package ui.window;
 
-import web.crawler.*;
-import myutil.TraceManager;
-
+import myutil.*;
+import myutil.externalSearch.Client;
+import myutil.externalSearch.Message;
+import myutil.externalSearch.Record;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MalformedConfigurationException;
+import ui.TDiagramMouseManager;
+import web.crawler.WebCrawler;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.html.HTMLDocument;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import myutil.GoogleSearch;
-import myutil.GraphicLib;
-import java.lang.Object;
-import java.awt.Desktop;
 import java.net.URI;
-import myutil.TableSorter;
-import java.util.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.text.html.HTMLDocument;
-
-import myutil.CheckConnection;
-import myutil.externalSearch.Record;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MalformedConfigurationException;
-import ui.TDiagramMouseManager;
-import myutil.externalSearch.Message;
-import myutil.externalSearch.Client;
+import java.util.ArrayList;
 
 //TODO : change display to tab.
 //TODO: decorate the text box
diff --git a/src/ui/window/JDialogSelectAvatarBlock.java b/src/ui/window/JDialogSelectAvatarBlock.java
index dcc4e6ffd98d8f0e775d4e18c87b8130ade9339c..966ea92d37f58748292e6ea42b777f8e9e35c366 100755
--- a/src/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/ui/window/JDialogSelectAvatarBlock.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDStateMachineOwner;
 
-import ui.*;
-import ui.avatarbd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectCPDiagrams.java b/src/ui/window/JDialogSelectCPDiagrams.java
index c00440bd90cdac280f535f24ca638726a27303d4..1242afdc49cae1f011f4b68d237946cd69e3f7a3 100755
--- a/src/ui/window/JDialogSelectCPDiagrams.java
+++ b/src/ui/window/JDialogSelectCPDiagrams.java
@@ -47,17 +47,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcp.TMLCPRefAD;
+import ui.tmlcp.TMLCPRefSD;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
 import java.util.List;
-
-import myutil.*;
-
-import ui.*;
-import ui.tmlcp.*;
+import java.util.Vector;
 
 
 public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectRequirements.java b/src/ui/window/JDialogSelectRequirements.java
index df06f3c3a84be6dd2ffa17dbe29c4a9d7b62eec6..c7348c9c810c97863e50f8b1b3286fe4b2627671 100755
--- a/src/ui/window/JDialogSelectRequirements.java
+++ b/src/ui/window/JDialogSelectRequirements.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.req.Requirement;
 
-import ui.*;
-import ui.req.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectRequirements extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLComponent.java b/src/ui/window/JDialogSelectTMLComponent.java
index bce97693a5eea8dfd1bb901986c17a3d1d58783e..6796f7fd44477d35838a80d818b730e91e12aa56 100755
--- a/src/ui/window/JDialogSelectTMLComponent.java
+++ b/src/ui/window/JDialogSelectTMLComponent.java
@@ -46,15 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCCompositeComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 import java.util.List;
-
-import ui.*;
-import ui.tmlcompd.*;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLComponent extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLNodes.java b/src/ui/window/JDialogSelectTMLNodes.java
index 51b33da2e732979aa1adc14fb9075e2666b1e224..1360c2c94456e105e2c1e38f301f99c85ef88421 100755
--- a/src/ui/window/JDialogSelectTMLNodes.java
+++ b/src/ui/window/JDialogSelectTMLNodes.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiNode;
 
-import ui.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLNodes extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLTask.java b/src/ui/window/JDialogSelectTMLTask.java
index 2092c58e5fd9cd9596ccc800aab32c0595af4d4f..c1db0e681bdbd6a514945795abc592a586659e95 100755
--- a/src/ui/window/JDialogSelectTMLTask.java
+++ b/src/ui/window/JDialogSelectTMLTask.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcd.TMLTaskOperator;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLTask extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSignalAssociation.java b/src/ui/window/JDialogSignalAssociation.java
index 44c1ca886d1504ee5e13732d3711a5d31c9466e8..4f24565f6adc0c1e0791ebe2c492ca9173159be6 100644
--- a/src/ui/window/JDialogSignalAssociation.java
+++ b/src/ui/window/JDialogSignalAssociation.java
@@ -46,15 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.TraceManager;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPortConnector;
 
-import ui.*;
-import ui.avatarbd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class JDialogSignalAssociation extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSimulation.java b/src/ui/window/JDialogSimulation.java
index b8edd11e45487b3bc6a83f70cb51c1c17523f35e..6207d627dc77ad8e4e136d0a0fdc649fcfdd5e90 100755
--- a/src/ui/window/JDialogSimulation.java
+++ b/src/ui/window/JDialogSimulation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogSimulation extends javax.swing.JDialog implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogSynchro.java b/src/ui/window/JDialogSynchro.java
index 9dbcee1405ae94f2b06c8c69252a2bac1d2a27ed..2639a05e875a625afc72b08d2981a24ef64f4056 100755
--- a/src/ui/window/JDialogSynchro.java
+++ b/src/ui/window/JDialogSynchro.java
@@ -46,14 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.TClassSynchroInterface;
+import ui.TTwoAttributes;
+import ui.cd.TCDSynchroGateList;
 
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogSynchro extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSystemCGeneration.java b/src/ui/window/JDialogSystemCGeneration.java
index ab5c1485ca4867d5ba1deab22cd166fd2c04dc92..277c3f77b53398a8619554f77ddc13ac73aa08e4 100755
--- a/src/ui/window/JDialogSystemCGeneration.java
+++ b/src/ui/window/JDialogSystemCGeneration.java
@@ -47,46 +47,9 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import launcher.LauncherException;
 import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
@@ -97,6 +60,18 @@ import ui.JTextAreaWriter;
 import ui.MainGUI;
 import ui.avatarpd.AvatarPDPanel;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class JDialogSystemCGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener  {
 
     protected MainGUI mgui;
@@ -261,9 +236,9 @@ public class JDialogSystemCGeneration extends javax.swing.JDialog implements Act
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        tabbedPane = new JTabbedPane();
+    	// Issue #41 Ordering of tabbed panes 
+        tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
diff --git a/src/ui/window/JDialogTMLADRandom.java b/src/ui/window/JDialogTMLADRandom.java
index c44ef2d3c88862beac6ade3467c4c3afde9ceb8f..ff6f4d3c53b6d807967de67538600b3e82115862 100755
--- a/src/ui/window/JDialogTMLADRandom.java
+++ b/src/ui/window/JDialogTMLADRandom.java
@@ -46,16 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmlad.*;
-
 
 public class JDialogTMLADRandom extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTMLCPControllerInstance.java b/src/ui/window/JDialogTMLCPControllerInstance.java
index fc093e1365989e66767777eb42ccd378c3ed4af0..b9b17047ef2dfecf0037420de84068938dc97412 100755
--- a/src/ui/window/JDialogTMLCPControllerInstance.java
+++ b/src/ui/window/JDialogTMLCPControllerInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPControllerInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCPStorageInstance.java b/src/ui/window/JDialogTMLCPStorageInstance.java
index 3537de7603888b84d31a8f133d25ea322698addd..c1490cd6234dad792d142e66f6b8cb6504c16e14 100755
--- a/src/ui/window/JDialogTMLCPStorageInstance.java
+++ b/src/ui/window/JDialogTMLCPStorageInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPStorageInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCPTransferInstance.java b/src/ui/window/JDialogTMLCPTransferInstance.java
index f78a1aa5f7af3100640dfb6d32bfbb7e34d2d38f..96e6e22a52d96f13d39bcd7c13be02ffa422420f 100755
--- a/src/ui/window/JDialogTMLCPTransferInstance.java
+++ b/src/ui/window/JDialogTMLCPTransferInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPTransferInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCompositePort.java b/src/ui/window/JDialogTMLCompositePort.java
index 59d033e35ae2a64d1078ac0b098aac7c1765aa0d..d21da8faea03c14518411100e36e2f0b4e8a3208 100755
--- a/src/ui/window/JDialogTMLCompositePort.java
+++ b/src/ui/window/JDialogTMLCompositePort.java
@@ -46,30 +46,16 @@
 
 package ui.window;
 
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import ui.IconManager;
 import ui.TType;
 import ui.tmlcd.TMLDataFlowType;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public class JDialogTMLCompositePort extends JDialog implements ActionListener {
 	
     private JPanel panel1, panel2, panel3, panel4;
diff --git a/src/ui/window/JDialogTMLConnectorNode.java b/src/ui/window/JDialogTMLConnectorNode.java
index e59993885654c93a93ae088322ad21b00926c759..f311e10ba8273c81b6782ab414230709b2390584 100755
--- a/src/ui/window/JDialogTMLConnectorNode.java
+++ b/src/ui/window/JDialogTMLConnectorNode.java
@@ -46,15 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiConnectorNode;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.tmldd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogTMLConnectorNode extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogTMLRemoteCompositeComponent.java b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
index 46b7a8b3ccf87fcfad8121ac994c5a8e2388d828..1480eec4665be6c2ab4960f485f5cedb18318205 100755
--- a/src/ui/window/JDialogTMLRemoteCompositeComponent.java
+++ b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.tmlcompd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogTMLSDInstance.java b/src/ui/window/JDialogTMLSDInstance.java
index 7cdee4702582a9e137c9084f483e8bcaa9741843..aed4e6866956b66eeaa9c7fafd72e6d18582eb6e 100755
--- a/src/ui/window/JDialogTMLSDInstance.java
+++ b/src/ui/window/JDialogTMLSDInstance.java
@@ -47,15 +47,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLTaskArtifact.java b/src/ui/window/JDialogTMLTaskArtifact.java
index 0c496f29dc42eac96bf96b21554ff85592ab5605..b9793ddc5e800dafea64883b6f36573ffed95fb1 100755
--- a/src/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/ui/window/JDialogTMLTaskArtifact.java
@@ -46,31 +46,34 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
-import ui.tmldd.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+//import javax.swing.event.*;
 
-public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements ActionListener  {
+public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements ActionListener {
 
 	private boolean regularClose;
 	private boolean emptyList = false;
     
-  private JPanel panel2, panel3;
-  private Frame frame;
-  private TMLArchiArtifact artifact;
+	private JPanel panel2, panel3;
+ // private Frame frame;
+	private TMLArchiArtifact artifact;
 	private String operation = "VOID";
 	private ArchUnitMEC MECType;
     
   //protected JTextField taskName;
-	protected JComboBox referenceTaskName, priority, operationsListCB;
+	protected JComboBox<String> referenceTaskName, priority, operationsListCB;
 	
 	private JTabbedPane tabbedPane;
 	
@@ -81,152 +84,154 @@ public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements Actio
     /** Creates new form  */
   public JDialogTMLTaskArtifact(Frame _frame, String _title, TMLArchiArtifact _artifact, String _operation, ArchUnitMEC _MECType) {
         super(_frame, _title, true);
-        frame = _frame;
+        //frame = _frame;
         artifact = _artifact;
-				operation = _operation;
-				MECType = _MECType;
+		operation = _operation;
+		MECType = _MECType;
         
         initComponents();
-        myInitComponents();
+    //    myInitComponents();
         pack();
     }
-    
-    private void myInitComponents() {
-    }
-    
+//    
+//    private void myInitComponents() {
+//    }
+//    
     private void initComponents() {
 
-			Container c = getContentPane();
-      GridBagLayout gridbag0 = new GridBagLayout();
-      GridBagLayout gridbag1 = new GridBagLayout();
-      GridBagLayout gridbag2 = new GridBagLayout();
-      GridBagLayout gridbag3 = new GridBagLayout();
-      GridBagConstraints c0 = new GridBagConstraints();
-      GridBagConstraints c1 = new GridBagConstraints();
-      GridBagConstraints c2 = new GridBagConstraints();
-      GridBagConstraints c3 = new GridBagConstraints();
-      
-      setFont(new Font("Helvetica", Font.PLAIN, 14));
-      c.setLayout(gridbag0);
-      
-      setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-      
-      
-      panel2 = new JPanel();
-      panel2.setLayout(gridbag2);
-      panel2.setBorder(new javax.swing.border.TitledBorder("Artifact attributes"));
-      panel2.setPreferredSize(new Dimension(350, 250));
+    	Container c = getContentPane();
+    	GridBagLayout gridbag0 = new GridBagLayout();
+    //	GridBagLayout gridbag1 = new GridBagLayout();
+    	GridBagLayout gridbag2 = new GridBagLayout();
+    	GridBagLayout gridbag3 = new GridBagLayout();
+    	GridBagConstraints c0 = new GridBagConstraints();
+    	GridBagConstraints c1 = new GridBagConstraints();
+    	//GridBagConstraints c2 = new GridBagConstraints();
+    	GridBagConstraints c3 = new GridBagConstraints();
 
-			tabbedPane = new JTabbedPane();
-        
-			c1.gridwidth = 1;
-      c1.gridheight = 1;
-      c1.weighty = 1.0;
-      c1.weightx = 1.0;
-      c1.fill = GridBagConstraints.HORIZONTAL;
-      panel2.add(new JLabel("Task:"), c1);
-      c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-			Vector<String> list = artifact.getTDiagramPanel().getMGUI().getAllNonMappedTMLTaskNames((TMLArchiDiagramPanel)(artifact.getTDiagramPanel()), artifact.getReferenceTaskName(), artifact.getTaskName());
-			int index = 0;
-			if (list.size() == 0) {
-				list.add("No more task to map");
-				emptyList = true;
-			} else {
-				index = indexOf(list, artifact.getValue());
-			}
-      referenceTaskName = new JComboBox(list);
-			referenceTaskName.setSelectedIndex(index);
-      //referenceTaskName.setEditable(true);
-      //referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
-			panel2.add(referenceTaskName, c1);
-		
-			list = new Vector<String>();
-			for(int i=0; i<11; i++) {
-				list.add(""+i);
-			}
-	    c1.gridwidth = 1;//GridBagConstraints.REMAINDER; //end row
-  	  panel2.add(new JLabel("Priority:"), c1);
+    	setFont(new Font("Helvetica", Font.PLAIN, 14));
+    	c.setLayout(gridbag0);
+
+    	setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+
+    	panel2 = new JPanel();
+    	panel2.setLayout(gridbag2);
+    	panel2.setBorder(new javax.swing.border.TitledBorder("Artifact attributes"));
+    	panel2.setPreferredSize(new Dimension(350, 250));
+
+    	// Issue #41 Ordering of tabbed panes 
+    	tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+
+    	c1.gridwidth = 1;
+    	c1.gridheight = 1;
+    	c1.weighty = 1.0;
+    	c1.weightx = 1.0;
+    	c1.fill = GridBagConstraints.HORIZONTAL;
+    	panel2.add(new JLabel("Task:"), c1);
+    	c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	Vector<String> list = artifact.getTDiagramPanel().getMGUI().getAllNonMappedTMLTaskNames((TMLArchiDiagramPanel)(artifact.getTDiagramPanel()), artifact.getReferenceTaskName(), artifact.getTaskName());
+    	int index = 0;
+    	if (list.size() == 0) {
+    		list.add("No more task to map");
+    		emptyList = true;
+    	} else {
+    		index = indexOf(list, artifact.getValue());
+    	}
+    	referenceTaskName = new JComboBox<String>(list);
+    	referenceTaskName.setSelectedIndex(index);
+    	//referenceTaskName.setEditable(true);
+    	//referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
+    	panel2.add(referenceTaskName, c1);
+
+    	list = new Vector<String>();
+    	for(int i=0; i<11; i++) {
+    		list.add(""+i);
+    	}
+    	c1.gridwidth = 1;//GridBagConstraints.REMAINDER; //end row
+    	panel2.add(new JLabel("Priority:"), c1);
     	//c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-			priority = new JComboBox(list);
-			priority.setSelectedIndex(artifact.getPriority());
-			panel2.add(priority, c1);
-		
-			panel3 = new JPanel();
-			panel3.setLayout(gridbag3);
-			panel3.setBorder(new javax.swing.border.TitledBorder("Code generation"));
-			panel3.setPreferredSize(new Dimension(350, 250));
-			c3.gridwidth = 1;
+    	priority = new JComboBox<String>(list);
+    	priority.setSelectedIndex(artifact.getPriority());
+    	panel2.add(priority, c1);
+
+    	panel3 = new JPanel();
+    	panel3.setLayout(gridbag3);
+    	panel3.setBorder(new javax.swing.border.TitledBorder("Code generation"));
+    	panel3.setPreferredSize(new Dimension(350, 250));
+    	c3.gridwidth = 1;
     	c3.gridheight = 1;
-	    c3.weighty = 1.0;
-  	  c3.weightx = 1.0;
+    	c3.weighty = 1.0;
+    	c3.weightx = 1.0;
     	c3.fill = GridBagConstraints.HORIZONTAL;
-	    //c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-  	  panel3.add(new JLabel("<html>Task Extension<br>Construct:</html>"), c3);
+    	//c3.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	panel3.add(new JLabel("<html>Task Extension<br>Construct:</html>"), c3);
     	c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-			Vector<String> operationsListS = new Vector<String>();
-			int indexOp = 0;
-			TraceManager.addDev( "Inside JDialogTMLTaskArtifact: " + MECType );
-			if( MECType instanceof FepMEC )	{
-				operationsListS = FepMEC.operationsList;
-				indexOp = operationsListS.indexOf( operation );
-			}
-			else if( MECType instanceof MapperMEC )	{
-				operationsListS.add( MapperMEC.Operation );
-				indexOp = operationsListS.indexOf( operation );
-			}
-			else if( MECType instanceof InterleaverMEC )	{
-				operationsListS.add( InterleaverMEC.Operation );
-				indexOp = operationsListS.indexOf( operation );
-			}
-			else if( MECType instanceof AdaifMEC )	{
-				operationsListS.add( AdaifMEC.Operation );
-				indexOp = operationsListS.indexOf( operation );
-			}
-			else if( MECType instanceof CpuMEC )	{
-				String tmp = (String)(referenceTaskName.getSelectedItem());
-				operationsListS.add( tmp.split("::")[1] );
-				indexOp = operationsListS.indexOf( operation );
-			}
-			else	{
-				operationsListS.add("No MEC selected");
-			}
-  	  operationsListCB = new JComboBox( operationsListS );
-			if( operation.equals( "VOID" ) || operation.equals( "" ) )	{
-				operationsListCB.setSelectedIndex( 0 );
-			}
-			else	{
-				if( indexOp == -1 )	{ indexOp = 0; }
-				operationsListCB.setSelectedIndex( indexOp  );
-			}
-			panel3.add( operationsListCB, c3 );
+    	Vector<String> operationsListS = new Vector<String>();
+    	int indexOp = 0;
+    	TraceManager.addDev( "Inside JDialogTMLTaskArtifact: " + MECType );
+    	if( MECType instanceof FepMEC )	{
+    		operationsListS = FepMEC.operationsList;
+    		indexOp = operationsListS.indexOf( operation );
+    	}
+    	else if( MECType instanceof MapperMEC )	{
+    		operationsListS.add( MapperMEC.Operation );
+    		indexOp = operationsListS.indexOf( operation );
+    	}
+    	else if( MECType instanceof InterleaverMEC )	{
+    		operationsListS.add( InterleaverMEC.Operation );
+    		indexOp = operationsListS.indexOf( operation );
+    	}
+    	else if( MECType instanceof AdaifMEC )	{
+    		operationsListS.add( AdaifMEC.Operation );
+    		indexOp = operationsListS.indexOf( operation );
+    	}
+    	else if( MECType instanceof CpuMEC )	{
+    		String tmp = (String)(referenceTaskName.getSelectedItem());
+    		operationsListS.add( tmp.split("::")[1] );
+    		indexOp = operationsListS.indexOf( operation );
+    	}
+    	else	{
+    		operationsListS.add("No MEC selected");
+    	}
+    	operationsListCB = new JComboBox<String>( operationsListS );
+    	if( operation.equals( "VOID" ) || operation.equals( "" ) )	{
+    		operationsListCB.setSelectedIndex( 0 );
+    	}
+    	else	{
+    		if( indexOp == -1 )	{ indexOp = 0; }
+    		operationsListCB.setSelectedIndex( indexOp  );
+    	}
+    	panel3.add( operationsListCB, c3 );
 
 
-			// main panel;
-			c0.gridheight = 10;
-			c0.weighty = 1.0;
+    	// main panel;
+    	c0.gridheight = 10;
+    	c0.weighty = 1.0;
     	c0.weightx = 1.0;
-	    c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-			c0.fill = GridBagConstraints.BOTH;
-			tabbedPane.addTab( "Simulation", panel2 );
-			tabbedPane.addTab( "Code generation", panel3 );
-			tabbedPane.setSelectedIndex(0);
+    	c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	c0.fill = GridBagConstraints.BOTH;
+    	tabbedPane.addTab( "Simulation", panel2 );
+    	tabbedPane.addTab( "Code generation", panel3 );
+    	tabbedPane.setSelectedIndex(0);
     	/*c.add(panel2, c0);
 	    c.add(panel3, c0);*/
-			c.add( tabbedPane, c0 );
-    	
-	    c0.gridwidth = 1;
-  	  c0.gridheight = 1;
+    	c.add( tabbedPane, c0 );
+
+    	c0.gridwidth = 1;
+    	c0.gridheight = 1;
     	c0.fill = GridBagConstraints.HORIZONTAL;
-	    closeButton = new JButton("Save and Close", IconManager.imgic25);
-  	  //closeButton.setPreferredSize(new Dimension(600, 50));
+    	closeButton = new JButton("Save and Close", IconManager.imgic25);
+    	//closeButton.setPreferredSize(new Dimension(600, 50));
     	closeButton.addActionListener(this);
-	    c.add(closeButton, c0);
-  	  c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+    	c.add(closeButton, c0);
+    	c0.gridwidth = GridBagConstraints.REMAINDER; //end row
     	cancelButton = new JButton("Cancel", IconManager.imgic27);
-	    cancelButton.addActionListener(this);
-  	  c.add(cancelButton, c0);
-		}
+    	cancelButton.addActionListener(this);
+    	c.add(cancelButton, c0);
+    }
     
+    @Override
     public void	actionPerformed(ActionEvent evt)  {
        /* if (evt.getSource() == typeBox) {
             boolean b = ((Boolean)(initValues.elementAt(typeBox.getSelectedIndex()))).booleanValue();
diff --git a/src/ui/window/JDialogTMatrixManagement.java b/src/ui/window/JDialogTMatrixManagement.java
index 32d3da8fdf3560db5bc69ed429bab26bf3510f61..ac22a06e24504ab4a2443139d08c019e8e695b18 100755
--- a/src/ui/window/JDialogTMatrixManagement.java
+++ b/src/ui/window/JDialogTMatrixManagement.java
@@ -46,16 +46,24 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.table.*;
-import java.util.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.TableSorter;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import tmatrix.*;
-import ui.*;
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
 
 public class JDialogTMatrixManagement extends JFrame implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogTOSClass.java b/src/ui/window/JDialogTOSClass.java
index a1f306beee83befcd4a61c4ccd2241d3e9604d56..656a4f4b360b8ebfae6f9a0b58682af4b903f4ef 100755
--- a/src/ui/window/JDialogTOSClass.java
+++ b/src/ui/window/JDialogTOSClass.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.oscd.TOSClass;
 
-import ui.oscd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTOSClass extends javax.swing.JDialog implements ActionListener {
 
diff --git a/src/ui/window/JDialogTObjectName.java b/src/ui/window/JDialogTObjectName.java
index baede842eb8ad8def7f035e9cd9f87638ed7c47e..be8c846f2609ad6014989c615f74a3db75e3b199 100755
--- a/src/ui/window/JDialogTObjectName.java
+++ b/src/ui/window/JDialogTObjectName.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.cd.TCDTClass;
+import ui.cd.TCDTObject;
 
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogTObjectName extends javax.swing.JDialog implements ActionListener {
         TCDTObject to;
diff --git a/src/ui/window/JDialogTPNValidation.java b/src/ui/window/JDialogTPNValidation.java
index eec86b855578226da850cf30f17c45f54b45b9c9..fb411a14b98ba92b729c84c8525a6181a421fc17 100755
--- a/src/ui/window/JDialogTPNValidation.java
+++ b/src/ui/window/JDialogTPNValidation.java
@@ -46,12 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTPNValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
 	private static boolean verboseChecked, summaryChecked = false;
diff --git a/src/ui/window/JDialogTextProcess.java b/src/ui/window/JDialogTextProcess.java
index 1adbc9e60065a5301bef995b51888e1cb858d5c0..4965c035ada8223935c8585cc579fcc23e794277 100755
--- a/src/ui/window/JDialogTextProcess.java
+++ b/src/ui/window/JDialogTextProcess.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.Conversion;
+import myutil.FileUtils;
+import ui.IconManager;
+import ui.JTextAreaWriter;
 
 import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogTextProcess extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogTimeInterval.java b/src/ui/window/JDialogTimeInterval.java
index a5804b4cdbe8f7ebbc08aaa4301d37735a96d771..9a9c58f2383e91dee289c4dd469467ac909d2a29 100755
--- a/src/ui/window/JDialogTimeInterval.java
+++ b/src/ui/window/JDialogTimeInterval.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTimeInterval extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTimeIntervalUnit.java b/src/ui/window/JDialogTimeIntervalUnit.java
index d56c5fffb3d8a3a6bc9234bf67d4a4f2a4560045..be0a32558856d949350d4f36d73bf62cffdcf962 100755
--- a/src/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/ui/window/JDialogTimeIntervalUnit.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTimeIntervalUnit extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTwoString.java b/src/ui/window/JDialogTwoString.java
index f15341562f1adafd9643cd4df51fd6e5a2df6603..ed9b7ed7da9830f73cccee1e67503d60275ca98a 100755
--- a/src/ui/window/JDialogTwoString.java
+++ b/src/ui/window/JDialogTwoString.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTwoString extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogUPPAALGeneration.java b/src/ui/window/JDialogUPPAALGeneration.java
index a0ddc65fb80c9d058b20cc7d5b5780c318194699..e306b3ccca83bcdc0fde4e81dab6fc9bca159bd7 100755
--- a/src/ui/window/JDialogUPPAALGeneration.java
+++ b/src/ui/window/JDialogUPPAALGeneration.java
@@ -46,20 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
 import myutil.*;
-import translator.tojava.*;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 
 public class JDialogUPPAALGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
 
     protected MainGUI mgui;
 
-    private String textJava1 = "Generate UPPAAL code in";
+   // private String textJava1 = "Generate UPPAAL code in";
 
     public final static int TURTLE_MODE = 0;
     public final static int DIPLODOCUS_MODE = 1;
@@ -97,7 +97,7 @@ public class JDialogUPPAALGeneration extends javax.swing.JDialog implements Acti
     private Thread t;
     private boolean go = false;
     private ProcessThread pt;
-    private boolean hasError = false;
+ //   private boolean hasError = false;
 
 
     /** Creates new form  */
@@ -138,9 +138,9 @@ public class JDialogUPPAALGeneration extends javax.swing.JDialog implements Acti
         Container c = getContentPane();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
-        //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
-        jp1 = new JTabbedPane();
+    	// Issue #41 Ordering of tabbed panes 
+        jp1 = GraphicLib.createTabbedPane();//new JTabbedPane();
 
         JPanel jp01 = new JPanel();
         GridBagLayout gridbag01 = new GridBagLayout();
@@ -275,16 +275,16 @@ public class JDialogUPPAALGeneration extends javax.swing.JDialog implements Acti
         go = true;
         t.start();
     }
-
-    private void testGo() throws InterruptedException {
-        if (go == false) {
-            throw new InterruptedException("Stopped by user");
-        }
-    }
+//
+//    private void testGo() throws InterruptedException {
+//        if (go == false) {
+//            throw new InterruptedException("Stopped by user");
+//        }
+//    }
 
     public void run() {
-        String cmd;
-        String list;
+      //  String cmd;
+    //    String list;
 
         boolean debug, choices, variables;
         int nb = 0;
@@ -394,14 +394,15 @@ public class JDialogUPPAALGeneration extends javax.swing.JDialog implements Acti
     }
 
     public boolean hasToContinue() {
-        return (go == true);
+        return go;
     }
 
     public void appendOut(String s) {
         jta.append(s);
     }
 
+    @Override
     public void setError() {
-        hasError = true;
+//        hasError = true;
     }
 }
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index 6e052f2546ce5a7c20db13b409f9d4cb228f15e8..a0ec2bf5e6fd111919744e3df27e294a89cd5ae4 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -46,18 +46,25 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.touppaal.AVATAR2UPPAAL;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import ui.*;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
 
-import avatartranslator.*;
-import avatartranslator.touppaal.*;
-import uppaaldesc.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
-
 public class JDialogUPPAALValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
     private static boolean deadlockAChecked/*, deadlockEChecked*/, generateTraceChecked, customChecked, stateAChecked, stateEChecked, stateLChecked, showDetailsChecked, translateChecked;
 
diff --git a/src/ui/window/JDialogUseCase.java b/src/ui/window/JDialogUseCase.java
index b92230ac4311d5b164e6ec5646579bf241daa7c0..f41db2225f288362bfefdc648e4848b45b743ac9 100755
--- a/src/ui/window/JDialogUseCase.java
+++ b/src/ui/window/JDialogUseCase.java
@@ -46,16 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogUseCase extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogVGMNNode.java b/src/ui/window/JDialogVGMNNode.java
index 8110728511795b8f428a78bd8bfa0914462dccec..362fb133596b1b73c6b7d2a24429b5a70790de84 100755
--- a/src/ui/window/JDialogVGMNNode.java
+++ b/src/ui/window/JDialogVGMNNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiVGMNNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogVGMNNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogVersioningConnector.java b/src/ui/window/JDialogVersioningConnector.java
index d7c68309f7d37e0c387118d8e22a442373ec3ccf..256cdf7be0336b81eaea0a537fbd1feb89d05cc4 100755
--- a/src/ui/window/JDialogVersioningConnector.java
+++ b/src/ui/window/JDialogVersioningConnector.java
@@ -46,18 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-public class JDialogVersioningConnector extends javax.swing.JDialog implements ActionListener  {
+public class JDialogVersioningConnector extends JDialog implements ActionListener  {
     
     
-    private JPanel panel1, panel2, panel3, panel4, panel5;
+    private JPanel panel1;//, panel2, panel3, panel4, panel5;
     
     // Panel1
     int oldVersion, newVersion;
@@ -81,16 +80,16 @@ public class JDialogVersioningConnector extends javax.swing.JDialog implements A
         
         
         initComponents();
-        myInitComponents();
+//        myInitComponents();
         pack();
     }
-    
-    
-    private void myInitComponents() {
-    }
+//    
+//    
+//    private void myInitComponents() {
+//    }
     
     private void initComponents() {
-        JTabbedPane tabbedPane = new JTabbedPane();
+       // JTabbedPane tabbedPane = new JTabbedPane();
         //tabbedPane.setPreferredSize(new Dimension(550, 400));
         
         Container c = getContentPane();
diff --git a/src/ui/window/JFrameBasicText.java b/src/ui/window/JFrameBasicText.java
index 72a40d80afb13dd509b24137ad4ebfdf102d7776..f45c085f061b270dde6d61ba2c8e770a41b1b0c0 100755
--- a/src/ui/window/JFrameBasicText.java
+++ b/src/ui/window/JFrameBasicText.java
@@ -45,12 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-//import myutil.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.*;
+//import myutil.*;
 
 
 public	class JFrameBasicText extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameBird.java b/src/ui/window/JFrameBird.java
index b5468b988c7382e305ee734403d35be657b9b3b1..3370c79b170877c6cb4f20b441072f8a729f0807 100755
--- a/src/ui/window/JFrameBird.java
+++ b/src/ui/window/JFrameBird.java
@@ -45,11 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.MainGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 
 
 public	class JFrameBird extends JFrame implements WindowListener {
diff --git a/src/ui/window/JFrameCode.java b/src/ui/window/JFrameCode.java
index 2aa703965e8f8632c0acbe962e4f71db42662861..e9adba372a881fd05a0f2740d9c9d552579ece68 100755
--- a/src/ui/window/JFrameCode.java
+++ b/src/ui/window/JFrameCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public	class JFrameCode extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameDeadlock.java b/src/ui/window/JFrameDeadlock.java
index d11ba747275d6c7a6b24a200366d235a29fd4a12..ea0dfc70bcddaf8cdf2bc5a5b3687e5f6e122e61 100755
--- a/src/ui/window/JFrameDeadlock.java
+++ b/src/ui/window/JFrameDeadlock.java
@@ -46,17 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 //import java.io.*;
+
+import myutil.TableSorter;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.graph.AUTGraph;
+
 import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
 import java.awt.*;
-import java.awt.event.*;
-//import java.util.*;
-import ui.graph.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-
-import myutil.*;
-import ui.*;
+//import javax.swing.event.*;
+//import java.util.*;
 
 
 public	class JFrameDeadlock extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameMinimize.java b/src/ui/window/JFrameMinimize.java
index 41dbd9790800ec60fbe76e8138ef1f53a7e7ad95..dc0c539d05959505cf41704fc21a0b46487341dd 100755
--- a/src/ui/window/JFrameMinimize.java
+++ b/src/ui/window/JFrameMinimize.java
@@ -46,18 +46,21 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
 
-import launcher.*;
-import myutil.*;
-import translator.*;
-import ui.*;
-import ui.cd.*;
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 
 
 public class JFrameMinimize extends javax.swing.JFrame implements ActionListener, ListSelectionListener, Runnable  {
diff --git a/src/ui/window/JFrameNC.java b/src/ui/window/JFrameNC.java
index 9a20484aae64e734fd784c562106ce551d41f5e3..7bb12a76c3204657a9ccd27946590ed9e2021538 100755
--- a/src/ui/window/JFrameNC.java
+++ b/src/ui/window/JFrameNC.java
@@ -45,20 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-//import java.io.*;
+import myutil.GraphicLib;
+import myutil.TableSorter;
+import nc.NCStructure;
+import ui.IconManager;
+
 import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
-import nc.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public	class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
@@ -602,8 +597,9 @@ public	class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIE
 		
 		
 		*/
-		
-		mainTabbedPane = new JTabbedPane();
+
+		// Issue #41 Ordering of tabbed panes 
+		mainTabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 		mainTabbedPane.addTab("General info.", IconManager.imgic13, jspGeneralInfo, "Information on diagram");
 		mainTabbedPane.addTab("Equipments", IconManager.imgic13, jspEquipmentInfo, "Information on equipments");
 		mainTabbedPane.addTab("Switches", IconManager.imgic13, jspSwitchInfo, "Information on switches");
@@ -635,7 +631,7 @@ public	class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIE
 	
 
 	
-	private void compute(int idFunc) {
+//	private void compute(int idFunc) {
 		/*computingPath = true;
 		GraphAlgorithms.go = true;
 		String info;
@@ -730,27 +726,22 @@ public	class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIE
 		t.setExternalCall((ExternalCall)this);
 		t.setStoppableGUIElement((StoppableGUIElement)this);
 		t.go();*/
-	}
-	
-	
-
-	
-	private int maxLengthColumn(Component c, AbstractTableModel tm, int index) {
-		int w = 0, wtmp;
-		FontMetrics fm = c.getFontMetrics(c.getFont());
-		if (fm == null) {
-			return 0;
-		}
-		
-		String s;
-		
-		for(int i=0; i<tm.getRowCount(); i++) {
-			s = tm.getValueAt(i, index).toString();
-			wtmp = fm.stringWidth(s);
-			w = Math.max(w, wtmp);
-		}
-		return w;
-	}
-	
-	
+//	}
+//		
+//	private int maxLengthColumn(Component c, AbstractTableModel tm, int index) {
+//		int w = 0, wtmp;
+//		FontMetrics fm = c.getFontMetrics(c.getFont());
+//		if (fm == null) {
+//			return 0;
+//		}
+//		
+//		String s;
+//		
+//		for(int i=0; i<tm.getRowCount(); i++) {
+//			s = tm.getValueAt(i, index).toString();
+//			wtmp = fm.stringWidth(s);
+//			w = Math.max(w, wtmp);
+//		}
+//		return w;
+//	}
 } // Class
\ No newline at end of file
diff --git a/src/ui/window/JFramePowerManagementAnalysis.java b/src/ui/window/JFramePowerManagementAnalysis.java
index 35db3aeac82e07bc7b05d045c0cb11e9ecf5f817..1a14cc9f431cf1ecb1a806d318ea74192dbfe3fd 100755
--- a/src/ui/window/JFramePowerManagementAnalysis.java
+++ b/src/ui/window/JFramePowerManagementAnalysis.java
@@ -45,25 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import myutil.FileException;
 import myutil.GraphicLib;
 import myutil.ScrolledJTextArea;
@@ -74,6 +55,11 @@ import ui.StoppableGUIElement;
 import ui.graph.AUTGraph;
 import ui.graph.VCDGenerator;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 
 public	class JFramePowerManagementAnalysis extends JFrame implements ActionListener, StoppableGUIElement, Runnable {
 	private static String START_STRING = "Select options and then, click on 'start' to analyze power consumption and generate a VCD trace\n";
diff --git a/src/ui/window/JFrameRequirementTable.java b/src/ui/window/JFrameRequirementTable.java
index 98b88960afcc40621cd8b62bfc418eeb93976797..1ec970b56c90792fe9abef2cb0e677a9da21f100 100755
--- a/src/ui/window/JFrameRequirementTable.java
+++ b/src/ui/window/JFrameRequirementTable.java
@@ -45,38 +45,33 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-//import java.io.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
 import myutil.*;
 import ui.*;
-import ui.file.*;
-import ui.req.*;
-import ui.avatarrd.*;
-
-import nc.*;
+import ui.avatarrd.AvatarRDPanel;
+import ui.req.RequirementDiagramPanel;
 
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public	class JFrameRequirementTable extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
 	
-	private Vector tabs;
+	private Vector<TURTLEPanel> tabs;
 	
-	private ArrayList<AbstractTableModel> atms;
-	private ArrayList<TableSorter> tss;
-	private ArrayList<String> titles;
+	private java.util.List<AbstractTableModel> atms;
+	private java.util.List<TableSorter> tss;
+	private java.util.List<String> titles;
 	
 	//private StatisticsTableModel tm;
 	
 	//private JStatisticsPanel jstat;
 	
-	private LinkedList<JScrollPane> panes;
+	//private java.util.List<JScrollPane> panes;
 	private JButton buttonGenerate;
 	
 	//private JTextField eq, sw, tr, li, pa;
@@ -97,7 +92,7 @@ public	class JFrameRequirementTable extends JFrame implements ActionListener /*,
 	//JButton goPath, goPathL, savePath, savePathL;
 	
 	
-	public JFrameRequirementTable(String title, Vector _tabs, JTabbedPane _main, Point [] _pts) {
+	public JFrameRequirementTable(String title, Vector<TURTLEPanel> _tabs, JTabbedPane _main, Point [] _pts) {
 		super(title);
 		tabs = _tabs;
 		pts = _pts;
@@ -127,40 +122,14 @@ public	class JFrameRequirementTable extends JFrame implements ActionListener /*,
 		
 		framePanel.add(jp, BorderLayout.SOUTH);
 		
-		// upper information
-		//Point p = FormatManager.nbStateTransitionRGAldebaran(data);
-		//Container c = getContentPane();
-		//GridBagLayout gridbag0 = new GridBagLayout();
-		//GridBagConstraints c0 = new GridBagConstraints();
-		
-		//jp = new JPanel();
-		//jp.setLayout(gridbag0);
-		
-		/*c0.gridwidth = 1;
-        c0.gridheight = 1;
-        c0.weighty = 1.0;
-        c0.weightx = 1.0;
-		jp.add(new JLabel("Equipments:"), c0);
-		c0.gridwidth = GridBagConstraints.REMAINDER;
-		eq = new JTextField(5);
-		eq.setEditable(false);
-		eq.setText(""+nc.equipments.size());
-		jp.add(eq, c0);
 		
-		c0.gridwidth = 1;
-		jp.add(new JLabel("Switches:"), c0);
-		c0.gridwidth = GridBagConstraints.REMAINDER;
-		sw = new JTextField(5);
-		sw.setEditable(false);
-		sw.setText(""+nc.switches.size());
-		jp.add(sw, c0);*/
-		
-		mainTabbedPane = new JTabbedPane();
+    	// Issue #41 Ordering of tabbed panes 
+		mainTabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
 		
 		// Information
 		TURTLEPanel tp;
 		int i, j;
-		TDiagramPanel tdp;
+//		TDiagramPanel tdp;
 		RequirementDiagramPanel rdp;
 		AvatarRDPanel ardp;
 		LinkedList<TGComponent> all, list;
@@ -169,7 +138,7 @@ public	class JFrameRequirementTable extends JFrame implements ActionListener /*,
 		String maintitle;
 		
 		for(i=0; i<tabs.size(); i++) {
-			tp = (TURTLEPanel)(tabs.elementAt(i));
+			tp = tabs.elementAt(i);
 			maintitle = main.getTitleAt(i);
 			if (tp instanceof RequirementPanel) {
 				for(j=0; j<tp.panels.size(); j++) {
@@ -272,23 +241,21 @@ public	class JFrameRequirementTable extends JFrame implements ActionListener /*,
 	
 	
 	
-	
-	private int maxLengthColumn(Component c, AbstractTableModel tm, int index) {
-		int w = 0, wtmp;
-		FontMetrics fm = c.getFontMetrics(c.getFont());
-		if (fm == null) {
-			return 0;
-		}
-		
-		String s;
-		
-		for(int i=0; i<tm.getRowCount(); i++) {
-			s = tm.getValueAt(i, index).toString();
-			wtmp = fm.stringWidth(s);
-			w = Math.max(w, wtmp);
-		}
-		return w;
-	}
-	
-	
+//	
+//	private int maxLengthColumn(Component c, AbstractTableModel tm, int index) {
+//		int w = 0, wtmp;
+//		FontMetrics fm = c.getFontMetrics(c.getFont());
+//		if (fm == null) {
+//			return 0;
+//		}
+//		
+//		String s;
+//		
+//		for(int i=0; i<tm.getRowCount(); i++) {
+//			s = tm.getValueAt(i, index).toString();
+//			wtmp = fm.stringWidth(s);
+//			w = Math.max(w, wtmp);
+//		}
+//		return w;
+//	}	
 } // Class
\ No newline at end of file
diff --git a/src/ui/window/JFrameSimulationTrace.java b/src/ui/window/JFrameSimulationTrace.java
index d662cd4e4f7a5ddf93918310373b21c4be19d46d..08eb9bbb83425fe09e4d47072864c21ac256d7ea 100755
--- a/src/ui/window/JFrameSimulationTrace.java
+++ b/src/ui/window/JFrameSimulationTrace.java
@@ -45,14 +45,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.io.*;
+import translator.Gate;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-import translator.*;
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Vector;
 
 public	class JFrameSimulationTrace extends JFrame	implements ActionListener {
     private Vector trace;
diff --git a/src/ui/window/JFrameStatistics.java b/src/ui/window/JFrameStatistics.java
index 8656cad782904a9a677ffe7f5e5844789ddf2483..8213ffe4d7860d3d597d46280bab141b84c73a5c 100755
--- a/src/ui/window/JFrameStatistics.java
+++ b/src/ui/window/JFrameStatistics.java
@@ -45,20 +45,23 @@
 
 package ui.window;
 
-//import java.io.*;
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.StoppableGUIElement;
+import ui.ThreadGUIElement;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTGraph;
+
 import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.graph.*;
-import ui.file.*;
-import automata.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public  class JFrameStatistics extends JFrame implements ActionListener, StoppableGUIElement, SteppedAlgorithm, ExternalCall {
@@ -531,18 +534,13 @@ public  class JFrameStatistics extends JFrame implements ActionListener, Stoppab
             return;
         }
 
-        //System.out.println("Making last elements");
-        mainTabbedPane = new JTabbedPane();
+        // Issue #41 Ordering of tabbed panes 
+        mainTabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         mainTabbedPane.addTab("General info.", IconManager.imgic13, jp, "# states, #transitions");
         mainTabbedPane.addTab("Statistics", IconManager.imgic13, jsp, "Statistics on states & transitions");
-        //if (graph.getNbTransition() < MAX_TRANSITIONS) {
         mainTabbedPane.addTab("Deadlocks", IconManager.imgic13, jspDeadlock, "Potential deadlocks");
         mainTabbedPane.addTab("Shortest Paths", IconManager.imgic13, jp2, "Shortest paths");
         mainTabbedPane.addTab("Longest Paths", IconManager.imgic13, jp4, "Longest paths");
-        //}
-        //}
-
-
 
         if (shouldIStop()) {
             return;
diff --git a/src/ui/window/JFrameText.java b/src/ui/window/JFrameText.java
index 45b2fe1eab51cebbb8f42c14e934e2c4f49e48c7..08fcfc0105fee34f0adad86eb90e5c384c83c8ef 100755
--- a/src/ui/window/JFrameText.java
+++ b/src/ui/window/JFrameText.java
@@ -45,14 +45,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.io.*;
+import myutil.FileUtils;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.RTLFileFilter;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import myutil.*;
-
-import ui.*;
-import ui.file.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileOutputStream;
 
 
 public	class JFrameText extends JFrame	implements ActionListener {
diff --git a/src/ui/window/JSimulationPanel.java b/src/ui/window/JSimulationPanel.java
index 6df7c0222c527972965d03ee572bdeebe9859f53..3a04ba36258241f63347eaac6ad79eb2ee18fa5b 100755
--- a/src/ui/window/JSimulationPanel.java
+++ b/src/ui/window/JSimulationPanel.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class JSimulationPanel extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
     private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/JSimulationPanelChrono.java b/src/ui/window/JSimulationPanelChrono.java
index 8678f4731d1dc52439ceb6c75cf3b8de6affc07a..54fb669b4d6339717037b5fcb065bef6a8504d50 100755
--- a/src/ui/window/JSimulationPanelChrono.java
+++ b/src/ui/window/JSimulationPanelChrono.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class JSimulationPanelChrono extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
     private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/LinksNCTableModel.java b/src/ui/window/LinksNCTableModel.java
index 4282ccac7e7c2422a2d9de88752d5d7a098fc006..7cae49730238026ace4d29132cd9ee46626fa656 100755
--- a/src/ui/window/LinksNCTableModel.java
+++ b/src/ui/window/LinksNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class LinksNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/PathsNCTableModel.java b/src/ui/window/PathsNCTableModel.java
index 27df5b46b2f082021397b5a568f0741591275bad..96cfcaf2dfcb5867eec3c6c24e21131ad4094b62 100755
--- a/src/ui/window/PathsNCTableModel.java
+++ b/src/ui/window/PathsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCPath;
+import nc.NCStructure;
+import nc.NCSwitch;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class PathsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/RequirementsTableModel.java b/src/ui/window/RequirementsTableModel.java
index b5c38520a8729018079b0e2fa99a32b6efba059a..1d97bae34bb86593af529e0fc968aad0daa7ffc0 100755
--- a/src/ui/window/RequirementsTableModel.java
+++ b/src/ui/window/RequirementsTableModel.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import java.awt.*;
-import javax.swing.table.*;
+import ui.TGComponent;
+import ui.avatarrd.AvatarRDRequirement;
+import ui.req.Requirement;
 
-import myutil.*;
-import ui.*;
-import ui.req.*;
-import ui.avatarrd.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class RequirementsTableModel extends AbstractTableModel {
 	private LinkedList<TGComponent> list;
diff --git a/src/ui/window/StatisticsItem.java b/src/ui/window/StatisticsItem.java
index 47fd8468136e48023ea327d299c42f44214052ad..dc1c9d94b6130a7fcb67cac1fe3dd8f5205a3780 100755
--- a/src/ui/window/StatisticsItem.java
+++ b/src/ui/window/StatisticsItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 import java.awt.*;
-import java.util.*;
+import java.util.Vector;
 
 public class StatisticsItem implements Comparable {
     private String name;
diff --git a/src/ui/window/StatisticsTableModel.java b/src/ui/window/StatisticsTableModel.java
index f2e209f63d36b3ef5cce7a3b7bcb4dd00b0e512b..61da418c7d5a5f828eae7b1fafa9af9cd5c25dd7 100755
--- a/src/ui/window/StatisticsTableModel.java
+++ b/src/ui/window/StatisticsTableModel.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import java.io.*;
-import javax.swing.table.*;
-
-import ui.graph.*;
-import myutil.*;
+import myutil.SteppedAlgorithm;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.Vector;
 
 public class StatisticsTableModel extends AbstractTableModel implements SteppedAlgorithm {
 	Vector statisticData;
diff --git a/src/ui/window/SwitchesNCTableModel.java b/src/ui/window/SwitchesNCTableModel.java
index 4c2f1c5a1dbdd894fb0ed935f157a4e2fe1ed44f..7c6167a4bff13dd86eeab798ac3d08578615cfb0 100755
--- a/src/ui/window/SwitchesNCTableModel.java
+++ b/src/ui/window/SwitchesNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCSwitch;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class SwitchesNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/TMatrixTableModel.java b/src/ui/window/TMatrixTableModel.java
index a6544121f37fb6c5b5b36b0914aceedabb06f518..6cf18b8348bade68982089f0252f4e8121023776 100755
--- a/src/ui/window/TMatrixTableModel.java
+++ b/src/ui/window/TMatrixTableModel.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import javax.swing.table.*;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
 
-import tmatrix.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TMatrixTableModel extends AbstractTableModel {
     RequirementModeling rm;
diff --git a/src/ui/window/TrafficsNCTableModel.java b/src/ui/window/TrafficsNCTableModel.java
index deae4ec0f4975bfda8aeefe4d16f76d3f8b76fe5..eb916885f08b6caad9eb7b0ac455f5061d7d2900 100755
--- a/src/ui/window/TrafficsNCTableModel.java
+++ b/src/ui/window/TrafficsNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCTraffic;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TrafficsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/uppaaldesc/UPPAALEventTemplate.java b/src/uppaaldesc/UPPAALEventTemplate.java
index c117bfa2d1c8b7e9d7653dba0aa3b85ae7bd3312..3352633a31caf0d6400a9bb5e7e7a7ffa9f4c070 100755
--- a/src/uppaaldesc/UPPAALEventTemplate.java
+++ b/src/uppaaldesc/UPPAALEventTemplate.java
@@ -45,9 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import tmltranslator.TMLEvent;
 
-import tmltranslator.*;
+import java.awt.*;
 
 
 public class UPPAALEventTemplate extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
index 06529fc2dfd87ee92079717311874f0d5b295a00..ac43b0469323a149fe313ab9bb3d83573355f3a8 100644
--- a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
@@ -45,9 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import tmltranslator.TMLEvent;
 
-import tmltranslator.*;
+import java.awt.*;
 
 
 public class UPPAALEventTemplateWithLoss extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
index ee28107bc93e8b23994fa21ca4bf855c70276c06..2ce501165c4248c863134528d1c04bbebc8b6a32 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
index 876c5c370216b7614c4aacd7093a70dd2f304a5e..de19c5185e4095479eeebad45f90425dbce90bcc 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
index 0ee867711f5ff04f10fe112a79b3bd29c6d01563..7fb333513384a70b695d2402731c18690eb675b1 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
index 6e078b807a91465882bb0083702c94de6ac471c1..d81de148f5d07a861bf2d00a9bf8d74cfbff55bd 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALLocation.java b/src/uppaaldesc/UPPAALLocation.java
index 9ca174a574c471c45f5cedcbdeca80e96e332ff6..c8e87ceef5f4829e6863f78c252a235ec06ee1f9 100755
--- a/src/uppaaldesc/UPPAALLocation.java
+++ b/src/uppaaldesc/UPPAALLocation.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import myutil.*;
+import myutil.Conversion;
+
+import java.awt.*;
 
 
 public class UPPAALLocation {
diff --git a/src/uppaaldesc/UPPAALMemoryTemplate.java b/src/uppaaldesc/UPPAALMemoryTemplate.java
index a0a4b01e5dc0510d9ab9893e4bb9dd6997dc9fec..7194753589dea0b6d541d9f14a169f6b5987dab1 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplate.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
index ffdae8051e1ba1dda25dac2f88f45b5ea39fa1c4..77668cc942877c29c22aecf270d06fa99b8f2674 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALRequestTemplate.java b/src/uppaaldesc/UPPAALRequestTemplate.java
index 2c71b9d7e2cca3b5067795f2758021365041bc92..fb5554643d04e17bee93e2b0409e398551649144 100755
--- a/src/uppaaldesc/UPPAALRequestTemplate.java
+++ b/src/uppaaldesc/UPPAALRequestTemplate.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
 
 
 public class UPPAALRequestTemplate extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
index e415db6355305a72f6c9ce7867f654dbae10c134..53cac0cd6a2cebd04c7bfe814a57ebf1ec4c5701 100755
--- a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
 
 
 public class UPPAALRequestTemplateWithLoss extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALSpec.java b/src/uppaaldesc/UPPAALSpec.java
index ac0a720a76a30bb97248a6e87e96a2dbe6f89a2b..22a371c7e659e33f268678efa61a5c6200cce996 100755
--- a/src/uppaaldesc/UPPAALSpec.java
+++ b/src/uppaaldesc/UPPAALSpec.java
@@ -45,9 +45,11 @@
 
 package uppaaldesc;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class UPPAALSpec {
diff --git a/src/uppaaldesc/UPPAALTemplate.java b/src/uppaaldesc/UPPAALTemplate.java
index 48338379ff72d8b380b6ff595c05b02b6fb29caf..c97ef71f37ba638701a3746e3df46f0da1a7781b 100755
--- a/src/uppaaldesc/UPPAALTemplate.java
+++ b/src/uppaaldesc/UPPAALTemplate.java
@@ -45,9 +45,10 @@
 
 package uppaaldesc;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class UPPAALTemplate {
diff --git a/src/uppaaldesc/UPPAALTransition.java b/src/uppaaldesc/UPPAALTransition.java
index ffd2cc285426943ec358b28a439411502baacec4..c8d3022b853217c95aef555db9f3e42dc55a0ff2 100755
--- a/src/uppaaldesc/UPPAALTransition.java
+++ b/src/uppaaldesc/UPPAALTransition.java
@@ -45,11 +45,13 @@
 
 package uppaaldesc;
 
-import java.util.*;
-
-import java.awt.Point;
 import myutil.Conversion;
 
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 
 public class UPPAALTransition {
 	public UPPAALLocation destinationLoc, sourceLoc;
diff --git a/src/vcd/VCDContent.java b/src/vcd/VCDContent.java
index 6e701f56edac5add4233f42715a292b1f7b1405f..8d9da0cd96cf55d7e07ec4b123198553e79d6b0e 100755
--- a/src/vcd/VCDContent.java
+++ b/src/vcd/VCDContent.java
@@ -45,10 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package vcd;
 
-import java.util.*;
-import java.text.*;
+import ui.DefaultText;
 
-import ui.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 public class VCDContent  {
     private String timeScale = "1 ns";
diff --git a/src/vcd/VCDTimeChange.java b/src/vcd/VCDTimeChange.java
index a4c02d19665bf3fb65c7f4ec0432e6c26b03aa75..9ccf77cc5a03a40a4c97a8eb6656f914fc6080fd 100755
--- a/src/vcd/VCDTimeChange.java
+++ b/src/vcd/VCDTimeChange.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package vcd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class VCDTimeChange  {
     private String timeValue;
diff --git a/src/web/crawler/Client.java b/src/web/crawler/Client.java
index a31869a9b7bb0192f6553323faa1276337398c16..ed37af91a0b34bb6959ce8d0c89f8e59d48cb22c 100644
--- a/src/web/crawler/Client.java
+++ b/src/web/crawler/Client.java
@@ -47,19 +47,14 @@
 
 package web.crawler;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.*;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
 public class Client {
 
     /**
diff --git a/src/web/crawler/DataVisualisation.java b/src/web/crawler/DataVisualisation.java
index b93ffebe74e5b697064422ba113d0adc75ef71a2..f58a15bfdee2b3015e7683a34cdaeb1326be0147 100644
--- a/src/web/crawler/DataVisualisation.java
+++ b/src/web/crawler/DataVisualisation.java
@@ -52,14 +52,19 @@ import com.panayotis.gnuplot.plot.DataSetPlot;
 import com.panayotis.gnuplot.style.PlotStyle;
 import com.panayotis.gnuplot.style.Style;
 import com.panayotis.gnuplot.terminal.ImageTerminal;
-import java.awt.AWTException;
+import org.mcavallo.opencloud.Cloud;
+import org.mcavallo.opencloud.Tag;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.sql.Array;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -67,13 +72,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import org.mcavallo.opencloud.Cloud;
-import org.mcavallo.opencloud.Tag;
-import javax.imageio.ImageIO;
+
 import static javax.imageio.ImageIO.write;
 import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
 
diff --git a/src/web/crawler/DatabaseCreation.java b/src/web/crawler/DatabaseCreation.java
index 6b03d724816c0de96d41bc0f336d63549d8dbba3..62aa7852023722a07fd4d3ebc574c50efde30e1e 100644
--- a/src/web/crawler/DatabaseCreation.java
+++ b/src/web/crawler/DatabaseCreation.java
@@ -48,18 +48,14 @@
 
 package web.crawler;
 
-import myutil.*;
+import myutil.TraceManager;
+import org.apache.derby.drda.NetworkServerControl;
 
-import java.awt.AWTException;
-import java.awt.Robot;
-import java.io.*;
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import org.apache.derby.drda.NetworkServerControl;
+import java.sql.*;
 
 /**
  * All the function necessary for the creation of the database, creation of tables in the database and the storage of this databse
diff --git a/src/web/crawler/DatabaseQuery.java b/src/web/crawler/DatabaseQuery.java
index b38cdac79d38745809bf02bb218ea873f12c468f..a32ffee1885795333486d9e12a818df3ee79bf4e 100644
--- a/src/web/crawler/DatabaseQuery.java
+++ b/src/web/crawler/DatabaseQuery.java
@@ -48,7 +48,8 @@
 
 package web.crawler;
 
-import java.awt.AWTException;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -60,7 +61,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.xml.transform.TransformerException;
+
 import static web.crawler.FileManagement.StoreResultsInFile;
 
 
diff --git a/src/web/crawler/FileManagement.java b/src/web/crawler/FileManagement.java
index 3cbb07a9022fd5e3e6629479a61ce47a3c8a0a0a..e44b0256fa001de1d96b0c9352ee0460ec5e5e12 100644
--- a/src/web/crawler/FileManagement.java
+++ b/src/web/crawler/FileManagement.java
@@ -47,46 +47,28 @@
 
 package web.crawler;
 
-import myutil.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import myutil.TraceManager;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.util.LinkedList;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.io.FileUtils;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.apache.commons.io.FileUtils;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
diff --git a/src/web/crawler/Message.java b/src/web/crawler/Message.java
index b061aa2a7eab3445bccf94eb2cb055488df900f2..166d5fbd17e78cd0f1db9964ae4b633f3255a1d1 100644
--- a/src/web/crawler/Message.java
+++ b/src/web/crawler/Message.java
@@ -1,14 +1,9 @@
 package web.crawler;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
 
 /**
  * @author Dan Huynh VO
diff --git a/src/web/crawler/MultiThreadServer.java b/src/web/crawler/MultiThreadServer.java
index 0b64d99e4b66c216059b1122029356abaaa6fa3c..37fa53eea373a8b4a70b7215d16239cc2e2a23d8 100644
--- a/src/web/crawler/MultiThreadServer.java
+++ b/src/web/crawler/MultiThreadServer.java
@@ -47,25 +47,15 @@
 
 package web.crawler;
 
-import java.awt.AWTException;
+import myutil.externalSearch.Message;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.transform.TransformerException;
+import java.awt.*;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Scanner;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import org.apache.commons.io.FileUtils;
-import web.crawler.WebCrawler;
-import myutil.externalSearch.Message;
 
 
 public class MultiThreadServer {
diff --git a/src/web/crawler/ThreadSocket.java b/src/web/crawler/ThreadSocket.java
index aec3944e25a99549a15fa2892b2674bbe8e1fac7..dc192eb2cf902065deec259ac5276b3c2a5e77b9 100644
--- a/src/web/crawler/ThreadSocket.java
+++ b/src/web/crawler/ThreadSocket.java
@@ -47,17 +47,17 @@
 
 package web.crawler;
 
-import myutil.externalSearch.*;
+import myutil.externalSearch.Message;
 
-import java.awt.AWTException;
-import java.net.Socket;
-import java.io.*;
+import javax.net.ssl.SSLSocket;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import myutil.externalSearch.Message;
-import javax.net.ssl.SSLSocket;
 
 
 
diff --git a/src/web/crawler/WebCrawler.java b/src/web/crawler/WebCrawler.java
index 4164c40d37a95844d14589cc829a3a2d27f74891..7a9a33421cc3569c4f617de4a3d2fe43b8b1e629 100644
--- a/src/web/crawler/WebCrawler.java
+++ b/src/web/crawler/WebCrawler.java
@@ -46,30 +46,27 @@
 
 package web.crawler;
 
-import myutil.*;
+import myutil.TraceManager;
 
-import java.awt.AWTException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.sql.SQLException;
-import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.concurrent.TimeUnit;
+
 import static web.crawler.FileManagement.ParsingXML;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import java.text.SimpleDateFormat;
-import java.util.Date;