diff --git a/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml b/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml
index e1b5c3a313242d39b89bb7516fab8672dd5923fd..4d3a9ffbd820f33fc5b974778240f98fef8867a9 100644
--- a/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml
+++ b/modeling/MicroWaveOven_SafetySecurity_fullMethodo.xml
@@ -79,19 +79,19 @@
 </COMPONENT>
 <SUBCOMPONENT type="5607" id="20" >
 <father id="27" num="0" />
-<cdparam x="355" y="367" />
+<cdparam x="355" y="352" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="355" maxX="355" minY="370" maxY="370" />
-<infoparam name="value " value="Attack Trees" />
+<cdrectangleparam minX="355" maxX="355" minY="355" maxY="355" />
+<infoparam name="value " value="Analysis_UseCase" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5607" id="21" >
 <father id="27" num="1" />
-<cdparam x="355" y="352" />
+<cdparam x="355" y="367" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="355" maxX="355" minY="355" maxY="355" />
-<infoparam name="value " value="Analysis_UseCase" />
+<cdrectangleparam minX="355" maxX="355" minY="370" maxY="370" />
+<infoparam name="value " value="Attack Trees" />
 </SUBCOMPONENT>
 
 <COMPONENT type="5602" id="35" >
@@ -1142,7 +1142,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="550" />
-<P1  x="120" y="239" id="584" />
+<P1  x="120" y="239" id="597" />
 <P2  x="191" y="187" id="566" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1151,7 +1151,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="552" />
-<P1  x="118" y="191" id="597" />
+<P1  x="118" y="191" id="584" />
 <P2  x="191" y="167" id="564" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1241,11 +1241,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="594" >
 <father id="632" num="0" />
-<cdparam x="20" y="219" />
+<cdparam x="18" y="171" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="closed" />
+<infoparam name="TGComponent" value="open" />
 <TGConnectingPoint num="0" id="582" />
 <TGConnectingPoint num="1" id="583" />
 <TGConnectingPoint num="2" id="584" />
@@ -1261,11 +1261,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="607" >
 <father id="632" num="1" />
-<cdparam x="18" y="171" />
+<cdparam x="20" y="219" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="open" />
+<infoparam name="TGComponent" value="closed" />
 <TGConnectingPoint num="0" id="595" />
 <TGConnectingPoint num="1" id="596" />
 <TGConnectingPoint num="2" id="597" />
@@ -1350,7 +1350,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="673" />
-<P1  x="141" y="80" id="716" />
+<P1  x="141" y="80" id="729" />
 <P2  x="179" y="60" id="686" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1359,7 +1359,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="675" />
-<P1  x="141" y="146" id="724" />
+<P1  x="141" y="146" id="711" />
 <P2  x="175" y="146" id="698" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1461,13 +1461,13 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="22" id="757" />
 <TGConnectingPoint num="23" id="758" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="721" >
+<SUBCOMPONENT type="5304" id="721" >
 <father id="759" num="0" />
-<cdparam x="41" y="68" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="41" y="126" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="14" minY="0" maxY="116" />
-<infoparam name="TGComponent" value="remainingTime" />
+<cdrectangleparam minX="0" maxX="14" minY="0" maxY="126" />
+<infoparam name="TGComponent" value="ringBell" />
 <TGConnectingPoint num="0" id="709" />
 <TGConnectingPoint num="1" id="710" />
 <TGConnectingPoint num="2" id="711" />
@@ -1480,17 +1480,14 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="9" id="718" />
 <TGConnectingPoint num="10" id="719" />
 <TGConnectingPoint num="11" id="720" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="734" >
+<SUBCOMPONENT type="5303" id="734" >
 <father id="759" num="1" />
-<cdparam x="41" y="126" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="41" y="68" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="14" minY="0" maxY="126" />
-<infoparam name="TGComponent" value="ringBell" />
+<cdrectangleparam minX="0" maxX="14" minY="0" maxY="116" />
+<infoparam name="TGComponent" value="remainingTime" />
 <TGConnectingPoint num="0" id="722" />
 <TGConnectingPoint num="1" id="723" />
 <TGConnectingPoint num="2" id="724" />
@@ -1503,6 +1500,9 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="9" id="731" />
 <TGConnectingPoint num="10" id="732" />
 <TGConnectingPoint num="11" id="733" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
 </SUBCOMPONENT>
 
 
@@ -1532,7 +1532,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="764" />
-<P1  x="119" y="400" id="939" />
+<P1  x="119" y="400" id="926" />
 <P2  x="175" y="370" id="857" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1541,7 +1541,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="766" />
-<P1  x="121" y="353" id="926" />
+<P1  x="121" y="353" id="939" />
 <P2  x="175" y="350" id="855" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1550,7 +1550,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="768" />
-<P1  x="120" y="248" id="875" />
+<P1  x="120" y="248" id="888" />
 <P2  x="189" y="226" id="834" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1559,7 +1559,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="770" />
-<P1  x="122" y="198" id="888" />
+<P1  x="122" y="198" id="875" />
 <P2  x="189" y="216" id="833" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1763,11 +1763,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="885" >
 <father id="923" num="0" />
-<cdparam x="20" y="228" />
+<cdparam x="22" y="178" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="closed" />
+<infoparam name="TGComponent" value="open" />
 <TGConnectingPoint num="0" id="873" />
 <TGConnectingPoint num="1" id="874" />
 <TGConnectingPoint num="2" id="875" />
@@ -1783,11 +1783,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="898" >
 <father id="923" num="1" />
-<cdparam x="22" y="178" />
+<cdparam x="20" y="228" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="open" />
+<infoparam name="TGComponent" value="closed" />
 <TGConnectingPoint num="0" id="886" />
 <TGConnectingPoint num="1" id="887" />
 <TGConnectingPoint num="2" id="888" />
@@ -1835,11 +1835,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="936" >
 <father id="974" num="0" />
-<cdparam x="21" y="333" />
+<cdparam x="19" y="380" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="99" />
-<infoparam name="TGComponent" value="startCooking" />
+<infoparam name="TGComponent" value="stopCooking" />
 <TGConnectingPoint num="0" id="924" />
 <TGConnectingPoint num="1" id="925" />
 <TGConnectingPoint num="2" id="926" />
@@ -1855,11 +1855,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="949" >
 <father id="974" num="1" />
-<cdparam x="19" y="380" />
+<cdparam x="21" y="333" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="99" />
-<infoparam name="TGComponent" value="stopCooking" />
+<infoparam name="TGComponent" value="startCooking" />
 <TGConnectingPoint num="0" id="937" />
 <TGConnectingPoint num="1" id="938" />
 <TGConnectingPoint num="2" id="939" />
@@ -3487,11 +3487,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="609" id="1859" >
 <father id="1896" num="0" />
-<cdparam x="618" y="299" />
-<sizeparam width="32" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="618" y="235" />
+<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="end" />
+<infoparam name="action state" value="magnetronIsOn" />
 <TGConnectingPoint num="0" id="1851" />
 <TGConnectingPoint num="1" id="1852" />
 <TGConnectingPoint num="2" id="1853" />
@@ -3503,11 +3503,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="609" id="1868" >
 <father id="1896" num="1" />
-<cdparam x="618" y="235" />
-<sizeparam width="97" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="618" y="299" />
+<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="magnetronIsOn" />
+<infoparam name="action state" value="end" />
 <TGConnectingPoint num="0" id="1860" />
 <TGConnectingPoint num="1" id="1861" />
 <TGConnectingPoint num="2" id="1862" />
@@ -3712,43 +3712,23 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="2001" />
-<TGConnectingPoint num="1" id="2002" />
-<TGConnectingPoint num="2" id="2003" />
-<TGConnectingPoint num="3" id="2004" />
-<TGConnectingPoint num="4" id="2005" />
-<P1  x="200" y="577" id="2155" />
+<TGConnectingPoint num="1" id="2004" />
+<TGConnectingPoint num="2" id="2005" />
+<P1  x="405" y="290" id="2460" />
 <P2  x="621" y="229" id="2143" />
-<Point x="228" y="577" />
-<Point x="228" y="407" />
-<Point x="575" y="407" />
+<Point x="575" y="290" />
 <Point x="575" y="228" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1997" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="1999" >
 <father id="2006" num="0" />
-<cdparam x="228" y="577" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1998" >
-<father id="2006" num="1" />
-<cdparam x="228" y="407" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1999" >
-<father id="2006" num="2" />
-<cdparam x="575" y="407" />
+<cdparam x="575" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="2000" >
-<father id="2006" num="3" />
+<father id="2006" num="1" />
 <cdparam x="575" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3764,7 +3744,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="1" id="2010" />
 <TGConnectingPoint num="2" id="2011" />
 <P1  x="746" y="209" id="2142" />
-<P2  x="864" y="242" id="2369" />
+<P2  x="864" y="242" id="2330" />
 <Point x="832" y="209" />
 <Point x="832" y="241" />
 <AutomaticDrawing  data="true" />
@@ -3792,7 +3772,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="2015" />
 <TGConnectingPoint num="1" id="2016" />
 <TGConnectingPoint num="2" id="2017" />
-<P1  x="836" y="301" id="2356" />
+<P1  x="836" y="301" id="2343" />
 <P2  x="746" y="229" id="2144" />
 <Point x="802" y="301" />
 <Point x="802" y="229" />
@@ -3822,7 +3802,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="1" id="2023" />
 <TGConnectingPoint num="2" id="2024" />
 <TGConnectingPoint num="3" id="2025" />
-<P1  x="559" y="549" id="2254" />
+<P1  x="559" y="549" id="2202" />
 <P2  x="652" y="239" id="2145" />
 <Point x="609" y="549" />
 <Point x="609" y="283" />
@@ -3865,9 +3845,9 @@ A sensor attached to the door enables detection of
 <CONNECTOR type="133" id="2030" >
 <cdparam x="319" y="378" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="2" />
 <TGConnectingPoint num="0" id="2029" />
-<P1  x="405" y="342" id="2447" />
+<P1  x="405" y="342" id="2473" />
 <P2  x="651" y="342" id="2110" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3878,7 +3858,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="2032" />
 <TGConnectingPoint num="1" id="2033" />
 <P1  x="492" y="225" id="2096" />
-<P2  x="287" y="189" id="2473" />
+<P2  x="287" y="189" id="2447" />
 <Point x="492" y="189" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2031" >
@@ -3893,18 +3873,18 @@ A sensor attached to the door enables detection of
 <CONNECTOR type="133" id="2036" >
 <cdparam x="257" y="254" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
 <TGConnectingPoint num="0" id="2035" />
-<P1  x="295" y="245" id="2434" />
+<P1  x="295" y="245" id="2486" />
 <P2  x="430" y="245" id="2097" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="133" id="2038" >
 <cdparam x="476" y="520" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="2" />
 <TGConnectingPoint num="0" id="2037" />
-<P1  x="495" y="479" id="2265" />
+<P1  x="493" y="474" id="2187" />
 <P2  x="492" y="265" id="2099" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3915,7 +3895,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="2041" />
 <TGConnectingPoint num="1" id="2042" />
 <TGConnectingPoint num="2" id="2043" />
-<P1  x="287" y="145" id="2493" />
+<P1  x="287" y="145" id="2441" />
 <P2  x="621" y="209" id="2141" />
 <Point x="505" y="145" />
 <Point x="505" y="209" />
@@ -3943,26 +3923,26 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="2045" />
 <P1  x="569" y="124" id="2128" />
-<P2  x="287" y="125" id="2491" />
+<P2  x="287" y="125" id="2439" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="133" id="2048" >
 <cdparam x="867" y="123" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="2" />
 <TGConnectingPoint num="0" id="2047" />
-<P1  x="784" y="123" id="2395" />
+<P1  x="784" y="123" id="2304" />
 <P2  x="694" y="124" id="2129" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="133" id="2054" >
 <cdparam x="868" y="183" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
 <TGConnectingPoint num="0" id="2051" />
 <TGConnectingPoint num="1" id="2052" />
 <TGConnectingPoint num="2" id="2053" />
-<P1  x="834" y="183" id="2382" />
+<P1  x="834" y="183" id="2317" />
 <P2  x="694" y="144" id="2131" />
 <Point x="753" y="183" />
 <Point x="753" y="144" />
@@ -3987,7 +3967,7 @@ A sensor attached to the door enables detection of
 <CONNECTOR type="133" id="2058" >
 <cdparam x="553" y="575" />
 <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="" />
+<infoparam name="connector from TGComponent to TGComponent" value="1" />
 <TGConnectingPoint num="0" id="2056" />
 <TGConnectingPoint num="1" id="2057" />
 <P1  x="532" y="598" id="2228" />
@@ -4007,37 +3987,18 @@ A sensor attached to the door enables detection of
 <cdparam x="179" y="657" />
 <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="" />
-<TGConnectingPoint num="0" id="2059" />
-<P1  x="200" y="597" id="2157" />
+<TGConnectingPoint num="0" id="4554" />
+<TGConnectingPoint num="1" id="2059" />
+<P1  x="228" y="310" id="2461" />
 <P2  x="270" y="598" id="2227" />
+<Point x="228" y="598" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="133" id="2066" >
-<cdparam x="81" y="253" />
-<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="" />
-<TGConnectingPoint num="0" id="2063" />
-<TGConnectingPoint num="1" id="2064" />
-<TGConnectingPoint num="2" id="2065" />
-<P1  x="52" y="290" id="2459" />
-<P2  x="75" y="587" id="2149" />
-<Point x="31" y="290" />
-<Point x="31" y="587" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2061" >
-<father id="2066" num="0" />
-<cdparam x="31" y="290" />
-<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="2062" >
-<father id="2066" num="1" />
-<cdparam x="31" y="587" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4553" >
+<father id="2060" num="0" />
+<cdparam x="228" y="598" />
 <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="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
@@ -4047,8 +4008,8 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="2068" />
 <TGConnectingPoint num="1" id="2069" />
-<P1  x="515" y="703" id="2215" />
-<P2  x="914" y="498" id="2319" />
+<P1  x="515" y="703" id="2241" />
+<P2  x="906" y="500" id="2384" />
 <Point x="906" y="703" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2067" >
@@ -4067,7 +4028,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="2072" />
 <TGConnectingPoint num="1" id="2073" />
 <P1  x="1253" y="400" id="2161" />
-<P2  x="1157" y="368" id="2344" />
+<P2  x="1157" y="368" id="2357" />
 <Point x="1253" y="367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2071" >
@@ -4084,7 +4045,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="2075" />
-<P1  x="1056" y="420" id="2331" />
+<P1  x="1056" y="420" id="2370" />
 <P2  x="1191" y="420" id="2162" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -4094,7 +4055,7 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="2078" />
 <TGConnectingPoint num="1" id="2079" />
-<P1  x="1136" y="480" id="2305" />
+<P1  x="1140" y="480" id="2396" />
 <P2  x="1253" y="440" id="2164" />
 <Point x="1253" y="480" />
 <AutomaticDrawing  data="true" />
@@ -4112,7 +4073,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="2081" />
-<P1  x="487" y="811" id="2187" />
+<P1  x="496" y="810" id="2265" />
 <P2  x="427" y="787" id="2185" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -4121,7 +4082,7 @@ A sensor attached to the door enables detection of
 <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="" />
 <TGConnectingPoint num="0" id="2083" />
-<P1  x="346" y="807" id="2200" />
+<P1  x="346" y="807" id="2252" />
 <P2  x="365" y="787" id="2184" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -4131,7 +4092,7 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="2085" />
 <P1  x="396" y="747" id="2174" />
-<P2  x="404" y="723" id="2216" />
+<P2  x="404" y="723" id="2242" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="301" id="2095" >
@@ -4163,7 +4124,7 @@ or by a maintenance station
 <sizeparam width="125" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;&lt;AFTER&gt;&gt;" />
+<infoparam name="TGComponent" value="&lt;&lt;SEQUENCE&gt;&gt;" />
 <TGConnectingPoint num="0" id="2096" />
 <TGConnectingPoint num="1" id="2097" />
 <TGConnectingPoint num="2" id="2098" />
@@ -4186,7 +4147,7 @@ or by a maintenance station
 <sizeparam width="125" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;&lt;AFTER&gt;&gt;" />
+<infoparam name="TGComponent" value="&lt;&lt;SEQUENCE&gt;&gt;" />
 <TGConnectingPoint num="0" id="2109" />
 <TGConnectingPoint num="1" id="2110" />
 <TGConnectingPoint num="2" id="2111" />
@@ -4209,7 +4170,7 @@ or by a maintenance station
 <sizeparam width="125" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;&lt;AFTER&gt;&gt;" />
+<infoparam name="TGComponent" value="&lt;&lt;SEQUENCE&gt;&gt;" />
 <TGConnectingPoint num="0" id="2122" />
 <TGConnectingPoint num="1" id="2123" />
 <TGConnectingPoint num="2" id="2124" />
@@ -4250,29 +4211,6 @@ or by a maintenance station
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1402" id="2160" >
-<cdparam x="75" y="567" />
-<sizeparam width="125" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;&lt;AFTER&gt;&gt;" />
-<TGConnectingPoint num="0" id="2148" />
-<TGConnectingPoint num="1" id="2149" />
-<TGConnectingPoint num="2" id="2150" />
-<TGConnectingPoint num="3" id="2151" />
-<TGConnectingPoint num="4" id="2152" />
-<TGConnectingPoint num="5" id="2153" />
-<TGConnectingPoint num="6" id="2154" />
-<TGConnectingPoint num="7" id="2155" />
-<TGConnectingPoint num="8" id="2156" />
-<TGConnectingPoint num="9" id="2157" />
-<TGConnectingPoint num="10" id="2158" />
-<TGConnectingPoint num="11" id="2159" />
-<extraparam>
-<info equation="" />
-</extraparam>
-</COMPONENT>
-
 <COMPONENT type="1402" id="2173" >
 <cdparam x="1191" y="400" />
 <sizeparam width="125" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4352,11 +4290,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="2199" >
 <father id="2302" num="0" />
-<cdparam x="437" y="811" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="416" y="474" />
+<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="BusProbing" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="173" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="CorruptOrFakeMessage" />
 <TGConnectingPoint num="0" id="2187" />
 <TGConnectingPoint num="1" id="2188" />
 <TGConnectingPoint num="2" id="2189" />
@@ -4375,11 +4314,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2212" >
 <father id="2302" num="1" />
-<cdparam x="256" y="807" />
-<sizeparam width="181" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="269" y="529" />
+<sizeparam width="290" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="147" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="HijackingTheRemoteSession" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="38" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="AttackerInjectWrongFirmwareOnTheDomainBus" />
 <TGConnectingPoint num="0" id="2200" />
 <TGConnectingPoint num="1" id="2201" />
 <TGConnectingPoint num="2" id="2202" />
@@ -4398,11 +4338,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2225" >
 <father id="2302" num="2" />
-<cdparam x="293" y="683" />
-<sizeparam width="222" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="310" y="633" />
+<sizeparam width="151" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="106" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="RemoteControlProtocolVulnerability" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="177" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="ManInTheMiddleAttack" />
 <TGConnectingPoint num="0" id="2213" />
 <TGConnectingPoint num="1" id="2214" />
 <TGConnectingPoint num="2" id="2215" />
@@ -4416,7 +4357,7 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2223" />
 <TGConnectingPoint num="11" id="2224" />
 <extraparam>
-<info description="Exploit vulnerability or implementation error" root="false" />
+<info description="" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2238" >
@@ -4424,6 +4365,7 @@ or by a maintenance station
 <cdparam x="270" y="578" />
 <sizeparam width="262" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="0" maxX="66" minY="0" maxY="389" />
 <infoparam name="TGComponent" value="ExploitVulnerabilityOrImplementationError" />
 <TGConnectingPoint num="0" id="2226" />
@@ -4444,11 +4386,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2251" >
 <father id="2302" num="4" />
-<cdparam x="310" y="633" />
-<sizeparam width="151" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="293" y="683" />
+<sizeparam width="222" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="177" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="ManInTheMiddleAttack" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="106" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="RemoteControlProtocolVulnerability" />
 <TGConnectingPoint num="0" id="2239" />
 <TGConnectingPoint num="1" id="2240" />
 <TGConnectingPoint num="2" id="2241" />
@@ -4462,16 +4405,17 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2249" />
 <TGConnectingPoint num="11" id="2250" />
 <extraparam>
-<info description="" root="false" />
+<info description="Exploit vulnerability or implementation error" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2264" >
 <father id="2302" num="5" />
-<cdparam x="269" y="529" />
-<sizeparam width="290" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="256" y="807" />
+<sizeparam width="181" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="38" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="AttackerInjectWrongFirmwareOnTheDomainBus" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="147" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="HijackingTheRemoteSession" />
 <TGConnectingPoint num="0" id="2252" />
 <TGConnectingPoint num="1" id="2253" />
 <TGConnectingPoint num="2" id="2254" />
@@ -4490,11 +4434,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2277" >
 <father id="2302" num="6" />
-<cdparam x="418" y="479" />
-<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="446" y="810" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="173" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="CorruptOrFakeMessage" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="BusProbing" />
 <TGConnectingPoint num="0" id="2265" />
 <TGConnectingPoint num="1" id="2266" />
 <TGConnectingPoint num="2" id="2267" />
@@ -4545,11 +4490,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="2315" >
 <father id="2431" num="0" />
-<cdparam x="985" y="460" />
-<sizeparam width="151" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="784" y="103" />
+<sizeparam width="376" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="225" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InjectBogusKeysInOven" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="0" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InfectedControllerSendsTooManyMessagesToWirelessInterface" />
 <TGConnectingPoint num="0" id="2303" />
 <TGConnectingPoint num="1" id="2304" />
 <TGConnectingPoint num="2" id="2305" />
@@ -4568,11 +4514,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2328" >
 <father id="2431" num="1" />
-<cdparam x="838" y="458" />
-<sizeparam width="153" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="834" y="163" />
+<sizeparam width="269" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="FlashYourOwnFirmware" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="107" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="ExploitVulnerabilitesOrImplementationError" />
 <TGConnectingPoint num="0" id="2316" />
 <TGConnectingPoint num="1" id="2317" />
 <TGConnectingPoint num="2" id="2318" />
@@ -4591,11 +4538,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2341" >
 <father id="2431" num="2" />
-<cdparam x="836" y="400" />
-<sizeparam width="220" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="864" y="222" />
+<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="156" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="FaultyORNoFirmwareAuthentication" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="221" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="AbortFlashingOperation" />
 <TGConnectingPoint num="0" id="2329" />
 <TGConnectingPoint num="1" id="2330" />
 <TGConnectingPoint num="2" id="2331" />
@@ -4614,11 +4562,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2354" >
 <father id="2431" num="3" />
-<cdparam x="802" y="348" />
-<sizeparam width="355" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="836" y="281" />
+<sizeparam width="251" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="21" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="MaintenanceInstalledModifiedFirmwareToWirelessInterface" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InfectedWirelessInterfaceNotResponding" />
 <TGConnectingPoint num="0" id="2342" />
 <TGConnectingPoint num="1" id="2343" />
 <TGConnectingPoint num="2" id="2344" />
@@ -4632,16 +4581,17 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2352" />
 <TGConnectingPoint num="11" id="2353" />
 <extraparam>
-<info description="" root="false" />
+<info description="Denial of service" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2367" >
 <father id="2431" num="4" />
-<cdparam x="836" y="281" />
-<sizeparam width="251" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="802" y="348" />
+<sizeparam width="355" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InfectedWirelessInterfaceNotResponding" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="21" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="MaintenanceInstalledModifiedFirmwareToWirelessInterface" />
 <TGConnectingPoint num="0" id="2355" />
 <TGConnectingPoint num="1" id="2356" />
 <TGConnectingPoint num="2" id="2357" />
@@ -4655,16 +4605,17 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2365" />
 <TGConnectingPoint num="11" id="2366" />
 <extraparam>
-<info description="Denial of service" root="false" />
+<info description="" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2380" >
 <father id="2431" num="5" />
-<cdparam x="864" y="222" />
-<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="836" y="400" />
+<sizeparam width="220" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="221" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="AbortFlashingOperation" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="156" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="FaultyORNoFirmwareAuthentication" />
 <TGConnectingPoint num="0" id="2368" />
 <TGConnectingPoint num="1" id="2369" />
 <TGConnectingPoint num="2" id="2370" />
@@ -4683,11 +4634,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2393" >
 <father id="2431" num="6" />
-<cdparam x="834" y="163" />
-<sizeparam width="269" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="830" y="460" />
+<sizeparam width="153" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="107" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="ExploitVulnerabilitesOrImplementationError" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="FlashYourOwnFirmware" />
 <TGConnectingPoint num="0" id="2381" />
 <TGConnectingPoint num="1" id="2382" />
 <TGConnectingPoint num="2" id="2383" />
@@ -4706,11 +4658,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2406" >
 <father id="2431" num="7" />
-<cdparam x="784" y="103" />
-<sizeparam width="376" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="989" y="460" />
+<sizeparam width="151" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="0" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InfectedControllerSendsTooManyMessagesToWirelessInterface" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="225" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InjectBogusKeysInOven" />
 <TGConnectingPoint num="0" id="2394" />
 <TGConnectingPoint num="1" id="2395" />
 <TGConnectingPoint num="2" id="2396" />
@@ -4761,11 +4714,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="2444" >
 <father id="2521" num="0" />
-<cdparam x="99" y="225" />
-<sizeparam width="196" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="88" y="115" />
+<sizeparam width="199" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="158" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="ExploitVulnerabilitiesInFlashing" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="155" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="OvenTakesTooLongToRespond" />
 <TGConnectingPoint num="0" id="2432" />
 <TGConnectingPoint num="1" id="2433" />
 <TGConnectingPoint num="2" id="2434" />
@@ -4779,16 +4733,17 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2442" />
 <TGConnectingPoint num="11" id="2443" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="Denial of Service Attack" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2457" >
 <father id="2521" num="1" />
-<cdparam x="77" y="322" />
-<sizeparam width="328" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="90" y="169" />
+<sizeparam width="197" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="26" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="InfectedWirelessInterfaceShuttingDownCommunication" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="157" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="GainAccessToWirelessInterface" />
 <TGConnectingPoint num="0" id="2445" />
 <TGConnectingPoint num="1" id="2446" />
 <TGConnectingPoint num="2" id="2447" />
@@ -4810,6 +4765,7 @@ or by a maintenance station
 <cdparam x="52" y="270" />
 <sizeparam width="353" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="0" maxX="1" minY="0" maxY="273" />
 <infoparam name="TGComponent" value="InfectedWirelessInterfaceReportsBogusMoreRecentVersion" />
 <TGConnectingPoint num="0" id="2458" />
@@ -4830,11 +4786,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2483" >
 <father id="2521" num="3" />
-<cdparam x="90" y="169" />
-<sizeparam width="197" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="77" y="322" />
+<sizeparam width="328" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="157" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="GainAccessToWirelessInterface" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="26" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="InfectedWirelessInterfaceShuttingDownCommunication" />
 <TGConnectingPoint num="0" id="2471" />
 <TGConnectingPoint num="1" id="2472" />
 <TGConnectingPoint num="2" id="2473" />
@@ -4853,11 +4810,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="2496" >
 <father id="2521" num="4" />
-<cdparam x="88" y="115" />
-<sizeparam width="199" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="99" y="225" />
+<sizeparam width="196" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="155" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="OvenTakesTooLongToRespond" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="158" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="ExploitVulnerabilitiesInFlashing" />
 <TGConnectingPoint num="0" id="2484" />
 <TGConnectingPoint num="1" id="2485" />
 <TGConnectingPoint num="2" id="2486" />
@@ -4871,7 +4829,7 @@ or by a maintenance station
 <TGConnectingPoint num="10" id="2494" />
 <TGConnectingPoint num="11" id="2495" />
 <extraparam>
-<info description="Denial of Service Attack" root="false" />
+<info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4933,16 +4891,16 @@ or by a maintenance station
 <MainCode value=""/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="RemotelyControlledMicrowave;MicroWaveOven;WirelessInterface;RemoteControl;" />
-<Ignored value="ObserverProp1;Door;Magnetron;Controller;ControlPanel;Bell;" />
+<Validated value="" />
+<Ignored value="" />
 
 <CONNECTOR type="5002" id="2523" >
-<cdparam x="770" y="461" />
+<cdparam x="712" y="302" />
 <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="2522" />
-<P1  x="722" y="954" id="2682" />
-<P2  x="727" y="996" id="2541" />
+<P1  x="664" y="795" id="2682" />
+<P2  x="669" y="837" id="2541" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obs_open()" />
@@ -4955,12 +4913,12 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="2525" >
-<cdparam x="344" y="574" />
+<cdparam x="286" y="415" />
 <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="2524" />
-<P1  x="468" y="658" id="2752" />
-<P2  x="173" y="657" id="2777" />
+<P1  x="412" y="497" id="2602" />
+<P2  x="115" y="498" id="2752" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -4969,25 +4927,25 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="2531" >
-<cdparam x="800" y="441" />
+<cdparam x="742" y="282" />
 <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="2528" />
 <TGConnectingPoint num="1" id="2529" />
 <TGConnectingPoint num="2" id="2530" />
-<P1  x="389" y="343" id="2800" />
-<P2  x="873" y="343" id="2801" />
-<Point x="395" y="310" />
-<Point x="878" y="310" />
+<P1  x="331" y="184" id="2800" />
+<P2  x="815" y="184" id="2801" />
+<Point x="332" y="151" />
+<Point x="815" y="151" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in wirelessChannelRead(Message msg)" />
 <osd value="out wirelessChannelWrite(Message msg)" />
-<FIFOType asynchronous="true" size="5" blocking="false" private="false" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="5" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR><SUBCOMPONENT type="-1" id="2526" >
 <father id="2531" num="0" />
-<cdparam x="395" y="310" />
+<cdparam x="332" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -4995,7 +4953,7 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="2527" >
 <father id="2531" num="1" />
-<cdparam x="878" y="310" />
+<cdparam x="815" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5003,12 +4961,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 
 <CONNECTOR type="5002" id="2533" >
-<cdparam x="719" y="481" />
+<cdparam x="661" y="322" />
 <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="2532" />
-<P1  x="476" y="912" id="2679" />
-<P2  x="377" y="911" id="2621" />
+<P1  x="418" y="753" id="2679" />
+<P2  x="319" y="752" id="2721" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -5017,12 +4975,12 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="2535" >
-<cdparam x="422" y="503" />
+<cdparam x="364" y="344" />
 <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="2534" />
-<P1  x="850" y="926" id="2729" />
-<P2  x="804" y="912" id="2680" />
+<P1  x="792" y="767" id="2629" />
+<P2  x="746" y="753" id="2680" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in open()" />
@@ -5033,12 +4991,12 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="2537" >
-<cdparam x="714" y="409" />
+<cdparam x="656" y="250" />
 <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="2536" />
-<P1  x="804" y="787" id="2669" />
-<P2  x="835" y="698" id="2695" />
+<P1  x="746" y="628" id="2669" />
+<P2  x="777" y="539" id="2645" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -5049,12 +5007,12 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="2539" >
-<cdparam x="394" y="430" />
+<cdparam x="336" y="271" />
 <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="2538" />
-<P1  x="443" y="757" id="2646" />
-<P2  x="476" y="870" id="2670" />
+<P1  x="385" y="598" id="2696" />
+<P2  x="418" y="711" id="2670" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in LEDOn()" />
@@ -5067,7 +5025,7 @@ or by a maintenance station
 </extraparam>
 </CONNECTOR>
 <COMPONENT type="5000" id="2564" >
-<cdparam x="615" y="996" />
+<cdparam x="557" y="837" />
 <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" />
@@ -5105,7 +5063,7 @@ or by a maintenance station
 </COMPONENT>
 
 <COMPONENT type="5003" id="2573" >
-<cdparam x="384" y="998" />
+<cdparam x="326" y="839" />
 <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" />
@@ -5124,7 +5082,7 @@ or by a maintenance station
 </COMPONENT>
 
 <COMPONENT type="5003" id="2582" >
-<cdparam x="150" y="996" />
+<cdparam x="92" y="837" />
 <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" />
@@ -5143,15 +5101,15 @@ or by a maintenance station
 </COMPONENT>
 
 <COMPONENT type="301" id="2591" >
-<cdparam x="121" y="181" />
-<sizeparam width="586" height="80" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="63" y="22" />
+<sizeparam width="591" height="95" 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 RemoteControl.duration
-#Authenticity RemoteControl.SendingRemoteOrder.msg1 WirelessInterface.gotWirelessOrder.msg2
+#Authenticity RemoteControl.SendingRemoteOrder.msg WirelessInterface.gotDecryptedOrder.msg2
 
-#InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK
 
+#InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK
 " />
 <TGConnectingPoint num="0" id="2583" />
 <TGConnectingPoint num="1" id="2584" />
@@ -5163,14 +5121,15 @@ or by a maintenance station
 <TGConnectingPoint num="7" id="2590" />
 <extraparam>
 <Line value="#Confidentiality RemoteControl.duration" />
-<Line value="#Authenticity RemoteControl.SendingRemoteOrder.msg1 WirelessInterface.gotWirelessOrder.msg2" />
+<Line value="#Authenticity RemoteControl.SendingRemoteOrder.msg WirelessInterface.gotDecryptedOrder.msg2" />
+<Line value="" />
 <Line value="" />
 <Line value="#InitialSystemKnowledge RemoteControl.PSK WirelessInterface.PSK" />
 </extraparam>
 </COMPONENT>
 
 <COMPONENT type="5000" id="2816" >
-<cdparam x="148" y="343" />
+<cdparam x="90" y="184" />
 <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" />
@@ -5205,13 +5164,49 @@ or by a maintenance station
 <Signal value="out wirelessChannelWrite(Message msg)" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="2616" >
+<SUBCOMPONENT type="5000" id="2766" >
 <father id="2816" num="0" />
-<cdparam x="491" y="390" />
-<sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="115" y="395" />
+<sizeparam width="921" height="412" 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" />
+<cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
+<infoparam name="Block0" value="MicroWaveOven" />
+<TGConnectingPoint num="0" id="2742" />
+<TGConnectingPoint num="1" id="2743" />
+<TGConnectingPoint num="2" id="2744" />
+<TGConnectingPoint num="3" id="2745" />
+<TGConnectingPoint num="4" id="2746" />
+<TGConnectingPoint num="5" id="2747" />
+<TGConnectingPoint num="6" id="2748" />
+<TGConnectingPoint num="7" id="2749" />
+<TGConnectingPoint num="8" id="2750" />
+<TGConnectingPoint num="9" id="2751" />
+<TGConnectingPoint num="10" id="2752" />
+<TGConnectingPoint num="11" id="2753" />
+<TGConnectingPoint num="12" id="2754" />
+<TGConnectingPoint num="13" id="2755" />
+<TGConnectingPoint num="14" id="2756" />
+<TGConnectingPoint num="15" id="2757" />
+<TGConnectingPoint num="16" id="2758" />
+<TGConnectingPoint num="17" id="2759" />
+<TGConnectingPoint num="18" id="2760" />
+<TGConnectingPoint num="19" id="2761" />
+<TGConnectingPoint num="20" id="2762" />
+<TGConnectingPoint num="21" id="2763" />
+<TGConnectingPoint num="22" id="2764" />
+<TGConnectingPoint num="23" id="2765" />
+<extraparam>
+<CryptoBlock value="false" />
+<Signal value="in remoteStart(int value)" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="2616" >
+<father id="2766" num="0" />
+<cdparam x="412" y="459" />
+<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="2592" />
 <TGConnectingPoint num="1" id="2593" />
 <TGConnectingPoint num="2" id="2594" />
@@ -5238,9 +5233,10 @@ or by a maintenance station
 <TGConnectingPoint num="23" id="2615" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<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="" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -5253,53 +5249,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)" />
-<globalCode value="" />
-<globalCode value="/* This is my global code !!!! */" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2791" >
-<father id="2816" 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="2767" />
-<TGConnectingPoint num="1" id="2768" />
-<TGConnectingPoint num="2" id="2769" />
-<TGConnectingPoint num="3" id="2770" />
-<TGConnectingPoint num="4" id="2771" />
-<TGConnectingPoint num="5" id="2772" />
-<TGConnectingPoint num="6" id="2773" />
-<TGConnectingPoint num="7" id="2774" />
-<TGConnectingPoint num="8" id="2775" />
-<TGConnectingPoint num="9" id="2776" />
-<TGConnectingPoint num="10" id="2777" />
-<TGConnectingPoint num="11" id="2778" />
-<TGConnectingPoint num="12" id="2779" />
-<TGConnectingPoint num="13" id="2780" />
-<TGConnectingPoint num="14" id="2781" />
-<TGConnectingPoint num="15" id="2782" />
-<TGConnectingPoint num="16" id="2783" />
-<TGConnectingPoint num="17" id="2784" />
-<TGConnectingPoint num="18" id="2785" />
-<TGConnectingPoint num="19" id="2786" />
-<TGConnectingPoint num="20" id="2787" />
-<TGConnectingPoint num="21" id="2788" />
-<TGConnectingPoint num="22" id="2789" />
-<TGConnectingPoint num="23" id="2790" />
-<extraparam>
-<CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" />
+<Signal value="out remoteStart(int value)" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2641" >
-<father id="2791" num="0" />
-<cdparam x="196" y="864" />
-<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2766" num="1" />
+<cdparam x="792" y="673" />
+<sizeparam width="215" height="126" 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" />
+<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
+<infoparam name="Block0" value="Door" />
 <TGConnectingPoint num="0" id="2617" />
 <TGConnectingPoint num="1" id="2618" />
 <TGConnectingPoint num="2" id="2619" />
@@ -5326,24 +5285,32 @@ or by a maintenance station
 <TGConnectingPoint num="23" id="2640" />
 <extraparam>
 <CryptoBlock value="false" />
-<Method value="$runBell()" />
-<Signal value="in ring()" />
+<Method value="$openM()" />
+<Method value="$closeM()" />
+<Signal value="out closed()" />
+<Signal value="out open()" />
+<globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
+<globalCode value="const char* openD = &quot;Open Door&quot;;" />
+<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Bell__runBell() {" />
-<globalCode value="  sendDatagram(dring, 18);" />
+<globalCode value="void _userImplemented_Door__openM() {" />
+<globalCode value="  sendDatagram(openD, 10);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Door__closeM() {" />
+<globalCode value="   sendDatagram(closeD, 10);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2666" >
-<father id="2791" num="1" />
-<cdparam x="187" y="676" />
-<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2766" num="2" />
+<cdparam x="777" y="459" />
+<sizeparam width="253" height="160" 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" />
+<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
+<infoparam name="Block0" value="Magnetron" />
 <TGConnectingPoint num="0" id="2642" />
 <TGConnectingPoint num="1" id="2643" />
 <TGConnectingPoint num="2" id="2644" />
@@ -5370,15 +5337,26 @@ or by a maintenance station
 <TGConnectingPoint num="23" id="2665" />
 <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)" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Method value="$ON()" />
+<Method value="$OFF()" />
+<Signal value="in startM()" />
+<Signal value="in stopM()" />
+<globalCode value="extern void sendDatagram(char *data, int size);" />
+<globalCode value="" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__ON() {" />
+<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__OFF() {" />
+<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
+<globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2691" >
-<father id="2791" num="2" />
-<cdparam x="476" y="787" />
+<father id="2766" num="3" />
+<cdparam x="418" y="628" />
 <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" />
@@ -5455,12 +5433,12 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2716" >
-<father id="2791" num="3" />
-<cdparam x="835" y="618" />
-<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2766" num="4" />
+<cdparam x="129" y="517" />
+<sizeparam width="256" height="162" 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" />
+<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
+<infoparam name="Block0" value="ControlPanel" />
 <TGConnectingPoint num="0" id="2692" />
 <TGConnectingPoint num="1" id="2693" />
 <TGConnectingPoint num="2" id="2694" />
@@ -5487,30 +5465,19 @@ or by a maintenance station
 <TGConnectingPoint num="23" id="2715" />
 <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()" />
-<globalCode value="extern void sendDatagram(char *data, int size);" />
-<globalCode value="" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__ON() {" />
-<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
-<globalCode value="}" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__OFF() {" />
-<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
-<globalCode value="}" />
+<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
+<Signal value="in LEDOn()" />
+<Signal value="in LEDoff()" />
+<Signal value="out startButton(int duration)" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2741" >
-<father id="2791" num="4" />
-<cdparam x="850" y="832" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2766" num="5" />
+<cdparam x="138" y="705" />
+<sizeparam width="181" height="95" 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" />
+<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
+<infoparam name="Block0" value="Bell" />
 <TGConnectingPoint num="0" id="2717" />
 <TGConnectingPoint num="1" id="2718" />
 <TGConnectingPoint num="2" id="2719" />
@@ -5537,61 +5504,54 @@ or by a maintenance station
 <TGConnectingPoint num="23" id="2740" />
 <extraparam>
 <CryptoBlock value="false" />
-<Method value="$openM()" />
-<Method value="$closeM()" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
-<globalCode value="" />
+<Method value="$runBell()" />
+<Signal value="in ring()" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* openD = &quot;Open Door&quot;;" />
-<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Door__openM() {" />
-<globalCode value="  sendDatagram(openD, 10);" />
-<globalCode value="}" />
+<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Door__closeM() {" />
-<globalCode value="   sendDatagram(closeD, 10);" />
+<globalCode value="void _userImplemented_Bell__runBell() {" />
+<globalCode value="  sendDatagram(dring, 18);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2766" >
-<father id="2791" num="5" />
-<cdparam x="468" y="620" />
-<sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="2791" >
+<father id="2816" num="1" />
+<cdparam x="433" y="231" />
+<sizeparam width="414" height="148" 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="2742" />
-<TGConnectingPoint num="1" id="2743" />
-<TGConnectingPoint num="2" id="2744" />
-<TGConnectingPoint num="3" id="2745" />
-<TGConnectingPoint num="4" id="2746" />
-<TGConnectingPoint num="5" id="2747" />
-<TGConnectingPoint num="6" id="2748" />
-<TGConnectingPoint num="7" id="2749" />
-<TGConnectingPoint num="8" id="2750" />
-<TGConnectingPoint num="9" id="2751" />
-<TGConnectingPoint num="10" id="2752" />
-<TGConnectingPoint num="11" id="2753" />
-<TGConnectingPoint num="12" id="2754" />
-<TGConnectingPoint num="13" id="2755" />
-<TGConnectingPoint num="14" id="2756" />
-<TGConnectingPoint num="15" id="2757" />
-<TGConnectingPoint num="16" id="2758" />
-<TGConnectingPoint num="17" id="2759" />
-<TGConnectingPoint num="18" id="2760" />
-<TGConnectingPoint num="19" id="2761" />
-<TGConnectingPoint num="20" id="2762" />
-<TGConnectingPoint num="21" id="2763" />
-<TGConnectingPoint num="22" id="2764" />
-<TGConnectingPoint num="23" id="2765" />
+<cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
+<infoparam name="Block0" value="RemoteControl" />
+<TGConnectingPoint num="0" id="2767" />
+<TGConnectingPoint num="1" id="2768" />
+<TGConnectingPoint num="2" id="2769" />
+<TGConnectingPoint num="3" id="2770" />
+<TGConnectingPoint num="4" id="2771" />
+<TGConnectingPoint num="5" id="2772" />
+<TGConnectingPoint num="6" id="2773" />
+<TGConnectingPoint num="7" id="2774" />
+<TGConnectingPoint num="8" id="2775" />
+<TGConnectingPoint num="9" id="2776" />
+<TGConnectingPoint num="10" id="2777" />
+<TGConnectingPoint num="11" id="2778" />
+<TGConnectingPoint num="12" id="2779" />
+<TGConnectingPoint num="13" id="2780" />
+<TGConnectingPoint num="14" id="2781" />
+<TGConnectingPoint num="15" id="2782" />
+<TGConnectingPoint num="16" id="2783" />
+<TGConnectingPoint num="17" id="2784" />
+<TGConnectingPoint num="18" id="2785" />
+<TGConnectingPoint num="19" id="2786" />
+<TGConnectingPoint num="20" id="2787" />
+<TGConnectingPoint num="21" id="2788" />
+<TGConnectingPoint num="22" id="2789" />
+<TGConnectingPoint num="23" id="2790" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<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" />
-<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -5604,7 +5564,8 @@ 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)" />
+<globalCode value="" />
+<globalCode value="/* This is my global code !!!! */" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6219,175 +6180,92 @@ or by a maintenance station
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3080" >
-<cdparam x="407" y="70" />
+<AVATARStateMachineDiagramPanel name="RemoteControl" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="118" id="3074" >
+<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="508" y="133" id="3077" />
+<P2  x="661" y="95" id="3147" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<CONNECTOR type="5102" id="3081" >
+<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="3079" />
-<P1  x="407" y="70" id="3122" />
-<P2  x="451" y="106" id="3082" />
+<TGConnectingPoint num="0" id="3080" />
+<P1  x="309" y="119" id="3207" />
+<P2  x="325" y="163" id="3154" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3078" >
-<father id="3080" num="0" />
-<cdparam x="444" y="75" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3079" >
+<father id="3081" num="0" />
+<cdparam x="340" y="118" />
+<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="3074" />
-<TGConnectingPoint num="1" id="3075" />
-<TGConnectingPoint num="2" id="3076" />
-<TGConnectingPoint num="3" id="3077" />
+<TGConnectingPoint num="0" id="3075" />
+<TGConnectingPoint num="1" id="3076" />
+<TGConnectingPoint num="2" id="3077" />
+<TGConnectingPoint num="3" id="3078" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg1.data = duration" />
+<actions value="msg = sencrypt(msg1, PSK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3121" >
-<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="3081" />
-<TGConnectingPoint num="1" id="3082" />
-<TGConnectingPoint num="2" id="3083" />
-<TGConnectingPoint num="3" id="3084" />
-<TGConnectingPoint num="4" id="3085" />
-<TGConnectingPoint num="5" id="3086" />
-<TGConnectingPoint num="6" id="3087" />
-<TGConnectingPoint num="7" id="3088" />
-<TGConnectingPoint num="8" id="3089" />
-<TGConnectingPoint num="9" id="3090" />
-<TGConnectingPoint num="10" id="3091" />
-<TGConnectingPoint num="11" id="3092" />
-<TGConnectingPoint num="12" id="3093" />
-<TGConnectingPoint num="13" id="3094" />
-<TGConnectingPoint num="14" id="3095" />
-<TGConnectingPoint num="15" id="3096" />
-<TGConnectingPoint num="16" id="3097" />
-<TGConnectingPoint num="17" id="3098" />
-<TGConnectingPoint num="18" id="3099" />
-<TGConnectingPoint num="19" id="3100" />
-<TGConnectingPoint num="20" id="3101" />
-<TGConnectingPoint num="21" id="3102" />
-<TGConnectingPoint num="22" id="3103" />
-<TGConnectingPoint num="23" id="3104" />
-<TGConnectingPoint num="24" id="3105" />
-<TGConnectingPoint num="25" id="3106" />
-<TGConnectingPoint num="26" id="3107" />
-<TGConnectingPoint num="27" id="3108" />
-<TGConnectingPoint num="28" id="3109" />
-<TGConnectingPoint num="29" id="3110" />
-<TGConnectingPoint num="30" id="3111" />
-<TGConnectingPoint num="31" id="3112" />
-<TGConnectingPoint num="32" id="3113" />
-<TGConnectingPoint num="33" id="3114" />
-<TGConnectingPoint num="34" id="3115" />
-<TGConnectingPoint num="35" id="3116" />
-<TGConnectingPoint num="36" id="3117" />
-<TGConnectingPoint num="37" id="3118" />
-<TGConnectingPoint num="38" id="3119" />
-<TGConnectingPoint num="39" id="3120" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3123" >
-<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="3122" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="WirelessInterface" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3130" >
-<cdparam x="466" y="419" />
+<CONNECTOR type="5102" id="3088" >
+<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 Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="3129" />
-<P1  x="449" y="422" id="3153" />
-<P2  x="460" y="455" id="3204" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3087" />
+<P1  x="325" y="213" id="3159" />
+<P2  x="347" y="291" id="3196" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3128" >
-<father id="3130" num="0" />
-<cdparam x="466" y="459" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3086" >
+<father id="3088" num="0" />
+<cdparam x="364" y="248" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam 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" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3137" >
-<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="3136" />
-<P1  x="414" y="275" id="3169" />
-<P2  x="449" y="392" id="3152" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3135" >
-<father id="3137" 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="3131" />
-<TGConnectingPoint num="1" id="3132" />
-<TGConnectingPoint num="2" id="3133" />
-<TGConnectingPoint num="3" id="3134" />
+<TGConnectingPoint num="0" id="3082" />
+<TGConnectingPoint num="1" id="3083" />
+<TGConnectingPoint num="2" id="3084" />
+<TGConnectingPoint num="3" id="3085" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg2 = sdecrypt(msg2, PSK)" />
-<actions value="selectedDuration = msg2.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3144" >
-<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="3143" />
-<P1  x="386" y="101" id="3217" />
-<P2  x="401" y="161" id="3206" />
+<CONNECTOR type="5102" id="3095" >
+<cdparam x="347" y="321" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3094" />
+<P1  x="347" y="321" id="3197" />
+<P2  x="348" y="377" id="3111" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3142" >
-<father id="3144" num="0" />
-<cdparam x="386" y="141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3093" >
+<father id="3095" 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="3138" />
-<TGConnectingPoint num="1" id="3139" />
-<TGConnectingPoint num="2" id="3140" />
-<TGConnectingPoint num="3" id="3141" />
+<TGConnectingPoint num="0" id="3089" />
+<TGConnectingPoint num="1" id="3090" />
+<TGConnectingPoint num="2" id="3091" />
+<TGConnectingPoint num="3" id="3092" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6397,25 +6275,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3151" >
-<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="3150" />
-<P1  x="401" y="191" id="3207" />
-<P2  x="414" y="225" id="3164" />
+<CONNECTOR type="5102" id="3102" >
+<cdparam x="373" 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="3101" />
+<P1  x="373" y="427" id="3109" />
+<P2  x="375" y="442" id="3194" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3149" >
-<father id="3151" num="0" />
-<cdparam x="453" y="214" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3100" >
+<father id="3102" num="0" />
+<cdparam x="373" y="467" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3145" />
-<TGConnectingPoint num="1" id="3146" />
-<TGConnectingPoint num="2" id="3147" />
-<TGConnectingPoint num="3" id="3148" />
+<TGConnectingPoint num="0" id="3096" />
+<TGConnectingPoint num="1" id="3097" />
+<TGConnectingPoint num="2" id="3098" />
+<TGConnectingPoint num="3" id="3099" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6425,278 +6303,391 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3162" >
-<cdparam x="358" y="397" />
-<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3143" >
+<cdparam x="323" y="377" />
+<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="Send signal" value="remoteStart(selectedDuration)" />
-<TGConnectingPoint num="0" id="3152" />
-<TGConnectingPoint num="1" id="3153" />
-<TGConnectingPoint num="2" id="3154" />
-<TGConnectingPoint num="3" id="3155" />
-<TGConnectingPoint num="4" id="3156" />
-<TGConnectingPoint num="5" id="3157" />
-<TGConnectingPoint num="6" id="3158" />
-<TGConnectingPoint num="7" id="3159" />
-<TGConnectingPoint num="8" id="3160" />
-<TGConnectingPoint num="9" id="3161" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3203" >
-<cdparam x="348" y="225" />
-<sizeparam width="133" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="Msg1Sent" />
+<TGConnectingPoint num="0" id="3103" />
+<TGConnectingPoint num="1" id="3104" />
+<TGConnectingPoint num="2" id="3105" />
+<TGConnectingPoint num="3" id="3106" />
+<TGConnectingPoint num="4" id="3107" />
+<TGConnectingPoint num="5" id="3108" />
+<TGConnectingPoint num="6" id="3109" />
+<TGConnectingPoint num="7" id="3110" />
+<TGConnectingPoint num="8" id="3111" />
+<TGConnectingPoint num="9" id="3112" />
+<TGConnectingPoint num="10" id="3113" />
+<TGConnectingPoint num="11" id="3114" />
+<TGConnectingPoint num="12" id="3115" />
+<TGConnectingPoint num="13" id="3116" />
+<TGConnectingPoint num="14" id="3117" />
+<TGConnectingPoint num="15" id="3118" />
+<TGConnectingPoint num="16" id="3119" />
+<TGConnectingPoint num="17" id="3120" />
+<TGConnectingPoint num="18" id="3121" />
+<TGConnectingPoint num="19" id="3122" />
+<TGConnectingPoint num="20" id="3123" />
+<TGConnectingPoint num="21" id="3124" />
+<TGConnectingPoint num="22" id="3125" />
+<TGConnectingPoint num="23" id="3126" />
+<TGConnectingPoint num="24" id="3127" />
+<TGConnectingPoint num="25" id="3128" />
+<TGConnectingPoint num="26" id="3129" />
+<TGConnectingPoint num="27" id="3130" />
+<TGConnectingPoint num="28" id="3131" />
+<TGConnectingPoint num="29" id="3132" />
+<TGConnectingPoint num="30" id="3133" />
+<TGConnectingPoint num="31" id="3134" />
+<TGConnectingPoint num="32" id="3135" />
+<TGConnectingPoint num="33" id="3136" />
+<TGConnectingPoint num="34" id="3137" />
+<TGConnectingPoint num="35" id="3138" />
+<TGConnectingPoint num="36" id="3139" />
+<TGConnectingPoint num="37" id="3140" />
+<TGConnectingPoint num="38" id="3141" />
+<TGConnectingPoint num="39" id="3142" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="301" id="3152" >
+<cdparam x="661" y="78" />
+<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="state0" value="gotWirelessOrder" />
-<TGConnectingPoint num="0" id="3163" />
-<TGConnectingPoint num="1" id="3164" />
-<TGConnectingPoint num="2" id="3165" />
-<TGConnectingPoint num="3" id="3166" />
-<TGConnectingPoint num="4" id="3167" />
-<TGConnectingPoint num="5" id="3168" />
-<TGConnectingPoint num="6" id="3169" />
-<TGConnectingPoint num="7" id="3170" />
-<TGConnectingPoint num="8" id="3171" />
-<TGConnectingPoint num="9" id="3172" />
-<TGConnectingPoint num="10" id="3173" />
-<TGConnectingPoint num="11" id="3174" />
-<TGConnectingPoint num="12" id="3175" />
-<TGConnectingPoint num="13" id="3176" />
-<TGConnectingPoint num="14" id="3177" />
-<TGConnectingPoint num="15" id="3178" />
-<TGConnectingPoint num="16" id="3179" />
-<TGConnectingPoint num="17" id="3180" />
-<TGConnectingPoint num="18" id="3181" />
-<TGConnectingPoint num="19" id="3182" />
-<TGConnectingPoint num="20" id="3183" />
-<TGConnectingPoint num="21" id="3184" />
-<TGConnectingPoint num="22" id="3185" />
-<TGConnectingPoint num="23" id="3186" />
-<TGConnectingPoint num="24" id="3187" />
-<TGConnectingPoint num="25" id="3188" />
-<TGConnectingPoint num="26" id="3189" />
-<TGConnectingPoint num="27" id="3190" />
-<TGConnectingPoint num="28" id="3191" />
-<TGConnectingPoint num="29" id="3192" />
-<TGConnectingPoint num="30" id="3193" />
-<TGConnectingPoint num="31" id="3194" />
-<TGConnectingPoint num="32" id="3195" />
-<TGConnectingPoint num="33" id="3196" />
-<TGConnectingPoint num="34" id="3197" />
-<TGConnectingPoint num="35" id="3198" />
-<TGConnectingPoint num="36" id="3199" />
-<TGConnectingPoint num="37" id="3200" />
-<TGConnectingPoint num="38" id="3201" />
-<TGConnectingPoint num="39" id="3202" />
+<infoparam name="UML Note" value="Encrypting data with the pre shared key
+" />
+<TGConnectingPoint num="0" id="3144" />
+<TGConnectingPoint num="1" id="3145" />
+<TGConnectingPoint num="2" id="3146" />
+<TGConnectingPoint num="3" id="3147" />
+<TGConnectingPoint num="4" id="3148" />
+<TGConnectingPoint num="5" id="3149" />
+<TGConnectingPoint num="6" id="3150" />
+<TGConnectingPoint num="7" id="3151" />
 <extraparam>
-<entryCode value="printf(&quot;Got duration from remote control :%d\n&quot;, msg2__data);" />
+<Line value="Encrypting data with the pre shared key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="3205" >
-<cdparam x="450" y="460" />
+<COMPONENT type="5106" id="3193" >
+<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="3153" />
+<TGConnectingPoint num="1" id="3154" />
+<TGConnectingPoint num="2" id="3155" />
+<TGConnectingPoint num="3" id="3156" />
+<TGConnectingPoint num="4" id="3157" />
+<TGConnectingPoint num="5" id="3158" />
+<TGConnectingPoint num="6" id="3159" />
+<TGConnectingPoint num="7" id="3160" />
+<TGConnectingPoint num="8" id="3161" />
+<TGConnectingPoint num="9" id="3162" />
+<TGConnectingPoint num="10" id="3163" />
+<TGConnectingPoint num="11" id="3164" />
+<TGConnectingPoint num="12" id="3165" />
+<TGConnectingPoint num="13" id="3166" />
+<TGConnectingPoint num="14" id="3167" />
+<TGConnectingPoint num="15" id="3168" />
+<TGConnectingPoint num="16" id="3169" />
+<TGConnectingPoint num="17" id="3170" />
+<TGConnectingPoint num="18" id="3171" />
+<TGConnectingPoint num="19" id="3172" />
+<TGConnectingPoint num="20" id="3173" />
+<TGConnectingPoint num="21" id="3174" />
+<TGConnectingPoint num="22" id="3175" />
+<TGConnectingPoint num="23" id="3176" />
+<TGConnectingPoint num="24" id="3177" />
+<TGConnectingPoint num="25" id="3178" />
+<TGConnectingPoint num="26" id="3179" />
+<TGConnectingPoint num="27" id="3180" />
+<TGConnectingPoint num="28" id="3181" />
+<TGConnectingPoint num="29" id="3182" />
+<TGConnectingPoint num="30" id="3183" />
+<TGConnectingPoint num="31" id="3184" />
+<TGConnectingPoint num="32" id="3185" />
+<TGConnectingPoint num="33" id="3186" />
+<TGConnectingPoint num="34" id="3187" />
+<TGConnectingPoint num="35" id="3188" />
+<TGConnectingPoint num="36" id="3189" />
+<TGConnectingPoint num="37" id="3190" />
+<TGConnectingPoint num="38" id="3191" />
+<TGConnectingPoint num="39" id="3192" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="3195" >
+<cdparam x="365" 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="3204" />
+<TGConnectingPoint num="0" id="3194" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="3216" >
-<cdparam x="311" y="166" />
-<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3206" >
+<cdparam x="266" y="296" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="wirelessChannelRead(msg2)" />
-<TGConnectingPoint num="0" id="3206" />
-<TGConnectingPoint num="1" id="3207" />
-<TGConnectingPoint num="2" id="3208" />
-<TGConnectingPoint num="3" id="3209" />
-<TGConnectingPoint num="4" id="3210" />
-<TGConnectingPoint num="5" id="3211" />
-<TGConnectingPoint num="6" id="3212" />
-<TGConnectingPoint num="7" id="3213" />
-<TGConnectingPoint num="8" id="3214" />
-<TGConnectingPoint num="9" id="3215" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3218" >
-<cdparam x="379" y="81" />
+<infoparam name="Send signal" value="wirelessChannelWrite(msg)" />
+<TGConnectingPoint num="0" id="3196" />
+<TGConnectingPoint num="1" id="3197" />
+<TGConnectingPoint num="2" id="3198" />
+<TGConnectingPoint num="3" id="3199" />
+<TGConnectingPoint num="4" id="3200" />
+<TGConnectingPoint num="5" id="3201" />
+<TGConnectingPoint num="6" id="3202" />
+<TGConnectingPoint num="7" id="3203" />
+<TGConnectingPoint num="8" id="3204" />
+<TGConnectingPoint num="9" id="3205" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3208" >
+<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="3217" />
+<TGConnectingPoint num="0" id="3207" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3225" >
-<cdparam x="407" y="209" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3224" />
-<P1  x="407" y="209" id="3313" />
-<P2  x="407" y="290" id="3261" />
+<AVATARStateMachineDiagramPanel name="MicroWaveOven" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3215" >
+<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="3214" />
+<P1  x="407" y="70" id="3257" />
+<P2  x="451" y="106" id="3217" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3223" >
-<father id="3225" num="0" />
-<cdparam x="407" y="249" />
-<sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3213" >
+<father id="3215" 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="3219" />
-<TGConnectingPoint num="1" id="3220" />
-<TGConnectingPoint num="2" id="3221" />
-<TGConnectingPoint num="3" id="3222" />
+<TGConnectingPoint num="0" id="3209" />
+<TGConnectingPoint num="1" id="3210" />
+<TGConnectingPoint num="2" id="3211" />
+<TGConnectingPoint num="3" id="3212" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="openM()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3232" >
-<cdparam x="407" y="300" />
+<COMPONENT type="5106" id="3256" >
+<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="3216" />
+<TGConnectingPoint num="1" id="3217" />
+<TGConnectingPoint num="2" id="3218" />
+<TGConnectingPoint num="3" id="3219" />
+<TGConnectingPoint num="4" id="3220" />
+<TGConnectingPoint num="5" id="3221" />
+<TGConnectingPoint num="6" id="3222" />
+<TGConnectingPoint num="7" id="3223" />
+<TGConnectingPoint num="8" id="3224" />
+<TGConnectingPoint num="9" id="3225" />
+<TGConnectingPoint num="10" id="3226" />
+<TGConnectingPoint num="11" id="3227" />
+<TGConnectingPoint num="12" id="3228" />
+<TGConnectingPoint num="13" id="3229" />
+<TGConnectingPoint num="14" id="3230" />
+<TGConnectingPoint num="15" id="3231" />
+<TGConnectingPoint num="16" id="3232" />
+<TGConnectingPoint num="17" id="3233" />
+<TGConnectingPoint num="18" id="3234" />
+<TGConnectingPoint num="19" id="3235" />
+<TGConnectingPoint num="20" id="3236" />
+<TGConnectingPoint num="21" id="3237" />
+<TGConnectingPoint num="22" id="3238" />
+<TGConnectingPoint num="23" id="3239" />
+<TGConnectingPoint num="24" id="3240" />
+<TGConnectingPoint num="25" id="3241" />
+<TGConnectingPoint num="26" id="3242" />
+<TGConnectingPoint num="27" id="3243" />
+<TGConnectingPoint num="28" id="3244" />
+<TGConnectingPoint num="29" id="3245" />
+<TGConnectingPoint num="30" id="3246" />
+<TGConnectingPoint num="31" id="3247" />
+<TGConnectingPoint num="32" id="3248" />
+<TGConnectingPoint num="33" id="3249" />
+<TGConnectingPoint num="34" id="3250" />
+<TGConnectingPoint num="35" id="3251" />
+<TGConnectingPoint num="36" id="3252" />
+<TGConnectingPoint num="37" id="3253" />
+<TGConnectingPoint num="38" id="3254" />
+<TGConnectingPoint num="39" id="3255" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3258" >
+<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="3257" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3265" >
+<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 state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3231" />
-<P1  x="407" y="340" id="3266" />
-<P2  x="407" y="374" id="3301" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3264" />
+<P1  x="419" y="209" id="3335" />
+<P2  x="419" y="313" id="3294" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3230" >
-<father id="3232" num="0" />
-<cdparam x="414" y="365" />
-<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3263" >
+<father id="3265" 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="3226" />
-<TGConnectingPoint num="1" id="3227" />
-<TGConnectingPoint num="2" id="3228" />
-<TGConnectingPoint num="3" id="3229" />
+<TGConnectingPoint num="0" id="3259" />
+<TGConnectingPoint num="1" id="3260" />
+<TGConnectingPoint num="2" id="3261" />
+<TGConnectingPoint num="3" id="3262" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="2" />
-<afterMax value="3" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="runBell()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3245" >
-<cdparam x="407" y="277" />
+<CONNECTOR type="5102" id="3278" >
+<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="3241" />
-<TGConnectingPoint num="1" id="3242" />
-<TGConnectingPoint num="2" id="3243" />
-<TGConnectingPoint num="3" id="3244" />
-<P1  x="407" y="404" id="3302" />
-<P2  x="357" y="125" id="3326" />
-<Point x="300" y="404" />
-<Point x="300" y="278" />
-<Point x="300" y="125" />
+<TGConnectingPoint num="0" id="3274" />
+<TGConnectingPoint num="1" id="3275" />
+<TGConnectingPoint num="2" id="3276" />
+<TGConnectingPoint num="3" id="3277" />
+<P1  x="419" y="363" id="3299" />
+<P2  x="369" y="123" id="3348" />
+<Point x="412" y="419" />
+<Point x="332" y="419" />
+<Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3233" >
-<father id="3245" num="0" />
-<cdparam x="300" y="404" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3266" >
+<father id="3278" 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="3234" >
-<father id="3245" num="1" />
-<cdparam x="300" y="278" />
+<SUBCOMPONENT type="-1" id="3267" >
+<father id="3278" 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="3235" >
-<father id="3245" num="2" />
-<cdparam x="300" y="125" />
+<SUBCOMPONENT type="-1" id="3268" >
+<father id="3278" 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="3240" >
-<father id="3245" num="3" />
-<cdparam x="246" y="301" />
-<sizeparam width="47" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="3273" >
+<father id="3278" 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="3236" />
-<TGConnectingPoint num="1" id="3237" />
-<TGConnectingPoint num="2" id="3238" />
-<TGConnectingPoint num="3" id="3239" />
+<TGConnectingPoint num="0" id="3269" />
+<TGConnectingPoint num="1" id="3270" />
+<TGConnectingPoint num="2" id="3271" />
+<TGConnectingPoint num="3" id="3272" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="closeM()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3252" >
-<cdparam x="407" y="150" />
+<CONNECTOR type="5102" id="3285" >
+<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="3251" />
-<P1  x="407" y="150" id="3329" />
-<P2  x="407" y="179" id="3312" />
+<TGConnectingPoint num="0" id="3284" />
+<P1  x="419" y="148" id="3351" />
+<P2  x="419" y="179" id="3334" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3250" >
-<father id="3252" num="0" />
-<cdparam x="412" y="172" />
-<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3283" >
+<father id="3285" 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="3246" />
-<TGConnectingPoint num="1" id="3247" />
-<TGConnectingPoint num="2" id="3248" />
-<TGConnectingPoint num="3" id="3249" />
+<TGConnectingPoint num="0" id="3279" />
+<TGConnectingPoint num="1" id="3280" />
+<TGConnectingPoint num="2" id="3281" />
+<TGConnectingPoint num="3" id="3282" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="2" />
-<afterMax value="3" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3259" >
+<CONNECTOR type="5102" id="3292" >
 <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="3258" />
-<P1  x="407" y="70" id="3364" />
-<P2  x="407" y="100" id="3324" />
+<TGConnectingPoint num="0" id="3291" />
+<P1  x="407" y="70" id="3386" />
+<P2  x="419" y="98" id="3346" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3257" >
-<father id="3259" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3290" >
+<father id="3292" 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="3253" />
-<TGConnectingPoint num="1" id="3254" />
-<TGConnectingPoint num="2" id="3255" />
-<TGConnectingPoint num="3" id="3256" />
+<TGConnectingPoint num="0" id="3286" />
+<TGConnectingPoint num="1" id="3287" />
+<TGConnectingPoint num="2" id="3288" />
+<TGConnectingPoint num="3" id="3289" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6706,292 +6697,254 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3300" >
-<cdparam x="357" y="290" />
+<COMPONENT type="5106" id="3333" >
+<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="Opened" />
-<TGConnectingPoint num="0" id="3260" />
-<TGConnectingPoint num="1" id="3261" />
-<TGConnectingPoint num="2" id="3262" />
-<TGConnectingPoint num="3" id="3263" />
-<TGConnectingPoint num="4" id="3264" />
-<TGConnectingPoint num="5" id="3265" />
-<TGConnectingPoint num="6" id="3266" />
-<TGConnectingPoint num="7" id="3267" />
-<TGConnectingPoint num="8" id="3268" />
-<TGConnectingPoint num="9" id="3269" />
-<TGConnectingPoint num="10" id="3270" />
-<TGConnectingPoint num="11" id="3271" />
-<TGConnectingPoint num="12" id="3272" />
-<TGConnectingPoint num="13" id="3273" />
-<TGConnectingPoint num="14" id="3274" />
-<TGConnectingPoint num="15" id="3275" />
-<TGConnectingPoint num="16" id="3276" />
-<TGConnectingPoint num="17" id="3277" />
-<TGConnectingPoint num="18" id="3278" />
-<TGConnectingPoint num="19" id="3279" />
-<TGConnectingPoint num="20" id="3280" />
-<TGConnectingPoint num="21" id="3281" />
-<TGConnectingPoint num="22" id="3282" />
-<TGConnectingPoint num="23" id="3283" />
-<TGConnectingPoint num="24" id="3284" />
-<TGConnectingPoint num="25" id="3285" />
-<TGConnectingPoint num="26" id="3286" />
-<TGConnectingPoint num="27" id="3287" />
-<TGConnectingPoint num="28" id="3288" />
-<TGConnectingPoint num="29" id="3289" />
-<TGConnectingPoint num="30" id="3290" />
-<TGConnectingPoint num="31" id="3291" />
-<TGConnectingPoint num="32" id="3292" />
-<TGConnectingPoint num="33" id="3293" />
-<TGConnectingPoint num="34" id="3294" />
-<TGConnectingPoint num="35" id="3295" />
-<TGConnectingPoint num="36" id="3296" />
-<TGConnectingPoint num="37" id="3297" />
-<TGConnectingPoint num="38" id="3298" />
-<TGConnectingPoint num="39" id="3299" />
+<infoparam name="state0" value="Ringing" />
+<TGConnectingPoint num="0" id="3293" />
+<TGConnectingPoint num="1" id="3294" />
+<TGConnectingPoint num="2" id="3295" />
+<TGConnectingPoint num="3" id="3296" />
+<TGConnectingPoint num="4" id="3297" />
+<TGConnectingPoint num="5" id="3298" />
+<TGConnectingPoint num="6" id="3299" />
+<TGConnectingPoint num="7" id="3300" />
+<TGConnectingPoint num="8" id="3301" />
+<TGConnectingPoint num="9" id="3302" />
+<TGConnectingPoint num="10" id="3303" />
+<TGConnectingPoint num="11" id="3304" />
+<TGConnectingPoint num="12" id="3305" />
+<TGConnectingPoint num="13" id="3306" />
+<TGConnectingPoint num="14" id="3307" />
+<TGConnectingPoint num="15" id="3308" />
+<TGConnectingPoint num="16" id="3309" />
+<TGConnectingPoint num="17" id="3310" />
+<TGConnectingPoint num="18" id="3311" />
+<TGConnectingPoint num="19" id="3312" />
+<TGConnectingPoint num="20" id="3313" />
+<TGConnectingPoint num="21" id="3314" />
+<TGConnectingPoint num="22" id="3315" />
+<TGConnectingPoint num="23" id="3316" />
+<TGConnectingPoint num="24" id="3317" />
+<TGConnectingPoint num="25" id="3318" />
+<TGConnectingPoint num="26" id="3319" />
+<TGConnectingPoint num="27" id="3320" />
+<TGConnectingPoint num="28" id="3321" />
+<TGConnectingPoint num="29" id="3322" />
+<TGConnectingPoint num="30" id="3323" />
+<TGConnectingPoint num="31" id="3324" />
+<TGConnectingPoint num="32" id="3325" />
+<TGConnectingPoint num="33" id="3326" />
+<TGConnectingPoint num="34" id="3327" />
+<TGConnectingPoint num="35" id="3328" />
+<TGConnectingPoint num="36" id="3329" />
+<TGConnectingPoint num="37" id="3330" />
+<TGConnectingPoint num="38" id="3331" />
+<TGConnectingPoint num="39" id="3332" />
 <extraparam>
-<entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
+<entryCode value="" />
+<entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3311" >
-<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="3301" />
-<TGConnectingPoint num="1" id="3302" />
-<TGConnectingPoint num="2" id="3303" />
-<TGConnectingPoint num="3" id="3304" />
-<TGConnectingPoint num="4" id="3305" />
-<TGConnectingPoint num="5" id="3306" />
-<TGConnectingPoint num="6" id="3307" />
-<TGConnectingPoint num="7" id="3308" />
-<TGConnectingPoint num="8" id="3309" />
-<TGConnectingPoint num="9" id="3310" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3322" >
-<cdparam x="384" y="184" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3344" >
+<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="open()" />
-<TGConnectingPoint num="0" id="3312" />
-<TGConnectingPoint num="1" id="3313" />
-<TGConnectingPoint num="2" id="3314" />
-<TGConnectingPoint num="3" id="3315" />
-<TGConnectingPoint num="4" id="3316" />
-<TGConnectingPoint num="5" id="3317" />
-<TGConnectingPoint num="6" id="3318" />
-<TGConnectingPoint num="7" id="3319" />
-<TGConnectingPoint num="8" id="3320" />
-<TGConnectingPoint num="9" id="3321" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3363" >
-<cdparam x="357" y="100" />
+<infoparam name="Send signal" value="ring()" />
+<TGConnectingPoint num="0" id="3334" />
+<TGConnectingPoint num="1" id="3335" />
+<TGConnectingPoint num="2" id="3336" />
+<TGConnectingPoint num="3" id="3337" />
+<TGConnectingPoint num="4" id="3338" />
+<TGConnectingPoint num="5" id="3339" />
+<TGConnectingPoint num="6" id="3340" />
+<TGConnectingPoint num="7" id="3341" />
+<TGConnectingPoint num="8" id="3342" />
+<TGConnectingPoint num="9" id="3343" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3385" >
+<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="IDLE" />
-<TGConnectingPoint num="0" id="3323" />
-<TGConnectingPoint num="1" id="3324" />
-<TGConnectingPoint num="2" id="3325" />
-<TGConnectingPoint num="3" id="3326" />
-<TGConnectingPoint num="4" id="3327" />
-<TGConnectingPoint num="5" id="3328" />
-<TGConnectingPoint num="6" id="3329" />
-<TGConnectingPoint num="7" id="3330" />
-<TGConnectingPoint num="8" id="3331" />
-<TGConnectingPoint num="9" id="3332" />
-<TGConnectingPoint num="10" id="3333" />
-<TGConnectingPoint num="11" id="3334" />
-<TGConnectingPoint num="12" id="3335" />
-<TGConnectingPoint num="13" id="3336" />
-<TGConnectingPoint num="14" id="3337" />
-<TGConnectingPoint num="15" id="3338" />
-<TGConnectingPoint num="16" id="3339" />
-<TGConnectingPoint num="17" id="3340" />
-<TGConnectingPoint num="18" id="3341" />
-<TGConnectingPoint num="19" id="3342" />
-<TGConnectingPoint num="20" id="3343" />
-<TGConnectingPoint num="21" id="3344" />
-<TGConnectingPoint num="22" id="3345" />
-<TGConnectingPoint num="23" id="3346" />
-<TGConnectingPoint num="24" id="3347" />
-<TGConnectingPoint num="25" id="3348" />
-<TGConnectingPoint num="26" id="3349" />
-<TGConnectingPoint num="27" id="3350" />
-<TGConnectingPoint num="28" id="3351" />
-<TGConnectingPoint num="29" id="3352" />
-<TGConnectingPoint num="30" id="3353" />
-<TGConnectingPoint num="31" id="3354" />
-<TGConnectingPoint num="32" id="3355" />
-<TGConnectingPoint num="33" id="3356" />
-<TGConnectingPoint num="34" id="3357" />
-<TGConnectingPoint num="35" id="3358" />
-<TGConnectingPoint num="36" id="3359" />
-<TGConnectingPoint num="37" id="3360" />
-<TGConnectingPoint num="38" id="3361" />
-<TGConnectingPoint num="39" id="3362" />
-<extraparam>
-<entryCode value="printf(&quot;Door is closed\n&quot;);" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3365" >
+<infoparam name="state0" value="Active" />
+<TGConnectingPoint num="0" id="3345" />
+<TGConnectingPoint num="1" id="3346" />
+<TGConnectingPoint num="2" id="3347" />
+<TGConnectingPoint num="3" id="3348" />
+<TGConnectingPoint num="4" id="3349" />
+<TGConnectingPoint num="5" id="3350" />
+<TGConnectingPoint num="6" id="3351" />
+<TGConnectingPoint num="7" id="3352" />
+<TGConnectingPoint num="8" id="3353" />
+<TGConnectingPoint num="9" id="3354" />
+<TGConnectingPoint num="10" id="3355" />
+<TGConnectingPoint num="11" id="3356" />
+<TGConnectingPoint num="12" id="3357" />
+<TGConnectingPoint num="13" id="3358" />
+<TGConnectingPoint num="14" id="3359" />
+<TGConnectingPoint num="15" id="3360" />
+<TGConnectingPoint num="16" id="3361" />
+<TGConnectingPoint num="17" id="3362" />
+<TGConnectingPoint num="18" id="3363" />
+<TGConnectingPoint num="19" id="3364" />
+<TGConnectingPoint num="20" id="3365" />
+<TGConnectingPoint num="21" id="3366" />
+<TGConnectingPoint num="22" id="3367" />
+<TGConnectingPoint num="23" id="3368" />
+<TGConnectingPoint num="24" id="3369" />
+<TGConnectingPoint num="25" id="3370" />
+<TGConnectingPoint num="26" id="3371" />
+<TGConnectingPoint num="27" id="3372" />
+<TGConnectingPoint num="28" id="3373" />
+<TGConnectingPoint num="29" id="3374" />
+<TGConnectingPoint num="30" id="3375" />
+<TGConnectingPoint num="31" id="3376" />
+<TGConnectingPoint num="32" id="3377" />
+<TGConnectingPoint num="33" id="3378" />
+<TGConnectingPoint num="34" id="3379" />
+<TGConnectingPoint num="35" id="3380" />
+<TGConnectingPoint num="36" id="3381" />
+<TGConnectingPoint num="37" id="3382" />
+<TGConnectingPoint num="38" id="3383" />
+<TGConnectingPoint num="39" id="3384" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3387" >
 <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="3364" />
+<TGConnectingPoint num="0" id="3386" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3378" >
-<cdparam x="407" y="380" />
+<AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3400" >
+<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="3374" />
-<TGConnectingPoint num="1" id="3375" />
-<TGConnectingPoint num="2" id="3376" />
-<TGConnectingPoint num="3" id="3377" />
-<P1  x="407" y="310" id="3408" />
-<P2  x="365" y="113" id="3475" />
-<Point x="407" y="327" />
-<Point x="323" y="327" />
-<Point x="323" y="113" />
+<TGConnectingPoint num="0" id="3396" />
+<TGConnectingPoint num="1" id="3397" />
+<TGConnectingPoint num="2" id="3398" />
+<TGConnectingPoint num="3" id="3399" />
+<P1  x="504" y="232" id="3459" />
+<P2  x="454" y="123" id="3420" />
+<Point x="503" y="254" />
+<Point x="425" y="254" />
+<Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3366" >
-<father id="3378" num="0" />
-<cdparam x="407" y="327" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3388" >
+<father id="3400" 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="3367" >
-<father id="3378" num="1" />
-<cdparam x="323" y="327" />
+<SUBCOMPONENT type="-1" id="3389" >
+<father id="3400" 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="3368" >
-<father id="3378" num="2" />
-<cdparam x="323" y="113" />
+<SUBCOMPONENT type="-1" id="3390" >
+<father id="3400" 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="3373" >
-<father id="3378" num="3" />
-<cdparam x="418" y="343" />
-<sizeparam width="29" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="3395" >
+<father id="3400" 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="3369" />
-<TGConnectingPoint num="1" id="3370" />
-<TGConnectingPoint num="2" id="3371" />
-<TGConnectingPoint num="3" id="3372" />
+<TGConnectingPoint num="0" id="3391" />
+<TGConnectingPoint num="1" id="3392" />
+<TGConnectingPoint num="2" id="3393" />
+<TGConnectingPoint num="3" id="3394" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[  ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="OFF()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3385" >
-<cdparam x="411" y="243" />
+<CONNECTOR type="5102" id="3409" >
+<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 state1 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3384" />
-<P1  x="408" y="242" id="3424" />
-<P2  x="407" y="280" id="3407" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3407" />
+<TGConnectingPoint num="1" id="3408" />
+<P1  x="504" y="148" id="3423" />
+<P2  x="504" y="202" id="3458" />
+<Point x="504" y="175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3383" >
-<father id="3385" num="0" />
-<cdparam x="411" y="283" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3401" >
+<father id="3409" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3379" />
-<TGConnectingPoint num="1" id="3380" />
-<TGConnectingPoint num="2" id="3381" />
-<TGConnectingPoint num="3" id="3382" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3392" >
-<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="3391" />
-<P1  x="407" y="183" id="3460" />
-<P2  x="408" y="202" id="3419" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3390" >
-<father id="3392" num="0" />
-<cdparam x="417" y="195" />
-<sizeparam width="26" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="3406" >
+<father id="3409" 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="3386" />
-<TGConnectingPoint num="1" id="3387" />
-<TGConnectingPoint num="2" id="3388" />
-<TGConnectingPoint num="3" id="3389" />
+<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="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="ON()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3399" >
-<cdparam x="393" y="131" />
+<CONNECTOR type="5102" id="3416" >
+<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 state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3398" />
-<P1  x="407" y="131" id="3478" />
-<P2  x="407" y="153" id="3459" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="3415" />
+<P1  x="481" y="74" id="3469" />
+<P2  x="504" y="98" id="3418" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3397" >
-<father id="3399" num="0" />
-<cdparam x="393" y="171" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3414" >
+<father id="3416" 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="3393" />
-<TGConnectingPoint num="1" id="3394" />
-<TGConnectingPoint num="2" id="3395" />
-<TGConnectingPoint num="3" id="3396" />
+<TGConnectingPoint num="0" id="3410" />
+<TGConnectingPoint num="1" id="3411" />
+<TGConnectingPoint num="2" id="3412" />
+<TGConnectingPoint num="3" id="3413" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7001,204 +6954,134 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3406" >
-<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="3405" />
-<P1  x="407" y="70" id="3470" />
-<P2  x="407" y="96" id="3473" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3404" >
-<father id="3406" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3457" >
+<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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3400" />
-<TGConnectingPoint num="1" id="3401" />
-<TGConnectingPoint num="2" id="3402" />
-<TGConnectingPoint num="3" id="3403" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5104" id="3417" >
-<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="3407" />
-<TGConnectingPoint num="1" id="3408" />
-<TGConnectingPoint num="2" id="3409" />
-<TGConnectingPoint num="3" id="3410" />
-<TGConnectingPoint num="4" id="3411" />
-<TGConnectingPoint num="5" id="3412" />
-<TGConnectingPoint num="6" id="3413" />
-<TGConnectingPoint num="7" id="3414" />
-<TGConnectingPoint num="8" id="3415" />
-<TGConnectingPoint num="9" id="3416" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3458" >
-<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="3418" />
-<TGConnectingPoint num="1" id="3419" />
-<TGConnectingPoint num="2" id="3420" />
-<TGConnectingPoint num="3" id="3421" />
-<TGConnectingPoint num="4" id="3422" />
-<TGConnectingPoint num="5" id="3423" />
-<TGConnectingPoint num="6" id="3424" />
-<TGConnectingPoint num="7" id="3425" />
-<TGConnectingPoint num="8" id="3426" />
-<TGConnectingPoint num="9" id="3427" />
-<TGConnectingPoint num="10" id="3428" />
-<TGConnectingPoint num="11" id="3429" />
-<TGConnectingPoint num="12" id="3430" />
-<TGConnectingPoint num="13" id="3431" />
-<TGConnectingPoint num="14" id="3432" />
-<TGConnectingPoint num="15" id="3433" />
-<TGConnectingPoint num="16" id="3434" />
-<TGConnectingPoint num="17" id="3435" />
-<TGConnectingPoint num="18" id="3436" />
-<TGConnectingPoint num="19" id="3437" />
-<TGConnectingPoint num="20" id="3438" />
-<TGConnectingPoint num="21" id="3439" />
-<TGConnectingPoint num="22" id="3440" />
-<TGConnectingPoint num="23" id="3441" />
-<TGConnectingPoint num="24" id="3442" />
-<TGConnectingPoint num="25" id="3443" />
-<TGConnectingPoint num="26" id="3444" />
-<TGConnectingPoint num="27" id="3445" />
-<TGConnectingPoint num="28" id="3446" />
-<TGConnectingPoint num="29" id="3447" />
-<TGConnectingPoint num="30" id="3448" />
-<TGConnectingPoint num="31" id="3449" />
-<TGConnectingPoint num="32" id="3450" />
-<TGConnectingPoint num="33" id="3451" />
-<TGConnectingPoint num="34" id="3452" />
-<TGConnectingPoint num="35" id="3453" />
-<TGConnectingPoint num="36" id="3454" />
-<TGConnectingPoint num="37" id="3455" />
-<TGConnectingPoint num="38" id="3456" />
-<TGConnectingPoint num="39" id="3457" />
-<extraparam>
-<entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="3469" >
-<cdparam x="376" y="158" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="Active" />
+<TGConnectingPoint num="0" id="3417" />
+<TGConnectingPoint num="1" id="3418" />
+<TGConnectingPoint num="2" id="3419" />
+<TGConnectingPoint num="3" id="3420" />
+<TGConnectingPoint num="4" id="3421" />
+<TGConnectingPoint num="5" id="3422" />
+<TGConnectingPoint num="6" id="3423" />
+<TGConnectingPoint num="7" id="3424" />
+<TGConnectingPoint num="8" id="3425" />
+<TGConnectingPoint num="9" id="3426" />
+<TGConnectingPoint num="10" id="3427" />
+<TGConnectingPoint num="11" id="3428" />
+<TGConnectingPoint num="12" id="3429" />
+<TGConnectingPoint num="13" id="3430" />
+<TGConnectingPoint num="14" id="3431" />
+<TGConnectingPoint num="15" id="3432" />
+<TGConnectingPoint num="16" id="3433" />
+<TGConnectingPoint num="17" id="3434" />
+<TGConnectingPoint num="18" id="3435" />
+<TGConnectingPoint num="19" id="3436" />
+<TGConnectingPoint num="20" id="3437" />
+<TGConnectingPoint num="21" id="3438" />
+<TGConnectingPoint num="22" id="3439" />
+<TGConnectingPoint num="23" id="3440" />
+<TGConnectingPoint num="24" id="3441" />
+<TGConnectingPoint num="25" id="3442" />
+<TGConnectingPoint num="26" id="3443" />
+<TGConnectingPoint num="27" id="3444" />
+<TGConnectingPoint num="28" id="3445" />
+<TGConnectingPoint num="29" id="3446" />
+<TGConnectingPoint num="30" id="3447" />
+<TGConnectingPoint num="31" id="3448" />
+<TGConnectingPoint num="32" id="3449" />
+<TGConnectingPoint num="33" id="3450" />
+<TGConnectingPoint num="34" id="3451" />
+<TGConnectingPoint num="35" id="3452" />
+<TGConnectingPoint num="36" id="3453" />
+<TGConnectingPoint num="37" id="3454" />
+<TGConnectingPoint num="38" id="3455" />
+<TGConnectingPoint num="39" id="3456" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3468" >
+<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="startM()" />
-<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="5100" id="3471" >
-<cdparam x="400" y="50" />
+<infoparam name="Send signal" value="startButton(duration)" />
+<TGConnectingPoint num="0" id="3458" />
+<TGConnectingPoint num="1" id="3459" />
+<TGConnectingPoint num="2" id="3460" />
+<TGConnectingPoint num="3" id="3461" />
+<TGConnectingPoint num="4" id="3462" />
+<TGConnectingPoint num="5" id="3463" />
+<TGConnectingPoint num="6" id="3464" />
+<TGConnectingPoint num="7" id="3465" />
+<TGConnectingPoint num="8" id="3466" />
+<TGConnectingPoint num="9" id="3467" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3470" >
+<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="3470" />
+<TGConnectingPoint num="0" id="3469" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3512" >
-<cdparam x="365" y="96" />
-<sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3477" >
+<cdparam x="671" y="552" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="3476" />
+<P1  x="671" y="552" id="3927" />
+<P2  x="671" y="557" id="4052" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3475" >
+<father id="3477" num="0" />
+<cdparam x="671" y="592" />
+<sizeparam width="10" height="15" minWidth="0" 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="WaitForStart" />
-<TGConnectingPoint num="0" id="3472" />
-<TGConnectingPoint num="1" id="3473" />
-<TGConnectingPoint num="2" id="3474" />
-<TGConnectingPoint num="3" id="3475" />
-<TGConnectingPoint num="4" id="3476" />
-<TGConnectingPoint num="5" id="3477" />
-<TGConnectingPoint num="6" id="3478" />
-<TGConnectingPoint num="7" id="3479" />
-<TGConnectingPoint num="8" id="3480" />
-<TGConnectingPoint num="9" id="3481" />
-<TGConnectingPoint num="10" id="3482" />
-<TGConnectingPoint num="11" id="3483" />
-<TGConnectingPoint num="12" id="3484" />
-<TGConnectingPoint num="13" id="3485" />
-<TGConnectingPoint num="14" id="3486" />
-<TGConnectingPoint num="15" id="3487" />
-<TGConnectingPoint num="16" id="3488" />
-<TGConnectingPoint num="17" id="3489" />
-<TGConnectingPoint num="18" id="3490" />
-<TGConnectingPoint num="19" id="3491" />
-<TGConnectingPoint num="20" id="3492" />
-<TGConnectingPoint num="21" id="3493" />
-<TGConnectingPoint num="22" id="3494" />
-<TGConnectingPoint num="23" id="3495" />
-<TGConnectingPoint num="24" id="3496" />
-<TGConnectingPoint num="25" id="3497" />
-<TGConnectingPoint num="26" id="3498" />
-<TGConnectingPoint num="27" id="3499" />
-<TGConnectingPoint num="28" id="3500" />
-<TGConnectingPoint num="29" id="3501" />
-<TGConnectingPoint num="30" id="3502" />
-<TGConnectingPoint num="31" id="3503" />
-<TGConnectingPoint num="32" id="3504" />
-<TGConnectingPoint num="33" id="3505" />
-<TGConnectingPoint num="34" id="3506" />
-<TGConnectingPoint num="35" id="3507" />
-<TGConnectingPoint num="36" id="3508" />
-<TGConnectingPoint num="37" id="3509" />
-<TGConnectingPoint num="38" id="3510" />
-<TGConnectingPoint num="39" id="3511" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3471" />
+<TGConnectingPoint num="1" id="3472" />
+<TGConnectingPoint num="2" id="3473" />
+<TGConnectingPoint num="3" id="3474" />
 <extraparam>
-<entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
+</SUBCOMPONENT>
 
-<AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3519" >
+<CONNECTOR type="5102" id="3484" >
 <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="3518" />
-<P1  x="671" y="540" id="3716" />
-<P2  x="671" y="551" id="3972" />
+<TGConnectingPoint num="0" id="3483" />
+<P1  x="671" y="518" id="3681" />
+<P2  x="671" y="522" id="3926" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3517" >
-<father id="3519" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3482" >
+<father id="3484" 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="3513" />
-<TGConnectingPoint num="1" id="3514" />
-<TGConnectingPoint num="2" id="3515" />
-<TGConnectingPoint num="3" id="3516" />
+<TGConnectingPoint num="0" id="3478" />
+<TGConnectingPoint num="1" id="3479" />
+<TGConnectingPoint num="2" id="3480" />
+<TGConnectingPoint num="3" id="3481" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7208,25 +7091,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3526" >
+<CONNECTOR type="5102" id="3491" >
 <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="3525" />
-<P1  x="671" y="332" id="3727" />
-<P2  x="671" y="345" id="3950" />
+<TGConnectingPoint num="0" id="3490" />
+<P1  x="671" y="332" id="3692" />
+<P2  x="671" y="345" id="3904" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3524" >
-<father id="3526" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3489" >
+<father id="3491" 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="3520" />
-<TGConnectingPoint num="1" id="3521" />
-<TGConnectingPoint num="2" id="3522" />
-<TGConnectingPoint num="3" id="3523" />
+<TGConnectingPoint num="0" id="3485" />
+<TGConnectingPoint num="1" id="3486" />
+<TGConnectingPoint num="2" id="3487" />
+<TGConnectingPoint num="3" id="3488" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7236,25 +7119,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3533" >
+<CONNECTOR type="5102" id="3498" >
 <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="3532" />
-<P1  x="428" y="380" id="3738" />
-<P2  x="428" y="395" id="3834" />
+<TGConnectingPoint num="0" id="3497" />
+<P1  x="428" y="380" id="4064" />
+<P2  x="428" y="395" id="3788" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3531" >
-<father id="3533" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3496" >
+<father id="3498" 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="3527" />
-<TGConnectingPoint num="1" id="3528" />
-<TGConnectingPoint num="2" id="3529" />
-<TGConnectingPoint num="3" id="3530" />
+<TGConnectingPoint num="0" id="3492" />
+<TGConnectingPoint num="1" id="3493" />
+<TGConnectingPoint num="2" id="3494" />
+<TGConnectingPoint num="3" id="3495" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7264,25 +7147,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3540" >
+<CONNECTOR type="5102" id="3505" >
 <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="3539" />
-<P1  x="661" y="175" id="4006" />
-<P2  x="661" y="180" id="3748" />
+<TGConnectingPoint num="0" id="3504" />
+<P1  x="661" y="175" id="3960" />
+<P2  x="661" y="180" id="3702" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3538" >
-<father id="3540" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3503" >
+<father id="3505" 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="3534" />
-<TGConnectingPoint num="1" id="3535" />
-<TGConnectingPoint num="2" id="3536" />
-<TGConnectingPoint num="3" id="3537" />
+<TGConnectingPoint num="0" id="3499" />
+<TGConnectingPoint num="1" id="3500" />
+<TGConnectingPoint num="2" id="3501" />
+<TGConnectingPoint num="3" id="3502" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7292,25 +7175,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3547" >
+<CONNECTOR type="5102" id="3512" >
 <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="3546" />
-<P1  x="661" y="95" id="3760" />
-<P2  x="661" y="106" id="4017" />
+<TGConnectingPoint num="0" id="3511" />
+<P1  x="661" y="95" id="3714" />
+<P2  x="661" y="106" id="3971" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3545" >
-<father id="3547" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3510" >
+<father id="3512" 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="3541" />
-<TGConnectingPoint num="1" id="3542" />
-<TGConnectingPoint num="2" id="3543" />
-<TGConnectingPoint num="3" id="3544" />
+<TGConnectingPoint num="0" id="3506" />
+<TGConnectingPoint num="1" id="3507" />
+<TGConnectingPoint num="2" id="3508" />
+<TGConnectingPoint num="3" id="3509" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7320,25 +7203,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3554" >
+<CONNECTOR type="5102" id="3519" >
 <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="3553" />
-<P1  x="492" y="208" id="3938" />
-<P2  x="453" y="262" id="3779" />
+<TGConnectingPoint num="0" id="3518" />
+<P1  x="492" y="208" id="3892" />
+<P2  x="453" y="262" id="3733" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3552" >
-<father id="3554" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3517" >
+<father id="3519" 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="3548" />
-<TGConnectingPoint num="1" id="3549" />
-<TGConnectingPoint num="2" id="3550" />
-<TGConnectingPoint num="3" id="3551" />
+<TGConnectingPoint num="0" id="3513" />
+<TGConnectingPoint num="1" id="3514" />
+<TGConnectingPoint num="2" id="3515" />
+<TGConnectingPoint num="3" id="3516" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7348,25 +7231,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3561" >
+<CONNECTOR type="5102" id="3526" >
 <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="3560" />
-<P1  x="357" y="209" id="3812" />
-<P2  x="403" y="262" id="3778" />
+<TGConnectingPoint num="0" id="3525" />
+<P1  x="357" y="209" id="3766" />
+<P2  x="403" y="262" id="3732" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3559" >
-<father id="3561" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3524" >
+<father id="3526" 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="3555" />
-<TGConnectingPoint num="1" id="3556" />
-<TGConnectingPoint num="2" id="3557" />
-<TGConnectingPoint num="3" id="3558" />
+<TGConnectingPoint num="0" id="3520" />
+<TGConnectingPoint num="1" id="3521" />
+<TGConnectingPoint num="2" id="3522" />
+<TGConnectingPoint num="3" id="3523" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7376,25 +7259,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3568" >
+<CONNECTOR type="5102" id="3533" >
 <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="3567" />
-<P1  x="409" y="164" id="3910" />
-<P2  x="357" y="179" id="3811" />
+<TGConnectingPoint num="0" id="3532" />
+<P1  x="409" y="164" id="3864" />
+<P2  x="357" y="179" id="3765" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3566" >
-<father id="3568" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3531" >
+<father id="3533" 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="3562" />
-<TGConnectingPoint num="1" id="3563" />
-<TGConnectingPoint num="2" id="3564" />
-<TGConnectingPoint num="3" id="3565" />
+<TGConnectingPoint num="0" id="3527" />
+<TGConnectingPoint num="1" id="3528" />
+<TGConnectingPoint num="2" id="3529" />
+<TGConnectingPoint num="3" id="3530" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7404,25 +7287,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3575" >
+<CONNECTOR type="5102" id="3540" >
 <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="3574" />
-<P1  x="661" y="210" id="3749" />
-<P2  x="471" y="152" id="3909" />
+<TGConnectingPoint num="0" id="3539" />
+<P1  x="661" y="210" id="3703" />
+<P2  x="471" y="152" id="3863" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3573" >
-<father id="3575" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3538" >
+<father id="3540" 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="3569" />
-<TGConnectingPoint num="1" id="3570" />
-<TGConnectingPoint num="2" id="3571" />
-<TGConnectingPoint num="3" id="3572" />
+<TGConnectingPoint num="0" id="3534" />
+<TGConnectingPoint num="1" id="3535" />
+<TGConnectingPoint num="2" id="3536" />
+<TGConnectingPoint num="3" id="3537" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7432,25 +7315,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3582" >
+<CONNECTOR type="5102" id="3547" >
 <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="3581" />
-<P1  x="661" y="141" id="4022" />
-<P2  x="661" y="145" id="4005" />
+<TGConnectingPoint num="0" id="3546" />
+<P1  x="661" y="141" id="3976" />
+<P2  x="661" y="145" id="3959" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3580" >
-<father id="3582" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3545" >
+<father id="3547" 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="3576" />
-<TGConnectingPoint num="1" id="3577" />
-<TGConnectingPoint num="2" id="3578" />
-<TGConnectingPoint num="3" id="3579" />
+<TGConnectingPoint num="0" id="3541" />
+<TGConnectingPoint num="1" id="3542" />
+<TGConnectingPoint num="2" id="3543" />
+<TGConnectingPoint num="3" id="3544" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7460,25 +7343,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3589" >
+<CONNECTOR type="5102" id="3554" >
 <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="3588" />
-<P1  x="661" y="61" id="3886" />
-<P2  x="661" y="65" id="3759" />
+<TGConnectingPoint num="0" id="3553" />
+<P1  x="661" y="61" id="3840" />
+<P2  x="661" y="65" id="3713" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3587" >
-<father id="3589" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3552" >
+<father id="3554" 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="3583" />
-<TGConnectingPoint num="1" id="3584" />
-<TGConnectingPoint num="2" id="3585" />
-<TGConnectingPoint num="3" id="3586" />
+<TGConnectingPoint num="0" id="3548" />
+<TGConnectingPoint num="1" id="3549" />
+<TGConnectingPoint num="2" id="3550" />
+<TGConnectingPoint num="3" id="3551" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7488,25 +7371,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3596" >
+<CONNECTOR type="5102" id="3561" >
 <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="3595" />
-<P1  x="671" y="503" id="3995" />
-<P2  x="671" y="510" id="3715" />
+<TGConnectingPoint num="0" id="3560" />
+<P1  x="671" y="485" id="3949" />
+<P2  x="671" y="488" id="3680" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3594" >
-<father id="3596" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3559" >
+<father id="3561" 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="3590" />
-<TGConnectingPoint num="1" id="3591" />
-<TGConnectingPoint num="2" id="3592" />
-<TGConnectingPoint num="3" id="3593" />
+<TGConnectingPoint num="0" id="3555" />
+<TGConnectingPoint num="1" id="3556" />
+<TGConnectingPoint num="2" id="3557" />
+<TGConnectingPoint num="3" id="3558" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7516,25 +7399,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3603" >
+<CONNECTOR type="5102" id="3568" >
 <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="3602" />
-<P1  x="671" y="443" id="4063" />
-<P2  x="671" y="473" id="3994" />
+<TGConnectingPoint num="0" id="3567" />
+<P1  x="671" y="443" id="4017" />
+<P2  x="671" y="455" id="3948" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3601" >
-<father id="3603" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3566" >
+<father id="3568" 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="3597" />
-<TGConnectingPoint num="1" id="3598" />
-<TGConnectingPoint num="2" id="3599" />
-<TGConnectingPoint num="3" id="3600" />
+<TGConnectingPoint num="0" id="3562" />
+<TGConnectingPoint num="1" id="3563" />
+<TGConnectingPoint num="2" id="3564" />
+<TGConnectingPoint num="3" id="3565" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7544,55 +7427,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3616" >
+<CONNECTOR type="5102" id="3581" >
 <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="3612" />
-<TGConnectingPoint num="1" id="3613" />
-<TGConnectingPoint num="2" id="3614" />
-<TGConnectingPoint num="3" id="3615" />
-<P1  x="671" y="581" id="3973" />
-<P2  x="478" y="432" id="3846" />
+<TGConnectingPoint num="0" id="3577" />
+<TGConnectingPoint num="1" id="3578" />
+<TGConnectingPoint num="2" id="3579" />
+<TGConnectingPoint num="3" id="3580" />
+<P1  x="671" y="587" id="4053" />
+<P2  x="478" y="432" id="3800" />
 <Point x="671" y="595" />
 <Point x="548" y="595" />
 <Point x="548" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3604" >
-<father id="3616" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3569" >
+<father id="3581" 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="3605" >
-<father id="3616" num="1" />
+<SUBCOMPONENT type="-1" id="3570" >
+<father id="3581" 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="3606" >
-<father id="3616" num="2" />
+<SUBCOMPONENT type="-1" id="3571" >
+<father id="3581" 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="3611" >
-<father id="3616" num="3" />
+<SUBCOMPONENT type="-1" id="3576" >
+<father id="3581" 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="3607" />
-<TGConnectingPoint num="1" id="3608" />
-<TGConnectingPoint num="2" id="3609" />
-<TGConnectingPoint num="3" id="3610" />
+<TGConnectingPoint num="0" id="3572" />
+<TGConnectingPoint num="1" id="3573" />
+<TGConnectingPoint num="2" id="3574" />
+<TGConnectingPoint num="3" id="3575" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7602,25 +7485,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3623" >
+<CONNECTOR type="5102" id="3588" >
 <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="3622" />
-<P1  x="671" y="375" id="3951" />
-<P2  x="671" y="393" id="4058" />
+<TGConnectingPoint num="0" id="3587" />
+<P1  x="671" y="375" id="3905" />
+<P2  x="671" y="393" id="4012" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3621" >
-<father id="3623" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3586" >
+<father id="3588" 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="3617" />
-<TGConnectingPoint num="1" id="3618" />
-<TGConnectingPoint num="2" id="3619" />
-<TGConnectingPoint num="3" id="3620" />
+<TGConnectingPoint num="0" id="3582" />
+<TGConnectingPoint num="1" id="3583" />
+<TGConnectingPoint num="2" id="3584" />
+<TGConnectingPoint num="3" id="3585" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7630,25 +7513,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3630" >
+<CONNECTOR type="5102" id="3595" >
 <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="3629" />
-<P1  x="670" y="287" id="3823" />
-<P2  x="671" y="302" id="3726" />
+<TGConnectingPoint num="0" id="3594" />
+<P1  x="670" y="287" id="3777" />
+<P2  x="671" y="302" id="3691" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3628" >
-<father id="3630" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3593" >
+<father id="3595" 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="3624" />
-<TGConnectingPoint num="1" id="3625" />
-<TGConnectingPoint num="2" id="3626" />
-<TGConnectingPoint num="3" id="3627" />
+<TGConnectingPoint num="0" id="3589" />
+<TGConnectingPoint num="1" id="3590" />
+<TGConnectingPoint num="2" id="3591" />
+<TGConnectingPoint num="3" id="3592" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7658,55 +7541,55 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3643" >
+<CONNECTOR type="5102" id="3608" >
 <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="3639" />
-<TGConnectingPoint num="1" id="3640" />
-<TGConnectingPoint num="2" id="3641" />
-<TGConnectingPoint num="3" id="3642" />
-<P1  x="403" y="445" id="3847" />
-<P2  x="378" y="432" id="3845" />
+<TGConnectingPoint num="0" id="3604" />
+<TGConnectingPoint num="1" id="3605" />
+<TGConnectingPoint num="2" id="3606" />
+<TGConnectingPoint num="3" id="3607" />
+<P1  x="403" y="445" id="3801" />
+<P2  x="378" y="432" id="3799" />
 <Point x="403" y="480" />
 <Point x="319" y="480" />
 <Point x="319" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3631" >
-<father id="3643" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3596" >
+<father id="3608" 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="3632" >
-<father id="3643" num="1" />
+<SUBCOMPONENT type="-1" id="3597" >
+<father id="3608" 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="3633" >
-<father id="3643" num="2" />
+<SUBCOMPONENT type="-1" id="3598" >
+<father id="3608" 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="3638" >
-<father id="3643" num="3" />
+<SUBCOMPONENT type="-1" id="3603" >
+<father id="3608" 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="3634" />
-<TGConnectingPoint num="1" id="3635" />
-<TGConnectingPoint num="2" id="3636" />
-<TGConnectingPoint num="3" id="3637" />
+<TGConnectingPoint num="0" id="3599" />
+<TGConnectingPoint num="1" id="3600" />
+<TGConnectingPoint num="2" id="3601" />
+<TGConnectingPoint num="3" id="3602" />
 <extraparam>
 <guard value="[ remainingTime&gt;0 ]" />
 <afterMin value="1" />
@@ -7718,25 +7601,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3650" >
+<CONNECTOR type="5102" id="3615" >
 <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="3649" />
-<P1  x="478" y="420" id="3837" />
-<P2  x="670" y="257" id="3822" />
+<TGConnectingPoint num="0" id="3614" />
+<P1  x="478" y="420" id="3791" />
+<P2  x="670" y="257" id="3776" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3648" >
-<father id="3650" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3613" >
+<father id="3615" 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="3644" />
-<TGConnectingPoint num="1" id="3645" />
-<TGConnectingPoint num="2" id="3646" />
-<TGConnectingPoint num="3" id="3647" />
+<TGConnectingPoint num="0" id="3609" />
+<TGConnectingPoint num="1" id="3610" />
+<TGConnectingPoint num="2" id="3611" />
+<TGConnectingPoint num="3" id="3612" />
 <extraparam>
 <guard value="[remainingTime &gt; 0 ]" />
 <afterMin value="1" />
@@ -7748,25 +7631,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3657" >
+<CONNECTOR type="5102" id="3622" >
 <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="3656" />
-<P1  x="428" y="445" id="3839" />
-<P2  x="428" y="507" id="3961" />
+<TGConnectingPoint num="0" id="3621" />
+<P1  x="428" y="445" id="3793" />
+<P2  x="428" y="507" id="3915" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3655" >
-<father id="3657" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3620" >
+<father id="3622" 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="3651" />
-<TGConnectingPoint num="1" id="3652" />
-<TGConnectingPoint num="2" id="3653" />
-<TGConnectingPoint num="3" id="3654" />
+<TGConnectingPoint num="0" id="3616" />
+<TGConnectingPoint num="1" id="3617" />
+<TGConnectingPoint num="2" id="3618" />
+<TGConnectingPoint num="3" id="3619" />
 <extraparam>
 <guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
@@ -7776,25 +7659,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3664" >
+<CONNECTOR type="5102" id="3629" >
 <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="3663" />
-<P1  x="428" y="334" id="3984" />
-<P2  x="428" y="350" id="3737" />
+<TGConnectingPoint num="0" id="3628" />
+<P1  x="428" y="334" id="3938" />
+<P2  x="428" y="350" id="4063" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3662" >
-<father id="3664" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3627" >
+<father id="3629" 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="3658" />
-<TGConnectingPoint num="1" id="3659" />
-<TGConnectingPoint num="2" id="3660" />
-<TGConnectingPoint num="3" id="3661" />
+<TGConnectingPoint num="0" id="3623" />
+<TGConnectingPoint num="1" id="3624" />
+<TGConnectingPoint num="2" id="3625" />
+<TGConnectingPoint num="3" id="3626" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7806,65 +7689,65 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3679" >
+<CONNECTOR type="5102" id="3644" >
 <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="3674" />
-<TGConnectingPoint num="1" id="3675" />
-<TGConnectingPoint num="2" id="3676" />
-<TGConnectingPoint num="3" id="3677" />
-<TGConnectingPoint num="4" id="3678" />
-<P1  x="428" y="579" id="3875" />
-<P2  x="389" y="119" id="3896" />
+<TGConnectingPoint num="0" id="3639" />
+<TGConnectingPoint num="1" id="3640" />
+<TGConnectingPoint num="2" id="3641" />
+<TGConnectingPoint num="3" id="3642" />
+<TGConnectingPoint num="4" id="3643" />
+<P1  x="428" y="579" id="3829" />
+<P2  x="389" y="119" id="3850" />
 <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="3665" >
-<father id="3679" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3630" >
+<father id="3644" 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="3666" >
-<father id="3679" num="1" />
+<SUBCOMPONENT type="-1" id="3631" >
+<father id="3644" 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="3667" >
-<father id="3679" num="2" />
+<SUBCOMPONENT type="-1" id="3632" >
+<father id="3644" 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="3668" >
-<father id="3679" num="3" />
+<SUBCOMPONENT type="-1" id="3633" >
+<father id="3644" 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="3673" >
-<father id="3679" num="4" />
+<SUBCOMPONENT type="-1" id="3638" >
+<father id="3644" num="4" />
 <cdparam x="448" y="590" />
 <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="3669" />
-<TGConnectingPoint num="1" id="3670" />
-<TGConnectingPoint num="2" id="3671" />
-<TGConnectingPoint num="3" id="3672" />
+<TGConnectingPoint num="0" id="3634" />
+<TGConnectingPoint num="1" id="3635" />
+<TGConnectingPoint num="2" id="3636" />
+<TGConnectingPoint num="3" id="3637" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="5" />
@@ -7874,25 +7757,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3686" >
+<CONNECTOR type="5102" id="3651" >
 <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="3685" />
-<P1  x="428" y="537" id="3962" />
-<P2  x="428" y="549" id="3874" />
+<TGConnectingPoint num="0" id="3650" />
+<P1  x="428" y="537" id="3916" />
+<P2  x="428" y="549" id="3828" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3684" >
-<father id="3686" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3649" >
+<father id="3651" 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="3680" />
-<TGConnectingPoint num="1" id="3681" />
-<TGConnectingPoint num="2" id="3682" />
-<TGConnectingPoint num="3" id="3683" />
+<TGConnectingPoint num="0" id="3645" />
+<TGConnectingPoint num="1" id="3646" />
+<TGConnectingPoint num="2" id="3647" />
+<TGConnectingPoint num="3" id="3648" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7902,25 +7785,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3693" >
+<CONNECTOR type="5102" id="3658" >
 <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="3692" />
-<P1  x="471" y="141" id="3900" />
-<P2  x="661" y="31" id="3885" />
+<TGConnectingPoint num="0" id="3657" />
+<P1  x="471" y="141" id="3854" />
+<P2  x="661" y="31" id="3839" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3691" >
-<father id="3693" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3656" >
+<father id="3658" 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="3687" />
-<TGConnectingPoint num="1" id="3688" />
-<TGConnectingPoint num="2" id="3689" />
-<TGConnectingPoint num="3" id="3690" />
+<TGConnectingPoint num="0" id="3652" />
+<TGConnectingPoint num="1" id="3653" />
+<TGConnectingPoint num="2" id="3654" />
+<TGConnectingPoint num="3" id="3655" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7930,25 +7813,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3700" >
+<CONNECTOR type="5102" id="3665" >
 <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="3699" />
-<P1  x="450" y="164" id="3911" />
-<P2  x="492" y="178" id="3937" />
+<TGConnectingPoint num="0" id="3664" />
+<P1  x="450" y="164" id="3865" />
+<P2  x="492" y="178" id="3891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3698" >
-<father id="3700" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3663" >
+<father id="3665" 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="3694" />
-<TGConnectingPoint num="1" id="3695" />
-<TGConnectingPoint num="2" id="3696" />
-<TGConnectingPoint num="3" id="3697" />
+<TGConnectingPoint num="0" id="3659" />
+<TGConnectingPoint num="1" id="3660" />
+<TGConnectingPoint num="2" id="3661" />
+<TGConnectingPoint num="3" id="3662" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7958,25 +7841,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3707" >
+<CONNECTOR type="5102" id="3672" >
 <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="3706" />
-<P1  x="430" y="100" id="3948" />
-<P2  x="430" y="119" id="3897" />
+<TGConnectingPoint num="0" id="3671" />
+<P1  x="430" y="100" id="3902" />
+<P2  x="430" y="119" id="3851" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3705" >
-<father id="3707" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3670" >
+<father id="3672" 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="3701" />
-<TGConnectingPoint num="1" id="3702" />
-<TGConnectingPoint num="2" id="3703" />
-<TGConnectingPoint num="3" id="3704" />
+<TGConnectingPoint num="0" id="3666" />
+<TGConnectingPoint num="1" id="3667" />
+<TGConnectingPoint num="2" id="3668" />
+<TGConnectingPoint num="3" id="3669" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7986,25 +7869,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3714" >
+<CONNECTOR type="5102" id="3679" >
 <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="3713" />
-<P1  x="428" y="298" id="3776" />
-<P2  x="428" y="304" id="3983" />
+<TGConnectingPoint num="0" id="3678" />
+<P1  x="428" y="298" id="3730" />
+<P2  x="428" y="304" id="3937" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3712" >
-<father id="3714" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3677" >
+<father id="3679" 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="3708" />
-<TGConnectingPoint num="1" id="3709" />
-<TGConnectingPoint num="2" id="3710" />
-<TGConnectingPoint num="3" id="3711" />
+<TGConnectingPoint num="0" id="3673" />
+<TGConnectingPoint num="1" id="3674" />
+<TGConnectingPoint num="2" id="3675" />
+<TGConnectingPoint num="3" id="3676" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8014,604 +7897,622 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3725" >
-<cdparam x="630" y="515" />
+<COMPONENT type="5103" id="3690" >
+<cdparam x="630" y="493" />
 <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="3715" />
-<TGConnectingPoint num="1" id="3716" />
-<TGConnectingPoint num="2" id="3717" />
-<TGConnectingPoint num="3" id="3718" />
-<TGConnectingPoint num="4" id="3719" />
-<TGConnectingPoint num="5" id="3720" />
-<TGConnectingPoint num="6" id="3721" />
-<TGConnectingPoint num="7" id="3722" />
-<TGConnectingPoint num="8" id="3723" />
-<TGConnectingPoint num="9" id="3724" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3736" >
+<TGConnectingPoint num="0" id="3680" />
+<TGConnectingPoint num="1" id="3681" />
+<TGConnectingPoint num="2" id="3682" />
+<TGConnectingPoint num="3" id="3683" />
+<TGConnectingPoint num="4" id="3684" />
+<TGConnectingPoint num="5" id="3685" />
+<TGConnectingPoint num="6" id="3686" />
+<TGConnectingPoint num="7" id="3687" />
+<TGConnectingPoint num="8" id="3688" />
+<TGConnectingPoint num="9" id="3689" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3701" >
 <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="3726" />
-<TGConnectingPoint num="1" id="3727" />
-<TGConnectingPoint num="2" id="3728" />
-<TGConnectingPoint num="3" id="3729" />
-<TGConnectingPoint num="4" id="3730" />
-<TGConnectingPoint num="5" id="3731" />
-<TGConnectingPoint num="6" id="3732" />
-<TGConnectingPoint num="7" id="3733" />
-<TGConnectingPoint num="8" id="3734" />
-<TGConnectingPoint num="9" id="3735" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3747" >
-<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="3737" />
-<TGConnectingPoint num="1" id="3738" />
-<TGConnectingPoint num="2" id="3739" />
-<TGConnectingPoint num="3" id="3740" />
-<TGConnectingPoint num="4" id="3741" />
-<TGConnectingPoint num="5" id="3742" />
-<TGConnectingPoint num="6" id="3743" />
-<TGConnectingPoint num="7" id="3744" />
-<TGConnectingPoint num="8" id="3745" />
-<TGConnectingPoint num="9" id="3746" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3758" >
+<TGConnectingPoint num="0" id="3691" />
+<TGConnectingPoint num="1" id="3692" />
+<TGConnectingPoint num="2" id="3693" />
+<TGConnectingPoint num="3" id="3694" />
+<TGConnectingPoint num="4" id="3695" />
+<TGConnectingPoint num="5" id="3696" />
+<TGConnectingPoint num="6" id="3697" />
+<TGConnectingPoint num="7" id="3698" />
+<TGConnectingPoint num="8" id="3699" />
+<TGConnectingPoint num="9" id="3700" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3712" >
 <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="3748" />
-<TGConnectingPoint num="1" id="3749" />
-<TGConnectingPoint num="2" id="3750" />
-<TGConnectingPoint num="3" id="3751" />
-<TGConnectingPoint num="4" id="3752" />
-<TGConnectingPoint num="5" id="3753" />
-<TGConnectingPoint num="6" id="3754" />
-<TGConnectingPoint num="7" id="3755" />
-<TGConnectingPoint num="8" id="3756" />
-<TGConnectingPoint num="9" id="3757" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3769" >
+<TGConnectingPoint num="0" id="3702" />
+<TGConnectingPoint num="1" id="3703" />
+<TGConnectingPoint num="2" id="3704" />
+<TGConnectingPoint num="3" id="3705" />
+<TGConnectingPoint num="4" id="3706" />
+<TGConnectingPoint num="5" id="3707" />
+<TGConnectingPoint num="6" id="3708" />
+<TGConnectingPoint num="7" id="3709" />
+<TGConnectingPoint num="8" id="3710" />
+<TGConnectingPoint num="9" id="3711" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3723" >
 <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="3759" />
-<TGConnectingPoint num="1" id="3760" />
-<TGConnectingPoint num="2" id="3761" />
-<TGConnectingPoint num="3" id="3762" />
-<TGConnectingPoint num="4" id="3763" />
-<TGConnectingPoint num="5" id="3764" />
-<TGConnectingPoint num="6" id="3765" />
-<TGConnectingPoint num="7" id="3766" />
-<TGConnectingPoint num="8" id="3767" />
-<TGConnectingPoint num="9" id="3768" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3810" >
+<TGConnectingPoint num="0" id="3713" />
+<TGConnectingPoint num="1" id="3714" />
+<TGConnectingPoint num="2" id="3715" />
+<TGConnectingPoint num="3" id="3716" />
+<TGConnectingPoint num="4" id="3717" />
+<TGConnectingPoint num="5" id="3718" />
+<TGConnectingPoint num="6" id="3719" />
+<TGConnectingPoint num="7" id="3720" />
+<TGConnectingPoint num="8" id="3721" />
+<TGConnectingPoint num="9" id="3722" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3764" >
 <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="3770" />
-<TGConnectingPoint num="1" id="3771" />
-<TGConnectingPoint num="2" id="3772" />
-<TGConnectingPoint num="3" id="3773" />
-<TGConnectingPoint num="4" id="3774" />
-<TGConnectingPoint num="5" id="3775" />
-<TGConnectingPoint num="6" id="3776" />
-<TGConnectingPoint num="7" id="3777" />
-<TGConnectingPoint num="8" id="3778" />
-<TGConnectingPoint num="9" id="3779" />
-<TGConnectingPoint num="10" id="3780" />
-<TGConnectingPoint num="11" id="3781" />
-<TGConnectingPoint num="12" id="3782" />
-<TGConnectingPoint num="13" id="3783" />
-<TGConnectingPoint num="14" id="3784" />
-<TGConnectingPoint num="15" id="3785" />
-<TGConnectingPoint num="16" id="3786" />
-<TGConnectingPoint num="17" id="3787" />
-<TGConnectingPoint num="18" id="3788" />
-<TGConnectingPoint num="19" id="3789" />
-<TGConnectingPoint num="20" id="3790" />
-<TGConnectingPoint num="21" id="3791" />
-<TGConnectingPoint num="22" id="3792" />
-<TGConnectingPoint num="23" id="3793" />
-<TGConnectingPoint num="24" id="3794" />
-<TGConnectingPoint num="25" id="3795" />
-<TGConnectingPoint num="26" id="3796" />
-<TGConnectingPoint num="27" id="3797" />
-<TGConnectingPoint num="28" id="3798" />
-<TGConnectingPoint num="29" id="3799" />
-<TGConnectingPoint num="30" id="3800" />
-<TGConnectingPoint num="31" id="3801" />
-<TGConnectingPoint num="32" id="3802" />
-<TGConnectingPoint num="33" id="3803" />
-<TGConnectingPoint num="34" id="3804" />
-<TGConnectingPoint num="35" id="3805" />
-<TGConnectingPoint num="36" id="3806" />
-<TGConnectingPoint num="37" id="3807" />
-<TGConnectingPoint num="38" id="3808" />
-<TGConnectingPoint num="39" id="3809" />
+<TGConnectingPoint num="0" id="3724" />
+<TGConnectingPoint num="1" id="3725" />
+<TGConnectingPoint num="2" id="3726" />
+<TGConnectingPoint num="3" id="3727" />
+<TGConnectingPoint num="4" id="3728" />
+<TGConnectingPoint num="5" id="3729" />
+<TGConnectingPoint num="6" id="3730" />
+<TGConnectingPoint num="7" id="3731" />
+<TGConnectingPoint num="8" id="3732" />
+<TGConnectingPoint num="9" id="3733" />
+<TGConnectingPoint num="10" id="3734" />
+<TGConnectingPoint num="11" id="3735" />
+<TGConnectingPoint num="12" id="3736" />
+<TGConnectingPoint num="13" id="3737" />
+<TGConnectingPoint num="14" id="3738" />
+<TGConnectingPoint num="15" id="3739" />
+<TGConnectingPoint num="16" id="3740" />
+<TGConnectingPoint num="17" id="3741" />
+<TGConnectingPoint num="18" id="3742" />
+<TGConnectingPoint num="19" id="3743" />
+<TGConnectingPoint num="20" id="3744" />
+<TGConnectingPoint num="21" id="3745" />
+<TGConnectingPoint num="22" id="3746" />
+<TGConnectingPoint num="23" id="3747" />
+<TGConnectingPoint num="24" id="3748" />
+<TGConnectingPoint num="25" id="3749" />
+<TGConnectingPoint num="26" id="3750" />
+<TGConnectingPoint num="27" id="3751" />
+<TGConnectingPoint num="28" id="3752" />
+<TGConnectingPoint num="29" id="3753" />
+<TGConnectingPoint num="30" id="3754" />
+<TGConnectingPoint num="31" id="3755" />
+<TGConnectingPoint num="32" id="3756" />
+<TGConnectingPoint num="33" id="3757" />
+<TGConnectingPoint num="34" id="3758" />
+<TGConnectingPoint num="35" id="3759" />
+<TGConnectingPoint num="36" id="3760" />
+<TGConnectingPoint num="37" id="3761" />
+<TGConnectingPoint num="38" id="3762" />
+<TGConnectingPoint num="39" id="3763" />
 <extraparam>
 <entryCode value="printf(&quot;Starting microwave, lets go!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3821" >
+<COMPONENT type="5104" id="3775" >
 <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="3811" />
-<TGConnectingPoint num="1" id="3812" />
-<TGConnectingPoint num="2" id="3813" />
-<TGConnectingPoint num="3" id="3814" />
-<TGConnectingPoint num="4" id="3815" />
-<TGConnectingPoint num="5" id="3816" />
-<TGConnectingPoint num="6" id="3817" />
-<TGConnectingPoint num="7" id="3818" />
-<TGConnectingPoint num="8" id="3819" />
-<TGConnectingPoint num="9" id="3820" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3832" >
+<TGConnectingPoint num="0" id="3765" />
+<TGConnectingPoint num="1" id="3766" />
+<TGConnectingPoint num="2" id="3767" />
+<TGConnectingPoint num="3" id="3768" />
+<TGConnectingPoint num="4" id="3769" />
+<TGConnectingPoint num="5" id="3770" />
+<TGConnectingPoint num="6" id="3771" />
+<TGConnectingPoint num="7" id="3772" />
+<TGConnectingPoint num="8" id="3773" />
+<TGConnectingPoint num="9" id="3774" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3786" >
 <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="3822" />
-<TGConnectingPoint num="1" id="3823" />
-<TGConnectingPoint num="2" id="3824" />
-<TGConnectingPoint num="3" id="3825" />
-<TGConnectingPoint num="4" id="3826" />
-<TGConnectingPoint num="5" id="3827" />
-<TGConnectingPoint num="6" id="3828" />
-<TGConnectingPoint num="7" id="3829" />
-<TGConnectingPoint num="8" id="3830" />
-<TGConnectingPoint num="9" id="3831" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3873" >
+<TGConnectingPoint num="0" id="3776" />
+<TGConnectingPoint num="1" id="3777" />
+<TGConnectingPoint num="2" id="3778" />
+<TGConnectingPoint num="3" id="3779" />
+<TGConnectingPoint num="4" id="3780" />
+<TGConnectingPoint num="5" id="3781" />
+<TGConnectingPoint num="6" id="3782" />
+<TGConnectingPoint num="7" id="3783" />
+<TGConnectingPoint num="8" id="3784" />
+<TGConnectingPoint num="9" id="3785" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3827" >
 <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="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" />
-<TGConnectingPoint num="10" id="3843" />
-<TGConnectingPoint num="11" id="3844" />
-<TGConnectingPoint num="12" id="3845" />
-<TGConnectingPoint num="13" id="3846" />
-<TGConnectingPoint num="14" id="3847" />
-<TGConnectingPoint num="15" id="3848" />
-<TGConnectingPoint num="16" id="3849" />
-<TGConnectingPoint num="17" id="3850" />
-<TGConnectingPoint num="18" id="3851" />
-<TGConnectingPoint num="19" id="3852" />
-<TGConnectingPoint num="20" id="3853" />
-<TGConnectingPoint num="21" id="3854" />
-<TGConnectingPoint num="22" id="3855" />
-<TGConnectingPoint num="23" id="3856" />
-<TGConnectingPoint num="24" id="3857" />
-<TGConnectingPoint num="25" id="3858" />
-<TGConnectingPoint num="26" id="3859" />
-<TGConnectingPoint num="27" id="3860" />
-<TGConnectingPoint num="28" id="3861" />
-<TGConnectingPoint num="29" id="3862" />
-<TGConnectingPoint num="30" id="3863" />
-<TGConnectingPoint num="31" id="3864" />
-<TGConnectingPoint num="32" id="3865" />
-<TGConnectingPoint num="33" id="3866" />
-<TGConnectingPoint num="34" id="3867" />
-<TGConnectingPoint num="35" id="3868" />
-<TGConnectingPoint num="36" id="3869" />
-<TGConnectingPoint num="37" id="3870" />
-<TGConnectingPoint num="38" id="3871" />
-<TGConnectingPoint num="39" id="3872" />
+<TGConnectingPoint num="0" id="3787" />
+<TGConnectingPoint num="1" id="3788" />
+<TGConnectingPoint num="2" id="3789" />
+<TGConnectingPoint num="3" id="3790" />
+<TGConnectingPoint num="4" id="3791" />
+<TGConnectingPoint num="5" id="3792" />
+<TGConnectingPoint num="6" id="3793" />
+<TGConnectingPoint num="7" id="3794" />
+<TGConnectingPoint num="8" id="3795" />
+<TGConnectingPoint num="9" id="3796" />
+<TGConnectingPoint num="10" id="3797" />
+<TGConnectingPoint num="11" id="3798" />
+<TGConnectingPoint num="12" id="3799" />
+<TGConnectingPoint num="13" id="3800" />
+<TGConnectingPoint num="14" id="3801" />
+<TGConnectingPoint num="15" id="3802" />
+<TGConnectingPoint num="16" id="3803" />
+<TGConnectingPoint num="17" id="3804" />
+<TGConnectingPoint num="18" id="3805" />
+<TGConnectingPoint num="19" id="3806" />
+<TGConnectingPoint num="20" id="3807" />
+<TGConnectingPoint num="21" id="3808" />
+<TGConnectingPoint num="22" id="3809" />
+<TGConnectingPoint num="23" id="3810" />
+<TGConnectingPoint num="24" id="3811" />
+<TGConnectingPoint num="25" id="3812" />
+<TGConnectingPoint num="26" id="3813" />
+<TGConnectingPoint num="27" id="3814" />
+<TGConnectingPoint num="28" id="3815" />
+<TGConnectingPoint num="29" id="3816" />
+<TGConnectingPoint num="30" id="3817" />
+<TGConnectingPoint num="31" id="3818" />
+<TGConnectingPoint num="32" id="3819" />
+<TGConnectingPoint num="33" id="3820" />
+<TGConnectingPoint num="34" id="3821" />
+<TGConnectingPoint num="35" id="3822" />
+<TGConnectingPoint num="36" id="3823" />
+<TGConnectingPoint num="37" id="3824" />
+<TGConnectingPoint num="38" id="3825" />
+<TGConnectingPoint num="39" id="3826" />
 <extraparam>
 <entryCode value="printf(&quot;Heating ; remaining time :%d\n&quot;, remainingTime);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3884" >
+<COMPONENT type="5103" id="3838" >
 <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="3874" />
-<TGConnectingPoint num="1" id="3875" />
-<TGConnectingPoint num="2" id="3876" />
-<TGConnectingPoint num="3" id="3877" />
-<TGConnectingPoint num="4" id="3878" />
-<TGConnectingPoint num="5" id="3879" />
-<TGConnectingPoint num="6" id="3880" />
-<TGConnectingPoint num="7" id="3881" />
-<TGConnectingPoint num="8" id="3882" />
-<TGConnectingPoint num="9" id="3883" />
+<TGConnectingPoint num="0" id="3828" />
+<TGConnectingPoint num="1" id="3829" />
+<TGConnectingPoint num="2" id="3830" />
+<TGConnectingPoint num="3" id="3831" />
+<TGConnectingPoint num="4" id="3832" />
+<TGConnectingPoint num="5" id="3833" />
+<TGConnectingPoint num="6" id="3834" />
+<TGConnectingPoint num="7" id="3835" />
+<TGConnectingPoint num="8" id="3836" />
+<TGConnectingPoint num="9" id="3837" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5104" id="3895" >
+<COMPONENT type="5104" id="3849" >
 <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="3885" />
-<TGConnectingPoint num="1" id="3886" />
-<TGConnectingPoint num="2" id="3887" />
-<TGConnectingPoint num="3" id="3888" />
-<TGConnectingPoint num="4" id="3889" />
-<TGConnectingPoint num="5" id="3890" />
-<TGConnectingPoint num="6" id="3891" />
-<TGConnectingPoint num="7" id="3892" />
-<TGConnectingPoint num="8" id="3893" />
-<TGConnectingPoint num="9" id="3894" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3936" >
+<TGConnectingPoint num="0" id="3839" />
+<TGConnectingPoint num="1" id="3840" />
+<TGConnectingPoint num="2" id="3841" />
+<TGConnectingPoint num="3" id="3842" />
+<TGConnectingPoint num="4" id="3843" />
+<TGConnectingPoint num="5" id="3844" />
+<TGConnectingPoint num="6" id="3845" />
+<TGConnectingPoint num="7" id="3846" />
+<TGConnectingPoint num="8" id="3847" />
+<TGConnectingPoint num="9" id="3848" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3890" >
 <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="3896" />
-<TGConnectingPoint num="1" id="3897" />
-<TGConnectingPoint num="2" id="3898" />
-<TGConnectingPoint num="3" id="3899" />
-<TGConnectingPoint num="4" id="3900" />
-<TGConnectingPoint num="5" id="3901" />
-<TGConnectingPoint num="6" id="3902" />
-<TGConnectingPoint num="7" id="3903" />
-<TGConnectingPoint num="8" id="3904" />
-<TGConnectingPoint num="9" id="3905" />
-<TGConnectingPoint num="10" id="3906" />
-<TGConnectingPoint num="11" id="3907" />
-<TGConnectingPoint num="12" id="3908" />
-<TGConnectingPoint num="13" id="3909" />
-<TGConnectingPoint num="14" id="3910" />
-<TGConnectingPoint num="15" id="3911" />
-<TGConnectingPoint num="16" id="3912" />
-<TGConnectingPoint num="17" id="3913" />
-<TGConnectingPoint num="18" id="3914" />
-<TGConnectingPoint num="19" id="3915" />
-<TGConnectingPoint num="20" id="3916" />
-<TGConnectingPoint num="21" id="3917" />
-<TGConnectingPoint num="22" id="3918" />
-<TGConnectingPoint num="23" id="3919" />
-<TGConnectingPoint num="24" id="3920" />
-<TGConnectingPoint num="25" id="3921" />
-<TGConnectingPoint num="26" id="3922" />
-<TGConnectingPoint num="27" id="3923" />
-<TGConnectingPoint num="28" id="3924" />
-<TGConnectingPoint num="29" id="3925" />
-<TGConnectingPoint num="30" id="3926" />
-<TGConnectingPoint num="31" id="3927" />
-<TGConnectingPoint num="32" id="3928" />
-<TGConnectingPoint num="33" id="3929" />
-<TGConnectingPoint num="34" id="3930" />
-<TGConnectingPoint num="35" id="3931" />
-<TGConnectingPoint num="36" id="3932" />
-<TGConnectingPoint num="37" id="3933" />
-<TGConnectingPoint num="38" id="3934" />
-<TGConnectingPoint num="39" id="3935" />
+<TGConnectingPoint num="0" id="3850" />
+<TGConnectingPoint num="1" id="3851" />
+<TGConnectingPoint num="2" id="3852" />
+<TGConnectingPoint num="3" id="3853" />
+<TGConnectingPoint num="4" id="3854" />
+<TGConnectingPoint num="5" id="3855" />
+<TGConnectingPoint num="6" id="3856" />
+<TGConnectingPoint num="7" id="3857" />
+<TGConnectingPoint num="8" id="3858" />
+<TGConnectingPoint num="9" id="3859" />
+<TGConnectingPoint num="10" id="3860" />
+<TGConnectingPoint num="11" id="3861" />
+<TGConnectingPoint num="12" id="3862" />
+<TGConnectingPoint num="13" id="3863" />
+<TGConnectingPoint num="14" id="3864" />
+<TGConnectingPoint num="15" id="3865" />
+<TGConnectingPoint num="16" id="3866" />
+<TGConnectingPoint num="17" id="3867" />
+<TGConnectingPoint num="18" id="3868" />
+<TGConnectingPoint num="19" id="3869" />
+<TGConnectingPoint num="20" id="3870" />
+<TGConnectingPoint num="21" id="3871" />
+<TGConnectingPoint num="22" id="3872" />
+<TGConnectingPoint num="23" id="3873" />
+<TGConnectingPoint num="24" id="3874" />
+<TGConnectingPoint num="25" id="3875" />
+<TGConnectingPoint num="26" id="3876" />
+<TGConnectingPoint num="27" id="3877" />
+<TGConnectingPoint num="28" id="3878" />
+<TGConnectingPoint num="29" id="3879" />
+<TGConnectingPoint num="30" id="3880" />
+<TGConnectingPoint num="31" id="3881" />
+<TGConnectingPoint num="32" id="3882" />
+<TGConnectingPoint num="33" id="3883" />
+<TGConnectingPoint num="34" id="3884" />
+<TGConnectingPoint num="35" id="3885" />
+<TGConnectingPoint num="36" id="3886" />
+<TGConnectingPoint num="37" id="3887" />
+<TGConnectingPoint num="38" id="3888" />
+<TGConnectingPoint num="39" id="3889" />
 <breakpoint />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3947" >
+<COMPONENT type="5104" id="3901" >
 <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="3937" />
-<TGConnectingPoint num="1" id="3938" />
-<TGConnectingPoint num="2" id="3939" />
-<TGConnectingPoint num="3" id="3940" />
-<TGConnectingPoint num="4" id="3941" />
-<TGConnectingPoint num="5" id="3942" />
-<TGConnectingPoint num="6" id="3943" />
-<TGConnectingPoint num="7" id="3944" />
-<TGConnectingPoint num="8" id="3945" />
-<TGConnectingPoint num="9" id="3946" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3949" >
+<TGConnectingPoint num="0" id="3891" />
+<TGConnectingPoint num="1" id="3892" />
+<TGConnectingPoint num="2" id="3893" />
+<TGConnectingPoint num="3" id="3894" />
+<TGConnectingPoint num="4" id="3895" />
+<TGConnectingPoint num="5" id="3896" />
+<TGConnectingPoint num="6" id="3897" />
+<TGConnectingPoint num="7" id="3898" />
+<TGConnectingPoint num="8" id="3899" />
+<TGConnectingPoint num="9" id="3900" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3903" >
 <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="3948" />
+<TGConnectingPoint num="0" id="3902" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="3960" >
+<COMPONENT type="5103" id="3914" >
 <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="3950" />
-<TGConnectingPoint num="1" id="3951" />
-<TGConnectingPoint num="2" id="3952" />
-<TGConnectingPoint num="3" id="3953" />
-<TGConnectingPoint num="4" id="3954" />
-<TGConnectingPoint num="5" id="3955" />
-<TGConnectingPoint num="6" id="3956" />
-<TGConnectingPoint num="7" id="3957" />
-<TGConnectingPoint num="8" id="3958" />
-<TGConnectingPoint num="9" id="3959" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3971" >
+<TGConnectingPoint num="0" id="3904" />
+<TGConnectingPoint num="1" id="3905" />
+<TGConnectingPoint num="2" id="3906" />
+<TGConnectingPoint num="3" id="3907" />
+<TGConnectingPoint num="4" id="3908" />
+<TGConnectingPoint num="5" id="3909" />
+<TGConnectingPoint num="6" id="3910" />
+<TGConnectingPoint num="7" id="3911" />
+<TGConnectingPoint num="8" id="3912" />
+<TGConnectingPoint num="9" id="3913" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3925" >
 <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="3961" />
-<TGConnectingPoint num="1" id="3962" />
-<TGConnectingPoint num="2" id="3963" />
-<TGConnectingPoint num="3" id="3964" />
-<TGConnectingPoint num="4" id="3965" />
-<TGConnectingPoint num="5" id="3966" />
-<TGConnectingPoint num="6" id="3967" />
-<TGConnectingPoint num="7" id="3968" />
-<TGConnectingPoint num="8" id="3969" />
-<TGConnectingPoint num="9" id="3970" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3982" >
-<cdparam x="619" y="556" />
+<TGConnectingPoint num="0" id="3915" />
+<TGConnectingPoint num="1" id="3916" />
+<TGConnectingPoint num="2" id="3917" />
+<TGConnectingPoint num="3" id="3918" />
+<TGConnectingPoint num="4" id="3919" />
+<TGConnectingPoint num="5" id="3920" />
+<TGConnectingPoint num="6" id="3921" />
+<TGConnectingPoint num="7" id="3922" />
+<TGConnectingPoint num="8" id="3923" />
+<TGConnectingPoint num="9" id="3924" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3936" >
+<cdparam x="619" y="527" />
 <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="3972" />
-<TGConnectingPoint num="1" id="3973" />
-<TGConnectingPoint num="2" id="3974" />
-<TGConnectingPoint num="3" id="3975" />
-<TGConnectingPoint num="4" id="3976" />
-<TGConnectingPoint num="5" id="3977" />
-<TGConnectingPoint num="6" id="3978" />
-<TGConnectingPoint num="7" id="3979" />
-<TGConnectingPoint num="8" id="3980" />
-<TGConnectingPoint num="9" id="3981" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3993" >
+<TGConnectingPoint num="0" id="3926" />
+<TGConnectingPoint num="1" id="3927" />
+<TGConnectingPoint num="2" id="3928" />
+<TGConnectingPoint num="3" id="3929" />
+<TGConnectingPoint num="4" id="3930" />
+<TGConnectingPoint num="5" id="3931" />
+<TGConnectingPoint num="6" id="3932" />
+<TGConnectingPoint num="7" id="3933" />
+<TGConnectingPoint num="8" id="3934" />
+<TGConnectingPoint num="9" id="3935" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3947" >
 <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="3983" />
-<TGConnectingPoint num="1" id="3984" />
-<TGConnectingPoint num="2" id="3985" />
-<TGConnectingPoint num="3" id="3986" />
-<TGConnectingPoint num="4" id="3987" />
-<TGConnectingPoint num="5" id="3988" />
-<TGConnectingPoint num="6" id="3989" />
-<TGConnectingPoint num="7" id="3990" />
-<TGConnectingPoint num="8" id="3991" />
-<TGConnectingPoint num="9" id="3992" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4004" >
-<cdparam x="640" y="478" />
+<TGConnectingPoint num="0" id="3937" />
+<TGConnectingPoint num="1" id="3938" />
+<TGConnectingPoint num="2" id="3939" />
+<TGConnectingPoint num="3" id="3940" />
+<TGConnectingPoint num="4" id="3941" />
+<TGConnectingPoint num="5" id="3942" />
+<TGConnectingPoint num="6" id="3943" />
+<TGConnectingPoint num="7" id="3944" />
+<TGConnectingPoint num="8" id="3945" />
+<TGConnectingPoint num="9" id="3946" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3958" >
+<cdparam x="640" y="460" />
 <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="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" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4015" >
+<TGConnectingPoint num="0" id="3948" />
+<TGConnectingPoint num="1" id="3949" />
+<TGConnectingPoint num="2" id="3950" />
+<TGConnectingPoint num="3" id="3951" />
+<TGConnectingPoint num="4" id="3952" />
+<TGConnectingPoint num="5" id="3953" />
+<TGConnectingPoint num="6" id="3954" />
+<TGConnectingPoint num="7" id="3955" />
+<TGConnectingPoint num="8" id="3956" />
+<TGConnectingPoint num="9" id="3957" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3969" >
 <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="4005" />
-<TGConnectingPoint num="1" id="4006" />
-<TGConnectingPoint num="2" id="4007" />
-<TGConnectingPoint num="3" id="4008" />
-<TGConnectingPoint num="4" id="4009" />
-<TGConnectingPoint num="5" id="4010" />
-<TGConnectingPoint num="6" id="4011" />
-<TGConnectingPoint num="7" id="4012" />
-<TGConnectingPoint num="8" id="4013" />
-<TGConnectingPoint num="9" id="4014" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4056" >
+<TGConnectingPoint num="0" id="3959" />
+<TGConnectingPoint num="1" id="3960" />
+<TGConnectingPoint num="2" id="3961" />
+<TGConnectingPoint num="3" id="3962" />
+<TGConnectingPoint num="4" id="3963" />
+<TGConnectingPoint num="5" id="3964" />
+<TGConnectingPoint num="6" id="3965" />
+<TGConnectingPoint num="7" id="3966" />
+<TGConnectingPoint num="8" id="3967" />
+<TGConnectingPoint num="9" id="3968" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4010" >
 <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="4016" />
-<TGConnectingPoint num="1" id="4017" />
-<TGConnectingPoint num="2" id="4018" />
-<TGConnectingPoint num="3" id="4019" />
-<TGConnectingPoint num="4" id="4020" />
-<TGConnectingPoint num="5" id="4021" />
-<TGConnectingPoint num="6" id="4022" />
-<TGConnectingPoint num="7" id="4023" />
-<TGConnectingPoint num="8" id="4024" />
-<TGConnectingPoint num="9" id="4025" />
-<TGConnectingPoint num="10" id="4026" />
-<TGConnectingPoint num="11" id="4027" />
-<TGConnectingPoint num="12" id="4028" />
-<TGConnectingPoint num="13" id="4029" />
-<TGConnectingPoint num="14" id="4030" />
-<TGConnectingPoint num="15" id="4031" />
-<TGConnectingPoint num="16" id="4032" />
-<TGConnectingPoint num="17" id="4033" />
-<TGConnectingPoint num="18" id="4034" />
-<TGConnectingPoint num="19" id="4035" />
-<TGConnectingPoint num="20" id="4036" />
-<TGConnectingPoint num="21" id="4037" />
-<TGConnectingPoint num="22" id="4038" />
-<TGConnectingPoint num="23" id="4039" />
-<TGConnectingPoint num="24" id="4040" />
-<TGConnectingPoint num="25" id="4041" />
-<TGConnectingPoint num="26" id="4042" />
-<TGConnectingPoint num="27" id="4043" />
-<TGConnectingPoint num="28" id="4044" />
-<TGConnectingPoint num="29" id="4045" />
-<TGConnectingPoint num="30" id="4046" />
-<TGConnectingPoint num="31" id="4047" />
-<TGConnectingPoint num="32" id="4048" />
-<TGConnectingPoint num="33" id="4049" />
-<TGConnectingPoint num="34" id="4050" />
-<TGConnectingPoint num="35" id="4051" />
-<TGConnectingPoint num="36" id="4052" />
-<TGConnectingPoint num="37" id="4053" />
-<TGConnectingPoint num="38" id="4054" />
-<TGConnectingPoint num="39" id="4055" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4097" >
+<TGConnectingPoint num="0" id="3970" />
+<TGConnectingPoint num="1" id="3971" />
+<TGConnectingPoint num="2" id="3972" />
+<TGConnectingPoint num="3" id="3973" />
+<TGConnectingPoint num="4" id="3974" />
+<TGConnectingPoint num="5" id="3975" />
+<TGConnectingPoint num="6" id="3976" />
+<TGConnectingPoint num="7" id="3977" />
+<TGConnectingPoint num="8" id="3978" />
+<TGConnectingPoint num="9" id="3979" />
+<TGConnectingPoint num="10" id="3980" />
+<TGConnectingPoint num="11" id="3981" />
+<TGConnectingPoint num="12" id="3982" />
+<TGConnectingPoint num="13" id="3983" />
+<TGConnectingPoint num="14" id="3984" />
+<TGConnectingPoint num="15" id="3985" />
+<TGConnectingPoint num="16" id="3986" />
+<TGConnectingPoint num="17" id="3987" />
+<TGConnectingPoint num="18" id="3988" />
+<TGConnectingPoint num="19" id="3989" />
+<TGConnectingPoint num="20" id="3990" />
+<TGConnectingPoint num="21" id="3991" />
+<TGConnectingPoint num="22" id="3992" />
+<TGConnectingPoint num="23" id="3993" />
+<TGConnectingPoint num="24" id="3994" />
+<TGConnectingPoint num="25" id="3995" />
+<TGConnectingPoint num="26" id="3996" />
+<TGConnectingPoint num="27" id="3997" />
+<TGConnectingPoint num="28" id="3998" />
+<TGConnectingPoint num="29" id="3999" />
+<TGConnectingPoint num="30" id="4000" />
+<TGConnectingPoint num="31" id="4001" />
+<TGConnectingPoint num="32" id="4002" />
+<TGConnectingPoint num="33" id="4003" />
+<TGConnectingPoint num="34" id="4004" />
+<TGConnectingPoint num="35" id="4005" />
+<TGConnectingPoint num="36" id="4006" />
+<TGConnectingPoint num="37" id="4007" />
+<TGConnectingPoint num="38" id="4008" />
+<TGConnectingPoint num="39" id="4009" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4051" >
 <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="4057" />
-<TGConnectingPoint num="1" id="4058" />
-<TGConnectingPoint num="2" id="4059" />
-<TGConnectingPoint num="3" id="4060" />
-<TGConnectingPoint num="4" id="4061" />
-<TGConnectingPoint num="5" id="4062" />
-<TGConnectingPoint num="6" id="4063" />
-<TGConnectingPoint num="7" id="4064" />
-<TGConnectingPoint num="8" id="4065" />
-<TGConnectingPoint num="9" id="4066" />
-<TGConnectingPoint num="10" id="4067" />
-<TGConnectingPoint num="11" id="4068" />
-<TGConnectingPoint num="12" id="4069" />
-<TGConnectingPoint num="13" id="4070" />
-<TGConnectingPoint num="14" id="4071" />
-<TGConnectingPoint num="15" id="4072" />
-<TGConnectingPoint num="16" id="4073" />
-<TGConnectingPoint num="17" id="4074" />
-<TGConnectingPoint num="18" id="4075" />
-<TGConnectingPoint num="19" id="4076" />
-<TGConnectingPoint num="20" id="4077" />
-<TGConnectingPoint num="21" id="4078" />
-<TGConnectingPoint num="22" id="4079" />
-<TGConnectingPoint num="23" id="4080" />
-<TGConnectingPoint num="24" id="4081" />
-<TGConnectingPoint num="25" id="4082" />
-<TGConnectingPoint num="26" id="4083" />
-<TGConnectingPoint num="27" id="4084" />
-<TGConnectingPoint num="28" id="4085" />
-<TGConnectingPoint num="29" id="4086" />
-<TGConnectingPoint num="30" id="4087" />
-<TGConnectingPoint num="31" id="4088" />
-<TGConnectingPoint num="32" id="4089" />
-<TGConnectingPoint num="33" id="4090" />
-<TGConnectingPoint num="34" id="4091" />
-<TGConnectingPoint num="35" id="4092" />
-<TGConnectingPoint num="36" id="4093" />
-<TGConnectingPoint num="37" id="4094" />
-<TGConnectingPoint num="38" id="4095" />
-<TGConnectingPoint num="39" id="4096" />
+<TGConnectingPoint num="0" id="4011" />
+<TGConnectingPoint num="1" id="4012" />
+<TGConnectingPoint num="2" id="4013" />
+<TGConnectingPoint num="3" id="4014" />
+<TGConnectingPoint num="4" id="4015" />
+<TGConnectingPoint num="5" id="4016" />
+<TGConnectingPoint num="6" id="4017" />
+<TGConnectingPoint num="7" id="4018" />
+<TGConnectingPoint num="8" id="4019" />
+<TGConnectingPoint num="9" id="4020" />
+<TGConnectingPoint num="10" id="4021" />
+<TGConnectingPoint num="11" id="4022" />
+<TGConnectingPoint num="12" id="4023" />
+<TGConnectingPoint num="13" id="4024" />
+<TGConnectingPoint num="14" id="4025" />
+<TGConnectingPoint num="15" id="4026" />
+<TGConnectingPoint num="16" id="4027" />
+<TGConnectingPoint num="17" id="4028" />
+<TGConnectingPoint num="18" id="4029" />
+<TGConnectingPoint num="19" id="4030" />
+<TGConnectingPoint num="20" id="4031" />
+<TGConnectingPoint num="21" id="4032" />
+<TGConnectingPoint num="22" id="4033" />
+<TGConnectingPoint num="23" id="4034" />
+<TGConnectingPoint num="24" id="4035" />
+<TGConnectingPoint num="25" id="4036" />
+<TGConnectingPoint num="26" id="4037" />
+<TGConnectingPoint num="27" id="4038" />
+<TGConnectingPoint num="28" id="4039" />
+<TGConnectingPoint num="29" id="4040" />
+<TGConnectingPoint num="30" id="4041" />
+<TGConnectingPoint num="31" id="4042" />
+<TGConnectingPoint num="32" id="4043" />
+<TGConnectingPoint num="33" id="4044" />
+<TGConnectingPoint num="34" id="4045" />
+<TGConnectingPoint num="35" id="4046" />
+<TGConnectingPoint num="36" id="4047" />
+<TGConnectingPoint num="37" id="4048" />
+<TGConnectingPoint num="38" id="4049" />
+<TGConnectingPoint num="39" id="4050" />
 <breakpoint />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4138" >
+<COMPONENT type="5103" id="4062" >
+<cdparam x="605" y="562" />
+<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="4052" />
+<TGConnectingPoint num="1" id="4053" />
+<TGConnectingPoint num="2" id="4054" />
+<TGConnectingPoint num="3" id="4055" />
+<TGConnectingPoint num="4" id="4056" />
+<TGConnectingPoint num="5" id="4057" />
+<TGConnectingPoint num="6" id="4058" />
+<TGConnectingPoint num="7" id="4059" />
+<TGConnectingPoint num="8" id="4060" />
+<TGConnectingPoint num="9" id="4061" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="4073" >
+<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="4063" />
+<TGConnectingPoint num="1" id="4064" />
+<TGConnectingPoint num="2" id="4065" />
+<TGConnectingPoint num="3" id="4066" />
+<TGConnectingPoint num="4" id="4067" />
+<TGConnectingPoint num="5" id="4068" />
+<TGConnectingPoint num="6" id="4069" />
+<TGConnectingPoint num="7" id="4070" />
+<TGConnectingPoint num="8" id="4071" />
+<TGConnectingPoint num="9" id="4072" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4114" >
 <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="4098" />
-<TGConnectingPoint num="1" id="4099" />
-<TGConnectingPoint num="2" id="4100" />
-<TGConnectingPoint num="3" id="4101" />
-<TGConnectingPoint num="4" id="4102" />
-<TGConnectingPoint num="5" id="4103" />
-<TGConnectingPoint num="6" id="4104" />
-<TGConnectingPoint num="7" id="4105" />
-<TGConnectingPoint num="8" id="4106" />
-<TGConnectingPoint num="9" id="4107" />
-<TGConnectingPoint num="10" id="4108" />
-<TGConnectingPoint num="11" id="4109" />
-<TGConnectingPoint num="12" id="4110" />
-<TGConnectingPoint num="13" id="4111" />
-<TGConnectingPoint num="14" id="4112" />
-<TGConnectingPoint num="15" id="4113" />
-<TGConnectingPoint num="16" id="4114" />
-<TGConnectingPoint num="17" id="4115" />
-<TGConnectingPoint num="18" id="4116" />
-<TGConnectingPoint num="19" id="4117" />
-<TGConnectingPoint num="20" id="4118" />
-<TGConnectingPoint num="21" id="4119" />
-<TGConnectingPoint num="22" id="4120" />
-<TGConnectingPoint num="23" id="4121" />
-<TGConnectingPoint num="24" id="4122" />
-<TGConnectingPoint num="25" id="4123" />
-<TGConnectingPoint num="26" id="4124" />
-<TGConnectingPoint num="27" id="4125" />
-<TGConnectingPoint num="28" id="4126" />
-<TGConnectingPoint num="29" id="4127" />
-<TGConnectingPoint num="30" id="4128" />
-<TGConnectingPoint num="31" id="4129" />
-<TGConnectingPoint num="32" id="4130" />
-<TGConnectingPoint num="33" id="4131" />
-<TGConnectingPoint num="34" id="4132" />
-<TGConnectingPoint num="35" id="4133" />
-<TGConnectingPoint num="36" id="4134" />
-<TGConnectingPoint num="37" id="4135" />
-<TGConnectingPoint num="38" id="4136" />
-<TGConnectingPoint num="39" id="4137" />
+<TGConnectingPoint num="0" id="4074" />
+<TGConnectingPoint num="1" id="4075" />
+<TGConnectingPoint num="2" id="4076" />
+<TGConnectingPoint num="3" id="4077" />
+<TGConnectingPoint num="4" id="4078" />
+<TGConnectingPoint num="5" id="4079" />
+<TGConnectingPoint num="6" id="4080" />
+<TGConnectingPoint num="7" id="4081" />
+<TGConnectingPoint num="8" id="4082" />
+<TGConnectingPoint num="9" id="4083" />
+<TGConnectingPoint num="10" id="4084" />
+<TGConnectingPoint num="11" id="4085" />
+<TGConnectingPoint num="12" id="4086" />
+<TGConnectingPoint num="13" id="4087" />
+<TGConnectingPoint num="14" id="4088" />
+<TGConnectingPoint num="15" id="4089" />
+<TGConnectingPoint num="16" id="4090" />
+<TGConnectingPoint num="17" id="4091" />
+<TGConnectingPoint num="18" id="4092" />
+<TGConnectingPoint num="19" id="4093" />
+<TGConnectingPoint num="20" id="4094" />
+<TGConnectingPoint num="21" id="4095" />
+<TGConnectingPoint num="22" id="4096" />
+<TGConnectingPoint num="23" id="4097" />
+<TGConnectingPoint num="24" id="4098" />
+<TGConnectingPoint num="25" id="4099" />
+<TGConnectingPoint num="26" id="4100" />
+<TGConnectingPoint num="27" id="4101" />
+<TGConnectingPoint num="28" id="4102" />
+<TGConnectingPoint num="29" id="4103" />
+<TGConnectingPoint num="30" id="4104" />
+<TGConnectingPoint num="31" id="4105" />
+<TGConnectingPoint num="32" id="4106" />
+<TGConnectingPoint num="33" id="4107" />
+<TGConnectingPoint num="34" id="4108" />
+<TGConnectingPoint num="35" id="4109" />
+<TGConnectingPoint num="36" id="4110" />
+<TGConnectingPoint num="37" id="4111" />
+<TGConnectingPoint num="38" id="4112" />
+<TGConnectingPoint num="39" id="4113" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -8619,94 +8520,142 @@ or by a maintenance station
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4151" >
-<cdparam x="504" y="232" />
+<AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="4127" >
+<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="4147" />
-<TGConnectingPoint num="1" id="4148" />
-<TGConnectingPoint num="2" id="4149" />
-<TGConnectingPoint num="3" id="4150" />
-<P1  x="504" y="232" id="4210" />
-<P2  x="454" y="123" id="4171" />
-<Point x="503" y="254" />
-<Point x="425" y="254" />
-<Point x="426" y="123" />
+<TGConnectingPoint num="0" id="4123" />
+<TGConnectingPoint num="1" id="4124" />
+<TGConnectingPoint num="2" id="4125" />
+<TGConnectingPoint num="3" id="4126" />
+<P1  x="407" y="310" id="4157" />
+<P2  x="365" y="113" id="4224" />
+<Point x="407" y="327" />
+<Point x="323" y="327" />
+<Point x="323" y="113" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4139" >
-<father id="4151" num="0" />
-<cdparam x="503" y="254" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4115" >
+<father id="4127" 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="4140" >
-<father id="4151" num="1" />
-<cdparam x="425" y="254" />
+<SUBCOMPONENT type="-1" id="4116" >
+<father id="4127" 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="4141" >
-<father id="4151" num="2" />
-<cdparam x="426" y="123" />
+<SUBCOMPONENT type="-1" id="4117" >
+<father id="4127" 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="4146" >
-<father id="4151" num="3" />
-<cdparam x="465" y="275" />
-<sizeparam width="100" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="4122" >
+<father id="4127" 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="4142" />
-<TGConnectingPoint num="1" id="4143" />
-<TGConnectingPoint num="2" id="4144" />
-<TGConnectingPoint num="3" id="4145" />
+<TGConnectingPoint num="0" id="4118" />
+<TGConnectingPoint num="1" id="4119" />
+<TGConnectingPoint num="2" id="4120" />
+<TGConnectingPoint num="3" id="4121" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="OFF()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4160" >
-<cdparam x="504" y="148" />
+<CONNECTOR type="5102" id="4134" >
+<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 state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4158" />
-<TGConnectingPoint num="1" id="4159" />
-<P1  x="504" y="148" id="4174" />
-<P2  x="504" y="202" id="4209" />
-<Point x="504" y="175" />
+<infoparam name="connector from state1 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="4133" />
+<P1  x="408" y="242" id="4173" />
+<P2  x="407" y="280" id="4156" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4152" >
-<father id="4160" num="0" />
-<cdparam x="504" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4132" >
+<father id="4134" 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="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4128" />
+<TGConnectingPoint num="1" id="4129" />
+<TGConnectingPoint num="2" id="4130" />
+<TGConnectingPoint num="3" id="4131" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4157" >
-<father id="4160" num="1" />
-<cdparam x="504" y="188" />
+
+<CONNECTOR type="5102" id="4141" >
+<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="4140" />
+<P1  x="407" y="183" id="4209" />
+<P2  x="408" y="202" id="4168" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4139" >
+<father id="4141" num="0" />
+<cdparam x="417" y="195" />
+<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="4135" />
+<TGConnectingPoint num="1" id="4136" />
+<TGConnectingPoint num="2" id="4137" />
+<TGConnectingPoint num="3" id="4138" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="ON()" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4148" >
+<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="4147" />
+<P1  x="407" y="131" id="4227" />
+<P2  x="407" y="153" id="4208" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4146" >
+<father id="4148" 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="4153" />
-<TGConnectingPoint num="1" id="4154" />
-<TGConnectingPoint num="2" id="4155" />
-<TGConnectingPoint num="3" id="4156" />
+<TGConnectingPoint num="0" id="4142" />
+<TGConnectingPoint num="1" id="4143" />
+<TGConnectingPoint num="2" id="4144" />
+<TGConnectingPoint num="3" id="4145" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8716,25 +8665,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4167" >
-<cdparam x="385" y="75" />
+<CONNECTOR type="5102" id="4155" >
+<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="4166" />
-<P1  x="481" y="74" id="4220" />
-<P2  x="504" y="98" id="4169" />
+<TGConnectingPoint num="0" id="4154" />
+<P1  x="407" y="70" id="4219" />
+<P2  x="407" y="96" id="4222" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4165" >
-<father id="4167" num="0" />
-<cdparam x="385" y="115" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4153" >
+<father id="4155" 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="4161" />
-<TGConnectingPoint num="1" id="4162" />
-<TGConnectingPoint num="2" id="4163" />
-<TGConnectingPoint num="3" id="4164" />
+<TGConnectingPoint num="0" id="4149" />
+<TGConnectingPoint num="1" id="4150" />
+<TGConnectingPoint num="2" id="4151" />
+<TGConnectingPoint num="3" id="4152" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8744,221 +8693,320 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4208" >
-<cdparam x="454" y="98" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="4166" >
+<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="state0" value="Active" />
-<TGConnectingPoint num="0" id="4168" />
-<TGConnectingPoint num="1" id="4169" />
-<TGConnectingPoint num="2" id="4170" />
-<TGConnectingPoint num="3" id="4171" />
-<TGConnectingPoint num="4" id="4172" />
-<TGConnectingPoint num="5" id="4173" />
-<TGConnectingPoint num="6" id="4174" />
-<TGConnectingPoint num="7" id="4175" />
-<TGConnectingPoint num="8" id="4176" />
-<TGConnectingPoint num="9" id="4177" />
-<TGConnectingPoint num="10" id="4178" />
-<TGConnectingPoint num="11" id="4179" />
-<TGConnectingPoint num="12" id="4180" />
-<TGConnectingPoint num="13" id="4181" />
-<TGConnectingPoint num="14" id="4182" />
-<TGConnectingPoint num="15" id="4183" />
-<TGConnectingPoint num="16" id="4184" />
-<TGConnectingPoint num="17" id="4185" />
-<TGConnectingPoint num="18" id="4186" />
-<TGConnectingPoint num="19" id="4187" />
-<TGConnectingPoint num="20" id="4188" />
-<TGConnectingPoint num="21" id="4189" />
-<TGConnectingPoint num="22" id="4190" />
-<TGConnectingPoint num="23" id="4191" />
-<TGConnectingPoint num="24" id="4192" />
-<TGConnectingPoint num="25" id="4193" />
-<TGConnectingPoint num="26" id="4194" />
-<TGConnectingPoint num="27" id="4195" />
-<TGConnectingPoint num="28" id="4196" />
-<TGConnectingPoint num="29" id="4197" />
-<TGConnectingPoint num="30" id="4198" />
-<TGConnectingPoint num="31" id="4199" />
-<TGConnectingPoint num="32" id="4200" />
-<TGConnectingPoint num="33" id="4201" />
-<TGConnectingPoint num="34" id="4202" />
-<TGConnectingPoint num="35" id="4203" />
-<TGConnectingPoint num="36" id="4204" />
-<TGConnectingPoint num="37" id="4205" />
-<TGConnectingPoint num="38" id="4206" />
-<TGConnectingPoint num="39" id="4207" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="4219" >
-<cdparam x="440" y="207" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="stopM()" />
+<TGConnectingPoint num="0" id="4156" />
+<TGConnectingPoint num="1" id="4157" />
+<TGConnectingPoint num="2" id="4158" />
+<TGConnectingPoint num="3" id="4159" />
+<TGConnectingPoint num="4" id="4160" />
+<TGConnectingPoint num="5" id="4161" />
+<TGConnectingPoint num="6" id="4162" />
+<TGConnectingPoint num="7" id="4163" />
+<TGConnectingPoint num="8" id="4164" />
+<TGConnectingPoint num="9" id="4165" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4207" >
+<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="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="4209" />
-<TGConnectingPoint num="1" id="4210" />
-<TGConnectingPoint num="2" id="4211" />
-<TGConnectingPoint num="3" id="4212" />
-<TGConnectingPoint num="4" id="4213" />
-<TGConnectingPoint num="5" id="4214" />
-<TGConnectingPoint num="6" id="4215" />
-<TGConnectingPoint num="7" id="4216" />
-<TGConnectingPoint num="8" id="4217" />
-<TGConnectingPoint num="9" id="4218" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4221" >
-<cdparam x="474" y="54" />
+<infoparam name="state1" value="Running" />
+<TGConnectingPoint num="0" id="4167" />
+<TGConnectingPoint num="1" id="4168" />
+<TGConnectingPoint num="2" id="4169" />
+<TGConnectingPoint num="3" id="4170" />
+<TGConnectingPoint num="4" id="4171" />
+<TGConnectingPoint num="5" id="4172" />
+<TGConnectingPoint num="6" id="4173" />
+<TGConnectingPoint num="7" id="4174" />
+<TGConnectingPoint num="8" id="4175" />
+<TGConnectingPoint num="9" id="4176" />
+<TGConnectingPoint num="10" id="4177" />
+<TGConnectingPoint num="11" id="4178" />
+<TGConnectingPoint num="12" id="4179" />
+<TGConnectingPoint num="13" id="4180" />
+<TGConnectingPoint num="14" id="4181" />
+<TGConnectingPoint num="15" id="4182" />
+<TGConnectingPoint num="16" id="4183" />
+<TGConnectingPoint num="17" id="4184" />
+<TGConnectingPoint num="18" id="4185" />
+<TGConnectingPoint num="19" id="4186" />
+<TGConnectingPoint num="20" id="4187" />
+<TGConnectingPoint num="21" id="4188" />
+<TGConnectingPoint num="22" id="4189" />
+<TGConnectingPoint num="23" id="4190" />
+<TGConnectingPoint num="24" id="4191" />
+<TGConnectingPoint num="25" id="4192" />
+<TGConnectingPoint num="26" id="4193" />
+<TGConnectingPoint num="27" id="4194" />
+<TGConnectingPoint num="28" id="4195" />
+<TGConnectingPoint num="29" id="4196" />
+<TGConnectingPoint num="30" id="4197" />
+<TGConnectingPoint num="31" id="4198" />
+<TGConnectingPoint num="32" id="4199" />
+<TGConnectingPoint num="33" id="4200" />
+<TGConnectingPoint num="34" id="4201" />
+<TGConnectingPoint num="35" id="4202" />
+<TGConnectingPoint num="36" id="4203" />
+<TGConnectingPoint num="37" id="4204" />
+<TGConnectingPoint num="38" id="4205" />
+<TGConnectingPoint num="39" id="4206" />
+<extraparam>
+<entryCode value="printf(&quot;DANGER: Magnetron is ON\n&quot;);" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="4218" >
+<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="4208" />
+<TGConnectingPoint num="1" id="4209" />
+<TGConnectingPoint num="2" id="4210" />
+<TGConnectingPoint num="3" id="4211" />
+<TGConnectingPoint num="4" id="4212" />
+<TGConnectingPoint num="5" id="4213" />
+<TGConnectingPoint num="6" id="4214" />
+<TGConnectingPoint num="7" id="4215" />
+<TGConnectingPoint num="8" id="4216" />
+<TGConnectingPoint num="9" id="4217" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="4220" >
+<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="4220" />
+<TGConnectingPoint num="0" id="4219" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4261" >
+<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="4221" />
+<TGConnectingPoint num="1" id="4222" />
+<TGConnectingPoint num="2" id="4223" />
+<TGConnectingPoint num="3" id="4224" />
+<TGConnectingPoint num="4" id="4225" />
+<TGConnectingPoint num="5" id="4226" />
+<TGConnectingPoint num="6" id="4227" />
+<TGConnectingPoint num="7" id="4228" />
+<TGConnectingPoint num="8" id="4229" />
+<TGConnectingPoint num="9" id="4230" />
+<TGConnectingPoint num="10" id="4231" />
+<TGConnectingPoint num="11" id="4232" />
+<TGConnectingPoint num="12" id="4233" />
+<TGConnectingPoint num="13" id="4234" />
+<TGConnectingPoint num="14" id="4235" />
+<TGConnectingPoint num="15" id="4236" />
+<TGConnectingPoint num="16" id="4237" />
+<TGConnectingPoint num="17" id="4238" />
+<TGConnectingPoint num="18" id="4239" />
+<TGConnectingPoint num="19" id="4240" />
+<TGConnectingPoint num="20" id="4241" />
+<TGConnectingPoint num="21" id="4242" />
+<TGConnectingPoint num="22" id="4243" />
+<TGConnectingPoint num="23" id="4244" />
+<TGConnectingPoint num="24" id="4245" />
+<TGConnectingPoint num="25" id="4246" />
+<TGConnectingPoint num="26" id="4247" />
+<TGConnectingPoint num="27" id="4248" />
+<TGConnectingPoint num="28" id="4249" />
+<TGConnectingPoint num="29" id="4250" />
+<TGConnectingPoint num="30" id="4251" />
+<TGConnectingPoint num="31" id="4252" />
+<TGConnectingPoint num="32" id="4253" />
+<TGConnectingPoint num="33" id="4254" />
+<TGConnectingPoint num="34" id="4255" />
+<TGConnectingPoint num="35" id="4256" />
+<TGConnectingPoint num="36" id="4257" />
+<TGConnectingPoint num="37" id="4258" />
+<TGConnectingPoint num="38" id="4259" />
+<TGConnectingPoint num="39" id="4260" />
+<extraparam>
+<entryCode value="printf(&quot;Magnetron is off\n&quot;);" />
+</extraparam>
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4228" >
-<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="4227" />
-<P1  x="419" y="209" id="4298" />
-<P2  x="419" y="313" id="4257" />
+<AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="4268" >
+<cdparam x="407" y="209" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="4267" />
+<P1  x="407" y="209" id="4356" />
+<P2  x="407" y="290" id="4304" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4226" >
-<father id="4228" num="0" />
-<cdparam x="429" y="249" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4266" >
+<father id="4268" num="0" />
+<cdparam x="407" 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="4222" />
-<TGConnectingPoint num="1" id="4223" />
-<TGConnectingPoint num="2" id="4224" />
-<TGConnectingPoint num="3" id="4225" />
+<TGConnectingPoint num="0" id="4262" />
+<TGConnectingPoint num="1" id="4263" />
+<TGConnectingPoint num="2" id="4264" />
+<TGConnectingPoint num="3" id="4265" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="runBell()" />
+<actions value="openM()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4241" >
-<cdparam x="419" y="209" />
+<CONNECTOR type="5102" id="4275" >
+<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="4274" />
+<P1  x="407" y="340" id="4309" />
+<P2  x="407" y="374" id="4344" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4273" >
+<father id="4275" 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="4269" />
+<TGConnectingPoint num="1" id="4270" />
+<TGConnectingPoint num="2" id="4271" />
+<TGConnectingPoint num="3" id="4272" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="2" />
+<afterMax value="3" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4288" >
+<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="4237" />
-<TGConnectingPoint num="1" id="4238" />
-<TGConnectingPoint num="2" id="4239" />
-<TGConnectingPoint num="3" id="4240" />
-<P1  x="419" y="363" id="4262" />
-<P2  x="369" y="123" id="4311" />
-<Point x="412" y="419" />
-<Point x="332" y="419" />
-<Point x="332" y="123" />
+<TGConnectingPoint num="0" id="4284" />
+<TGConnectingPoint num="1" id="4285" />
+<TGConnectingPoint num="2" id="4286" />
+<TGConnectingPoint num="3" id="4287" />
+<P1  x="407" y="404" id="4345" />
+<P2  x="357" y="125" id="4369" />
+<Point x="300" y="404" />
+<Point x="300" y="278" />
+<Point x="300" y="125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4229" >
-<father id="4241" num="0" />
-<cdparam x="412" y="419" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4276" >
+<father id="4288" 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="4230" >
-<father id="4241" num="1" />
-<cdparam x="332" y="419" />
+<SUBCOMPONENT type="-1" id="4277" >
+<father id="4288" 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="4231" >
-<father id="4241" num="2" />
-<cdparam x="332" y="123" />
+<SUBCOMPONENT type="-1" id="4278" >
+<father id="4288" 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="4236" >
-<father id="4241" num="3" />
-<cdparam x="430" y="402" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="4283" >
+<father id="4288" 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="4232" />
-<TGConnectingPoint num="1" id="4233" />
-<TGConnectingPoint num="2" id="4234" />
-<TGConnectingPoint num="3" id="4235" />
+<TGConnectingPoint num="0" id="4279" />
+<TGConnectingPoint num="1" id="4280" />
+<TGConnectingPoint num="2" id="4281" />
+<TGConnectingPoint num="3" id="4282" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="closeM()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4248" >
-<cdparam x="420" y="151" />
+<CONNECTOR type="5102" id="4295" >
+<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="4247" />
-<P1  x="419" y="148" id="4314" />
-<P2  x="419" y="179" id="4297" />
+<TGConnectingPoint num="0" id="4294" />
+<P1  x="407" y="150" id="4372" />
+<P2  x="407" y="179" id="4355" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4246" >
-<father id="4248" num="0" />
-<cdparam x="420" y="191" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4293" >
+<father id="4295" num="0" />
+<cdparam x="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="4242" />
-<TGConnectingPoint num="1" id="4243" />
-<TGConnectingPoint num="2" id="4244" />
-<TGConnectingPoint num="3" id="4245" />
+<TGConnectingPoint num="0" id="4289" />
+<TGConnectingPoint num="1" id="4290" />
+<TGConnectingPoint num="2" id="4291" />
+<TGConnectingPoint num="3" id="4292" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
+<afterMin value="2" />
+<afterMax value="3" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4255" >
+<CONNECTOR type="5102" id="4302" >
 <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="4254" />
-<P1  x="407" y="70" id="4349" />
-<P2  x="419" y="98" id="4309" />
+<TGConnectingPoint num="0" id="4301" />
+<P1  x="407" y="70" id="4407" />
+<P2  x="407" y="100" id="4367" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4253" >
-<father id="4255" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4300" >
+<father id="4302" 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="4249" />
-<TGConnectingPoint num="1" id="4250" />
-<TGConnectingPoint num="2" id="4251" />
-<TGConnectingPoint num="3" id="4252" />
+<TGConnectingPoint num="0" id="4296" />
+<TGConnectingPoint num="1" id="4297" />
+<TGConnectingPoint num="2" id="4298" />
+<TGConnectingPoint num="3" id="4299" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8968,228 +9016,262 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4296" >
-<cdparam x="369" y="313" />
+<COMPONENT type="5106" id="4343" >
+<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="Ringing" />
-<TGConnectingPoint num="0" id="4256" />
-<TGConnectingPoint num="1" id="4257" />
-<TGConnectingPoint num="2" id="4258" />
-<TGConnectingPoint num="3" id="4259" />
-<TGConnectingPoint num="4" id="4260" />
-<TGConnectingPoint num="5" id="4261" />
-<TGConnectingPoint num="6" id="4262" />
-<TGConnectingPoint num="7" id="4263" />
-<TGConnectingPoint num="8" id="4264" />
-<TGConnectingPoint num="9" id="4265" />
-<TGConnectingPoint num="10" id="4266" />
-<TGConnectingPoint num="11" id="4267" />
-<TGConnectingPoint num="12" id="4268" />
-<TGConnectingPoint num="13" id="4269" />
-<TGConnectingPoint num="14" id="4270" />
-<TGConnectingPoint num="15" id="4271" />
-<TGConnectingPoint num="16" id="4272" />
-<TGConnectingPoint num="17" id="4273" />
-<TGConnectingPoint num="18" id="4274" />
-<TGConnectingPoint num="19" id="4275" />
-<TGConnectingPoint num="20" id="4276" />
-<TGConnectingPoint num="21" id="4277" />
-<TGConnectingPoint num="22" id="4278" />
-<TGConnectingPoint num="23" id="4279" />
-<TGConnectingPoint num="24" id="4280" />
-<TGConnectingPoint num="25" id="4281" />
-<TGConnectingPoint num="26" id="4282" />
-<TGConnectingPoint num="27" id="4283" />
-<TGConnectingPoint num="28" id="4284" />
-<TGConnectingPoint num="29" id="4285" />
-<TGConnectingPoint num="30" id="4286" />
-<TGConnectingPoint num="31" id="4287" />
-<TGConnectingPoint num="32" id="4288" />
-<TGConnectingPoint num="33" id="4289" />
-<TGConnectingPoint num="34" id="4290" />
-<TGConnectingPoint num="35" id="4291" />
-<TGConnectingPoint num="36" id="4292" />
-<TGConnectingPoint num="37" id="4293" />
-<TGConnectingPoint num="38" id="4294" />
-<TGConnectingPoint num="39" id="4295" />
+<infoparam name="state0" value="Opened" />
+<TGConnectingPoint num="0" id="4303" />
+<TGConnectingPoint num="1" id="4304" />
+<TGConnectingPoint num="2" id="4305" />
+<TGConnectingPoint num="3" id="4306" />
+<TGConnectingPoint num="4" id="4307" />
+<TGConnectingPoint num="5" id="4308" />
+<TGConnectingPoint num="6" id="4309" />
+<TGConnectingPoint num="7" id="4310" />
+<TGConnectingPoint num="8" id="4311" />
+<TGConnectingPoint num="9" id="4312" />
+<TGConnectingPoint num="10" id="4313" />
+<TGConnectingPoint num="11" id="4314" />
+<TGConnectingPoint num="12" id="4315" />
+<TGConnectingPoint num="13" id="4316" />
+<TGConnectingPoint num="14" id="4317" />
+<TGConnectingPoint num="15" id="4318" />
+<TGConnectingPoint num="16" id="4319" />
+<TGConnectingPoint num="17" id="4320" />
+<TGConnectingPoint num="18" id="4321" />
+<TGConnectingPoint num="19" id="4322" />
+<TGConnectingPoint num="20" id="4323" />
+<TGConnectingPoint num="21" id="4324" />
+<TGConnectingPoint num="22" id="4325" />
+<TGConnectingPoint num="23" id="4326" />
+<TGConnectingPoint num="24" id="4327" />
+<TGConnectingPoint num="25" id="4328" />
+<TGConnectingPoint num="26" id="4329" />
+<TGConnectingPoint num="27" id="4330" />
+<TGConnectingPoint num="28" id="4331" />
+<TGConnectingPoint num="29" id="4332" />
+<TGConnectingPoint num="30" id="4333" />
+<TGConnectingPoint num="31" id="4334" />
+<TGConnectingPoint num="32" id="4335" />
+<TGConnectingPoint num="33" id="4336" />
+<TGConnectingPoint num="34" id="4337" />
+<TGConnectingPoint num="35" id="4338" />
+<TGConnectingPoint num="36" id="4339" />
+<TGConnectingPoint num="37" id="4340" />
+<TGConnectingPoint num="38" id="4341" />
+<TGConnectingPoint num="39" id="4342" />
 <extraparam>
-<entryCode value="" />
-<entryCode value="printf(&quot;\nDRING DRING DRING !!!!\n\n&quot;);" />
+<entryCode value="printf(&quot;Door is opened!!!\n&quot;);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4307" >
-<cdparam x="395" y="184" />
-<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="4354" >
+<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="ring()" />
-<TGConnectingPoint num="0" id="4297" />
-<TGConnectingPoint num="1" id="4298" />
-<TGConnectingPoint num="2" id="4299" />
-<TGConnectingPoint num="3" id="4300" />
-<TGConnectingPoint num="4" id="4301" />
-<TGConnectingPoint num="5" id="4302" />
-<TGConnectingPoint num="6" id="4303" />
-<TGConnectingPoint num="7" id="4304" />
-<TGConnectingPoint num="8" id="4305" />
-<TGConnectingPoint num="9" id="4306" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4348" >
-<cdparam x="369" y="98" />
+<infoparam name="Send signal" value="closed()" />
+<TGConnectingPoint num="0" id="4344" />
+<TGConnectingPoint num="1" id="4345" />
+<TGConnectingPoint num="2" id="4346" />
+<TGConnectingPoint num="3" id="4347" />
+<TGConnectingPoint num="4" id="4348" />
+<TGConnectingPoint num="5" id="4349" />
+<TGConnectingPoint num="6" id="4350" />
+<TGConnectingPoint num="7" id="4351" />
+<TGConnectingPoint num="8" id="4352" />
+<TGConnectingPoint num="9" id="4353" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="4365" >
+<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="4355" />
+<TGConnectingPoint num="1" id="4356" />
+<TGConnectingPoint num="2" id="4357" />
+<TGConnectingPoint num="3" id="4358" />
+<TGConnectingPoint num="4" id="4359" />
+<TGConnectingPoint num="5" id="4360" />
+<TGConnectingPoint num="6" id="4361" />
+<TGConnectingPoint num="7" id="4362" />
+<TGConnectingPoint num="8" id="4363" />
+<TGConnectingPoint num="9" id="4364" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4406" >
+<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="Active" />
-<TGConnectingPoint num="0" id="4308" />
-<TGConnectingPoint num="1" id="4309" />
-<TGConnectingPoint num="2" id="4310" />
-<TGConnectingPoint num="3" id="4311" />
-<TGConnectingPoint num="4" id="4312" />
-<TGConnectingPoint num="5" id="4313" />
-<TGConnectingPoint num="6" id="4314" />
-<TGConnectingPoint num="7" id="4315" />
-<TGConnectingPoint num="8" id="4316" />
-<TGConnectingPoint num="9" id="4317" />
-<TGConnectingPoint num="10" id="4318" />
-<TGConnectingPoint num="11" id="4319" />
-<TGConnectingPoint num="12" id="4320" />
-<TGConnectingPoint num="13" id="4321" />
-<TGConnectingPoint num="14" id="4322" />
-<TGConnectingPoint num="15" id="4323" />
-<TGConnectingPoint num="16" id="4324" />
-<TGConnectingPoint num="17" id="4325" />
-<TGConnectingPoint num="18" id="4326" />
-<TGConnectingPoint num="19" id="4327" />
-<TGConnectingPoint num="20" id="4328" />
-<TGConnectingPoint num="21" id="4329" />
-<TGConnectingPoint num="22" id="4330" />
-<TGConnectingPoint num="23" id="4331" />
-<TGConnectingPoint num="24" id="4332" />
-<TGConnectingPoint num="25" id="4333" />
-<TGConnectingPoint num="26" id="4334" />
-<TGConnectingPoint num="27" id="4335" />
-<TGConnectingPoint num="28" id="4336" />
-<TGConnectingPoint num="29" id="4337" />
-<TGConnectingPoint num="30" id="4338" />
-<TGConnectingPoint num="31" id="4339" />
-<TGConnectingPoint num="32" id="4340" />
-<TGConnectingPoint num="33" id="4341" />
-<TGConnectingPoint num="34" id="4342" />
-<TGConnectingPoint num="35" id="4343" />
-<TGConnectingPoint num="36" id="4344" />
-<TGConnectingPoint num="37" id="4345" />
-<TGConnectingPoint num="38" id="4346" />
-<TGConnectingPoint num="39" id="4347" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4350" >
+<infoparam name="state0" value="IDLE" />
+<TGConnectingPoint num="0" id="4366" />
+<TGConnectingPoint num="1" id="4367" />
+<TGConnectingPoint num="2" id="4368" />
+<TGConnectingPoint num="3" id="4369" />
+<TGConnectingPoint num="4" id="4370" />
+<TGConnectingPoint num="5" id="4371" />
+<TGConnectingPoint num="6" id="4372" />
+<TGConnectingPoint num="7" id="4373" />
+<TGConnectingPoint num="8" id="4374" />
+<TGConnectingPoint num="9" id="4375" />
+<TGConnectingPoint num="10" id="4376" />
+<TGConnectingPoint num="11" id="4377" />
+<TGConnectingPoint num="12" id="4378" />
+<TGConnectingPoint num="13" id="4379" />
+<TGConnectingPoint num="14" id="4380" />
+<TGConnectingPoint num="15" id="4381" />
+<TGConnectingPoint num="16" id="4382" />
+<TGConnectingPoint num="17" id="4383" />
+<TGConnectingPoint num="18" id="4384" />
+<TGConnectingPoint num="19" id="4385" />
+<TGConnectingPoint num="20" id="4386" />
+<TGConnectingPoint num="21" id="4387" />
+<TGConnectingPoint num="22" id="4388" />
+<TGConnectingPoint num="23" id="4389" />
+<TGConnectingPoint num="24" id="4390" />
+<TGConnectingPoint num="25" id="4391" />
+<TGConnectingPoint num="26" id="4392" />
+<TGConnectingPoint num="27" id="4393" />
+<TGConnectingPoint num="28" id="4394" />
+<TGConnectingPoint num="29" id="4395" />
+<TGConnectingPoint num="30" id="4396" />
+<TGConnectingPoint num="31" id="4397" />
+<TGConnectingPoint num="32" id="4398" />
+<TGConnectingPoint num="33" id="4399" />
+<TGConnectingPoint num="34" id="4400" />
+<TGConnectingPoint num="35" id="4401" />
+<TGConnectingPoint num="36" id="4402" />
+<TGConnectingPoint num="37" id="4403" />
+<TGConnectingPoint num="38" id="4404" />
+<TGConnectingPoint num="39" id="4405" />
+<extraparam>
+<entryCode value="printf(&quot;Door is closed\n&quot;);" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4408" >
 <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="4349" />
+<TGConnectingPoint num="0" id="4407" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="RemoteControl" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="118" id="4351" >
-<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="508" y="119" id="4354" />
-<P2  x="660" y="162" id="4424" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="5102" id="4358" >
-<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="4357" />
-<P1  x="309" y="119" id="4484" />
-<P2  x="325" y="163" id="4431" />
+<AVATARStateMachineDiagramPanel name="WirelessInterface" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="4415" >
+<cdparam x="447" y="399" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="4414" />
+<P1  x="447" y="399" id="4450" />
+<P2  x="474" y="432" id="4485" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4356" >
-<father id="4358" num="0" />
-<cdparam x="340" y="118" />
-<sizeparam width="168" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4413" >
+<father id="4415" num="0" />
+<cdparam x="447" y="439" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4352" />
-<TGConnectingPoint num="1" id="4353" />
-<TGConnectingPoint num="2" id="4354" />
-<TGConnectingPoint num="3" id="4355" />
+<TGConnectingPoint num="0" id="4409" />
+<TGConnectingPoint num="1" id="4410" />
+<TGConnectingPoint num="2" id="4411" />
+<TGConnectingPoint num="3" id="4412" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg1.data = duration" />
-<actions value="msg1 = sencrypt(msg1, PSK)" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4365" >
-<cdparam x="327" y="221" />
+<CONNECTOR type="5102" id="4422" >
+<cdparam x="491" y="459" />
 <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="4364" />
-<P1  x="325" y="213" id="4436" />
-<P2  x="347" y="291" id="4473" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="4421" />
+<P1  x="474" y="462" id="4486" />
+<P2  x="485" y="495" id="4537" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4363" >
-<father id="4365" num="0" />
-<cdparam x="364" y="248" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4420" >
+<father id="4422" num="0" />
+<cdparam x="491" y="499" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4359" />
-<TGConnectingPoint num="1" id="4360" />
-<TGConnectingPoint num="2" id="4361" />
-<TGConnectingPoint num="3" id="4362" />
+<TGConnectingPoint num="0" id="4416" />
+<TGConnectingPoint num="1" id="4417" />
+<TGConnectingPoint num="2" id="4418" />
+<TGConnectingPoint num="3" id="4419" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4372" >
-<cdparam x="347" y="321" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4371" />
-<P1  x="347" y="321" id="4474" />
-<P2  x="348" y="377" id="4388" />
+<CONNECTOR type="5102" id="4429" >
+<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="4428" />
+<P1  x="414" y="275" id="4502" />
+<P2  x="447" y="349" id="4445" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4370" >
-<father id="4372" num="0" />
-<cdparam x="347" y="361" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4427" >
+<father id="4429" num="0" />
+<cdparam x="459" y="317" />
+<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="4423" />
+<TGConnectingPoint num="1" id="4424" />
+<TGConnectingPoint num="2" id="4425" />
+<TGConnectingPoint num="3" id="4426" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="msg3 = sdecrypt(msg2, PSK)" />
+<actions value="selectedDuration = msg3.data" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4436" >
+<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="4435" />
+<P1  x="386" y="101" id="4550" />
+<P2  x="401" y="161" id="4539" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4434" >
+<father id="4436" 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="4366" />
-<TGConnectingPoint num="1" id="4367" />
-<TGConnectingPoint num="2" id="4368" />
-<TGConnectingPoint num="3" id="4369" />
+<TGConnectingPoint num="0" id="4430" />
+<TGConnectingPoint num="1" id="4431" />
+<TGConnectingPoint num="2" id="4432" />
+<TGConnectingPoint num="3" id="4433" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9199,25 +9281,25 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4379" >
-<cdparam x="373" 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="4378" />
-<P1  x="373" y="427" id="4386" />
-<P2  x="375" y="442" id="4471" />
+<CONNECTOR type="5102" id="4443" >
+<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="4442" />
+<P1  x="401" y="191" id="4540" />
+<P2  x="414" y="225" id="4497" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4377" >
-<father id="4379" num="0" />
-<cdparam x="373" y="467" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4441" >
+<father id="4443" 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="4373" />
-<TGConnectingPoint num="1" id="4374" />
-<TGConnectingPoint num="2" id="4375" />
-<TGConnectingPoint num="3" id="4376" />
+<TGConnectingPoint num="0" id="4437" />
+<TGConnectingPoint num="1" id="4438" />
+<TGConnectingPoint num="2" id="4439" />
+<TGConnectingPoint num="3" id="4440" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9227,160 +9309,159 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4420" >
-<cdparam x="323" y="377" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4484" >
+<cdparam x="306" y="349" />
+<sizeparam width="282" 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="gotDecryptedOrder" />
+<TGConnectingPoint num="0" id="4444" />
+<TGConnectingPoint num="1" id="4445" />
+<TGConnectingPoint num="2" id="4446" />
+<TGConnectingPoint num="3" id="4447" />
+<TGConnectingPoint num="4" id="4448" />
+<TGConnectingPoint num="5" id="4449" />
+<TGConnectingPoint num="6" id="4450" />
+<TGConnectingPoint num="7" id="4451" />
+<TGConnectingPoint num="8" id="4452" />
+<TGConnectingPoint num="9" id="4453" />
+<TGConnectingPoint num="10" id="4454" />
+<TGConnectingPoint num="11" id="4455" />
+<TGConnectingPoint num="12" id="4456" />
+<TGConnectingPoint num="13" id="4457" />
+<TGConnectingPoint num="14" id="4458" />
+<TGConnectingPoint num="15" id="4459" />
+<TGConnectingPoint num="16" id="4460" />
+<TGConnectingPoint num="17" id="4461" />
+<TGConnectingPoint num="18" id="4462" />
+<TGConnectingPoint num="19" id="4463" />
+<TGConnectingPoint num="20" id="4464" />
+<TGConnectingPoint num="21" id="4465" />
+<TGConnectingPoint num="22" id="4466" />
+<TGConnectingPoint num="23" id="4467" />
+<TGConnectingPoint num="24" id="4468" />
+<TGConnectingPoint num="25" id="4469" />
+<TGConnectingPoint num="26" id="4470" />
+<TGConnectingPoint num="27" id="4471" />
+<TGConnectingPoint num="28" id="4472" />
+<TGConnectingPoint num="29" id="4473" />
+<TGConnectingPoint num="30" id="4474" />
+<TGConnectingPoint num="31" id="4475" />
+<TGConnectingPoint num="32" id="4476" />
+<TGConnectingPoint num="33" id="4477" />
+<TGConnectingPoint num="34" id="4478" />
+<TGConnectingPoint num="35" id="4479" />
+<TGConnectingPoint num="36" id="4480" />
+<TGConnectingPoint num="37" id="4481" />
+<TGConnectingPoint num="38" id="4482" />
+<TGConnectingPoint num="39" id="4483" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="4495" >
+<cdparam x="383" y="437" />
+<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="state0" value="Msg1Sent" />
-<TGConnectingPoint num="0" id="4380" />
-<TGConnectingPoint num="1" id="4381" />
-<TGConnectingPoint num="2" id="4382" />
-<TGConnectingPoint num="3" id="4383" />
-<TGConnectingPoint num="4" id="4384" />
-<TGConnectingPoint num="5" id="4385" />
-<TGConnectingPoint num="6" id="4386" />
-<TGConnectingPoint num="7" id="4387" />
-<TGConnectingPoint num="8" id="4388" />
-<TGConnectingPoint num="9" id="4389" />
-<TGConnectingPoint num="10" id="4390" />
-<TGConnectingPoint num="11" id="4391" />
-<TGConnectingPoint num="12" id="4392" />
-<TGConnectingPoint num="13" id="4393" />
-<TGConnectingPoint num="14" id="4394" />
-<TGConnectingPoint num="15" id="4395" />
-<TGConnectingPoint num="16" id="4396" />
-<TGConnectingPoint num="17" id="4397" />
-<TGConnectingPoint num="18" id="4398" />
-<TGConnectingPoint num="19" id="4399" />
-<TGConnectingPoint num="20" id="4400" />
-<TGConnectingPoint num="21" id="4401" />
-<TGConnectingPoint num="22" id="4402" />
-<TGConnectingPoint num="23" id="4403" />
-<TGConnectingPoint num="24" id="4404" />
-<TGConnectingPoint num="25" id="4405" />
-<TGConnectingPoint num="26" id="4406" />
-<TGConnectingPoint num="27" id="4407" />
-<TGConnectingPoint num="28" id="4408" />
-<TGConnectingPoint num="29" id="4409" />
-<TGConnectingPoint num="30" id="4410" />
-<TGConnectingPoint num="31" id="4411" />
-<TGConnectingPoint num="32" id="4412" />
-<TGConnectingPoint num="33" id="4413" />
-<TGConnectingPoint num="34" id="4414" />
-<TGConnectingPoint num="35" id="4415" />
-<TGConnectingPoint num="36" id="4416" />
-<TGConnectingPoint num="37" id="4417" />
-<TGConnectingPoint num="38" id="4418" />
-<TGConnectingPoint num="39" id="4419" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="4429" >
-<cdparam x="660" y="145" />
-<sizeparam width="251" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="remoteStart(selectedDuration)" />
+<TGConnectingPoint num="0" id="4485" />
+<TGConnectingPoint num="1" id="4486" />
+<TGConnectingPoint num="2" id="4487" />
+<TGConnectingPoint num="3" id="4488" />
+<TGConnectingPoint num="4" id="4489" />
+<TGConnectingPoint num="5" id="4490" />
+<TGConnectingPoint num="6" id="4491" />
+<TGConnectingPoint num="7" id="4492" />
+<TGConnectingPoint num="8" id="4493" />
+<TGConnectingPoint num="9" id="4494" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4536" >
+<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="UML Note" value="Encrypting data with the pre shared key
-" />
-<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" />
+<infoparam name="state0" value="gotWirelessOrder" />
+<TGConnectingPoint num="0" id="4496" />
+<TGConnectingPoint num="1" id="4497" />
+<TGConnectingPoint num="2" id="4498" />
+<TGConnectingPoint num="3" id="4499" />
+<TGConnectingPoint num="4" id="4500" />
+<TGConnectingPoint num="5" id="4501" />
+<TGConnectingPoint num="6" id="4502" />
+<TGConnectingPoint num="7" id="4503" />
+<TGConnectingPoint num="8" id="4504" />
+<TGConnectingPoint num="9" id="4505" />
+<TGConnectingPoint num="10" id="4506" />
+<TGConnectingPoint num="11" id="4507" />
+<TGConnectingPoint num="12" id="4508" />
+<TGConnectingPoint num="13" id="4509" />
+<TGConnectingPoint num="14" id="4510" />
+<TGConnectingPoint num="15" id="4511" />
+<TGConnectingPoint num="16" id="4512" />
+<TGConnectingPoint num="17" id="4513" />
+<TGConnectingPoint num="18" id="4514" />
+<TGConnectingPoint num="19" id="4515" />
+<TGConnectingPoint num="20" id="4516" />
+<TGConnectingPoint num="21" id="4517" />
+<TGConnectingPoint num="22" id="4518" />
+<TGConnectingPoint num="23" id="4519" />
+<TGConnectingPoint num="24" id="4520" />
+<TGConnectingPoint num="25" id="4521" />
+<TGConnectingPoint num="26" id="4522" />
+<TGConnectingPoint num="27" id="4523" />
+<TGConnectingPoint num="28" id="4524" />
+<TGConnectingPoint num="29" id="4525" />
+<TGConnectingPoint num="30" id="4526" />
+<TGConnectingPoint num="31" id="4527" />
+<TGConnectingPoint num="32" id="4528" />
+<TGConnectingPoint num="33" id="4529" />
+<TGConnectingPoint num="34" id="4530" />
+<TGConnectingPoint num="35" id="4531" />
+<TGConnectingPoint num="36" id="4532" />
+<TGConnectingPoint num="37" id="4533" />
+<TGConnectingPoint num="38" id="4534" />
+<TGConnectingPoint num="39" id="4535" />
 <extraparam>
-<Line value="Encrypting data with the pre shared key" />
+<entryCode value="printf(&quot;Got duration from remote control :%d\n&quot;, msg2__data);" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4470" >
-<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="4430" />
-<TGConnectingPoint num="1" id="4431" />
-<TGConnectingPoint num="2" id="4432" />
-<TGConnectingPoint num="3" id="4433" />
-<TGConnectingPoint num="4" id="4434" />
-<TGConnectingPoint num="5" id="4435" />
-<TGConnectingPoint num="6" id="4436" />
-<TGConnectingPoint num="7" id="4437" />
-<TGConnectingPoint num="8" id="4438" />
-<TGConnectingPoint num="9" id="4439" />
-<TGConnectingPoint num="10" id="4440" />
-<TGConnectingPoint num="11" id="4441" />
-<TGConnectingPoint num="12" id="4442" />
-<TGConnectingPoint num="13" id="4443" />
-<TGConnectingPoint num="14" id="4444" />
-<TGConnectingPoint num="15" id="4445" />
-<TGConnectingPoint num="16" id="4446" />
-<TGConnectingPoint num="17" id="4447" />
-<TGConnectingPoint num="18" id="4448" />
-<TGConnectingPoint num="19" id="4449" />
-<TGConnectingPoint num="20" id="4450" />
-<TGConnectingPoint num="21" id="4451" />
-<TGConnectingPoint num="22" id="4452" />
-<TGConnectingPoint num="23" id="4453" />
-<TGConnectingPoint num="24" id="4454" />
-<TGConnectingPoint num="25" id="4455" />
-<TGConnectingPoint num="26" id="4456" />
-<TGConnectingPoint num="27" id="4457" />
-<TGConnectingPoint num="28" id="4458" />
-<TGConnectingPoint num="29" id="4459" />
-<TGConnectingPoint num="30" id="4460" />
-<TGConnectingPoint num="31" id="4461" />
-<TGConnectingPoint num="32" id="4462" />
-<TGConnectingPoint num="33" id="4463" />
-<TGConnectingPoint num="34" id="4464" />
-<TGConnectingPoint num="35" id="4465" />
-<TGConnectingPoint num="36" id="4466" />
-<TGConnectingPoint num="37" id="4467" />
-<TGConnectingPoint num="38" id="4468" />
-<TGConnectingPoint num="39" id="4469" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="4472" >
-<cdparam x="365" y="447" />
+<COMPONENT type="5101" id="4538" >
+<cdparam x="475" y="500" />
 <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="4471" />
+<TGConnectingPoint num="0" id="4537" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="4483" >
-<cdparam x="262" y="296" />
-<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="4549" >
+<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="Send signal" value="wirelessChannelWrite(msg1)" />
-<TGConnectingPoint num="0" id="4473" />
-<TGConnectingPoint num="1" id="4474" />
-<TGConnectingPoint num="2" id="4475" />
-<TGConnectingPoint num="3" id="4476" />
-<TGConnectingPoint num="4" id="4477" />
-<TGConnectingPoint num="5" id="4478" />
-<TGConnectingPoint num="6" id="4479" />
-<TGConnectingPoint num="7" id="4480" />
-<TGConnectingPoint num="8" id="4481" />
-<TGConnectingPoint num="9" id="4482" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4485" >
-<cdparam x="302" y="99" />
+<infoparam name="Receive signal" value="wirelessChannelRead(msg2)" />
+<TGConnectingPoint num="0" id="4539" />
+<TGConnectingPoint num="1" id="4540" />
+<TGConnectingPoint num="2" id="4541" />
+<TGConnectingPoint num="3" id="4542" />
+<TGConnectingPoint num="4" id="4543" />
+<TGConnectingPoint num="5" id="4544" />
+<TGConnectingPoint num="6" id="4545" />
+<TGConnectingPoint num="7" id="4546" />
+<TGConnectingPoint num="8" id="4547" />
+<TGConnectingPoint num="9" id="4548" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="4551" >
+<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="4484" />
+<TGConnectingPoint num="0" id="4550" />
 </COMPONENT>
 
 
diff --git a/modeling/ebook_reader_01.xml b/modeling/ebook_reader_01.xml
index 9108ec8bb884e24a3cb8afcb293793c4d2133368..fd00851b0b57e239961ae24123120302005a38ef 100644
--- a/modeling/ebook_reader_01.xml
+++ b/modeling/ebook_reader_01.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.94-beta2">
+<TURTLEGMODELING version="0.98-beta1">
 
 <Modeling type="AVATAR Design" nameTab="AVATAR Design" >
 <AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
 <CONNECTOR type="5002" id="2" >
 <cdparam x="504" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -58,7 +64,7 @@
 </CONNECTOR>
 <COMPONENT type="5003" id="15" >
 <cdparam x="633" y="78" />
-<sizeparam width="212" height="167" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="212" height="167" 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="DataType0" value="MemoryForPages" />
@@ -82,7 +88,7 @@
 
 <COMPONENT type="301" id="24" >
 <cdparam x="636" y="10" />
-<sizeparam width="340" height="50" minWidth="50" minHeight="20" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="340" height="50" 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="Add the possibility to prefetch pages, and keep the old
@@ -104,7 +110,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5003" id="33" >
 <cdparam x="147" y="167" />
-<sizeparam width="163" height="96" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="163" height="96" 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="DataType0" value="Page" />
@@ -123,7 +129,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5003" id="42" >
 <cdparam x="148" y="66" />
-<sizeparam width="162" height="92" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="162" height="92" 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="DataType0" value="Document" />
@@ -144,7 +150,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5000" id="67" >
 <cdparam x="379" y="69" />
-<sizeparam width="225" height="191" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="225" height="191" 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="Block0" value="PageLoader" />
@@ -173,6 +179,7 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="22" id="65" />
 <TGConnectingPoint num="23" id="66" />
 <extraparam>
+<CryptoBlock value="false" />
 <Attribute access="0" id="doc" value="" type="5" typeOther="Document" />
 <Attribute access="0" id="page" value="" type="5" typeOther="Page" />
 <Attribute access="0" id="pageid" value="" type="8" typeOther="" />
@@ -188,7 +195,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5000" id="92" >
 <cdparam x="639" y="283" />
-<sizeparam width="198" height="184" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="198" height="184" 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="Block0" value="UserModel" />
@@ -217,6 +224,7 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="22" id="90" />
 <TGConnectingPoint num="23" id="91" />
 <extraparam>
+<CryptoBlock value="false" />
 <Attribute access="0" id="doc1" value="" type="5" typeOther="Document" />
 <Attribute access="0" id="doc2" value="" type="5" typeOther="Document" />
 <Attribute access="0" id="index" value="" type="8" typeOther="" />
@@ -230,7 +238,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5000" id="117" >
 <cdparam x="92" y="287" />
-<sizeparam width="250" height="177" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="250" height="177" 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="Block0" value="DisplayDriver" />
@@ -259,6 +267,7 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="22" id="115" />
 <TGConnectingPoint num="23" id="116" />
 <extraparam>
+<CryptoBlock value="false" />
 <Attribute access="0" id="page" value="" type="5" typeOther="Page" />
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 <Method value="printPage(int data)" />
@@ -268,7 +277,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5000" id="142" >
 <cdparam x="377" y="282" />
-<sizeparam width="229" height="184" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="229" height="184" 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="Block0" value="EReaderController" />
@@ -297,6 +306,7 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="22" id="140" />
 <TGConnectingPoint num="23" id="141" />
 <extraparam>
+<CryptoBlock value="false" />
 <Attribute access="0" id="currentDocument" value="" type="5" typeOther="Document" />
 <Attribute access="0" id="currentPage" value="" type="8" typeOther="" />
 <Attribute access="0" id="page" value="" type="5" typeOther="Page" />
@@ -328,7 +338,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="143" >
 <father id="151" num="0" />
 <cdparam x="703" y="1048" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="point " value="null" />
@@ -336,7 +346,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="148" >
 <father id="151" num="1" />
 <cdparam x="476" y="889" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="39" height="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="" />
@@ -350,8 +360,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -368,7 +376,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="152" >
 <father id="160" num="0" />
 <cdparam x="631" y="1459" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="point " value="null" />
@@ -376,7 +384,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="157" >
 <father id="160" num="1" />
 <cdparam x="562" y="1447" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -398,13 +406,13 @@ ones in memory (for example, the three last!)
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to TGComponent" value="null" />
 <TGConnectingPoint num="0" id="166" />
-<P1  x="256" y="1075" id="934" />
-<P2  x="263" y="1113" id="977" />
+<P1  x="256" y="1075" id="978" />
+<P2  x="263" y="1113" id="934" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="165" >
 <father id="167" num="0" />
 <cdparam x="148" y="1101" />
-<sizeparam width="293" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="293" height="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="" />
@@ -418,8 +426,6 @@ ones in memory (for example, the three last!)
 <afterMax value="maxPageLoadingTime" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -428,13 +434,13 @@ ones in memory (for example, the three last!)
 <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="173" />
-<P1  x="263" y="1205" id="942" />
+<P1  x="263" y="1205" id="943" />
 <P2  x="263" y="1270" id="894" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="172" >
 <father id="174" num="0" />
 <cdparam x="257" y="1216" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -462,7 +468,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="179" >
 <father id="181" num="0" />
 <cdparam x="273" y="1333" />
-<sizeparam width="200" height="90" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="200" 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="" />
@@ -482,8 +488,6 @@ ones in memory (for example, the three last!)
 <actions value="memory.data2 = memory.data3" />
 <actions value="memory.index3 = pageid" />
 <actions value="memory.data3 = x" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -492,13 +496,13 @@ ones in memory (for example, the three last!)
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to state0" value="null" />
 <TGConnectingPoint num="0" id="187" />
-<P1  x="263" y="1143" id="978" />
-<P2  x="263" y="1155" id="937" />
+<P1  x="263" y="1143" id="935" />
+<P2  x="263" y="1155" id="938" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="186" >
 <father id="188" num="0" />
 <cdparam x="265" y="1152" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -512,8 +516,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -528,7 +530,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="193" >
 <father id="195" num="0" />
 <cdparam x="391" y="807" />
-<sizeparam width="124" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="124" height="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="" />
@@ -543,8 +545,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="pageid = pageid + 1" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -559,7 +559,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="200" >
 <father id="202" num="0" />
 <cdparam x="459" y="1019" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -593,7 +593,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="203" >
 <father id="215" num="0" />
 <cdparam x="1046" y="731" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -601,7 +601,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="204" >
 <father id="215" num="1" />
 <cdparam x="1153" y="731" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -609,7 +609,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="205" >
 <father id="215" num="2" />
 <cdparam x="1153" y="378" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -617,7 +617,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="210" >
 <father id="215" num="3" />
 <cdparam x="1046" y="743" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -649,7 +649,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="216" >
 <father id="226" num="0" />
 <cdparam x="527" y="823" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -657,7 +657,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="217" >
 <father id="226" num="1" />
 <cdparam x="493" y="709" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -665,7 +665,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="222" >
 <father id="226" num="2" />
 <cdparam x="647" y="1017" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -679,8 +679,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -697,7 +695,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="227" >
 <father id="235" num="0" />
 <cdparam x="735" y="443" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -705,7 +703,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="232" >
 <father id="235" num="1" />
 <cdparam x="591" y="430" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -737,7 +735,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="236" >
 <father id="246" num="0" />
 <cdparam x="440" y="406" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -745,7 +743,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="237" >
 <father id="246" num="1" />
 <cdparam x="441" y="488" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -753,7 +751,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="242" >
 <father id="246" num="2" />
 <cdparam x="350" y="446" />
-<sizeparam width="171" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="171" 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="" />
@@ -782,7 +780,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="251" >
 <father id="253" num="0" />
 <cdparam x="200" y="368" />
-<sizeparam width="171" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="171" 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="" />
@@ -797,8 +795,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="page.data = memory.data1" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -813,7 +809,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="258" >
 <father id="260" num="0" />
 <cdparam x="766" y="750" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -841,7 +837,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="265" >
 <father id="267" num="0" />
 <cdparam x="760" y="600" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -869,7 +865,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="272" >
 <father id="274" num="0" />
 <cdparam x="859" y="672" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -883,8 +879,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -899,7 +893,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="279" >
 <father id="281" num="0" />
 <cdparam x="428" y="165" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -927,7 +921,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="286" >
 <father id="288" num="0" />
 <cdparam x="428" y="256" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -955,7 +949,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="293" >
 <father id="295" num="0" />
 <cdparam x="428" y="312" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -977,13 +971,13 @@ ones in memory (for example, the three last!)
 <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="301" />
-<P1  x="864" y="565" id="784" />
-<P2  x="858" y="606" id="786" />
+<P1  x="864" y="565" id="787" />
+<P2  x="858" y="606" id="784" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="300" >
 <father id="302" num="0" />
 <cdparam x="574" y="578" />
-<sizeparam width="293" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="293" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1005,13 +999,13 @@ ones in memory (for example, the three last!)
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to state0" value="null" />
 <TGConnectingPoint num="0" id="308" />
-<P1  x="858" y="636" id="787" />
+<P1  x="858" y="636" id="785" />
 <P2  x="816" y="660" id="690" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="307" >
 <father id="309" num="0" />
 <cdparam x="719" y="648" />
-<sizeparam width="84" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="84" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1026,8 +1020,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="page.data = x" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1042,7 +1034,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="314" >
 <father id="316" num="0" />
 <cdparam x="737" y="820" />
-<sizeparam width="200" height="90" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="200" 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="" />
@@ -1062,8 +1054,6 @@ ones in memory (for example, the three last!)
 <actions value="memory.data2 = memory.data3" />
 <actions value="memory.index3 = pageid" />
 <actions value="memory.data3 = page.data" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1078,7 +1068,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="321" >
 <father id="323" num="0" />
 <cdparam x="434" y="408" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1092,8 +1082,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1108,7 +1096,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="328" >
 <father id="330" num="0" />
 <cdparam x="272" y="436" />
-<sizeparam width="171" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="171" 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="" />
@@ -1123,8 +1111,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="page.data = memory.data2" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1139,7 +1125,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="335" >
 <father id="337" num="0" />
 <cdparam x="201" y="658" />
-<sizeparam width="329" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="329" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1167,7 +1153,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="342" >
 <father id="344" num="0" />
 <cdparam x="456" y="770" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1181,8 +1167,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1197,7 +1181,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="349" >
 <father id="351" num="0" />
 <cdparam x="581" y="1119" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -1225,7 +1209,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="356" >
 <father id="358" num="0" />
 <cdparam x="26" y="1011" />
-<sizeparam width="850" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="850" height="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="" />
@@ -1239,14 +1223,12 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="5107" id="374" >
 <cdparam x="363" y="829" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
@@ -1269,7 +1251,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="415" >
 <cdparam x="487" y="1149" />
-<sizeparam width="289" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="289" 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="1900" />
 <infoparam name="state0" value="WaitingForPageToLoad" />
@@ -1313,11 +1295,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="412" />
 <TGConnectingPoint num="38" id="413" />
 <TGConnectingPoint num="39" id="414" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5103" id="426" >
 <cdparam x="322" y="754" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="Send signal" value="pageReady(page)" />
@@ -1335,7 +1319,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="467" >
 <cdparam x="328" y="672" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="state0" value="PageReady" />
@@ -1379,11 +1363,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="464" />
 <TGConnectingPoint num="38" id="465" />
 <TGConnectingPoint num="39" id="466" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="508" >
 <cdparam x="238" y="486" />
-<sizeparam width="154" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="154" 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="1900" />
 <infoparam name="state0" value="gotItFromMemory" />
@@ -1428,11 +1414,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="38" id="506" />
 <TGConnectingPoint num="39" id="507" />
 <invariant />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5107" id="524" >
 <cdparam x="382" y="346" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
@@ -1455,7 +1443,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="565" >
 <cdparam x="679" y="919" />
-<sizeparam width="274" height="38" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="274" 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="1900" />
 <infoparam name="state0" value="PutPageInMemoryDone" />
@@ -1499,11 +1487,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="562" />
 <TGConnectingPoint num="38" id="563" />
 <TGConnectingPoint num="39" id="564" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="606" >
 <cdparam x="296" y="270" />
-<sizeparam width="264" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="264" 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="1900" />
 <infoparam name="state0" value="getFromMemory" />
@@ -1547,11 +1537,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="603" />
 <TGConnectingPoint num="38" id="604" />
 <TGConnectingPoint num="39" id="605" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="647" >
 <cdparam x="685" y="762" />
-<sizeparam width="263" height="42" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="263" 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="1900" />
 <infoparam name="state0" value="PutPageInMemory" />
@@ -1595,11 +1587,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="644" />
 <TGConnectingPoint num="38" id="645" />
 <TGConnectingPoint num="39" id="646" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="688" >
 <cdparam x="996" y="653" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="state0" value="Interrupted" />
@@ -1644,11 +1638,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="38" id="686" />
 <TGConnectingPoint num="39" id="687" />
 <accessibility />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="729" >
 <cdparam x="766" y="660" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1900" />
 <infoparam name="state0" value="PageLoaded" />
@@ -1692,11 +1688,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="726" />
 <TGConnectingPoint num="38" id="727" />
 <TGConnectingPoint num="39" id="728" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="770" >
 <cdparam x="320" y="166" />
-<sizeparam width="217" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="217" 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="1900" />
 <infoparam name="state0" value="WaitingForPageToLoad" />
@@ -1740,11 +1738,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="767" />
 <TGConnectingPoint num="38" id="768" />
 <TGConnectingPoint num="39" id="769" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5100" id="772" >
 <cdparam x="421" y="105" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -1753,7 +1753,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="783" >
 <cdparam x="972" y="610" />
-<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="Receive signal" value="loadPage(doc, pageid)" />
@@ -1771,7 +1771,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="829" >
 <cdparam x="537" y="510" />
-<sizeparam width="397" height="230" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="397" height="230" 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="LoadingPage" />
@@ -1815,33 +1815,35 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="826" />
 <TGConnectingPoint num="38" id="827" />
 <TGConnectingPoint num="39" id="828" />
+<extraparam>
+</extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5100" id="785" >
+<SUBCOMPONENT type="5108" id="786" >
 <father id="829" num="0" />
-<cdparam x="857" y="545" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="382" minY="0" maxY="215" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="784" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5108" id="788" >
-<father id="829" num="1" />
 <cdparam x="790" y="611" />
-<sizeparam width="136" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="136" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="261" minY="0" maxY="210" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="786" />
-<TGConnectingPoint num="1" id="787" />
+<TGConnectingPoint num="0" id="784" />
+<TGConnectingPoint num="1" id="785" />
 <extraparam>
 <Data variable="x" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="788" >
+<father id="829" num="1" />
+<cdparam x="857" y="545" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="382" minY="0" maxY="215" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="787" />
+</SUBCOMPONENT>
 
 <COMPONENT type="5104" id="840" >
 <cdparam x="485" y="1083" />
-<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="Receive signal" value="loadPage(doc, pageid)" />
@@ -1859,7 +1861,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="851" >
 <cdparam x="354" y="228" />
-<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="148" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="Receive signal" value="loadPage(doc, pageid)" />
@@ -1877,7 +1879,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="892" >
 <cdparam x="126" y="1431" />
-<sizeparam width="274" height="38" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="274" 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="1900" />
 <infoparam name="state0" value="PutPrefetchInMemoryDone" />
@@ -1921,11 +1923,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="889" />
 <TGConnectingPoint num="38" id="890" />
 <TGConnectingPoint num="39" id="891" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="933" >
 <cdparam x="132" y="1270" />
-<sizeparam width="263" height="42" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="263" 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="1900" />
 <infoparam name="state0" value="PutPrefetchInMemory" />
@@ -1969,11 +1973,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="930" />
 <TGConnectingPoint num="38" id="931" />
 <TGConnectingPoint num="39" id="932" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5106" id="1020" >
 <cdparam x="127" y="1028" />
-<sizeparam width="258" height="201" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="258" height="201" 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="Prefetching" />
@@ -2017,76 +2023,80 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1017" />
 <TGConnectingPoint num="38" id="1018" />
 <TGConnectingPoint num="39" id="1019" />
+<extraparam>
+</extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5100" id="935" >
+<SUBCOMPONENT type="5108" id="936" >
 <father id="1020" num="0" />
-<cdparam x="249" y="1055" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="195" y="1118" />
+<sizeparam width="136" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="243" minY="0" maxY="186" />
-<infoparam name="start state" value="null" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="181" />
+<infoparam name="TGComponent" value="null" />
 <TGConnectingPoint num="0" id="934" />
+<TGConnectingPoint num="1" id="935" />
+<extraparam>
+<Data variable="x" minValue="0" maxValue="10" functionId="0" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="976" >
+<SUBCOMPONENT type="5106" id="977" >
 <father id="1020" num="1" />
 <cdparam x="213" y="1155" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="158" minY="0" maxY="151" />
 <infoparam name="state0" value="PagePrefetched" />
-<TGConnectingPoint num="0" id="936" />
-<TGConnectingPoint num="1" id="937" />
-<TGConnectingPoint num="2" id="938" />
-<TGConnectingPoint num="3" id="939" />
-<TGConnectingPoint num="4" id="940" />
-<TGConnectingPoint num="5" id="941" />
-<TGConnectingPoint num="6" id="942" />
-<TGConnectingPoint num="7" id="943" />
-<TGConnectingPoint num="8" id="944" />
-<TGConnectingPoint num="9" id="945" />
-<TGConnectingPoint num="10" id="946" />
-<TGConnectingPoint num="11" id="947" />
-<TGConnectingPoint num="12" id="948" />
-<TGConnectingPoint num="13" id="949" />
-<TGConnectingPoint num="14" id="950" />
-<TGConnectingPoint num="15" id="951" />
-<TGConnectingPoint num="16" id="952" />
-<TGConnectingPoint num="17" id="953" />
-<TGConnectingPoint num="18" id="954" />
-<TGConnectingPoint num="19" id="955" />
-<TGConnectingPoint num="20" id="956" />
-<TGConnectingPoint num="21" id="957" />
-<TGConnectingPoint num="22" id="958" />
-<TGConnectingPoint num="23" id="959" />
-<TGConnectingPoint num="24" id="960" />
-<TGConnectingPoint num="25" id="961" />
-<TGConnectingPoint num="26" id="962" />
-<TGConnectingPoint num="27" id="963" />
-<TGConnectingPoint num="28" id="964" />
-<TGConnectingPoint num="29" id="965" />
-<TGConnectingPoint num="30" id="966" />
-<TGConnectingPoint num="31" id="967" />
-<TGConnectingPoint num="32" id="968" />
-<TGConnectingPoint num="33" id="969" />
-<TGConnectingPoint num="34" id="970" />
-<TGConnectingPoint num="35" id="971" />
-<TGConnectingPoint num="36" id="972" />
-<TGConnectingPoint num="37" id="973" />
-<TGConnectingPoint num="38" id="974" />
-<TGConnectingPoint num="39" id="975" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5108" id="979" >
+<TGConnectingPoint num="0" id="937" />
+<TGConnectingPoint num="1" id="938" />
+<TGConnectingPoint num="2" id="939" />
+<TGConnectingPoint num="3" id="940" />
+<TGConnectingPoint num="4" id="941" />
+<TGConnectingPoint num="5" id="942" />
+<TGConnectingPoint num="6" id="943" />
+<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="8" id="945" />
+<TGConnectingPoint num="9" id="946" />
+<TGConnectingPoint num="10" id="947" />
+<TGConnectingPoint num="11" id="948" />
+<TGConnectingPoint num="12" id="949" />
+<TGConnectingPoint num="13" id="950" />
+<TGConnectingPoint num="14" id="951" />
+<TGConnectingPoint num="15" id="952" />
+<TGConnectingPoint num="16" id="953" />
+<TGConnectingPoint num="17" id="954" />
+<TGConnectingPoint num="18" id="955" />
+<TGConnectingPoint num="19" id="956" />
+<TGConnectingPoint num="20" id="957" />
+<TGConnectingPoint num="21" id="958" />
+<TGConnectingPoint num="22" id="959" />
+<TGConnectingPoint num="23" id="960" />
+<TGConnectingPoint num="24" id="961" />
+<TGConnectingPoint num="25" id="962" />
+<TGConnectingPoint num="26" id="963" />
+<TGConnectingPoint num="27" id="964" />
+<TGConnectingPoint num="28" id="965" />
+<TGConnectingPoint num="29" id="966" />
+<TGConnectingPoint num="30" id="967" />
+<TGConnectingPoint num="31" id="968" />
+<TGConnectingPoint num="32" id="969" />
+<TGConnectingPoint num="33" id="970" />
+<TGConnectingPoint num="34" id="971" />
+<TGConnectingPoint num="35" id="972" />
+<TGConnectingPoint num="36" id="973" />
+<TGConnectingPoint num="37" id="974" />
+<TGConnectingPoint num="38" id="975" />
+<TGConnectingPoint num="39" id="976" />
+<extraparam>
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="979" >
 <father id="1020" num="2" />
-<cdparam x="195" y="1118" />
-<sizeparam width="136" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="249" y="1055" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="181" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="977" />
-<TGConnectingPoint num="1" id="978" />
-<extraparam>
-<Data variable="x" minValue="0" maxValue="10" functionId="0" />
-</extraparam>
+<cdrectangleparam minX="0" maxX="243" minY="0" maxY="186" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="978" />
 </SUBCOMPONENT>
 
 
@@ -2104,7 +2114,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1025" >
 <father id="1027" num="0" />
 <cdparam x="478" y="456" />
-<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2132,7 +2142,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1032" >
 <father id="1034" num="0" />
 <cdparam x="472" y="417" />
-<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2160,7 +2170,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1039" >
 <father id="1041" num="0" />
 <cdparam x="479" y="374" />
-<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2188,7 +2198,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1046" >
 <father id="1048" num="0" />
 <cdparam x="448" y="187" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2202,8 +2212,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2218,7 +2226,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1053" >
 <father id="1055" num="0" />
 <cdparam x="488" y="245" />
-<sizeparam width="128" height="45" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="128" 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="" />
@@ -2249,7 +2257,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1060" >
 <father id="1062" num="0" />
 <cdparam x="474" y="327" />
-<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="63" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2277,7 +2285,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1067" >
 <father id="1069" num="0" />
 <cdparam x="473" y="504" />
-<sizeparam width="63" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="63" 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="" />
@@ -2292,8 +2300,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="index = 1" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2308,7 +2314,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1074" >
 <father id="1076" num="0" />
 <cdparam x="460" y="604" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2322,14 +2328,12 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="5101" id="1078" >
 <cdparam x="451" y="589" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2338,7 +2342,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1089" >
 <cdparam x="407" y="539" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Send signal" value="goToPage(index)" />
@@ -2356,7 +2360,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1100" >
 <cdparam x="390" y="286" />
-<sizeparam width="134" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="134" height="20" minWidth="30" 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="openDocument(doc1)" />
@@ -2374,7 +2378,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1141" >
 <cdparam x="319" y="160" />
-<sizeparam width="276" height="65" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="276" height="65" 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="firstDoc" />
@@ -2418,11 +2422,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1138" />
 <TGConnectingPoint num="38" id="1139" />
 <TGConnectingPoint num="39" id="1140" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5100" id="1143" >
 <cdparam x="427" y="86" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2431,7 +2437,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1154" >
 <cdparam x="413" y="333" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Send signal" value="flipNextPage()" />
@@ -2449,7 +2455,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1165" >
 <cdparam x="415" y="380" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Send signal" value="flipNextPage()" />
@@ -2467,7 +2473,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1176" >
 <cdparam x="415" y="461" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Send signal" value="flipNextPage()" />
@@ -2485,7 +2491,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1187" >
 <cdparam x="415" y="422" />
-<sizeparam width="91" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Send signal" value="flipNextPage()" />
@@ -2522,7 +2528,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1188" >
 <father id="1200" num="0" />
 <cdparam x="400" y="312" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2530,7 +2536,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1189" >
 <father id="1200" num="1" />
 <cdparam x="250" y="312" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2538,7 +2544,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1190" >
 <father id="1200" num="2" />
 <cdparam x="250" y="167" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2546,7 +2552,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1195" >
 <father id="1200" num="3" />
 <cdparam x="410" y="275" />
-<sizeparam width="103" height="45" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="103" 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="" />
@@ -2562,8 +2568,6 @@ ones in memory (for example, the three last!)
 <computeMax value="" />
 <actions value="data = page.data" />
 <actions value="printPage(data)" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2578,7 +2582,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1205" >
 <father id="1207" num="0" />
 <cdparam x="398" y="135" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2592,8 +2596,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2608,7 +2610,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1212" >
 <father id="1214" num="0" />
 <cdparam x="399" y="232" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -2622,14 +2624,12 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="5104" id="1225" >
 <cdparam x="338" y="222" />
-<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="Receive signal" value="displayPage(page)" />
@@ -2647,7 +2647,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1266" >
 <cdparam x="295" y="142" />
-<sizeparam width="209" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="209" 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="WaitingForPageToDisplay" />
@@ -2691,11 +2691,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1263" />
 <TGConnectingPoint num="38" id="1264" />
 <TGConnectingPoint num="39" id="1265" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5100" id="1268" >
 <cdparam x="391" y="75" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -2717,7 +2719,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1273" >
 <father id="1275" num="0" />
 <cdparam x="828" y="376" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2731,8 +2733,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2751,7 +2751,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1276" >
 <father id="1286" num="0" />
 <cdparam x="965" y="368" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -2759,7 +2759,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1277" >
 <father id="1286" num="1" />
 <cdparam x="965" y="273" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -2767,7 +2767,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1282" >
 <father id="1286" num="2" />
 <cdparam x="870" y="558" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2781,8 +2781,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2797,7 +2795,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1291" >
 <father id="1293" num="0" />
 <cdparam x="870" y="533" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2811,8 +2809,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2827,7 +2823,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1298" >
 <father id="1300" num="0" />
 <cdparam x="556" y="262" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2841,8 +2837,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2863,7 +2857,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1301" >
 <father id="1313" num="0" />
 <cdparam x="836" y="703" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -2871,7 +2865,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1302" >
 <father id="1313" num="1" />
 <cdparam x="894" y="703" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -2879,7 +2873,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1303" >
 <father id="1313" num="2" />
 <cdparam x="894" y="558" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -2887,7 +2881,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1308" >
 <father id="1313" num="3" />
 <cdparam x="852" y="669" />
-<sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="39" height="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="" />
@@ -2915,7 +2909,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1318" >
 <father id="1320" num="0" />
 <cdparam x="492" y="725" />
-<sizeparam width="405" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="405" 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="" />
@@ -2944,7 +2938,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1325" >
 <father id="1327" num="0" />
 <cdparam x="604" y="727" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2972,7 +2966,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1332" >
 <father id="1334" num="0" />
 <cdparam x="722" y="571" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -2986,8 +2980,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3002,7 +2994,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1339" >
 <father id="1341" num="0" />
 <cdparam x="448" y="646" />
-<sizeparam width="388" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="388" height="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="" />
@@ -3017,8 +3009,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="currentDocument.currentPage = currentDocument.currentPage + 1" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3033,7 +3023,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1346" >
 <father id="1348" num="0" />
 <cdparam x="587" y="554" />
-<sizeparam width="111" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="111" height="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="" />
@@ -3047,8 +3037,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3063,7 +3051,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1353" >
 <father id="1355" num="0" />
 <cdparam x="292" y="682" />
-<sizeparam width="388" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="388" height="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="" />
@@ -3078,8 +3066,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="currentDocument.currentPage = currentDocument.currentPage + 1" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3094,7 +3080,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1360" >
 <father id="1362" num="0" />
 <cdparam x="309" y="554" />
-<sizeparam width="264" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="264" height="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="" />
@@ -3108,8 +3094,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3130,7 +3114,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1363" >
 <father id="1375" num="0" />
 <cdparam x="269" y="676" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -3138,7 +3122,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1364" >
 <father id="1375" num="1" />
 <cdparam x="186" y="676" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -3146,7 +3130,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1365" >
 <father id="1375" num="2" />
 <cdparam x="186" y="515" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
@@ -3154,7 +3138,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1370" >
 <father id="1375" num="3" />
 <cdparam x="255" y="697" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="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="" />
@@ -3168,8 +3152,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3184,7 +3166,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1380" >
 <father id="1382" num="0" />
 <cdparam x="306" y="662" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3198,8 +3180,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3214,7 +3194,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1387" >
 <father id="1389" num="0" />
 <cdparam x="366" y="587" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3228,8 +3208,6 @@ ones in memory (for example, the three last!)
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3244,7 +3222,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1394" >
 <father id="1396" num="0" />
 <cdparam x="408" y="508" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3272,7 +3250,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1401" >
 <father id="1403" num="0" />
 <cdparam x="607" y="405" />
-<sizeparam width="259" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="259" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3287,8 +3265,6 @@ ones in memory (for example, the three last!)
 <computeMin value="" />
 <computeMax value="" />
 <actions value="currentPage = currentDocument.currentPage" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3303,7 +3279,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1408" >
 <father id="1410" num="0" />
 <cdparam x="565" y="116" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3331,7 +3307,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1415" >
 <father id="1417" num="0" />
 <cdparam x="565" y="211" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3365,7 +3341,7 @@ ones in memory (for example, the three last!)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1418" >
 <father id="1430" num="0" />
 <cdparam x="1075" y="569" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -3373,7 +3349,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1419" >
 <father id="1430" num="1" />
 <cdparam x="1080" y="272" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -3381,7 +3357,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1420" >
 <father id="1430" num="2" />
 <cdparam x="882" y="153" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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" />
@@ -3389,7 +3365,7 @@ ones in memory (for example, the three last!)
 <SUBCOMPONENT type="-1" id="1425" >
 <father id="1430" num="3" />
 <cdparam x="747" y="461" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3408,7 +3384,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5103" id="1441" >
 <cdparam x="211" y="622" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1400" />
 <infoparam name="Send signal" value="displayPage(page)" />
@@ -3426,7 +3402,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1452" >
 <cdparam x="219" y="570" />
-<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="101" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getPage(page)" />
@@ -3444,7 +3420,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1463" >
 <cdparam x="378" y="590" />
-<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1400" />
 <infoparam name="Receive signal" value="flipNextPage()" />
@@ -3462,7 +3438,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1504" >
 <cdparam x="412" y="748" />
-<sizeparam width="256" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="256" 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="1400" />
 <infoparam name="state0" value="PageLoadingManagement" />
@@ -3506,11 +3482,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1501" />
 <TGConnectingPoint num="38" id="1502" />
 <TGConnectingPoint num="39" id="1503" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5107" id="1520" >
 <cdparam x="760" y="665" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="choice" value="null" />
@@ -3533,7 +3511,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1531" >
 <cdparam x="678" y="589" />
-<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1400" />
 <infoparam name="Receive signal" value="goToPage(currentPage)" />
@@ -3551,7 +3529,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1542" >
 <cdparam x="515" y="590" />
-<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1400" />
 <infoparam name="Receive signal" value="flipPreviousPage()" />
@@ -3569,7 +3547,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1583" >
 <cdparam x="280" y="481" />
-<sizeparam width="590" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="590" 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="1400" />
 <infoparam name="state0" value="WaitingForPageBeingLoadedOrUserEvent" />
@@ -3613,11 +3591,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1580" />
 <TGConnectingPoint num="38" id="1581" />
 <TGConnectingPoint num="39" id="1582" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5103" id="1594" >
 <cdparam x="452" y="430" />
-<sizeparam width="247" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="247" height="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="loadPage(currentDocument, currentPage)" />
@@ -3635,7 +3615,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1635" >
 <cdparam x="468" y="336" />
-<sizeparam width="214" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="214" 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="1400" />
 <infoparam name="state0" value="PageLoadingManagement" />
@@ -3679,11 +3659,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1632" />
 <TGConnectingPoint num="38" id="1633" />
 <TGConnectingPoint num="39" id="1634" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5104" id="1646" >
 <cdparam x="703" y="302" />
-<sizeparam width="212" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="212" height="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="Receive signal" value="openDocument(currentDocument)" />
@@ -3701,7 +3683,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1657" >
 <cdparam x="969" y="535" />
-<sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="1400" />
 <infoparam name="Receive signal" value="home()" />
@@ -3719,7 +3701,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5104" id="1668" >
 <cdparam x="450" y="197" />
-<sizeparam width="212" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="212" height="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="Receive signal" value="openDocument(currentDocument)" />
@@ -3737,7 +3719,7 @@ ones in memory (for example, the three last!)
 
 <COMPONENT type="5106" id="1709" >
 <cdparam x="488" y="128" />
-<sizeparam width="137" height="50" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="137" 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="1400" />
 <infoparam name="state0" value="WaitingForDocument" />
@@ -3781,11 +3763,13 @@ ones in memory (for example, the three last!)
 <TGConnectingPoint num="37" id="1706" />
 <TGConnectingPoint num="38" id="1707" />
 <TGConnectingPoint num="39" id="1708" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 <COMPONENT type="5100" id="1711" >
 <cdparam x="549" y="67" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="start state" value="null" />
diff --git a/src/ui/AttackTreePanelTranslator.java b/src/ui/AttackTreePanelTranslator.java
index 1faa9ad99db990e6e6a0ddd7ce1f238451550bea..69096826b54edbbd0e28d29122cde99b2dd7a3ea 100644
--- a/src/ui/AttackTreePanelTranslator.java
+++ b/src/ui/AttackTreePanelTranslator.java
@@ -101,7 +101,7 @@ public class AttackTreePanelTranslator {
         }
 
 
-        TraceManager.addDev("AT=" + at.toString());
+        //TraceManager.addDev("AT=" + at.toString());
         return at;
 
     }
diff --git a/src/ui/window/JDialogModelChecking.java b/src/ui/window/JDialogModelChecking.java
index 48a3a67b9e325116f2968bd04d1ac2cef43d7eb1..dc306924a0d9e321cdf41f901691513ac8a5ac4b 100755
--- a/src/ui/window/JDialogModelChecking.java
+++ b/src/ui/window/JDialogModelChecking.java
@@ -1,48 +1,48 @@
 /**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 JDialogModelChecking
- * Dialog for managing Tclasses to be validated
- * Creation: 13/12/2003
- * @version 1.0 13/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 JDialogModelChecking
+   * Dialog for managing Tclasses to be validated
+   * Creation: 13/12/2003
+   * @version 1.0 13/12/2003
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.window;
 
@@ -57,10 +57,10 @@ import ui.*;
 
 public class JDialogModelChecking extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public static Vector validated, ignored;
-	private static boolean overideSyntaxChecking = false;
-    
+    private static boolean overideSyntaxChecking = false;
+
     private Vector val, ign, back;
-    
+
     //subpanels
     private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
     private JList listIgnored;
@@ -69,18 +69,18 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
     private JButton addOneValidated;
     private JButton addOneIgnored;
     private JButton allIgnored;
-	protected JCheckBox syntax;
-    
+    protected JCheckBox syntax;
+
     // Main Panel
     private JButton closeButton;
     private JButton cancelButton;
-    
+
     /** Creates new form  */
     public JDialogModelChecking(Frame f, Vector _back, LinkedList componentList, String title) {
         super(f, title, true);
-        
+
         back = _back;
-        
+
         if ((validated == null) || (ignored == null)) {
             val = makeNewVal(componentList);
             //System.out.println("Val size: " + val.size() + "component list:" + componentList.size());
@@ -92,16 +92,16 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             checkTClasses(ign, componentList);
             addNewTclasses(val, componentList, ign);
         }
-        
+
         initComponents();
         myInitComponents();
         pack();
     }
-    
+
     private Vector makeNewVal(LinkedList list) {
         Vector v = new Vector();
         TGComponent tgc;
-        
+
         for(int i=0; i<list.size(); i++) {
             tgc = (TGComponent)(list.get(i));
             //System.out.println(tgc);
@@ -111,10 +111,10 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         }
         return v;
     }
-    
+
     private void checkTClasses(Vector tobeChecked, LinkedList source) {
         TClassInterface t;
-        
+
         for(int i=0; i<tobeChecked.size(); i++) {
             t = (TClassInterface)(tobeChecked.elementAt(i));
             if (!source.contains(t)) {
@@ -123,10 +123,10 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             }
         }
     }
-    
+
     public void addNewTclasses(Vector added, LinkedList source, Vector notSource) {
         TGComponent tgc;
-        
+
         for(int i=0; i<source.size(); i++) {
             tgc = (TGComponent)(source.get(i));
             if ((tgc instanceof TClassInterface) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
@@ -135,11 +135,11 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             }
         }
     }
-    
+
     private void myInitComponents() {
         setButtons();
     }
-    
+
     private void initComponents() {
         Container c = getContentPane();
         GridBagLayout gridbag1 = new GridBagLayout();
@@ -147,7 +147,7 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         setFont(new Font("Helvetica", Font.PLAIN, 14));
         c.setLayout(new BorderLayout());
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        
+
         // ignored list
         panel1 = new JPanel();
         panel1.setLayout(new BorderLayout());
@@ -160,7 +160,7 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         panel1.add(scrollPane1, BorderLayout.CENTER);
         panel1.setPreferredSize(new Dimension(200, 250));
         c.add(panel1, BorderLayout.WEST);
-        
+
         // validated list
         panel2 = new JPanel();
         panel2.setLayout(new BorderLayout());
@@ -173,80 +173,80 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         panel2.add(scrollPane2, BorderLayout.CENTER);
         panel2.setPreferredSize(new Dimension(200, 250));
         c.add(panel2, BorderLayout.EAST);
-        
+
         // central buttons
         panel3 = new JPanel();
         panel3.setLayout(gridbag1);
-        
+
         c1.weighty = 1.0;
         c1.weightx = 1.0;
         c1.gridwidth = GridBagConstraints.REMAINDER; //end row
         c1.fill = GridBagConstraints.HORIZONTAL;
         c1.gridheight = 1;
-        
+
         allValidated = new JButton(IconManager.imgic50);
         allValidated.setPreferredSize(new Dimension(50, 25));
         allValidated.addActionListener(this);
         allValidated.setActionCommand("allValidated");
         panel3.add(allValidated, c1);
-        
+
         addOneValidated = new JButton(IconManager.imgic48);
         addOneValidated.setPreferredSize(new Dimension(50, 25));
         addOneValidated.addActionListener(this);
         addOneValidated.setActionCommand("addOneValidated");
         panel3.add(addOneValidated, c1);
-        
+
         panel3.add(new JLabel(" "), c1);
-        
+
         addOneIgnored = new JButton(IconManager.imgic46);
         addOneIgnored.addActionListener(this);
         addOneIgnored.setPreferredSize(new Dimension(50, 25));
         addOneIgnored.setActionCommand("addOneIgnored");
         panel3.add(addOneIgnored, c1);
-        
+
         allIgnored = new JButton(IconManager.imgic44);
         allIgnored.addActionListener(this);
         allIgnored.setPreferredSize(new Dimension(50, 25));
         allIgnored.setActionCommand("allIgnored");
         panel3.add(allIgnored, c1);
-        
+
         c.add(panel3, BorderLayout.CENTER);
-        
+
         // main panel;
         panel6 = new JPanel();
         panel6.setLayout(new BorderLayout());
-		
-		panel5 = new JPanel();
+
+        panel5 = new JPanel();
         panel5.setLayout(new FlowLayout());
-		
-		syntax = new JCheckBox("Overide TIF syntax checking");
-		syntax.setSelected(overideSyntaxChecking);
-		panel5.add(syntax);
-		
+
+        syntax = new JCheckBox("Overide TIF syntax checking");
+        syntax.setSelected(overideSyntaxChecking);
+        panel5.add(syntax);
+
         panel4 = new JPanel();
         panel4.setLayout(new FlowLayout());
-        
+
         closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
         //closeButton.setPreferredSize(new Dimension(600, 50));
         closeButton.addActionListener(this);
         closeButton.setPreferredSize(new Dimension(200, 30));
-        
+
         cancelButton = new JButton("Cancel", IconManager.imgic27);
         cancelButton.addActionListener(this);
         cancelButton.setPreferredSize(new Dimension(200, 30));
         panel4.add(cancelButton);
-		panel4.add(closeButton);
-		
-		panel6.add(panel5, BorderLayout.NORTH);
-		panel6.add(panel4, BorderLayout.SOUTH);
-        
+        panel4.add(closeButton);
+
+        panel6.add(panel5, BorderLayout.NORTH);
+        panel6.add(panel4, BorderLayout.SOUTH);
+
         c.add(panel6, BorderLayout.SOUTH);
-        
+
     }
-    
-    public void	actionPerformed(ActionEvent evt)  {
+
+    public void actionPerformed(ActionEvent evt)  {
         String command = evt.getActionCommand();
-        
+
         // Compare the action command to the known actions.
         if (command.equals("Start Syntax Analysis"))  {
             closeDialog();
@@ -262,8 +262,8 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             allIgnored();
         }
     }
-    
-    
+
+
     private void addOneIgnored() {
         int [] list = listValidated.getSelectedIndices();
         Vector v = new Vector();
@@ -273,13 +273,13 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             ign.addElement(o);
             v.addElement(o);
         }
-        
+
         val.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void addOneValidated() {
         int [] list = listIgnored.getSelectedIndices();
         Vector v = new Vector();
@@ -289,13 +289,13 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             val.addElement(o);
             v.addElement(o);
         }
-        
+
         ign.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allValidated() {
         val.addAll(ign);
         ign.removeAllElements();
@@ -303,7 +303,7 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allIgnored() {
         ign.addAll(val);
         val.removeAllElements();
@@ -311,8 +311,8 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         listValidated.setListData(val);
         setButtons();
     }
-    
-    
+
+
     public void closeDialog() {
         back.removeAllElements();
         for(int i=0; i<val.size(); i++) {
@@ -320,38 +320,38 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         }
         validated = val;
         ignored = ign;
-		overideSyntaxChecking = syntax.isSelected();
+        overideSyntaxChecking = syntax.isSelected();
         dispose();
     }
-    
+
     public void cancelDialog() {
         dispose();
     }
-    
+
     private void setButtons() {
         int i1 = listIgnored.getSelectedIndex();
         int i2 = listValidated.getSelectedIndex();
-        
+
         if (i1 == -1) {
             addOneValidated.setEnabled(false);
         } else {
             addOneValidated.setEnabled(true);
             //listValidated.clearSelection();
         }
-        
+
         if (i2 == -1) {
             addOneIgnored.setEnabled(false);
         } else {
             addOneIgnored.setEnabled(true);
             //listIgnored.clearSelection();
         }
-        
+
         if (ign.size() ==0) {
             allValidated.setEnabled(false);
         } else {
             allValidated.setEnabled(true);
         }
-        
+
         if (val.size() ==0) {
             allIgnored.setEnabled(false);
             closeButton.setEnabled(false);
@@ -364,11 +364,11 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
             }
         }
     }
-    
+
     public int nbStart() {
         int cpt = 0;
         TClassInterface t;
-        for(int	i=0; i<val.size(); i++) {
+        for(int i=0; i<val.size(); i++) {
             t = (TClassInterface)(val.elementAt(i));
             if (t.isStart()) {
                 cpt ++;
@@ -376,13 +376,13 @@ public class JDialogModelChecking extends javax.swing.JDialog implements ActionL
         }
         return cpt;
     }
-    
+
     public void valueChanged(ListSelectionEvent e) {
         setButtons();
     }
-	
-	public boolean getOverideSyntaxChecking() {
-		return overideSyntaxChecking;
-	}
-    
+
+    public boolean getOverideSyntaxChecking() {
+        return overideSyntaxChecking;
+    }
+
 }
diff --git a/src/ui/window/JDialogSelectAvatarBlock.java b/src/ui/window/JDialogSelectAvatarBlock.java
index 31150ff6e0193100ad93d56c8d09d53d2a37f9d9..f78377df404c6ab12570673291439d3a6d2188a6 100755
--- a/src/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/ui/window/JDialogSelectAvatarBlock.java
@@ -1,48 +1,48 @@
 /**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 JDialogSelectAvatarBlock
- * Dialog for managing blocks to be validated
- * Creation: 18/05/2010
- * @version 1.0 18/05/2010
- * @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 JDialogSelectAvatarBlock
+   * Dialog for managing blocks to be validated
+   * Creation: 18/05/2010
+   * @version 1.0 18/05/2010
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.window;
 
@@ -58,10 +58,10 @@ import ui.avatarbd.*;
 
 public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public Vector validated, ignored;
-	private boolean optimized = true;
-    
+    private boolean optimized = true;
+
     private Vector val, ign, back;
-    
+
     //subpanels
     private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
     private JList listIgnored;
@@ -70,23 +70,23 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
     private JButton addOneValidated;
     private JButton addOneIgnored;
     private JButton allIgnored;
-	protected JCheckBox optimize;
-    
+    protected JCheckBox optimize;
+
     // Main Panel
     private JButton closeButton;
     private JButton cancelButton;
-    
+
     private boolean hasBeenCancelled = false;
-    
+
     /** Creates new form  */
     public JDialogSelectAvatarBlock(Frame f, Vector _back, LinkedList componentList, String title, Vector _validated, Vector _ignored, boolean _optimized) {
         super(f, title, true);
-        
+
         back = _back;
         validated = _validated;
         ignored = _ignored;
         optimized = _optimized;
-        
+
         if ((validated == null) || (ignored == null)) {
             val = makeNewVal(componentList);
             ign = new Vector();
@@ -97,16 +97,16 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             checkTask(ign, componentList);
             addNewTask(val, componentList, ign);
         }
-        
+
         initComponents();
         myInitComponents();
         pack();
     }
-    
+
     private Vector makeNewVal(LinkedList list) {
         Vector v = new Vector();
         TGComponent tgc;
-        
+
         for(int i=0; i<list.size(); i++) {
             tgc = (TGComponent)(list.get(i));
             //System.out.println(tgc);
@@ -116,10 +116,10 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
         }
         return v;
     }
-    
+
     private void checkTask(Vector tobeChecked, LinkedList source) {
         AvatarBDBlock t;
-        
+
         for(int i=0; i<tobeChecked.size(); i++) {
             t = (AvatarBDBlock)(tobeChecked.elementAt(i));
             if (!source.contains(t)) {
@@ -128,10 +128,10 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             }
         }
     }
-    
+
     public void addNewTask(Vector added, LinkedList source, Vector notSource) {
         TGComponent tgc;
-        
+
         for(int i=0; i<source.size(); i++) {
             tgc = (TGComponent)(source.get(i));
             if ((tgc instanceof AvatarBDBlock) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
@@ -140,19 +140,28 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             }
         }
     }
-    
+
     private void myInitComponents() {
         setButtons();
     }
-    
+
     private void initComponents() {
         Container c = getContentPane();
         GridBagLayout gridbag1 = new GridBagLayout();
         GridBagConstraints c1 = new GridBagConstraints();
+	GridBagLayout gridbag2 = new GridBagLayout();
+        GridBagConstraints c2 = new GridBagConstraints();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
-        c.setLayout(new BorderLayout());
+        //c.setLayout(new BorderLayout());
+	c.setLayout(gridbag2);
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        
+
+	c2.weighty = 1.0;
+        c2.weightx = 1.0;
+	c2.gridwidth = 1;
+        c2.fill = GridBagConstraints.HORIZONTAL;
+        c2.gridheight = 1;
+
         // ignored list
         panel1 = new JPanel();
         panel1.setLayout(new BorderLayout());
@@ -164,94 +173,98 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
         JScrollPane scrollPane1 = new JScrollPane(listIgnored);
         panel1.add(scrollPane1, BorderLayout.CENTER);
         panel1.setPreferredSize(new Dimension(200, 250));
-        c.add(panel1, BorderLayout.WEST);
-        
-        // validated list
-        panel2 = new JPanel();
-        panel2.setLayout(new BorderLayout());
-        panel2.setBorder(new javax.swing.border.TitledBorder("Blocks taken into account"));
-        listValidated = new JList(val);
-        //listValidated.setPreferredSize(new Dimension(200, 250));
-        listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
-        listValidated.addListSelectionListener(this);
-        JScrollPane scrollPane2 = new JScrollPane(listValidated);
-        panel2.add(scrollPane2, BorderLayout.CENTER);
-        panel2.setPreferredSize(new Dimension(200, 250));
-        c.add(panel2, BorderLayout.EAST);
+        c.add(panel1, c2);
+
         
         // central buttons
         panel3 = new JPanel();
         panel3.setLayout(gridbag1);
-        
+
         c1.weighty = 1.0;
         c1.weightx = 1.0;
         c1.gridwidth = GridBagConstraints.REMAINDER; //end row
         c1.fill = GridBagConstraints.HORIZONTAL;
         c1.gridheight = 1;
-        
+
         allValidated = new JButton(IconManager.imgic50);
         allValidated.setPreferredSize(new Dimension(50, 25));
         allValidated.addActionListener(this);
         allValidated.setActionCommand("allValidated");
         panel3.add(allValidated, c1);
-        
+
         addOneValidated = new JButton(IconManager.imgic48);
         addOneValidated.setPreferredSize(new Dimension(50, 25));
         addOneValidated.addActionListener(this);
         addOneValidated.setActionCommand("addOneValidated");
         panel3.add(addOneValidated, c1);
-        
+
         panel3.add(new JLabel(" "), c1);
-        
+
         addOneIgnored = new JButton(IconManager.imgic46);
         addOneIgnored.addActionListener(this);
         addOneIgnored.setPreferredSize(new Dimension(50, 25));
         addOneIgnored.setActionCommand("addOneIgnored");
         panel3.add(addOneIgnored, c1);
-        
+
         allIgnored = new JButton(IconManager.imgic44);
         allIgnored.addActionListener(this);
         allIgnored.setPreferredSize(new Dimension(50, 25));
         allIgnored.setActionCommand("allIgnored");
         panel3.add(allIgnored, c1);
-        
-        c.add(panel3, BorderLayout.CENTER);
-        
+
+        c.add(panel3, c2);
+
+
+	// validated list
+        panel2 = new JPanel();
+        panel2.setLayout(new BorderLayout());
+        panel2.setBorder(new javax.swing.border.TitledBorder("Blocks taken into account"));
+        listValidated = new JList(val);
+        //listValidated.setPreferredSize(new Dimension(200, 250));
+        listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+        listValidated.addListSelectionListener(this);
+        JScrollPane scrollPane2 = new JScrollPane(listValidated);
+        panel2.add(scrollPane2, BorderLayout.CENTER);
+        panel2.setPreferredSize(new Dimension(200, 250));
+	c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+        c.add(panel2, c2);
+
+
         // main panel;
-		panel6 = new JPanel();
+        panel6 = new JPanel();
         panel6.setLayout(new BorderLayout());
-		
-		panel5 = new JPanel();
+
+        panel5 = new JPanel();
         panel5.setLayout(new FlowLayout());
-		
-		optimize = new JCheckBox("Optimize specification");
-		optimize.setSelected(optimized);
-		panel5.add(optimize);
-		
+
+        optimize = new JCheckBox("Optimize specification");
+        optimize.setSelected(optimized);
+        panel5.add(optimize);
+
         panel4 = new JPanel();
         panel4.setLayout(new FlowLayout());
-        
+
         closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
         //closeButton.setPreferredSize(new Dimension(600, 50));
         closeButton.addActionListener(this);
         closeButton.setPreferredSize(new Dimension(200, 30));
-        
+
         cancelButton = new JButton("Cancel", IconManager.imgic27);
         cancelButton.addActionListener(this);
         cancelButton.setPreferredSize(new Dimension(200, 30));
         panel4.add(cancelButton);
-		panel4.add(closeButton);
-		
-		panel6.add(panel5, BorderLayout.NORTH);
-		panel6.add(panel4, BorderLayout.SOUTH);
-        
-        c.add(panel6, BorderLayout.SOUTH);
-        
+        panel4.add(closeButton);
+
+        panel6.add(panel5, BorderLayout.NORTH);
+        panel6.add(panel4, BorderLayout.SOUTH);
+
+        c.add(panel6, c2);
+
     }
-    
-    public void	actionPerformed(ActionEvent evt)  {
+
+    public void actionPerformed(ActionEvent evt)  {
         String command = evt.getActionCommand();
-        
+
         // Compare the action command to the known actions.
         if (command.equals("Start Syntax Analysis"))  {
             closeDialog();
@@ -267,8 +280,8 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             allIgnored();
         }
     }
-    
-    
+
+
     private void addOneIgnored() {
         int [] list = listValidated.getSelectedIndices();
         Vector v = new Vector();
@@ -278,13 +291,13 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             ign.addElement(o);
             v.addElement(o);
         }
-        
+
         val.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void addOneValidated() {
         int [] list = listIgnored.getSelectedIndices();
         Vector v = new Vector();
@@ -294,13 +307,13 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             val.addElement(o);
             v.addElement(o);
         }
-        
+
         ign.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allValidated() {
         val.addAll(ign);
         ign.removeAllElements();
@@ -308,7 +321,7 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allIgnored() {
         ign.addAll(val);
         val.removeAllElements();
@@ -316,8 +329,8 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
         listValidated.setListData(val);
         setButtons();
     }
-    
-    
+
+
     public void closeDialog() {
         back.removeAllElements();
         for(int i=0; i<val.size(); i++) {
@@ -325,39 +338,39 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
         }
         validated = val;
         ignored = ign;
-		optimized = optimize.isSelected();
+        optimized = optimize.isSelected();
         dispose();
     }
-    
+
     public void cancelDialog() {
-    	hasBeenCancelled = true;
+        hasBeenCancelled = true;
         dispose();
     }
-    
+
     private void setButtons() {
         int i1 = listIgnored.getSelectedIndex();
         int i2 = listValidated.getSelectedIndex();
-        
+
         if (i1 == -1) {
             addOneValidated.setEnabled(false);
         } else {
             addOneValidated.setEnabled(true);
             //listValidated.clearSelection();
         }
-        
+
         if (i2 == -1) {
             addOneIgnored.setEnabled(false);
         } else {
             addOneIgnored.setEnabled(true);
             //listIgnored.clearSelection();
         }
-        
+
         if (ign.size() ==0) {
             allValidated.setEnabled(false);
         } else {
             allValidated.setEnabled(true);
         }
-        
+
         if (val.size() ==0) {
             allIgnored.setEnabled(false);
             closeButton.setEnabled(false);
@@ -366,25 +379,25 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
             closeButton.setEnabled(true);
         }
     }
-    
-    
+
+
     public void valueChanged(ListSelectionEvent e) {
         setButtons();
     }
-	
-	public boolean getOptimized() {
-		return optimized;
-	}
-	
-	public boolean hasBeenCancelled() {
-		return hasBeenCancelled;
-	}
-	
-	public Vector getValidated() {
-    	return validated;
+
+    public boolean getOptimized() {
+        return optimized;
+    }
+
+    public boolean hasBeenCancelled() {
+        return hasBeenCancelled;
     }
-    
+
+    public Vector getValidated() {
+        return validated;
+    }
+
     public Vector getIgnored() {
-    	return ignored;
+        return ignored;
     }
-}
\ No newline at end of file
+}
diff --git a/src/ui/window/JDialogSelectTMLComponent.java b/src/ui/window/JDialogSelectTMLComponent.java
index eb081c1fd452b1058d732a6e29d10af0d620af85..d4972a58806f24054b0ad6aa2e1f6d9b7d73eb81 100755
--- a/src/ui/window/JDialogSelectTMLComponent.java
+++ b/src/ui/window/JDialogSelectTMLComponent.java
@@ -1,48 +1,48 @@
 /**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 JDialogSelectTMLComponent
-* Dialog for managing primitive components to be validated
-* Creation: 28/03/2008
-* @version 1.0 28/03/2008
-* @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 JDialogSelectTMLComponent
+   * Dialog for managing primitive components to be validated
+   * Creation: 28/03/2008
+   * @version 1.0 28/03/2008
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.window;
 
@@ -58,10 +58,10 @@ import ui.tmlcompd.*;
 
 public class JDialogSelectTMLComponent extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public static Vector validated, ignored;
-	private static boolean optimized = true;
-    
+    private static boolean optimized = true;
+
     private Vector val, ign, back;
-    
+
     //subpanels
     private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
     private JList listIgnored;
@@ -70,21 +70,21 @@ public class JDialogSelectTMLComponent extends javax.swing.JDialog implements Ac
     private JButton addOneValidated;
     private JButton addOneIgnored;
     private JButton allIgnored;
-	protected JCheckBox optimize;
-    
+    protected JCheckBox optimize;
+
     // Main Panel
     private JButton closeButton;
     private JButton cancelButton;
-    
+
     /** Creates new form  */
     public JDialogSelectTMLComponent(Frame f, Vector _back, LinkedList componentList, String title) {
         super(f, title, true);
-        
+
         back = _back;
-		
-		LinkedList pcl = new LinkedList();
-		makeComponentList(pcl, componentList);
-        
+
+        LinkedList pcl = new LinkedList();
+        makeComponentList(pcl, componentList);
+
         if ((validated == null) || (ignored == null)) {
             val = makeNewVal(pcl);
             ign = new Vector();
@@ -95,301 +95,313 @@ public class JDialogSelectTMLComponent extends javax.swing.JDialog implements Ac
             checkTask(ign, pcl);
             addNewTask(val, pcl, ign);
         }
-        
+
         initComponents();
         myInitComponents();
         pack();
     }
-	
-	private void makeComponentList(LinkedList cs, LinkedList lcs) {
-		TGComponent tgc;
-		TMLCCompositeComponent ccomp;
-		
-		for(int i=0; i<lcs.size(); i++) {
+
+    private void makeComponentList(LinkedList cs, LinkedList lcs) {
+        TGComponent tgc;
+        TMLCCompositeComponent ccomp;
+
+        for(int i=0; i<lcs.size(); i++) {
             tgc = (TGComponent)(lcs.get(i));
-			if (tgc instanceof TMLCCompositeComponent) {
-				ccomp = (TMLCCompositeComponent)tgc;
-				cs.addAll(ccomp.getAllPrimitiveComponents());
-			}
-			if (tgc instanceof TMLCPrimitiveComponent) {
+            if (tgc instanceof TMLCCompositeComponent) {
+                ccomp = (TMLCCompositeComponent)tgc;
+                cs.addAll(ccomp.getAllPrimitiveComponents());
+            }
+            if (tgc instanceof TMLCPrimitiveComponent) {
                 cs.add(tgc);
             }
-			
-			if (tgc instanceof TMLCRemoteCompositeComponent) {
-				 cs.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
-			}
-		}
-	}
-	
-	private Vector makeNewVal(LinkedList list) {
-		Vector v = new Vector();
-		TGComponent tgc;
-		
-		for(int i=0; i<list.size(); i++) {
-			tgc = (TGComponent)(list.get(i));
-			//System.out.println(tgc);
-			if (tgc instanceof TMLCPrimitiveComponent) {
-				v.addElement(tgc);
-			}
-		}
-		return v;
-	}
-	
-	private void checkTask(Vector tobeChecked, LinkedList source) {
-		TMLCPrimitiveComponent t;
-		
-		for(int i=0; i<tobeChecked.size(); i++) {
-			t = (TMLCPrimitiveComponent)(tobeChecked.elementAt(i));
-			if (!source.contains(t)) {
-				tobeChecked.removeElementAt(i);
-				i--;
-			}
-		}
-	}
-	
-	public void addNewTask(Vector added, LinkedList source, Vector notSource) {
-		TGComponent tgc;
-		
-		for(int i=0; i<source.size(); i++) {
-			tgc = (TGComponent)(source.get(i));
-			if ((tgc instanceof TMLCPrimitiveComponent) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
-				added.addElement(tgc);
-				//System.out.println("New element");
-			}
-		}
-	}
-	
-	private void myInitComponents() {
-		setButtons();
-	}
+
+            if (tgc instanceof TMLCRemoteCompositeComponent) {
+                cs.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
+            }
+        }
+    }
+
+    private Vector makeNewVal(LinkedList list) {
+        Vector v = new Vector();
+        TGComponent tgc;
+
+        for(int i=0; i<list.size(); i++) {
+            tgc = (TGComponent)(list.get(i));
+            //System.out.println(tgc);
+            if (tgc instanceof TMLCPrimitiveComponent) {
+                v.addElement(tgc);
+            }
+        }
+        return v;
+    }
+
+    private void checkTask(Vector tobeChecked, LinkedList source) {
+        TMLCPrimitiveComponent t;
+
+        for(int i=0; i<tobeChecked.size(); i++) {
+            t = (TMLCPrimitiveComponent)(tobeChecked.elementAt(i));
+            if (!source.contains(t)) {
+                tobeChecked.removeElementAt(i);
+                i--;
+            }
+        }
+    }
+
+    public void addNewTask(Vector added, LinkedList source, Vector notSource) {
+        TGComponent tgc;
+
+        for(int i=0; i<source.size(); i++) {
+            tgc = (TGComponent)(source.get(i));
+            if ((tgc instanceof TMLCPrimitiveComponent) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
+                added.addElement(tgc);
+                //System.out.println("New element");
+            }
+        }
+    }
+
+    private void myInitComponents() {
+        setButtons();
+    }
+
+    private void initComponents() {
+        Container c = getContentPane();
+        GridBagLayout gridbag1 = new GridBagLayout();
+        GridBagConstraints c1 = new GridBagConstraints();
+	GridBagLayout gridbag2 = new GridBagLayout();
+        GridBagConstraints c2 = new GridBagConstraints();
+        setFont(new Font("Helvetica", Font.PLAIN, 14));
+
+	c.setLayout(gridbag2);
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+	c2.weighty = 1.0;
+        c2.weightx = 1.0;
+	c2.gridwidth = 1;
+        c2.fill = GridBagConstraints.HORIZONTAL;
+        c2.gridheight = 1;
+
+        // ignored list
+        panel1 = new JPanel();
+        panel1.setLayout(new BorderLayout());
+        panel1.setBorder(new javax.swing.border.TitledBorder("Ignored components"));
+        listIgnored = new JList(ign);
+        //listIgnored.setPreferredSize(new Dimension(200, 250));
+        listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+        listIgnored.addListSelectionListener(this);
+        JScrollPane scrollPane1 = new JScrollPane(listIgnored);
+        panel1.add(scrollPane1, BorderLayout.CENTER);
+        panel1.setPreferredSize(new Dimension(200, 250));
+        c.add(panel1, c2);
+
+
+
+        // central buttons
+        panel3 = new JPanel();
+        panel3.setLayout(gridbag1);
+
+        c1.weighty = 1.0;
+        c1.weightx = 1.0;
+        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+        c1.fill = GridBagConstraints.HORIZONTAL;
+        c1.gridheight = 1;
+
+        allValidated = new JButton(IconManager.imgic50);
+        allValidated.setPreferredSize(new Dimension(50, 25));
+        allValidated.addActionListener(this);
+        allValidated.setActionCommand("allValidated");
+        panel3.add(allValidated, c1);
+
+        addOneValidated = new JButton(IconManager.imgic48);
+        addOneValidated.setPreferredSize(new Dimension(50, 25));
+        addOneValidated.addActionListener(this);
+        addOneValidated.setActionCommand("addOneValidated");
+        panel3.add(addOneValidated, c1);
+
+        panel3.add(new JLabel(" "), c1);
+
+        addOneIgnored = new JButton(IconManager.imgic46);
+        addOneIgnored.addActionListener(this);
+        addOneIgnored.setPreferredSize(new Dimension(50, 25));
+        addOneIgnored.setActionCommand("addOneIgnored");
+        panel3.add(addOneIgnored, c1);
+
+        allIgnored = new JButton(IconManager.imgic44);
+        allIgnored.addActionListener(this);
+        allIgnored.setPreferredSize(new Dimension(50, 25));
+        allIgnored.setActionCommand("allIgnored");
+        panel3.add(allIgnored, c1);
 	
-	private void initComponents() {
-		Container c = getContentPane();
-		GridBagLayout gridbag1 = new GridBagLayout();
-		GridBagConstraints c1 = new GridBagConstraints();
-		setFont(new Font("Helvetica", Font.PLAIN, 14));
-		c.setLayout(new BorderLayout());
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-		
-		// ignored list
-		panel1 = new JPanel();
-		panel1.setLayout(new BorderLayout());
-		panel1.setBorder(new javax.swing.border.TitledBorder("Ignored components"));
-		listIgnored = new JList(ign);
-		//listIgnored.setPreferredSize(new Dimension(200, 250));
-		listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
-		listIgnored.addListSelectionListener(this);
-		JScrollPane scrollPane1 = new JScrollPane(listIgnored);
-		panel1.add(scrollPane1, BorderLayout.CENTER);
-		panel1.setPreferredSize(new Dimension(200, 250));
-		c.add(panel1, BorderLayout.WEST);
-		
-		// validated list
-		panel2 = new JPanel();
-		panel2.setLayout(new BorderLayout());
-		panel2.setBorder(new javax.swing.border.TitledBorder("Used components"));
-		listValidated = new JList(val);
-		//listValidated.setPreferredSize(new Dimension(200, 250));
-		listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
-		listValidated.addListSelectionListener(this);
-		JScrollPane scrollPane2 = new JScrollPane(listValidated);
-		panel2.add(scrollPane2, BorderLayout.CENTER);
-		panel2.setPreferredSize(new Dimension(200, 250));
-		c.add(panel2, BorderLayout.EAST);
-		
-		// central buttons
-		panel3 = new JPanel();
-		panel3.setLayout(gridbag1);
-		
-		c1.weighty = 1.0;
-		c1.weightx = 1.0;
-		c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-		c1.fill = GridBagConstraints.HORIZONTAL;
-		c1.gridheight = 1;
-		
-		allValidated = new JButton(IconManager.imgic50);
-		allValidated.setPreferredSize(new Dimension(50, 25));
-		allValidated.addActionListener(this);
-		allValidated.setActionCommand("allValidated");
-		panel3.add(allValidated, c1);
-		
-		addOneValidated = new JButton(IconManager.imgic48);
-		addOneValidated.setPreferredSize(new Dimension(50, 25));
-		addOneValidated.addActionListener(this);
-		addOneValidated.setActionCommand("addOneValidated");
-		panel3.add(addOneValidated, c1);
-		
-		panel3.add(new JLabel(" "), c1);
-		
-		addOneIgnored = new JButton(IconManager.imgic46);
-		addOneIgnored.addActionListener(this);
-		addOneIgnored.setPreferredSize(new Dimension(50, 25));
-		addOneIgnored.setActionCommand("addOneIgnored");
-		panel3.add(addOneIgnored, c1);
-		
-		allIgnored = new JButton(IconManager.imgic44);
-		allIgnored.addActionListener(this);
-		allIgnored.setPreferredSize(new Dimension(50, 25));
-		allIgnored.setActionCommand("allIgnored");
-		panel3.add(allIgnored, c1);
-		
-		c.add(panel3, BorderLayout.CENTER);
-		
-		// main panel;
-		panel6 = new JPanel();
+        c.add(panel3, c2);
+
+	// validated list
+        panel2 = new JPanel();
+        panel2.setLayout(new BorderLayout());
+        panel2.setBorder(new javax.swing.border.TitledBorder("Used components"));
+        listValidated = new JList(val);
+        //listValidated.setPreferredSize(new Dimension(200, 250));
+        listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+        listValidated.addListSelectionListener(this);
+        JScrollPane scrollPane2 = new JScrollPane(listValidated);
+        panel2.add(scrollPane2, BorderLayout.CENTER);
+        panel2.setPreferredSize(new Dimension(200, 250));
+	c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+        c.add(panel2, c2);
+
+        // main panel;
+        panel6 = new JPanel();
         panel6.setLayout(new BorderLayout());
-		
-		panel5 = new JPanel();
+
+        panel5 = new JPanel();
         panel5.setLayout(new FlowLayout());
-		
-		optimize = new JCheckBox("Optimize TML specification");
-		optimize.setSelected(optimized);
-		panel5.add(optimize);
-		
+
+        optimize = new JCheckBox("Optimize TML specification");
+        optimize.setSelected(optimized);
+        panel5.add(optimize);
+
         panel4 = new JPanel();
         panel4.setLayout(new FlowLayout());
-        
+
         closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
         //closeButton.setPreferredSize(new Dimension(600, 50));
         closeButton.addActionListener(this);
         closeButton.setPreferredSize(new Dimension(200, 30));
-        
+
         cancelButton = new JButton("Cancel", IconManager.imgic27);
         cancelButton.addActionListener(this);
         cancelButton.setPreferredSize(new Dimension(200, 30));
         panel4.add(cancelButton);
-		panel4.add(closeButton);
-		
-		panel6.add(panel5, BorderLayout.NORTH);
-		panel6.add(panel4, BorderLayout.SOUTH);
-        
-        c.add(panel6, BorderLayout.SOUTH);
-		
-	}
-	
-	public void	actionPerformed(ActionEvent evt)  {
-		String command = evt.getActionCommand();
-		
-		// Compare the action command to the known actions.
-		if (command.equals("Start Syntax Analysis"))  {
-			closeDialog();
-		} else if (command.equals("Cancel")) {
-			cancelDialog();
-		} else if (command.equals("addOneIgnored")) {
-			addOneIgnored();
-		} else if (command.equals("addOneValidated")) {
-			addOneValidated();
-		} else if (command.equals("allValidated")) {
-			allValidated();
-		} else if (command.equals("allIgnored")) {
-			allIgnored();
-		}
-	}
-	
-	
-	private void addOneIgnored() {
-		int [] list = listValidated.getSelectedIndices();
-		Vector v = new Vector();
-		Object o;
-		for (int i=0; i<list.length; i++){
-			o = val.elementAt(list[i]);
-			ign.addElement(o);
-			v.addElement(o);
-		}
-		
-		val.removeAll(v);
-		listIgnored.setListData(ign);
-		listValidated.setListData(val);
-		setButtons();
-	}
-	
-	private void addOneValidated() {
-		int [] list = listIgnored.getSelectedIndices();
-		Vector v = new Vector();
-		Object o;
-		for (int i=0; i<list.length; i++){
-			o = ign.elementAt(list[i]);
-			val.addElement(o);
-			v.addElement(o);
-		}
-		
-		ign.removeAll(v);
-		listIgnored.setListData(ign);
-		listValidated.setListData(val);
-		setButtons();
-	}
-	
-	private void allValidated() {
-		val.addAll(ign);
-		ign.removeAllElements();
-		listIgnored.setListData(ign);
-		listValidated.setListData(val);
-		setButtons();
-	}
-	
-	private void allIgnored() {
-		ign.addAll(val);
-		val.removeAllElements();
-		listIgnored.setListData(ign);
-		listValidated.setListData(val);
-		setButtons();
-	}
-	
-	
-	public void closeDialog() {
-		back.removeAllElements();
-		for(int i=0; i<val.size(); i++) {
-			back.addElement(val.elementAt(i));
-		}
-		validated = val;
-		ignored = ign;
-		optimized = optimize.isSelected();
-		dispose();
-	}
-	
-	public void cancelDialog() {
-		dispose();
-	}
-	
-	private void setButtons() {
-		int i1 = listIgnored.getSelectedIndex();
-		int i2 = listValidated.getSelectedIndex();
-		
-		if (i1 == -1) {
-			addOneValidated.setEnabled(false);
-		} else {
-			addOneValidated.setEnabled(true);
-			//listValidated.clearSelection();
-		}
-		
-		if (i2 == -1) {
-			addOneIgnored.setEnabled(false);
-		} else {
-			addOneIgnored.setEnabled(true);
-			//listIgnored.clearSelection();
-		}
-		
-		if (ign.size() ==0) {
-			allValidated.setEnabled(false);
-		} else {
-			allValidated.setEnabled(true);
-		}
-		
-		if (val.size() ==0) {
-			allIgnored.setEnabled(false);
-			closeButton.setEnabled(false);
-		} else {
-			allIgnored.setEnabled(true);
-			closeButton.setEnabled(true);
-		}
-	}
-	
-	
-	public void valueChanged(ListSelectionEvent e) {
-		setButtons();
-	}
-	
-	public boolean getOptimize() {
-		return optimized;
-	}
-}
\ No newline at end of file
+        panel4.add(closeButton);
+
+        panel6.add(panel5, BorderLayout.NORTH);
+        panel6.add(panel4, BorderLayout.SOUTH);
+
+        c.add(panel6, c2);
+
+    }
+
+    public void actionPerformed(ActionEvent evt)  {
+        String command = evt.getActionCommand();
+
+        // Compare the action command to the known actions.
+        if (command.equals("Start Syntax Analysis"))  {
+            closeDialog();
+        } else if (command.equals("Cancel")) {
+            cancelDialog();
+        } else if (command.equals("addOneIgnored")) {
+            addOneIgnored();
+        } else if (command.equals("addOneValidated")) {
+            addOneValidated();
+        } else if (command.equals("allValidated")) {
+            allValidated();
+        } else if (command.equals("allIgnored")) {
+            allIgnored();
+        }
+    }
+
+
+    private void addOneIgnored() {
+        int [] list = listValidated.getSelectedIndices();
+        Vector v = new Vector();
+        Object o;
+        for (int i=0; i<list.length; i++){
+            o = val.elementAt(list[i]);
+            ign.addElement(o);
+            v.addElement(o);
+        }
+
+        val.removeAll(v);
+        listIgnored.setListData(ign);
+        listValidated.setListData(val);
+        setButtons();
+    }
+
+    private void addOneValidated() {
+        int [] list = listIgnored.getSelectedIndices();
+        Vector v = new Vector();
+        Object o;
+        for (int i=0; i<list.length; i++){
+            o = ign.elementAt(list[i]);
+            val.addElement(o);
+            v.addElement(o);
+        }
+
+        ign.removeAll(v);
+        listIgnored.setListData(ign);
+        listValidated.setListData(val);
+        setButtons();
+    }
+
+    private void allValidated() {
+        val.addAll(ign);
+        ign.removeAllElements();
+        listIgnored.setListData(ign);
+        listValidated.setListData(val);
+        setButtons();
+    }
+
+    private void allIgnored() {
+        ign.addAll(val);
+        val.removeAllElements();
+        listIgnored.setListData(ign);
+        listValidated.setListData(val);
+        setButtons();
+    }
+
+
+    public void closeDialog() {
+        back.removeAllElements();
+        for(int i=0; i<val.size(); i++) {
+            back.addElement(val.elementAt(i));
+        }
+        validated = val;
+        ignored = ign;
+        optimized = optimize.isSelected();
+        dispose();
+    }
+
+    public void cancelDialog() {
+        dispose();
+    }
+
+    private void setButtons() {
+        int i1 = listIgnored.getSelectedIndex();
+        int i2 = listValidated.getSelectedIndex();
+
+        if (i1 == -1) {
+            addOneValidated.setEnabled(false);
+        } else {
+            addOneValidated.setEnabled(true);
+            //listValidated.clearSelection();
+        }
+
+        if (i2 == -1) {
+            addOneIgnored.setEnabled(false);
+        } else {
+            addOneIgnored.setEnabled(true);
+            //listIgnored.clearSelection();
+        }
+
+        if (ign.size() ==0) {
+            allValidated.setEnabled(false);
+        } else {
+            allValidated.setEnabled(true);
+        }
+
+        if (val.size() ==0) {
+            allIgnored.setEnabled(false);
+            closeButton.setEnabled(false);
+        } else {
+            allIgnored.setEnabled(true);
+            closeButton.setEnabled(true);
+        }
+    }
+
+
+    public void valueChanged(ListSelectionEvent e) {
+        setButtons();
+    }
+
+    public boolean getOptimize() {
+        return optimized;
+    }
+}
diff --git a/src/ui/window/JDialogSelectTMLNodes.java b/src/ui/window/JDialogSelectTMLNodes.java
index f892dc76fd569616a9cf04f91e66961b222bd1a5..8086592ad6a5f3b03bd9232e6306d216cae5c9ac 100755
--- a/src/ui/window/JDialogSelectTMLNodes.java
+++ b/src/ui/window/JDialogSelectTMLNodes.java
@@ -1,48 +1,48 @@
 /**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 JDialogSelectTMLNodes
- * Dialog for managing nodes to be validated
- * Creation: 19/09/2007
- * @version 1.0 19/09/2007
- * @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 JDialogSelectTMLNodes
+   * Dialog for managing nodes to be validated
+   * Creation: 19/09/2007
+   * @version 1.0 19/09/2007
+   * @author Ludovic APVRILLE
+   * @see
+   */
 
 package ui.window;
 
@@ -58,35 +58,35 @@ import ui.tmldd.*;
 
 public class JDialogSelectTMLNodes extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public static Vector validated, ignored;
-	private static boolean optimized = true;
-	
-	private int clock;
-    
+    private static boolean optimized = true;
+
+    private int clock;
+
     private Vector val, ign, back;
-    
+
     //subpanels
-	private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
+    private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
     private JList listIgnored;
     private JList listValidated;
     private JButton allValidated;
     private JButton addOneValidated;
     private JButton addOneIgnored;
     private JButton allIgnored;
-	protected JCheckBox optimize;
-	protected JTextField clockField;
-    
+    protected JCheckBox optimize;
+    protected JTextField clockField;
+
     // Main Panel
     private JButton closeButton;
     private JButton cancelButton;
-    
+
     /** Creates new form  */
     public JDialogSelectTMLNodes(Frame f, Vector _back, LinkedList componentList, String title, int _clock) {
         super(f, title, true);
-        
+
         back = _back;
-		
-		clock = _clock;
-        
+
+        clock = _clock;
+
         if ((validated == null) || (ignored == null)) {
             val = makeNewVal(componentList);
             ign = new Vector();
@@ -97,16 +97,16 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             checkNode(ign, componentList);
             addNewNode(val, componentList, ign);
         }
-        
+
         initComponents();
         myInitComponents();
         pack();
     }
-    
+
     private Vector makeNewVal(LinkedList list) {
         Vector v = new Vector();
         TGComponent tgc;
-        
+
         for(int i=0; i<list.size(); i++) {
             tgc = (TGComponent)(list.get(i));
             //System.out.println(tgc);
@@ -116,10 +116,10 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
         }
         return v;
     }
-    
+
     private void checkNode(Vector tobeChecked, LinkedList source) {
         TMLArchiNode t;
-        
+
         for(int i=0; i<tobeChecked.size(); i++) {
             t = (TMLArchiNode)(tobeChecked.elementAt(i));
             if (!source.contains(t)) {
@@ -128,10 +128,10 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             }
         }
     }
-    
+
     public void addNewNode(Vector added, LinkedList source, Vector notSource) {
         TGComponent tgc;
-        
+
         for(int i=0; i<source.size(); i++) {
             tgc = (TGComponent)(source.get(i));
             if ((tgc instanceof TMLArchiNode) && (!added.contains(tgc)) && (!notSource.contains(tgc))){
@@ -140,19 +140,27 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             }
         }
     }
-    
+
     private void myInitComponents() {
         setButtons();
     }
-    
+
     private void initComponents() {
         Container c = getContentPane();
         GridBagLayout gridbag1 = new GridBagLayout();
         GridBagConstraints c1 = new GridBagConstraints();
+	GridBagLayout gridbag2 = new GridBagLayout();
+        GridBagConstraints c2 = new GridBagConstraints();
         setFont(new Font("Helvetica", Font.PLAIN, 14));
-        c.setLayout(new BorderLayout());
+        c.setLayout(gridbag2);
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        
+	
+	c2.weighty = 1.0;
+        c2.weightx = 1.0;
+	c2.gridwidth = 1;
+        c2.fill = GridBagConstraints.HORIZONTAL;
+        c2.gridheight = 1;
+
         // ignored list
         panel1 = new JPanel();
         panel1.setLayout(new BorderLayout());
@@ -164,108 +172,111 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
         JScrollPane scrollPane1 = new JScrollPane(listIgnored);
         panel1.add(scrollPane1, BorderLayout.CENTER);
         panel1.setPreferredSize(new Dimension(200, 250));
-        c.add(panel1, BorderLayout.WEST);
-        
-        // validated list
-        panel2 = new JPanel();
-        panel2.setLayout(new BorderLayout());
-        panel2.setBorder(new javax.swing.border.TitledBorder("Nodes taken into account"));
-        listValidated = new JList(val);
-        //listValidated.setPreferredSize(new Dimension(200, 250));
-        listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
-        listValidated.addListSelectionListener(this);
-        JScrollPane scrollPane2 = new JScrollPane(listValidated);
-        panel2.add(scrollPane2, BorderLayout.CENTER);
-        panel2.setPreferredSize(new Dimension(200, 250));
-        c.add(panel2, BorderLayout.EAST);
-        
+        c.add(panel1, c2);
+
+
+
         // central buttons
         panel3 = new JPanel();
         panel3.setLayout(gridbag1);
-        
+
         c1.weighty = 1.0;
         c1.weightx = 1.0;
         c1.gridwidth = GridBagConstraints.REMAINDER; //end row
         c1.fill = GridBagConstraints.HORIZONTAL;
         c1.gridheight = 1;
-        
+
         allValidated = new JButton(IconManager.imgic50);
         allValidated.setPreferredSize(new Dimension(50, 25));
         allValidated.addActionListener(this);
         allValidated.setActionCommand("allValidated");
         panel3.add(allValidated, c1);
-        
+
         addOneValidated = new JButton(IconManager.imgic48);
         addOneValidated.setPreferredSize(new Dimension(50, 25));
         addOneValidated.addActionListener(this);
         addOneValidated.setActionCommand("addOneValidated");
         panel3.add(addOneValidated, c1);
-        
+
         panel3.add(new JLabel(" "), c1);
-        
+
         addOneIgnored = new JButton(IconManager.imgic46);
         addOneIgnored.addActionListener(this);
         addOneIgnored.setPreferredSize(new Dimension(50, 25));
         addOneIgnored.setActionCommand("addOneIgnored");
         panel3.add(addOneIgnored, c1);
-        
+
         allIgnored = new JButton(IconManager.imgic44);
         allIgnored.addActionListener(this);
         allIgnored.setPreferredSize(new Dimension(50, 25));
         allIgnored.setActionCommand("allIgnored");
         panel3.add(allIgnored, c1);
-        
-        c.add(panel3, BorderLayout.CENTER);
-        
+
+        c.add(panel3, c2);
+
+	// validated list
+        panel2 = new JPanel();
+        panel2.setLayout(new BorderLayout());
+        panel2.setBorder(new javax.swing.border.TitledBorder("Nodes taken into account"));
+        listValidated = new JList(val);
+        //listValidated.setPreferredSize(new Dimension(200, 250));
+        listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
+        listValidated.addListSelectionListener(this);
+        JScrollPane scrollPane2 = new JScrollPane(listValidated);
+        panel2.add(scrollPane2, BorderLayout.CENTER);
+        panel2.setPreferredSize(new Dimension(200, 250));
+	c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+        c.add(panel2, c2);
+
         // main panel;
         panel6 = new JPanel();
         panel6.setLayout(new BorderLayout());
-		
-		panel5 = new JPanel();
-		GridBagLayout gridbag2 = new GridBagLayout();
-        GridBagConstraints c2 = new GridBagConstraints();
+
+        panel5 = new JPanel();
+        GridBagLayout gridbag3 = new GridBagLayout();
+        GridBagConstraints c3 = new GridBagConstraints();
         panel5.setLayout(gridbag2);
-		
-		c2.weighty = 1.0;
-        c2.weightx = 1.0;
-        c2.fill = GridBagConstraints.HORIZONTAL;
-        c2.gridheight = 1;
-		
-		c2.gridwidth = GridBagConstraints.REMAINDER; //end row
-		optimize = new JCheckBox("Optimize TML specification");
-		optimize.setSelected(optimized);
-		panel5.add(optimize, c2);
-		
-		c2.gridwidth = 1; //end row
-		panel5.add(new JLabel("Master clock (in MHz)"), c2);
-		c2.gridwidth = GridBagConstraints.REMAINDER; //end row
-		clockField = new JTextField("" + clock);
-		panel5.add(clockField, c2);
-		
+
+        c3.weighty = 1.0;
+        c3.weightx = 1.0;
+        c3.fill = GridBagConstraints.HORIZONTAL;
+        c3.gridheight = 1;
+
+        c3.gridwidth = GridBagConstraints.REMAINDER; //end row
+        optimize = new JCheckBox("Optimize TML specification");
+        optimize.setSelected(optimized);
+        panel5.add(optimize, c3);
+
+        c3.gridwidth = 1; //end row
+        panel5.add(new JLabel("Master clock (in MHz)"), c3);
+        c3.gridwidth = GridBagConstraints.REMAINDER; //end row
+        clockField = new JTextField("" + clock);
+        panel5.add(clockField, c3);
+
         panel4 = new JPanel();
         panel4.setLayout(new FlowLayout());
-        
+
         closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
         //closeButton.setPreferredSize(new Dimension(600, 50));
         closeButton.addActionListener(this);
         closeButton.setPreferredSize(new Dimension(200, 30));
-        
+
         cancelButton = new JButton("Cancel", IconManager.imgic27);
         cancelButton.addActionListener(this);
         cancelButton.setPreferredSize(new Dimension(200, 30));
         panel4.add(cancelButton);
-		panel4.add(closeButton);
-		
-		panel6.add(panel5, BorderLayout.NORTH);
-		panel6.add(panel4, BorderLayout.SOUTH);
-        
-        c.add(panel6, BorderLayout.SOUTH);
-        
+        panel4.add(closeButton);
+
+        panel6.add(panel5, BorderLayout.NORTH);
+        panel6.add(panel4, BorderLayout.SOUTH);
+
+        c.add(panel6, c2);
+
     }
-    
-    public void	actionPerformed(ActionEvent evt)  {
+
+    public void actionPerformed(ActionEvent evt)  {
         String command = evt.getActionCommand();
-        
+
         // Compare the action command to the known actions.
         if (command.equals("Start Syntax Analysis"))  {
             closeDialog();
@@ -281,8 +292,8 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             allIgnored();
         }
     }
-    
-    
+
+
     private void addOneIgnored() {
         int [] list = listValidated.getSelectedIndices();
         Vector v = new Vector();
@@ -292,13 +303,13 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             ign.addElement(o);
             v.addElement(o);
         }
-        
+
         val.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void addOneValidated() {
         int [] list = listIgnored.getSelectedIndices();
         Vector v = new Vector();
@@ -308,13 +319,13 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             val.addElement(o);
             v.addElement(o);
         }
-        
+
         ign.removeAll(v);
         listIgnored.setListData(ign);
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allValidated() {
         val.addAll(ign);
         ign.removeAllElements();
@@ -322,7 +333,7 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
         listValidated.setListData(val);
         setButtons();
     }
-    
+
     private void allIgnored() {
         ign.addAll(val);
         val.removeAllElements();
@@ -330,8 +341,8 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
         listValidated.setListData(val);
         setButtons();
     }
-    
-    
+
+
     public void closeDialog() {
         back.removeAllElements();
         for(int i=0; i<val.size(); i++) {
@@ -341,35 +352,35 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
         ignored = ign;
         dispose();
     }
-    
+
     public void cancelDialog() {
         dispose();
     }
-    
+
     private void setButtons() {
         int i1 = listIgnored.getSelectedIndex();
         int i2 = listValidated.getSelectedIndex();
-        
+
         if (i1 == -1) {
             addOneValidated.setEnabled(false);
         } else {
             addOneValidated.setEnabled(true);
             //listValidated.clearSelection();
         }
-        
+
         if (i2 == -1) {
             addOneIgnored.setEnabled(false);
         } else {
             addOneIgnored.setEnabled(true);
             //listIgnored.clearSelection();
         }
-        
+
         if (ign.size() ==0) {
             allValidated.setEnabled(false);
         } else {
             allValidated.setEnabled(true);
         }
-        
+
         if (val.size() ==0) {
             allIgnored.setEnabled(false);
             closeButton.setEnabled(false);
@@ -378,23 +389,23 @@ public class JDialogSelectTMLNodes extends javax.swing.JDialog implements Action
             closeButton.setEnabled(true);
         }
     }
-    
-	public int getClock() {
-		try {
-			int c = Integer.decode(clockField.getText()).intValue();
-			if (c > 0) {
-				return c;
-			}
-		} catch (Exception e) {
-		}
-		return clock;
-	}
-    
+
+    public int getClock() {
+        try {
+            int c = Integer.decode(clockField.getText()).intValue();
+            if (c > 0) {
+                return c;
+            }
+        } catch (Exception e) {
+        }
+        return clock;
+    }
+
     public void valueChanged(ListSelectionEvent e) {
         setButtons();
     }
-	
-	public boolean getOptimize() {
-		return optimized;
-	}
-}
\ No newline at end of file
+
+    public boolean getOptimize() {
+        return optimized;
+    }
+}
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index 4a2e2bebd2155dd02c6eb3e52d336d8a828fd5a1..d308b6ff534b57d7210c3f433fcb7b64a0725042 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -163,7 +163,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
         jp1.add(stateA, c1);
         stateA.setSelected(stateAChecked);
 
-	stateL = new JCheckBox("Leads to");
+        stateL = new JCheckBox("Leads to");
         stateL.addActionListener(this);
         stateL.setToolTipText("Study the fact that, if accessed,  a given state is eventually followed by another one");
         jp1.add(stateL, c1);
@@ -259,7 +259,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
         deadlockAChecked = deadlockA.isSelected();
         stateEChecked = stateE.isSelected();
         stateAChecked = stateA.isSelected();
-	stateLChecked = stateL.isSelected();
+        stateLChecked = stateL.isSelected();
         customChecked = custom.isSelected();
         generateTraceChecked = generateTrace.isSelected();
         showDetailsChecked = showDetails.isSelected();
@@ -362,44 +362,47 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
                 }
             }
 
-	    if (stateL.isSelected() && (mode != NOT_STARTED)) {
+            if (stateL.isSelected() && (mode != NOT_STARTED)) {
                 ArrayList<String> list = mgui.gtm.getUPPAALQueries(tp);
-		String s1, s2, name1, name2, query1, query2;
-		int index1, index2;
+                String s1, s2, name1, name2, query1, query2;
+                int index1, index2;
                 if ((list != null) && (list.size() > 0)){
-		    for(int i=0; i<list.size()-1; i++) {
-			for(int j=i+1; j<list.size(); j++) {
-			    s1 = list.get(i);
-			    s2 = list.get(j);
-			    index1 = s1.indexOf('$');
-			    index2 = s2.indexOf('$');
-			    if ((index1 != -1) && (index2 != -1) && (mode != NOT_STARTED)) {
-				name1 = s1.substring(index1+1, s1.length());
-				query1 = s1.substring(0, index1);
-				name2 = s2.substring(index2+1, s2.length());
-				query2 = s2.substring(0, index2);
-				jta.append("\nLeads to: " + name1 + "--> " + name2 + "\n");
-				workQuery(query1 + " --> " + query2, fn, trace_id, rshc);
-				trace_id++;
-				jta.append("\nLeads to: " + name2 + "--> " + name1 + "\n");
-				workQuery(query2 + " --> " + query1, fn, trace_id, rshc);
-				trace_id++;
-			    }else {
-				jta.append("A component could not be studied (internal error)\n");
-			    }
-			}
-		    }
-                    for(String s: list) {
-                        index = s.indexOf('$');
-                        if ((index != -1) && (mode != NOT_STARTED)) {
-                            name = s.substring(index+1, s.length());
-                            query = s.substring(0, index);
-                            //jta.append("\n--------------------------------------------\n");
-                            jta.append("\nLeads to: " + name + "\n");
-                            workQuery("A<> " + query, fn, trace_id, rshc);
-                            trace_id++;
-                        } else {
-                            jta.append("A component could not be studied (internal error)\n");
+                    for(int i=0; i<list.size()-1; i++) {
+                        for(int j=i+1; j<list.size(); j++) {
+                            s1 = list.get(i);
+                            s2 = list.get(j);
+                            index1 = s1.indexOf('$');
+                            index2 = s2.indexOf('$');
+                            //TraceManager.addDev("\n******\n\n\n");
+                            //TraceManager.addDev("s1=" + s1 + "\ns2=" + s2);
+                            if ((index1 != -1) && (index2 != -1) && (mode != NOT_STARTED)) {
+                                name1 = s1.substring(index1+1, s1.length());
+                                query1 = s1.substring(0, index1);
+                                name2 = s2.substring(index2+1, s2.length());
+                                query2 = s2.substring(0, index2);
+                                //TraceManager.addDev("name1=" + name1 + "\nname2=" + name2);
+                                //TraceManager.addDev("query1=" + s1 + "\nquery2=" + s2);
+                                if ((name1.compareTo(name2) != 0) && (name1.length() > 0) && (name2.length() > 0)) {
+				    if (!(showDetails.isSelected())) {
+					int indexName = name1.indexOf(":");
+					if (indexName != -1) {
+					    name1 = name1.substring(indexName+1, name1.length()).trim();
+					}
+					indexName = name2.indexOf(":");
+					if (indexName != -1) {
+					    name2 = name2.substring(indexName+1, name2.length()).trim();
+					}
+				    }
+                                    jta.append("\nLeads to: " + name1 + "--> " + name2 + "\n");
+                                    workQuery(query1 + " --> " + query2, fn, trace_id, rshc);
+                                    trace_id++;
+                                    jta.append("\nLeads to: " + name2 + "--> " + name1 + "\n");
+                                    workQuery(query2 + " --> " + query1, fn, trace_id, rshc);
+                                    trace_id++;
+                                }
+                            }else {
+                                jta.append("A component could not be studied (internal error)\n");
+                            }
                         }
                     }
                 } else {
@@ -450,6 +453,9 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
     }
 
     private void workQuery(String query, String fn, int trace_id, RshClient rshc) throws LauncherException {
+
+        //TraceManager.addDev("Working on query: " + query);
+
         String cmd1, data;
         if(showDetails.isSelected()) {
             jta.append("-> " + query + "\n");
@@ -530,7 +536,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
             deadlockA.setEnabled(true);
             stateE.setEnabled(true);
             stateA.setEnabled(true);
-	    stateL.setEnabled(true);
+            stateL.setEnabled(true);
             //customText.setEnabled(true);
             customText.setEnabled(custom.isSelected());
             generateTrace.setEnabled(true);
@@ -555,7 +561,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
             deadlockA.setEnabled(false);
             stateE.setEnabled(false);
             stateA.setEnabled(false);
-	    stateL.setEnabled(false);
+            stateL.setEnabled(false);
             customText.setEnabled(false);
             generateTrace.setEnabled(false);
             showDetails.setEnabled(false);
@@ -572,7 +578,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
             deadlockA.setEnabled(false);
             stateE.setEnabled(false);
             stateA.setEnabled(false);
-	    stateL.setEnabled(false);
+            stateL.setEnabled(false);
             customText.setEnabled(false);
             generateTrace.setEnabled(false);
             showDetails.setEnabled(false);