diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 1b5175ca0c338e196f70f09806a4f54050ed9f5e..b6918c17ff1c304ef5e20a56c76e7dee30c3956e 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -4,24 +4,6 @@
 
 <Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
 <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="5202" id="1789" >
-<cdparam x="894" y="479" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1790" />
-<P1  x="894" y="479" id="7" />
-<P2  x="939" y="106" id="82" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5202" id="1787" >
-<cdparam x="800" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1788" />
-<P1  x="800" y="136" id="87" />
-<P2  x="496" y="42" id="304" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
 <COMPONENT type="5200" id="44" >
 <cdparam x="844" y="479" />
 <sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -87,7 +69,7 @@
 </COMPONENT>
 
 <COMPONENT type="5207" id="60" >
-<cdparam x="749" y="252" />
+<cdparam x="727" y="252" />
 <sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
@@ -588,37 +570,55 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="5206" id="390" >
+<CONNECTOR type="5202" id="390" >
+<cdparam x="894" y="479" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
+<TGConnectingPoint num="0" id="389" />
+<P1  x="894" y="479" id="7" />
+<P2  x="939" y="106" id="82" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5202" id="392" >
+<cdparam x="800" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
+<TGConnectingPoint num="0" id="391" />
+<P1  x="800" y="136" id="87" />
+<P2  x="496" y="42" id="304" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5206" id="394" >
 <cdparam x="271" y="491" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="389" />
+<TGConnectingPoint num="0" id="393" />
 <P1  x="271" y="491" id="129" />
 <P2  x="297" y="468" id="354" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5206" id="396" >
+<CONNECTOR type="5206" id="400" >
 <cdparam x="271" y="611" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="393" />
-<TGConnectingPoint num="1" id="394" />
-<TGConnectingPoint num="2" id="395" />
+<TGConnectingPoint num="0" id="397" />
+<TGConnectingPoint num="1" id="398" />
+<TGConnectingPoint num="2" id="399" />
 <P1  x="271" y="611" id="132" />
 <P2  x="944" y="599" id="11" />
 <Point x="318" y="685" />
 <Point x="769" y="688" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="391" >
-<father id="396" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="395" >
+<father id="400" num="0" />
 <cdparam x="318" y="685" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="392" >
-<father id="396" num="1" />
+<SUBCOMPONENT type="-1" id="396" >
+<father id="400" num="1" />
 <cdparam x="769" y="688" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -626,128 +626,128 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5206" id="398" >
+<CONNECTOR type="5206" id="402" >
 <cdparam x="894" y="599" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="397" />
+<TGConnectingPoint num="0" id="401" />
 <P1  x="894" y="599" id="10" />
 <P2  x="347" y="581" id="126" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="400" >
+<CONNECTOR type="5205" id="404" >
 <cdparam x="47" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="399" />
+<TGConnectingPoint num="0" id="403" />
 <P1  x="47" y="302" id="174" />
 <P2  x="46" y="521" id="121" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="402" >
+<CONNECTOR type="5205" id="406" >
 <cdparam x="844" y="569" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="401" />
+<TGConnectingPoint num="0" id="405" />
 <P1  x="844" y="569" id="3" />
 <P2  x="347" y="551" id="125" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="404" >
+<CONNECTOR type="5205" id="408" >
 <cdparam x="869" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="403" />
+<TGConnectingPoint num="0" id="407" />
 <P1  x="869" y="136" id="88" />
 <P2  x="944" y="479" id="8" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="406" >
+<CONNECTOR type="5205" id="410" >
 <cdparam x="661" y="76" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="405" />
+<TGConnectingPoint num="0" id="409" />
 <P1  x="661" y="76" id="78" />
 <P2  x="496" y="70" id="305" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5208" id="408" >
+<CONNECTOR type="5208" id="412" >
 <cdparam x="749" y="267" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
-<TGConnectingPoint num="0" id="407" />
-<P1  x="749" y="267" id="46" />
+<TGConnectingPoint num="0" id="411" />
+<P1  x="727" y="267" id="46" />
 <P2  x="504" y="199" id="273" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5208" id="410" >
+<CONNECTOR type="5208" id="414" >
 <cdparam x="783" y="223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
-<TGConnectingPoint num="0" id="409" />
+<TGConnectingPoint num="0" id="413" />
 <P1  x="741" y="223" id="63" />
 <P2  x="504" y="173" id="272" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="412" >
+<CONNECTOR type="5205" id="416" >
 <cdparam x="124" y="457" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="411" />
+<TGConnectingPoint num="0" id="415" />
 <P1  x="121" y="491" id="127" />
 <P2  x="122" y="302" id="176" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="414" >
+<CONNECTOR type="5205" id="418" >
 <cdparam x="244" y="315" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="413" />
+<TGConnectingPoint num="0" id="417" />
 <P1  x="208" y="337" id="345" />
 <P2  x="160" y="272" id="170" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="416" >
+<CONNECTOR type="5205" id="420" >
 <cdparam x="249" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="415" />
+<TGConnectingPoint num="0" id="419" />
 <P1  x="233" y="199" id="242" />
 <P2  x="160" y="212" id="168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="418" >
+<CONNECTOR type="5205" id="422" >
 <cdparam x="237" y="98" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="417" />
+<TGConnectingPoint num="0" id="421" />
 <P1  x="192" y="97" id="303" />
 <P2  x="122" y="182" id="173" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="420" >
+<CONNECTOR type="5203" id="424" >
 <cdparam x="538" y="537" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="419" />
+<TGConnectingPoint num="0" id="423" />
 <P1  x="678" y="411" id="210" />
 <P2  x="565" y="381" id="361" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="422" >
+<CONNECTOR type="5203" id="426" >
 <cdparam x="545" y="329" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="421" />
+<TGConnectingPoint num="0" id="425" />
 <P1  x="628" y="323" id="226" />
 <P2  x="504" y="199" id="257" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="424" >
+<CONNECTOR type="5203" id="428" >
 <cdparam x="563" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="0" id="427" />
 <P1  x="626" y="168" id="286" />
 <P2  x="496" y="97" id="318" />
 <AutomaticDrawing  data="true" />
@@ -756,37 +756,37 @@
 </AvatarRDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="426" >
+<CONNECTOR type="5312" id="430" >
 <cdparam x="582" y="248" />
 <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="reg" />
-<TGConnectingPoint num="0" id="425" />
-<P1  x="502" y="258" id="551" />
-<P2  x="502" y="334" id="439" />
+<TGConnectingPoint num="0" id="429" />
+<P1  x="502" y="258" id="555" />
+<P2  x="502" y="334" id="443" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="432" >
+<CONNECTOR type="5310" id="436" >
 <cdparam x="247" y="616" />
 <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="429" />
-<TGConnectingPoint num="1" id="430" />
-<TGConnectingPoint num="2" id="431" />
-<P1  x="492" y="126" id="514" />
-<P2  x="492" y="209" id="555" />
+<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="1" id="434" />
+<TGConnectingPoint num="2" id="435" />
+<P1  x="492" y="126" id="518" />
+<P2  x="492" y="209" id="559" />
 <Point x="467" y="147" />
 <Point x="467" y="192" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="427" >
-<father id="432" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="431" >
+<father id="436" num="0" />
 <cdparam x="467" y="147" />
 <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="428" >
-<father id="432" num="1" />
+<SUBCOMPONENT type="-1" id="432" >
+<father id="436" num="1" />
 <cdparam x="467" y="192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -794,229 +794,229 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="434" >
+<CONNECTOR type="5311" id="438" >
 <cdparam x="280" y="200" />
 <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="433" />
-<P1  x="302" y="261" id="464" />
-<P2  x="361" y="261" id="452" />
+<TGConnectingPoint num="0" id="437" />
+<P1  x="302" y="261" id="481" />
+<P2  x="361" y="261" id="456" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="436" >
+<CONNECTOR type="5312" id="440" >
 <cdparam x="473" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="435" />
-<P1  x="390" y="286" id="450" />
-<P2  x="390" y="331" id="444" />
+<TGConnectingPoint num="0" id="439" />
+<P1  x="390" y="286" id="454" />
+<P2  x="390" y="331" id="448" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="438" >
+<CONNECTOR type="5311" id="442" >
 <cdparam x="276" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="437" />
-<P1  x="305" y="211" id="477" />
-<P2  x="361" y="211" id="451" />
+<TGConnectingPoint num="0" id="441" />
+<P1  x="305" y="211" id="468" />
+<P2  x="361" y="211" id="455" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="443" >
+<COMPONENT type="5308" id="447" >
 <cdparam x="446" y="334" />
 <sizeparam width="112" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="439" />
-<TGConnectingPoint num="1" id="440" />
-<TGConnectingPoint num="2" id="441" />
-<TGConnectingPoint num="3" id="442" />
+<TGConnectingPoint num="0" id="443" />
+<TGConnectingPoint num="1" id="444" />
+<TGConnectingPoint num="2" id="445" />
+<TGConnectingPoint num="3" id="446" />
 <extraparam>
 <liveness data="0" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="448" >
+<COMPONENT type="5308" id="452" >
 <cdparam x="340" y="331" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="444" />
-<TGConnectingPoint num="1" id="445" />
-<TGConnectingPoint num="2" id="446" />
-<TGConnectingPoint num="3" id="447" />
+<TGConnectingPoint num="0" id="448" />
+<TGConnectingPoint num="1" id="449" />
+<TGConnectingPoint num="2" id="450" />
+<TGConnectingPoint num="3" id="451" />
 <extraparam>
 <liveness data="1" />
 <not data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="461" >
+<COMPONENT type="5302" id="465" >
 <cdparam x="361" y="187" />
 <sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="&gt;50" />
-<TGConnectingPoint num="0" id="449" />
-<TGConnectingPoint num="1" id="450" />
-<TGConnectingPoint num="2" id="451" />
-<TGConnectingPoint num="3" id="452" />
-<TGConnectingPoint num="4" id="453" />
-<TGConnectingPoint num="5" id="454" />
-<TGConnectingPoint num="6" id="455" />
-<TGConnectingPoint num="7" id="456" />
-<TGConnectingPoint num="8" id="457" />
-<TGConnectingPoint num="9" id="458" />
-<TGConnectingPoint num="10" id="459" />
-<TGConnectingPoint num="11" id="460" />
+<TGConnectingPoint num="0" id="453" />
+<TGConnectingPoint num="1" id="454" />
+<TGConnectingPoint num="2" id="455" />
+<TGConnectingPoint num="3" id="456" />
+<TGConnectingPoint num="4" id="457" />
+<TGConnectingPoint num="5" id="458" />
+<TGConnectingPoint num="6" id="459" />
+<TGConnectingPoint num="7" id="460" />
+<TGConnectingPoint num="8" id="461" />
+<TGConnectingPoint num="9" id="462" />
+<TGConnectingPoint num="10" id="463" />
+<TGConnectingPoint num="11" id="464" />
 </COMPONENT>
 
-<COMPONENT type="5300" id="512" >
+<COMPONENT type="5300" id="516" >
 <cdparam x="150" y="142" />
 <sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="488" />
-<TGConnectingPoint num="1" id="489" />
-<TGConnectingPoint num="2" id="490" />
-<TGConnectingPoint num="3" id="491" />
-<TGConnectingPoint num="4" id="492" />
-<TGConnectingPoint num="5" id="493" />
-<TGConnectingPoint num="6" id="494" />
-<TGConnectingPoint num="7" id="495" />
-<TGConnectingPoint num="8" id="496" />
-<TGConnectingPoint num="9" id="497" />
-<TGConnectingPoint num="10" id="498" />
-<TGConnectingPoint num="11" id="499" />
-<TGConnectingPoint num="12" id="500" />
-<TGConnectingPoint num="13" id="501" />
-<TGConnectingPoint num="14" id="502" />
-<TGConnectingPoint num="15" id="503" />
-<TGConnectingPoint num="16" id="504" />
-<TGConnectingPoint num="17" id="505" />
-<TGConnectingPoint num="18" id="506" />
-<TGConnectingPoint num="19" id="507" />
-<TGConnectingPoint num="20" id="508" />
-<TGConnectingPoint num="21" id="509" />
-<TGConnectingPoint num="22" id="510" />
-<TGConnectingPoint num="23" id="511" />
+<TGConnectingPoint num="0" id="492" />
+<TGConnectingPoint num="1" id="493" />
+<TGConnectingPoint num="2" id="494" />
+<TGConnectingPoint num="3" id="495" />
+<TGConnectingPoint num="4" id="496" />
+<TGConnectingPoint num="5" id="497" />
+<TGConnectingPoint num="6" id="498" />
+<TGConnectingPoint num="7" id="499" />
+<TGConnectingPoint num="8" id="500" />
+<TGConnectingPoint num="9" id="501" />
+<TGConnectingPoint num="10" id="502" />
+<TGConnectingPoint num="11" id="503" />
+<TGConnectingPoint num="12" id="504" />
+<TGConnectingPoint num="13" id="505" />
+<TGConnectingPoint num="14" id="506" />
+<TGConnectingPoint num="15" id="507" />
+<TGConnectingPoint num="16" id="508" />
+<TGConnectingPoint num="17" id="509" />
+<TGConnectingPoint num="18" id="510" />
+<TGConnectingPoint num="19" id="511" />
+<TGConnectingPoint num="20" id="512" />
+<TGConnectingPoint num="21" id="513" />
+<TGConnectingPoint num="22" id="514" />
+<TGConnectingPoint num="23" id="515" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="474" >
-<father id="512" num="0" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
-<TGConnectingPoint num="0" id="462" />
-<TGConnectingPoint num="1" id="463" />
-<TGConnectingPoint num="2" id="464" />
-<TGConnectingPoint num="3" id="465" />
-<TGConnectingPoint num="4" id="466" />
-<TGConnectingPoint num="5" id="467" />
-<TGConnectingPoint num="6" id="468" />
-<TGConnectingPoint num="7" id="469" />
-<TGConnectingPoint num="8" id="470" />
-<TGConnectingPoint num="9" id="471" />
-<TGConnectingPoint num="10" id="472" />
-<TGConnectingPoint num="11" id="473" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="487" >
-<father id="512" num="1" />
+<SUBCOMPONENT type="5304" id="478" >
+<father id="516" num="0" />
 <cdparam x="166" y="191" />
 <sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
 <infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
-<TGConnectingPoint num="2" id="477" />
-<TGConnectingPoint num="3" id="478" />
-<TGConnectingPoint num="4" id="479" />
-<TGConnectingPoint num="5" id="480" />
-<TGConnectingPoint num="6" id="481" />
-<TGConnectingPoint num="7" id="482" />
-<TGConnectingPoint num="8" id="483" />
-<TGConnectingPoint num="9" id="484" />
-<TGConnectingPoint num="10" id="485" />
-<TGConnectingPoint num="11" id="486" />
+<TGConnectingPoint num="0" id="466" />
+<TGConnectingPoint num="1" id="467" />
+<TGConnectingPoint num="2" id="468" />
+<TGConnectingPoint num="3" id="469" />
+<TGConnectingPoint num="4" id="470" />
+<TGConnectingPoint num="5" id="471" />
+<TGConnectingPoint num="6" id="472" />
+<TGConnectingPoint num="7" id="473" />
+<TGConnectingPoint num="8" id="474" />
+<TGConnectingPoint num="9" id="475" />
+<TGConnectingPoint num="10" id="476" />
+<TGConnectingPoint num="11" id="477" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="491" >
+<father id="516" num="1" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<TGConnectingPoint num="0" id="479" />
+<TGConnectingPoint num="1" id="480" />
+<TGConnectingPoint num="2" id="481" />
+<TGConnectingPoint num="3" id="482" />
+<TGConnectingPoint num="4" id="483" />
+<TGConnectingPoint num="5" id="484" />
+<TGConnectingPoint num="6" id="485" />
+<TGConnectingPoint num="7" id="486" />
+<TGConnectingPoint num="8" id="487" />
+<TGConnectingPoint num="9" id="488" />
+<TGConnectingPoint num="10" id="489" />
+<TGConnectingPoint num="11" id="490" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="550" >
+<COMPONENT type="5300" id="554" >
 <cdparam x="459" y="61" />
 <sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="526" />
-<TGConnectingPoint num="1" id="527" />
-<TGConnectingPoint num="2" id="528" />
-<TGConnectingPoint num="3" id="529" />
-<TGConnectingPoint num="4" id="530" />
-<TGConnectingPoint num="5" id="531" />
-<TGConnectingPoint num="6" id="532" />
-<TGConnectingPoint num="7" id="533" />
-<TGConnectingPoint num="8" id="534" />
-<TGConnectingPoint num="9" id="535" />
-<TGConnectingPoint num="10" id="536" />
-<TGConnectingPoint num="11" id="537" />
-<TGConnectingPoint num="12" id="538" />
-<TGConnectingPoint num="13" id="539" />
-<TGConnectingPoint num="14" id="540" />
-<TGConnectingPoint num="15" id="541" />
-<TGConnectingPoint num="16" id="542" />
-<TGConnectingPoint num="17" id="543" />
-<TGConnectingPoint num="18" id="544" />
-<TGConnectingPoint num="19" id="545" />
-<TGConnectingPoint num="20" id="546" />
-<TGConnectingPoint num="21" id="547" />
-<TGConnectingPoint num="22" id="548" />
-<TGConnectingPoint num="23" id="549" />
+<TGConnectingPoint num="0" id="530" />
+<TGConnectingPoint num="1" id="531" />
+<TGConnectingPoint num="2" id="532" />
+<TGConnectingPoint num="3" id="533" />
+<TGConnectingPoint num="4" id="534" />
+<TGConnectingPoint num="5" id="535" />
+<TGConnectingPoint num="6" id="536" />
+<TGConnectingPoint num="7" id="537" />
+<TGConnectingPoint num="8" id="538" />
+<TGConnectingPoint num="9" id="539" />
+<TGConnectingPoint num="10" id="540" />
+<TGConnectingPoint num="11" id="541" />
+<TGConnectingPoint num="12" id="542" />
+<TGConnectingPoint num="13" id="543" />
+<TGConnectingPoint num="14" id="544" />
+<TGConnectingPoint num="15" id="545" />
+<TGConnectingPoint num="16" id="546" />
+<TGConnectingPoint num="17" id="547" />
+<TGConnectingPoint num="18" id="548" />
+<TGConnectingPoint num="19" id="549" />
+<TGConnectingPoint num="20" id="550" />
+<TGConnectingPoint num="21" id="551" />
+<TGConnectingPoint num="22" id="552" />
+<TGConnectingPoint num="23" id="553" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="525" >
-<father id="550" num="0" />
+<SUBCOMPONENT type="5303" id="529" >
+<father id="554" num="0" />
 <cdparam x="492" y="102" />
 <sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
 <infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="513" />
-<TGConnectingPoint num="1" id="514" />
-<TGConnectingPoint num="2" id="515" />
-<TGConnectingPoint num="3" id="516" />
-<TGConnectingPoint num="4" id="517" />
-<TGConnectingPoint num="5" id="518" />
-<TGConnectingPoint num="6" id="519" />
-<TGConnectingPoint num="7" id="520" />
-<TGConnectingPoint num="8" id="521" />
-<TGConnectingPoint num="9" id="522" />
-<TGConnectingPoint num="10" id="523" />
-<TGConnectingPoint num="11" id="524" />
+<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="1" id="518" />
+<TGConnectingPoint num="2" id="519" />
+<TGConnectingPoint num="3" id="520" />
+<TGConnectingPoint num="4" id="521" />
+<TGConnectingPoint num="5" id="522" />
+<TGConnectingPoint num="6" id="523" />
+<TGConnectingPoint num="7" id="524" />
+<TGConnectingPoint num="8" id="525" />
+<TGConnectingPoint num="9" id="526" />
+<TGConnectingPoint num="10" id="527" />
+<TGConnectingPoint num="11" id="528" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5306" id="562" >
+<COMPONENT type="5306" id="566" >
 <cdparam x="467" y="209" />
 <sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="nbOfCoins &gt;= 0" />
-<TGConnectingPoint num="0" id="551" />
-<TGConnectingPoint num="1" id="552" />
-<TGConnectingPoint num="2" id="553" />
-<TGConnectingPoint num="3" id="554" />
-<TGConnectingPoint num="4" id="555" />
-<TGConnectingPoint num="5" id="556" />
-<TGConnectingPoint num="6" id="557" />
-<TGConnectingPoint num="7" id="558" />
-<TGConnectingPoint num="8" id="559" />
-<TGConnectingPoint num="9" id="560" />
-<TGConnectingPoint num="10" id="561" />
+<TGConnectingPoint num="0" id="555" />
+<TGConnectingPoint num="1" id="556" />
+<TGConnectingPoint num="2" id="557" />
+<TGConnectingPoint num="3" id="558" />
+<TGConnectingPoint num="4" id="559" />
+<TGConnectingPoint num="5" id="560" />
+<TGConnectingPoint num="6" id="561" />
+<TGConnectingPoint num="7" id="562" />
+<TGConnectingPoint num="8" id="563" />
+<TGConnectingPoint num="9" id="564" />
+<TGConnectingPoint num="10" id="565" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
@@ -1026,55 +1026,55 @@
 </AvatarPDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="564" >
+<CONNECTOR type="5312" id="568" >
 <cdparam x="580" y="547" />
 <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="reg" />
-<TGConnectingPoint num="0" id="563" />
-<P1  x="637" y="538" id="745" />
-<P2  x="632" y="563" id="596" />
+<TGConnectingPoint num="0" id="567" />
+<P1  x="637" y="538" id="749" />
+<P2  x="632" y="563" id="600" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="566" >
+<CONNECTOR type="5312" id="570" >
 <cdparam x="506" y="493" />
 <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="reg" />
-<TGConnectingPoint num="0" id="565" />
-<P1  x="577" y="471" id="750" />
-<P2  x="617" y="498" id="738" />
+<TGConnectingPoint num="0" id="569" />
+<P1  x="577" y="471" id="754" />
+<P2  x="617" y="498" id="742" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="568" >
+<CONNECTOR type="5312" id="572" >
 <cdparam x="694" y="460" />
 <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="reg" />
-<TGConnectingPoint num="0" id="567" />
-<P1  x="694" y="472" id="592" />
-<P2  x="657" y="498" id="740" />
+<TGConnectingPoint num="0" id="571" />
+<P1  x="694" y="472" id="596" />
+<P2  x="657" y="498" id="744" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="574" >
+<CONNECTOR type="5311" id="578" >
 <cdparam x="581" y="133" />
 <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="571" />
-<TGConnectingPoint num="1" id="572" />
-<TGConnectingPoint num="2" id="573" />
-<P1  x="581" y="154" id="660" />
-<P2  x="546" y="305" id="717" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<P1  x="581" y="154" id="651" />
+<P2  x="546" y="305" id="721" />
 <Point x="518" y="154" />
 <Point x="518" y="305" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="569" >
-<father id="574" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="573" >
+<father id="578" num="0" />
 <cdparam x="518" y="154" />
 <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="570" >
-<father id="574" num="1" />
+<SUBCOMPONENT type="-1" id="574" >
+<father id="578" num="1" />
 <cdparam x="518" y="305" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1082,18 +1082,18 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="578" >
+<CONNECTOR type="5311" id="582" >
 <cdparam x="631" y="143" />
 <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="576" />
-<TGConnectingPoint num="1" id="577" />
-<P1  x="631" y="164" id="655" />
-<P2  x="667" y="310" id="704" />
+<TGConnectingPoint num="0" id="580" />
+<TGConnectingPoint num="1" id="581" />
+<P1  x="631" y="164" id="646" />
+<P2  x="667" y="310" id="708" />
 <Point x="631" y="310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="575" >
-<father id="578" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="579" >
+<father id="582" num="0" />
 <cdparam x="631" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1101,27 +1101,27 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="580" >
+<CONNECTOR type="5312" id="584" >
 <cdparam x="695" y="396" />
 <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="reg" />
-<TGConnectingPoint num="0" id="579" />
-<P1  x="696" y="385" id="703" />
-<P2  x="694" y="417" id="591" />
+<TGConnectingPoint num="0" id="583" />
+<P1  x="696" y="385" id="707" />
+<P2  x="694" y="417" id="595" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="584" >
+<CONNECTOR type="5310" id="588" >
 <cdparam x="877" y="168" />
 <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="582" />
-<TGConnectingPoint num="1" id="583" />
-<P1  x="721" y="158" id="640" />
-<P2  x="700" y="204" id="694" />
+<TGConnectingPoint num="0" id="586" />
+<TGConnectingPoint num="1" id="587" />
+<P1  x="721" y="158" id="657" />
+<P2  x="700" y="204" id="698" />
 <Point x="700" y="158" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="581" >
-<father id="584" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="585" >
+<father id="588" num="0" />
 <cdparam x="700" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1129,292 +1129,292 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="586" >
+<CONNECTOR type="5312" id="590" >
 <cdparam x="915" y="307" />
 <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="reg" />
-<TGConnectingPoint num="0" id="585" />
-<P1  x="710" y="254" id="690" />
-<P2  x="711" y="285" id="702" />
+<TGConnectingPoint num="0" id="589" />
+<P1  x="710" y="254" id="694" />
+<P2  x="711" y="285" id="706" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="588" >
+<CONNECTOR type="5312" id="592" >
 <cdparam x="993" y="581" />
 <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="reg" />
-<TGConnectingPoint num="0" id="587" />
-<P1  x="576" y="385" id="716" />
-<P2  x="577" y="416" id="749" />
+<TGConnectingPoint num="0" id="591" />
+<P1  x="576" y="385" id="720" />
+<P2  x="577" y="416" id="753" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="590" >
+<CONNECTOR type="5311" id="594" >
 <cdparam x="426" y="264" />
 <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="589" />
-<P1  x="491" y="345" id="603" />
-<P2  x="546" y="345" id="721" />
+<TGConnectingPoint num="0" id="593" />
+<P1  x="491" y="345" id="607" />
+<P2  x="546" y="345" id="725" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="595" >
+<COMPONENT type="5308" id="599" >
 <cdparam x="644" y="417" />
 <sizeparam width="100" height="55" 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="prop01" />
-<TGConnectingPoint num="0" id="591" />
-<TGConnectingPoint num="1" id="592" />
-<TGConnectingPoint num="2" id="593" />
-<TGConnectingPoint num="3" id="594" />
+<TGConnectingPoint num="0" id="595" />
+<TGConnectingPoint num="1" id="596" />
+<TGConnectingPoint num="2" id="597" />
+<TGConnectingPoint num="3" id="598" />
 <extraparam>
 <liveness data="1" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="600" >
+<COMPONENT type="5308" id="604" >
 <cdparam x="559" y="563" />
 <sizeparam width="146" height="54" 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="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="596" />
-<TGConnectingPoint num="1" id="597" />
-<TGConnectingPoint num="2" id="598" />
-<TGConnectingPoint num="3" id="599" />
+<TGConnectingPoint num="0" id="600" />
+<TGConnectingPoint num="1" id="601" />
+<TGConnectingPoint num="2" id="602" />
+<TGConnectingPoint num="3" id="603" />
 <extraparam>
 <liveness data="0" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5300" id="638" >
+<COMPONENT type="5300" id="642" >
 <cdparam x="372" y="227" />
 <sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="614" />
-<TGConnectingPoint num="1" id="615" />
-<TGConnectingPoint num="2" id="616" />
-<TGConnectingPoint num="3" id="617" />
-<TGConnectingPoint num="4" id="618" />
-<TGConnectingPoint num="5" id="619" />
-<TGConnectingPoint num="6" id="620" />
-<TGConnectingPoint num="7" id="621" />
-<TGConnectingPoint num="8" id="622" />
-<TGConnectingPoint num="9" id="623" />
-<TGConnectingPoint num="10" id="624" />
-<TGConnectingPoint num="11" id="625" />
-<TGConnectingPoint num="12" id="626" />
-<TGConnectingPoint num="13" id="627" />
-<TGConnectingPoint num="14" id="628" />
-<TGConnectingPoint num="15" id="629" />
-<TGConnectingPoint num="16" id="630" />
-<TGConnectingPoint num="17" id="631" />
-<TGConnectingPoint num="18" id="632" />
-<TGConnectingPoint num="19" id="633" />
-<TGConnectingPoint num="20" id="634" />
-<TGConnectingPoint num="21" id="635" />
-<TGConnectingPoint num="22" id="636" />
-<TGConnectingPoint num="23" id="637" />
+<TGConnectingPoint num="0" id="618" />
+<TGConnectingPoint num="1" id="619" />
+<TGConnectingPoint num="2" id="620" />
+<TGConnectingPoint num="3" id="621" />
+<TGConnectingPoint num="4" id="622" />
+<TGConnectingPoint num="5" id="623" />
+<TGConnectingPoint num="6" id="624" />
+<TGConnectingPoint num="7" id="625" />
+<TGConnectingPoint num="8" id="626" />
+<TGConnectingPoint num="9" id="627" />
+<TGConnectingPoint num="10" id="628" />
+<TGConnectingPoint num="11" id="629" />
+<TGConnectingPoint num="12" id="630" />
+<TGConnectingPoint num="13" id="631" />
+<TGConnectingPoint num="14" id="632" />
+<TGConnectingPoint num="15" id="633" />
+<TGConnectingPoint num="16" id="634" />
+<TGConnectingPoint num="17" id="635" />
+<TGConnectingPoint num="18" id="636" />
+<TGConnectingPoint num="19" id="637" />
+<TGConnectingPoint num="20" id="638" />
+<TGConnectingPoint num="21" id="639" />
+<TGConnectingPoint num="22" id="640" />
+<TGConnectingPoint num="23" id="641" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="613" >
-<father id="638" num="0" />
+<SUBCOMPONENT type="5304" id="617" >
+<father id="642" num="0" />
 <cdparam x="391" y="326" />
 <sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="32" minY="0" maxY="114" />
 <infoparam name="TGComponent" value="beverageReady" />
-<TGConnectingPoint num="0" id="601" />
-<TGConnectingPoint num="1" id="602" />
-<TGConnectingPoint num="2" id="603" />
-<TGConnectingPoint num="3" id="604" />
-<TGConnectingPoint num="4" id="605" />
-<TGConnectingPoint num="5" id="606" />
-<TGConnectingPoint num="6" id="607" />
-<TGConnectingPoint num="7" id="608" />
-<TGConnectingPoint num="8" id="609" />
-<TGConnectingPoint num="9" id="610" />
-<TGConnectingPoint num="10" id="611" />
-<TGConnectingPoint num="11" id="612" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
+<TGConnectingPoint num="2" id="607" />
+<TGConnectingPoint num="3" id="608" />
+<TGConnectingPoint num="4" id="609" />
+<TGConnectingPoint num="5" id="610" />
+<TGConnectingPoint num="6" id="611" />
+<TGConnectingPoint num="7" id="612" />
+<TGConnectingPoint num="8" id="613" />
+<TGConnectingPoint num="9" id="614" />
+<TGConnectingPoint num="10" id="615" />
+<TGConnectingPoint num="11" id="616" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="689" >
+<COMPONENT type="5300" id="693" >
 <cdparam x="563" y="78" />
 <sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="665" />
-<TGConnectingPoint num="1" id="666" />
-<TGConnectingPoint num="2" id="667" />
-<TGConnectingPoint num="3" id="668" />
-<TGConnectingPoint num="4" id="669" />
-<TGConnectingPoint num="5" id="670" />
-<TGConnectingPoint num="6" id="671" />
-<TGConnectingPoint num="7" id="672" />
-<TGConnectingPoint num="8" id="673" />
-<TGConnectingPoint num="9" id="674" />
-<TGConnectingPoint num="10" id="675" />
-<TGConnectingPoint num="11" id="676" />
-<TGConnectingPoint num="12" id="677" />
-<TGConnectingPoint num="13" id="678" />
-<TGConnectingPoint num="14" id="679" />
-<TGConnectingPoint num="15" id="680" />
-<TGConnectingPoint num="16" id="681" />
-<TGConnectingPoint num="17" id="682" />
-<TGConnectingPoint num="18" id="683" />
-<TGConnectingPoint num="19" id="684" />
-<TGConnectingPoint num="20" id="685" />
-<TGConnectingPoint num="21" id="686" />
-<TGConnectingPoint num="22" id="687" />
-<TGConnectingPoint num="23" id="688" />
+<TGConnectingPoint num="0" id="669" />
+<TGConnectingPoint num="1" id="670" />
+<TGConnectingPoint num="2" id="671" />
+<TGConnectingPoint num="3" id="672" />
+<TGConnectingPoint num="4" id="673" />
+<TGConnectingPoint num="5" id="674" />
+<TGConnectingPoint num="6" id="675" />
+<TGConnectingPoint num="7" id="676" />
+<TGConnectingPoint num="8" id="677" />
+<TGConnectingPoint num="9" id="678" />
+<TGConnectingPoint num="10" id="679" />
+<TGConnectingPoint num="11" id="680" />
+<TGConnectingPoint num="12" id="681" />
+<TGConnectingPoint num="13" id="682" />
+<TGConnectingPoint num="14" id="683" />
+<TGConnectingPoint num="15" id="684" />
+<TGConnectingPoint num="16" id="685" />
+<TGConnectingPoint num="17" id="686" />
+<TGConnectingPoint num="18" id="687" />
+<TGConnectingPoint num="19" id="688" />
+<TGConnectingPoint num="20" id="689" />
+<TGConnectingPoint num="21" id="690" />
+<TGConnectingPoint num="22" id="691" />
+<TGConnectingPoint num="23" id="692" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="651" >
-<father id="689" num="0" />
+<SUBCOMPONENT type="5304" id="655" >
+<father id="693" num="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
+<TGConnectingPoint num="0" id="643" />
+<TGConnectingPoint num="1" id="644" />
+<TGConnectingPoint num="2" id="645" />
+<TGConnectingPoint num="3" id="646" />
+<TGConnectingPoint num="4" id="647" />
+<TGConnectingPoint num="5" id="648" />
+<TGConnectingPoint num="6" id="649" />
+<TGConnectingPoint num="7" id="650" />
+<TGConnectingPoint num="8" id="651" />
+<TGConnectingPoint num="9" id="652" />
+<TGConnectingPoint num="10" id="653" />
+<TGConnectingPoint num="11" id="654" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5303" id="668" >
+<father id="693" num="1" />
 <cdparam x="721" y="133" />
 <sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
 <infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="639" />
-<TGConnectingPoint num="1" id="640" />
-<TGConnectingPoint num="2" id="641" />
-<TGConnectingPoint num="3" id="642" />
-<TGConnectingPoint num="4" id="643" />
-<TGConnectingPoint num="5" id="644" />
-<TGConnectingPoint num="6" id="645" />
-<TGConnectingPoint num="7" id="646" />
-<TGConnectingPoint num="8" id="647" />
-<TGConnectingPoint num="9" id="648" />
-<TGConnectingPoint num="10" id="649" />
-<TGConnectingPoint num="11" id="650" />
+<TGConnectingPoint num="0" id="656" />
+<TGConnectingPoint num="1" id="657" />
+<TGConnectingPoint num="2" id="658" />
+<TGConnectingPoint num="3" id="659" />
+<TGConnectingPoint num="4" id="660" />
+<TGConnectingPoint num="5" id="661" />
+<TGConnectingPoint num="6" id="662" />
+<TGConnectingPoint num="7" id="663" />
+<TGConnectingPoint num="8" id="664" />
+<TGConnectingPoint num="9" id="665" />
+<TGConnectingPoint num="10" id="666" />
+<TGConnectingPoint num="11" id="667" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="664" >
-<father id="689" num="1" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
-<TGConnectingPoint num="0" id="652" />
-<TGConnectingPoint num="1" id="653" />
-<TGConnectingPoint num="2" id="654" />
-<TGConnectingPoint num="3" id="655" />
-<TGConnectingPoint num="4" id="656" />
-<TGConnectingPoint num="5" id="657" />
-<TGConnectingPoint num="6" id="658" />
-<TGConnectingPoint num="7" id="659" />
-<TGConnectingPoint num="8" id="660" />
-<TGConnectingPoint num="9" id="661" />
-<TGConnectingPoint num="10" id="662" />
-<TGConnectingPoint num="11" id="663" />
-</SUBCOMPONENT>
 
-<COMPONENT type="5306" id="701" >
+<COMPONENT type="5306" id="705" >
 <cdparam x="675" y="204" />
 <sizeparam width="100" height="50" 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="nbOfCoins &gt; 1" />
-<TGConnectingPoint num="0" id="690" />
-<TGConnectingPoint num="1" id="691" />
-<TGConnectingPoint num="2" id="692" />
-<TGConnectingPoint num="3" id="693" />
-<TGConnectingPoint num="4" id="694" />
-<TGConnectingPoint num="5" id="695" />
-<TGConnectingPoint num="6" id="696" />
-<TGConnectingPoint num="7" id="697" />
-<TGConnectingPoint num="8" id="698" />
-<TGConnectingPoint num="9" id="699" />
-<TGConnectingPoint num="10" id="700" />
+<TGConnectingPoint num="0" id="694" />
+<TGConnectingPoint num="1" id="695" />
+<TGConnectingPoint num="2" id="696" />
+<TGConnectingPoint num="3" id="697" />
+<TGConnectingPoint num="4" id="698" />
+<TGConnectingPoint num="5" id="699" />
+<TGConnectingPoint num="6" id="700" />
+<TGConnectingPoint num="7" id="701" />
+<TGConnectingPoint num="8" id="702" />
+<TGConnectingPoint num="9" id="703" />
+<TGConnectingPoint num="10" id="704" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="714" >
+<COMPONENT type="5302" id="718" >
 <cdparam x="667" y="285" />
 <sizeparam width="59" height="100" minWidth="50" 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="=0" />
-<TGConnectingPoint num="0" id="702" />
-<TGConnectingPoint num="1" id="703" />
-<TGConnectingPoint num="2" id="704" />
-<TGConnectingPoint num="3" id="705" />
-<TGConnectingPoint num="4" id="706" />
-<TGConnectingPoint num="5" id="707" />
-<TGConnectingPoint num="6" id="708" />
-<TGConnectingPoint num="7" id="709" />
-<TGConnectingPoint num="8" id="710" />
-<TGConnectingPoint num="9" id="711" />
-<TGConnectingPoint num="10" id="712" />
-<TGConnectingPoint num="11" id="713" />
+<TGConnectingPoint num="0" id="706" />
+<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="2" id="708" />
+<TGConnectingPoint num="3" id="709" />
+<TGConnectingPoint num="4" id="710" />
+<TGConnectingPoint num="5" id="711" />
+<TGConnectingPoint num="6" id="712" />
+<TGConnectingPoint num="7" id="713" />
+<TGConnectingPoint num="8" id="714" />
+<TGConnectingPoint num="9" id="715" />
+<TGConnectingPoint num="10" id="716" />
+<TGConnectingPoint num="11" id="717" />
 </COMPONENT>
 
-<COMPONENT type="5301" id="735" >
+<COMPONENT type="5301" id="739" >
 <cdparam x="546" y="285" />
 <sizeparam width="60" height="100" minWidth="50" 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;LS&gt;&gt;" />
-<TGConnectingPoint num="0" id="715" />
-<TGConnectingPoint num="1" id="716" />
-<TGConnectingPoint num="2" id="717" />
-<TGConnectingPoint num="3" id="718" />
-<TGConnectingPoint num="4" id="719" />
-<TGConnectingPoint num="5" id="720" />
-<TGConnectingPoint num="6" id="721" />
-<TGConnectingPoint num="7" id="722" />
-<TGConnectingPoint num="8" id="723" />
-<TGConnectingPoint num="9" id="724" />
-<TGConnectingPoint num="10" id="725" />
-<TGConnectingPoint num="11" id="726" />
-<TGConnectingPoint num="12" id="727" />
-<TGConnectingPoint num="13" id="728" />
-<TGConnectingPoint num="14" id="729" />
-<TGConnectingPoint num="15" id="730" />
-<TGConnectingPoint num="16" id="731" />
-<TGConnectingPoint num="17" id="732" />
-<TGConnectingPoint num="18" id="733" />
-<TGConnectingPoint num="19" id="734" />
+<TGConnectingPoint num="0" id="719" />
+<TGConnectingPoint num="1" id="720" />
+<TGConnectingPoint num="2" id="721" />
+<TGConnectingPoint num="3" id="722" />
+<TGConnectingPoint num="4" id="723" />
+<TGConnectingPoint num="5" id="724" />
+<TGConnectingPoint num="6" id="725" />
+<TGConnectingPoint num="7" id="726" />
+<TGConnectingPoint num="8" id="727" />
+<TGConnectingPoint num="9" id="728" />
+<TGConnectingPoint num="10" id="729" />
+<TGConnectingPoint num="11" id="730" />
+<TGConnectingPoint num="12" id="731" />
+<TGConnectingPoint num="13" id="732" />
+<TGConnectingPoint num="14" id="733" />
+<TGConnectingPoint num="15" id="734" />
+<TGConnectingPoint num="16" id="735" />
+<TGConnectingPoint num="17" id="736" />
+<TGConnectingPoint num="18" id="737" />
+<TGConnectingPoint num="19" id="738" />
 </COMPONENT>
 
-<COMPONENT type="5309" id="748" >
+<COMPONENT type="5309" id="752" >
 <cdparam x="597" y="498" />
 <sizeparam width="80" height="40" minWidth="75" 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;=&gt;" />
-<TGConnectingPoint num="0" id="736" />
-<TGConnectingPoint num="1" id="737" />
-<TGConnectingPoint num="2" id="738" />
-<TGConnectingPoint num="3" id="739" />
-<TGConnectingPoint num="4" id="740" />
-<TGConnectingPoint num="5" id="741" />
-<TGConnectingPoint num="6" id="742" />
-<TGConnectingPoint num="7" id="743" />
-<TGConnectingPoint num="8" id="744" />
-<TGConnectingPoint num="9" id="745" />
-<TGConnectingPoint num="10" id="746" />
-<TGConnectingPoint num="11" id="747" />
+<TGConnectingPoint num="0" id="740" />
+<TGConnectingPoint num="1" id="741" />
+<TGConnectingPoint num="2" id="742" />
+<TGConnectingPoint num="3" id="743" />
+<TGConnectingPoint num="4" id="744" />
+<TGConnectingPoint num="5" id="745" />
+<TGConnectingPoint num="6" id="746" />
+<TGConnectingPoint num="7" id="747" />
+<TGConnectingPoint num="8" id="748" />
+<TGConnectingPoint num="9" id="749" />
+<TGConnectingPoint num="10" id="750" />
+<TGConnectingPoint num="11" id="751" />
 </COMPONENT>
 
-<COMPONENT type="5308" id="753" >
+<COMPONENT type="5308" id="757" >
 <cdparam x="527" y="416" />
 <sizeparam width="100" height="55" 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="prop02" />
-<TGConnectingPoint num="0" id="749" />
-<TGConnectingPoint num="1" id="750" />
-<TGConnectingPoint num="2" id="751" />
-<TGConnectingPoint num="3" id="752" />
+<TGConnectingPoint num="0" id="753" />
+<TGConnectingPoint num="1" id="754" />
+<TGConnectingPoint num="2" id="755" />
+<TGConnectingPoint num="3" id="756" />
 <extraparam>
 <liveness data="1" />
 <not data="false" />
@@ -1434,16 +1434,16 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="Wallet;CoffeeMachine;TeaButton;CoffeeButton;" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="755" >
+<CONNECTOR type="5002" id="759" >
 <cdparam x="321" y="567" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="754" />
-<P1  x="559" y="330" id="791" />
-<P2  x="560" y="377" id="849" />
+<TGConnectingPoint num="0" id="758" />
+<P1  x="559" y="330" id="820" />
+<P2  x="560" y="377" id="853" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushCoffeeButton()" />
@@ -1451,13 +1451,13 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="757" >
+<CONNECTOR type="5002" id="761" >
 <cdparam x="275" y="114" />
 <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="756" />
-<P1  x="306" y="110" id="771" />
-<P2  x="445" y="108" id="845" />
+<TGConnectingPoint num="0" id="760" />
+<P1  x="306" y="109" id="775" />
+<P2  x="445" y="108" id="849" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getCoin(int nbOfCoins)" />
@@ -1467,13 +1467,13 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="759" >
+<CONNECTOR type="5002" id="763" >
 <cdparam x="623" y="565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="758" />
-<P1  x="789" y="326" id="816" />
-<P2  x="790" y="377" id="850" />
+<TGConnectingPoint num="0" id="762" />
+<P1  x="789" y="326" id="795" />
+<P2  x="790" y="377" id="854" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushTeaButton()" />
@@ -1481,36 +1481,36 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="784" >
-<cdparam x="106" y="56" />
+<COMPONENT type="5000" id="788" >
+<cdparam x="106" y="55" />
 <sizeparam width="200" height="218" 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="Wallet" />
-<TGConnectingPoint num="0" id="760" />
-<TGConnectingPoint num="1" id="761" />
-<TGConnectingPoint num="2" id="762" />
-<TGConnectingPoint num="3" id="763" />
-<TGConnectingPoint num="4" id="764" />
-<TGConnectingPoint num="5" id="765" />
-<TGConnectingPoint num="6" id="766" />
-<TGConnectingPoint num="7" id="767" />
-<TGConnectingPoint num="8" id="768" />
-<TGConnectingPoint num="9" id="769" />
-<TGConnectingPoint num="10" id="770" />
-<TGConnectingPoint num="11" id="771" />
-<TGConnectingPoint num="12" id="772" />
-<TGConnectingPoint num="13" id="773" />
-<TGConnectingPoint num="14" id="774" />
-<TGConnectingPoint num="15" id="775" />
-<TGConnectingPoint num="16" id="776" />
-<TGConnectingPoint num="17" id="777" />
-<TGConnectingPoint num="18" id="778" />
-<TGConnectingPoint num="19" id="779" />
-<TGConnectingPoint num="20" id="780" />
-<TGConnectingPoint num="21" id="781" />
-<TGConnectingPoint num="22" id="782" />
-<TGConnectingPoint num="23" id="783" />
+<TGConnectingPoint num="0" id="764" />
+<TGConnectingPoint num="1" id="765" />
+<TGConnectingPoint num="2" id="766" />
+<TGConnectingPoint num="3" id="767" />
+<TGConnectingPoint num="4" id="768" />
+<TGConnectingPoint num="5" id="769" />
+<TGConnectingPoint num="6" id="770" />
+<TGConnectingPoint num="7" id="771" />
+<TGConnectingPoint num="8" id="772" />
+<TGConnectingPoint num="9" id="773" />
+<TGConnectingPoint num="10" id="774" />
+<TGConnectingPoint num="11" id="775" />
+<TGConnectingPoint num="12" id="776" />
+<TGConnectingPoint num="13" id="777" />
+<TGConnectingPoint num="14" id="778" />
+<TGConnectingPoint num="15" id="779" />
+<TGConnectingPoint num="16" id="780" />
+<TGConnectingPoint num="17" id="781" />
+<TGConnectingPoint num="18" id="782" />
+<TGConnectingPoint num="19" id="783" />
+<TGConnectingPoint num="20" id="784" />
+<TGConnectingPoint num="21" id="785" />
+<TGConnectingPoint num="22" id="786" />
+<TGConnectingPoint num="23" id="787" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
@@ -1523,36 +1523,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="859" >
+<COMPONENT type="5000" id="863" >
 <cdparam x="445" y="19" />
 <sizeparam width="461" height="358" 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="CoffeeMachine" />
-<TGConnectingPoint num="0" id="835" />
-<TGConnectingPoint num="1" id="836" />
-<TGConnectingPoint num="2" id="837" />
-<TGConnectingPoint num="3" id="838" />
-<TGConnectingPoint num="4" id="839" />
-<TGConnectingPoint num="5" id="840" />
-<TGConnectingPoint num="6" id="841" />
-<TGConnectingPoint num="7" id="842" />
-<TGConnectingPoint num="8" id="843" />
-<TGConnectingPoint num="9" id="844" />
-<TGConnectingPoint num="10" id="845" />
-<TGConnectingPoint num="11" id="846" />
-<TGConnectingPoint num="12" id="847" />
-<TGConnectingPoint num="13" id="848" />
-<TGConnectingPoint num="14" id="849" />
-<TGConnectingPoint num="15" id="850" />
-<TGConnectingPoint num="16" id="851" />
-<TGConnectingPoint num="17" id="852" />
-<TGConnectingPoint num="18" id="853" />
-<TGConnectingPoint num="19" id="854" />
-<TGConnectingPoint num="20" id="855" />
-<TGConnectingPoint num="21" id="856" />
-<TGConnectingPoint num="22" id="857" />
-<TGConnectingPoint num="23" id="858" />
+<TGConnectingPoint num="0" id="839" />
+<TGConnectingPoint num="1" id="840" />
+<TGConnectingPoint num="2" id="841" />
+<TGConnectingPoint num="3" id="842" />
+<TGConnectingPoint num="4" id="843" />
+<TGConnectingPoint num="5" id="844" />
+<TGConnectingPoint num="6" id="845" />
+<TGConnectingPoint num="7" id="846" />
+<TGConnectingPoint num="8" id="847" />
+<TGConnectingPoint num="9" id="848" />
+<TGConnectingPoint num="10" id="849" />
+<TGConnectingPoint num="11" id="850" />
+<TGConnectingPoint num="12" id="851" />
+<TGConnectingPoint num="13" id="852" />
+<TGConnectingPoint num="14" id="853" />
+<TGConnectingPoint num="15" id="854" />
+<TGConnectingPoint num="16" id="855" />
+<TGConnectingPoint num="17" id="856" />
+<TGConnectingPoint num="18" id="857" />
+<TGConnectingPoint num="19" id="858" />
+<TGConnectingPoint num="20" id="859" />
+<TGConnectingPoint num="21" id="860" />
+<TGConnectingPoint num="22" id="861" />
+<TGConnectingPoint num="23" id="862" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
@@ -1569,74 +1569,74 @@
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="809" >
-<father id="859" num="0" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="813" >
+<father id="863" num="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="785" />
-<TGConnectingPoint num="1" id="786" />
-<TGConnectingPoint num="2" id="787" />
-<TGConnectingPoint num="3" id="788" />
-<TGConnectingPoint num="4" id="789" />
-<TGConnectingPoint num="5" id="790" />
-<TGConnectingPoint num="6" id="791" />
-<TGConnectingPoint num="7" id="792" />
-<TGConnectingPoint num="8" id="793" />
-<TGConnectingPoint num="9" id="794" />
-<TGConnectingPoint num="10" id="795" />
-<TGConnectingPoint num="11" id="796" />
-<TGConnectingPoint num="12" id="797" />
-<TGConnectingPoint num="13" id="798" />
-<TGConnectingPoint num="14" id="799" />
-<TGConnectingPoint num="15" id="800" />
-<TGConnectingPoint num="16" id="801" />
-<TGConnectingPoint num="17" id="802" />
-<TGConnectingPoint num="18" id="803" />
-<TGConnectingPoint num="19" id="804" />
-<TGConnectingPoint num="20" id="805" />
-<TGConnectingPoint num="21" id="806" />
-<TGConnectingPoint num="22" id="807" />
-<TGConnectingPoint num="23" id="808" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="789" />
+<TGConnectingPoint num="1" id="790" />
+<TGConnectingPoint num="2" id="791" />
+<TGConnectingPoint num="3" id="792" />
+<TGConnectingPoint num="4" id="793" />
+<TGConnectingPoint num="5" id="794" />
+<TGConnectingPoint num="6" id="795" />
+<TGConnectingPoint num="7" id="796" />
+<TGConnectingPoint num="8" id="797" />
+<TGConnectingPoint num="9" id="798" />
+<TGConnectingPoint num="10" id="799" />
+<TGConnectingPoint num="11" id="800" />
+<TGConnectingPoint num="12" id="801" />
+<TGConnectingPoint num="13" id="802" />
+<TGConnectingPoint num="14" id="803" />
+<TGConnectingPoint num="15" id="804" />
+<TGConnectingPoint num="16" id="805" />
+<TGConnectingPoint num="17" id="806" />
+<TGConnectingPoint num="18" id="807" />
+<TGConnectingPoint num="19" id="808" />
+<TGConnectingPoint num="20" id="809" />
+<TGConnectingPoint num="21" id="810" />
+<TGConnectingPoint num="22" id="811" />
+<TGConnectingPoint num="23" id="812" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="834" >
-<father id="859" num="1" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="838" >
+<father id="863" num="1" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="810" />
-<TGConnectingPoint num="1" id="811" />
-<TGConnectingPoint num="2" id="812" />
-<TGConnectingPoint num="3" id="813" />
-<TGConnectingPoint num="4" id="814" />
-<TGConnectingPoint num="5" id="815" />
-<TGConnectingPoint num="6" id="816" />
-<TGConnectingPoint num="7" id="817" />
-<TGConnectingPoint num="8" id="818" />
-<TGConnectingPoint num="9" id="819" />
-<TGConnectingPoint num="10" id="820" />
-<TGConnectingPoint num="11" id="821" />
-<TGConnectingPoint num="12" id="822" />
-<TGConnectingPoint num="13" id="823" />
-<TGConnectingPoint num="14" id="824" />
-<TGConnectingPoint num="15" id="825" />
-<TGConnectingPoint num="16" id="826" />
-<TGConnectingPoint num="17" id="827" />
-<TGConnectingPoint num="18" id="828" />
-<TGConnectingPoint num="19" id="829" />
-<TGConnectingPoint num="20" id="830" />
-<TGConnectingPoint num="21" id="831" />
-<TGConnectingPoint num="22" id="832" />
-<TGConnectingPoint num="23" id="833" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="814" />
+<TGConnectingPoint num="1" id="815" />
+<TGConnectingPoint num="2" id="816" />
+<TGConnectingPoint num="3" id="817" />
+<TGConnectingPoint num="4" id="818" />
+<TGConnectingPoint num="5" id="819" />
+<TGConnectingPoint num="6" id="820" />
+<TGConnectingPoint num="7" id="821" />
+<TGConnectingPoint num="8" id="822" />
+<TGConnectingPoint num="9" id="823" />
+<TGConnectingPoint num="10" id="824" />
+<TGConnectingPoint num="11" id="825" />
+<TGConnectingPoint num="12" id="826" />
+<TGConnectingPoint num="13" id="827" />
+<TGConnectingPoint num="14" id="828" />
+<TGConnectingPoint num="15" id="829" />
+<TGConnectingPoint num="16" id="830" />
+<TGConnectingPoint num="17" id="831" />
+<TGConnectingPoint num="18" id="832" />
+<TGConnectingPoint num="19" id="833" />
+<TGConnectingPoint num="20" id="834" />
+<TGConnectingPoint num="21" id="835" />
+<TGConnectingPoint num="22" id="836" />
+<TGConnectingPoint num="23" id="837" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
@@ -1648,25 +1648,25 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="866" >
+<CONNECTOR type="5102" id="870" >
 <cdparam x="516" y="264" />
 <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="865" />
-<P1  x="485" y="219" id="907" />
-<P2  x="485" y="275" id="918" />
+<TGConnectingPoint num="0" id="869" />
+<P1  x="485" y="219" id="911" />
+<P2  x="485" y="275" id="922" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="864" >
-<father id="866" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="868" >
+<father id="870" num="0" />
 <cdparam x="493" y="251" />
 <sizeparam width="161" 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="860" />
-<TGConnectingPoint num="1" id="861" />
-<TGConnectingPoint num="2" id="862" />
-<TGConnectingPoint num="3" id="863" />
+<TGConnectingPoint num="0" id="864" />
+<TGConnectingPoint num="1" id="865" />
+<TGConnectingPoint num="2" id="866" />
+<TGConnectingPoint num="3" id="867" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1679,25 +1679,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="873" >
+<CONNECTOR type="5102" id="877" >
 <cdparam x="382" y="165" />
 <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="872" />
-<P1  x="382" y="165" id="1014" />
-<P2  x="485" y="189" id="906" />
+<TGConnectingPoint num="0" id="876" />
+<P1  x="382" y="165" id="1018" />
+<P2  x="485" y="189" id="910" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="871" >
-<father id="873" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="875" >
+<father id="877" num="0" />
 <cdparam x="382" y="205" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
-<TGConnectingPoint num="2" id="869" />
-<TGConnectingPoint num="3" id="870" />
+<TGConnectingPoint num="0" id="871" />
+<TGConnectingPoint num="1" id="872" />
+<TGConnectingPoint num="2" id="873" />
+<TGConnectingPoint num="3" id="874" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1708,25 +1708,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="880" >
+<CONNECTOR type="5102" id="884" >
 <cdparam x="223" y="260" />
 <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="879" />
-<P1  x="251" y="231" id="896" />
-<P2  x="252" y="300" id="959" />
+<TGConnectingPoint num="0" id="883" />
+<P1  x="251" y="231" id="900" />
+<P2  x="252" y="300" id="963" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="878" >
-<father id="880" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="882" >
+<father id="884" num="0" />
 <cdparam x="175" y="246" />
 <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="874" />
-<TGConnectingPoint num="1" id="875" />
-<TGConnectingPoint num="2" id="876" />
-<TGConnectingPoint num="3" id="877" />
+<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="1" id="879" />
+<TGConnectingPoint num="2" id="880" />
+<TGConnectingPoint num="3" id="881" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="minUserDelay" />
@@ -1739,25 +1739,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="887" >
+<CONNECTOR type="5102" id="891" >
 <cdparam x="357" y="165" />
 <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="886" />
-<P1  x="357" y="165" id="1013" />
-<P2  x="251" y="201" id="895" />
+<TGConnectingPoint num="0" id="890" />
+<P1  x="357" y="165" id="1017" />
+<P2  x="251" y="201" id="899" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="885" >
-<father id="887" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="889" >
+<father id="891" num="0" />
 <cdparam x="220" y="174" />
 <sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="881" />
-<TGConnectingPoint num="1" id="882" />
-<TGConnectingPoint num="2" id="883" />
-<TGConnectingPoint num="3" id="884" />
+<TGConnectingPoint num="0" id="885" />
+<TGConnectingPoint num="1" id="886" />
+<TGConnectingPoint num="2" id="887" />
+<TGConnectingPoint num="3" id="888" />
 <extraparam>
 <guard value="[nbOfCoins &gt; 0]" />
 <afterMin value="" />
@@ -1768,25 +1768,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="894" >
+<CONNECTOR type="5102" id="898" >
 <cdparam x="369" y="115" />
 <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="893" />
-<P1  x="370" y="64" id="1040" />
-<P2  x="370" y="135" id="1000" />
+<TGConnectingPoint num="0" id="897" />
+<P1  x="370" y="64" id="1044" />
+<P2  x="370" y="135" id="1004" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="892" >
-<father id="894" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="896" >
+<father id="898" num="0" />
 <cdparam x="376" y="105" />
 <sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="888" />
-<TGConnectingPoint num="1" id="889" />
-<TGConnectingPoint num="2" id="890" />
-<TGConnectingPoint num="3" id="891" />
+<TGConnectingPoint num="0" id="892" />
+<TGConnectingPoint num="1" id="893" />
+<TGConnectingPoint num="2" id="894" />
+<TGConnectingPoint num="3" id="895" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1798,224 +1798,259 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="905" >
+<COMPONENT type="5103" id="909" >
 <cdparam x="217" y="206" />
 <sizeparam width="69" height="20" minWidth="30" 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="putCoin(x)" />
-<TGConnectingPoint num="0" id="895" />
-<TGConnectingPoint num="1" id="896" />
-<TGConnectingPoint num="2" id="897" />
-<TGConnectingPoint num="3" id="898" />
-<TGConnectingPoint num="4" id="899" />
-<TGConnectingPoint num="5" id="900" />
-<TGConnectingPoint num="6" id="901" />
-<TGConnectingPoint num="7" id="902" />
-<TGConnectingPoint num="8" id="903" />
-<TGConnectingPoint num="9" id="904" />
+<TGConnectingPoint num="0" id="899" />
+<TGConnectingPoint num="1" id="900" />
+<TGConnectingPoint num="2" id="901" />
+<TGConnectingPoint num="3" id="902" />
+<TGConnectingPoint num="4" id="903" />
+<TGConnectingPoint num="5" id="904" />
+<TGConnectingPoint num="6" id="905" />
+<TGConnectingPoint num="7" id="906" />
+<TGConnectingPoint num="8" id="907" />
+<TGConnectingPoint num="9" id="908" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="916" >
+<COMPONENT type="5104" id="920" >
 <cdparam x="447" y="194" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="906" />
-<TGConnectingPoint num="1" id="907" />
-<TGConnectingPoint num="2" id="908" />
-<TGConnectingPoint num="3" id="909" />
-<TGConnectingPoint num="4" id="910" />
-<TGConnectingPoint num="5" id="911" />
-<TGConnectingPoint num="6" id="912" />
-<TGConnectingPoint num="7" id="913" />
-<TGConnectingPoint num="8" id="914" />
-<TGConnectingPoint num="9" id="915" />
+<TGConnectingPoint num="0" id="910" />
+<TGConnectingPoint num="1" id="911" />
+<TGConnectingPoint num="2" id="912" />
+<TGConnectingPoint num="3" id="913" />
+<TGConnectingPoint num="4" id="914" />
+<TGConnectingPoint num="5" id="915" />
+<TGConnectingPoint num="6" id="916" />
+<TGConnectingPoint num="7" id="917" />
+<TGConnectingPoint num="8" id="918" />
+<TGConnectingPoint num="9" id="919" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="957" >
+<COMPONENT type="5106" id="961" >
 <cdparam x="460" y="275" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="917" />
-<TGConnectingPoint num="1" id="918" />
-<TGConnectingPoint num="2" id="919" />
-<TGConnectingPoint num="3" id="920" />
-<TGConnectingPoint num="4" id="921" />
-<TGConnectingPoint num="5" id="922" />
-<TGConnectingPoint num="6" id="923" />
-<TGConnectingPoint num="7" id="924" />
-<TGConnectingPoint num="8" id="925" />
-<TGConnectingPoint num="9" id="926" />
-<TGConnectingPoint num="10" id="927" />
-<TGConnectingPoint num="11" id="928" />
-<TGConnectingPoint num="12" id="929" />
-<TGConnectingPoint num="13" id="930" />
-<TGConnectingPoint num="14" id="931" />
-<TGConnectingPoint num="15" id="932" />
-<TGConnectingPoint num="16" id="933" />
-<TGConnectingPoint num="17" id="934" />
-<TGConnectingPoint num="18" id="935" />
-<TGConnectingPoint num="19" id="936" />
-<TGConnectingPoint num="20" id="937" />
-<TGConnectingPoint num="21" id="938" />
-<TGConnectingPoint num="22" id="939" />
-<TGConnectingPoint num="23" id="940" />
-<TGConnectingPoint num="24" id="941" />
-<TGConnectingPoint num="25" id="942" />
-<TGConnectingPoint num="26" id="943" />
-<TGConnectingPoint num="27" id="944" />
-<TGConnectingPoint num="28" id="945" />
-<TGConnectingPoint num="29" id="946" />
-<TGConnectingPoint num="30" id="947" />
-<TGConnectingPoint num="31" id="948" />
-<TGConnectingPoint num="32" id="949" />
-<TGConnectingPoint num="33" id="950" />
-<TGConnectingPoint num="34" id="951" />
-<TGConnectingPoint num="35" id="952" />
-<TGConnectingPoint num="36" id="953" />
-<TGConnectingPoint num="37" id="954" />
-<TGConnectingPoint num="38" id="955" />
-<TGConnectingPoint num="39" id="956" />
+<TGConnectingPoint num="0" id="921" />
+<TGConnectingPoint num="1" id="922" />
+<TGConnectingPoint num="2" id="923" />
+<TGConnectingPoint num="3" id="924" />
+<TGConnectingPoint num="4" id="925" />
+<TGConnectingPoint num="5" id="926" />
+<TGConnectingPoint num="6" id="927" />
+<TGConnectingPoint num="7" id="928" />
+<TGConnectingPoint num="8" id="929" />
+<TGConnectingPoint num="9" id="930" />
+<TGConnectingPoint num="10" id="931" />
+<TGConnectingPoint num="11" id="932" />
+<TGConnectingPoint num="12" id="933" />
+<TGConnectingPoint num="13" id="934" />
+<TGConnectingPoint num="14" id="935" />
+<TGConnectingPoint num="15" id="936" />
+<TGConnectingPoint num="16" id="937" />
+<TGConnectingPoint num="17" id="938" />
+<TGConnectingPoint num="18" id="939" />
+<TGConnectingPoint num="19" id="940" />
+<TGConnectingPoint num="20" id="941" />
+<TGConnectingPoint num="21" id="942" />
+<TGConnectingPoint num="22" id="943" />
+<TGConnectingPoint num="23" id="944" />
+<TGConnectingPoint num="24" id="945" />
+<TGConnectingPoint num="25" id="946" />
+<TGConnectingPoint num="26" id="947" />
+<TGConnectingPoint num="27" id="948" />
+<TGConnectingPoint num="28" id="949" />
+<TGConnectingPoint num="29" id="950" />
+<TGConnectingPoint num="30" id="951" />
+<TGConnectingPoint num="31" id="952" />
+<TGConnectingPoint num="32" id="953" />
+<TGConnectingPoint num="33" id="954" />
+<TGConnectingPoint num="34" id="955" />
+<TGConnectingPoint num="35" id="956" />
+<TGConnectingPoint num="36" id="957" />
+<TGConnectingPoint num="37" id="958" />
+<TGConnectingPoint num="38" id="959" />
+<TGConnectingPoint num="39" id="960" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="998" >
+<COMPONENT type="5106" id="1002" >
 <cdparam x="227" y="300" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="958" />
-<TGConnectingPoint num="1" id="959" />
-<TGConnectingPoint num="2" id="960" />
-<TGConnectingPoint num="3" id="961" />
-<TGConnectingPoint num="4" id="962" />
-<TGConnectingPoint num="5" id="963" />
-<TGConnectingPoint num="6" id="964" />
-<TGConnectingPoint num="7" id="965" />
-<TGConnectingPoint num="8" id="966" />
-<TGConnectingPoint num="9" id="967" />
-<TGConnectingPoint num="10" id="968" />
-<TGConnectingPoint num="11" id="969" />
-<TGConnectingPoint num="12" id="970" />
-<TGConnectingPoint num="13" id="971" />
-<TGConnectingPoint num="14" id="972" />
-<TGConnectingPoint num="15" id="973" />
-<TGConnectingPoint num="16" id="974" />
-<TGConnectingPoint num="17" id="975" />
-<TGConnectingPoint num="18" id="976" />
-<TGConnectingPoint num="19" id="977" />
-<TGConnectingPoint num="20" id="978" />
-<TGConnectingPoint num="21" id="979" />
-<TGConnectingPoint num="22" id="980" />
-<TGConnectingPoint num="23" id="981" />
-<TGConnectingPoint num="24" id="982" />
-<TGConnectingPoint num="25" id="983" />
-<TGConnectingPoint num="26" id="984" />
-<TGConnectingPoint num="27" id="985" />
-<TGConnectingPoint num="28" id="986" />
-<TGConnectingPoint num="29" id="987" />
-<TGConnectingPoint num="30" id="988" />
-<TGConnectingPoint num="31" id="989" />
-<TGConnectingPoint num="32" id="990" />
-<TGConnectingPoint num="33" id="991" />
-<TGConnectingPoint num="34" id="992" />
-<TGConnectingPoint num="35" id="993" />
-<TGConnectingPoint num="36" id="994" />
-<TGConnectingPoint num="37" id="995" />
-<TGConnectingPoint num="38" id="996" />
-<TGConnectingPoint num="39" id="997" />
+<TGConnectingPoint num="0" id="962" />
+<TGConnectingPoint num="1" id="963" />
+<TGConnectingPoint num="2" id="964" />
+<TGConnectingPoint num="3" id="965" />
+<TGConnectingPoint num="4" id="966" />
+<TGConnectingPoint num="5" id="967" />
+<TGConnectingPoint num="6" id="968" />
+<TGConnectingPoint num="7" id="969" />
+<TGConnectingPoint num="8" id="970" />
+<TGConnectingPoint num="9" id="971" />
+<TGConnectingPoint num="10" id="972" />
+<TGConnectingPoint num="11" id="973" />
+<TGConnectingPoint num="12" id="974" />
+<TGConnectingPoint num="13" id="975" />
+<TGConnectingPoint num="14" id="976" />
+<TGConnectingPoint num="15" id="977" />
+<TGConnectingPoint num="16" id="978" />
+<TGConnectingPoint num="17" id="979" />
+<TGConnectingPoint num="18" id="980" />
+<TGConnectingPoint num="19" id="981" />
+<TGConnectingPoint num="20" id="982" />
+<TGConnectingPoint num="21" id="983" />
+<TGConnectingPoint num="22" id="984" />
+<TGConnectingPoint num="23" id="985" />
+<TGConnectingPoint num="24" id="986" />
+<TGConnectingPoint num="25" id="987" />
+<TGConnectingPoint num="26" id="988" />
+<TGConnectingPoint num="27" id="989" />
+<TGConnectingPoint num="28" id="990" />
+<TGConnectingPoint num="29" id="991" />
+<TGConnectingPoint num="30" id="992" />
+<TGConnectingPoint num="31" id="993" />
+<TGConnectingPoint num="32" id="994" />
+<TGConnectingPoint num="33" id="995" />
+<TGConnectingPoint num="34" id="996" />
+<TGConnectingPoint num="35" id="997" />
+<TGConnectingPoint num="36" id="998" />
+<TGConnectingPoint num="37" id="999" />
+<TGConnectingPoint num="38" id="1000" />
+<TGConnectingPoint num="39" id="1001" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1039" >
+<COMPONENT type="5106" id="1043" >
 <cdparam x="345" y="135" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="999" />
-<TGConnectingPoint num="1" id="1000" />
-<TGConnectingPoint num="2" id="1001" />
-<TGConnectingPoint num="3" id="1002" />
-<TGConnectingPoint num="4" id="1003" />
-<TGConnectingPoint num="5" id="1004" />
-<TGConnectingPoint num="6" id="1005" />
-<TGConnectingPoint num="7" id="1006" />
-<TGConnectingPoint num="8" id="1007" />
-<TGConnectingPoint num="9" id="1008" />
-<TGConnectingPoint num="10" id="1009" />
-<TGConnectingPoint num="11" id="1010" />
-<TGConnectingPoint num="12" id="1011" />
-<TGConnectingPoint num="13" id="1012" />
-<TGConnectingPoint num="14" id="1013" />
-<TGConnectingPoint num="15" id="1014" />
-<TGConnectingPoint num="16" id="1015" />
-<TGConnectingPoint num="17" id="1016" />
-<TGConnectingPoint num="18" id="1017" />
-<TGConnectingPoint num="19" id="1018" />
-<TGConnectingPoint num="20" id="1019" />
-<TGConnectingPoint num="21" id="1020" />
-<TGConnectingPoint num="22" id="1021" />
-<TGConnectingPoint num="23" id="1022" />
-<TGConnectingPoint num="24" id="1023" />
-<TGConnectingPoint num="25" id="1024" />
-<TGConnectingPoint num="26" id="1025" />
-<TGConnectingPoint num="27" id="1026" />
-<TGConnectingPoint num="28" id="1027" />
-<TGConnectingPoint num="29" id="1028" />
-<TGConnectingPoint num="30" id="1029" />
-<TGConnectingPoint num="31" id="1030" />
-<TGConnectingPoint num="32" id="1031" />
-<TGConnectingPoint num="33" id="1032" />
-<TGConnectingPoint num="34" id="1033" />
-<TGConnectingPoint num="35" id="1034" />
-<TGConnectingPoint num="36" id="1035" />
-<TGConnectingPoint num="37" id="1036" />
-<TGConnectingPoint num="38" id="1037" />
-<TGConnectingPoint num="39" id="1038" />
+<TGConnectingPoint num="0" id="1003" />
+<TGConnectingPoint num="1" id="1004" />
+<TGConnectingPoint num="2" id="1005" />
+<TGConnectingPoint num="3" id="1006" />
+<TGConnectingPoint num="4" id="1007" />
+<TGConnectingPoint num="5" id="1008" />
+<TGConnectingPoint num="6" id="1009" />
+<TGConnectingPoint num="7" id="1010" />
+<TGConnectingPoint num="8" id="1011" />
+<TGConnectingPoint num="9" id="1012" />
+<TGConnectingPoint num="10" id="1013" />
+<TGConnectingPoint num="11" id="1014" />
+<TGConnectingPoint num="12" id="1015" />
+<TGConnectingPoint num="13" id="1016" />
+<TGConnectingPoint num="14" id="1017" />
+<TGConnectingPoint num="15" id="1018" />
+<TGConnectingPoint num="16" id="1019" />
+<TGConnectingPoint num="17" id="1020" />
+<TGConnectingPoint num="18" id="1021" />
+<TGConnectingPoint num="19" id="1022" />
+<TGConnectingPoint num="20" id="1023" />
+<TGConnectingPoint num="21" id="1024" />
+<TGConnectingPoint num="22" id="1025" />
+<TGConnectingPoint num="23" id="1026" />
+<TGConnectingPoint num="24" id="1027" />
+<TGConnectingPoint num="25" id="1028" />
+<TGConnectingPoint num="26" id="1029" />
+<TGConnectingPoint num="27" id="1030" />
+<TGConnectingPoint num="28" id="1031" />
+<TGConnectingPoint num="29" id="1032" />
+<TGConnectingPoint num="30" id="1033" />
+<TGConnectingPoint num="31" id="1034" />
+<TGConnectingPoint num="32" id="1035" />
+<TGConnectingPoint num="33" id="1036" />
+<TGConnectingPoint num="34" id="1037" />
+<TGConnectingPoint num="35" id="1038" />
+<TGConnectingPoint num="36" id="1039" />
+<TGConnectingPoint num="37" id="1040" />
+<TGConnectingPoint num="38" id="1041" />
+<TGConnectingPoint num="39" id="1042" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1041" >
+<COMPONENT type="5100" id="1045" >
 <cdparam x="363" y="44" />
 <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="1040" />
+<TGConnectingPoint num="0" id="1044" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="1048" >
+<CONNECTOR type="118" id="1898" >
+<cdparam x="372" y="83" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="412" y="82" id="1304" />
+<P2  x="472" y="82" id="1885" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<COMPONENT type="301" id="1881" >
+<cdparam x="472" y="75" />
+<sizeparam width="100" height="15" minWidth="20" minHeight="10" 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="Activity1.docx" />
+<TGConnectingPoint num="0" id="1882" />
+<TGConnectingPoint num="1" id="1883" />
+<TGConnectingPoint num="2" id="1884" />
+<TGConnectingPoint num="3" id="1885" />
+<TGConnectingPoint num="4" id="1886" />
+<TGConnectingPoint num="5" id="1887" />
+<TGConnectingPoint num="6" id="1888" />
+<TGConnectingPoint num="7" id="1889" />
+<TGConnectingPoint num="8" id="1890" />
+<TGConnectingPoint num="9" id="1891" />
+<TGConnectingPoint num="10" id="1892" />
+<TGConnectingPoint num="11" id="1893" />
+<TGConnectingPoint num="12" id="1894" />
+<TGConnectingPoint num="13" id="1895" />
+<TGConnectingPoint num="14" id="1896" />
+<TGConnectingPoint num="15" id="1897" />
+<extraparam>
+<Line value="Activity1.docx" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5102" id="1052" >
 <cdparam x="691" y="288" />
 <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="1047" />
-<P1  x="699" y="289" id="1186" />
-<P2  x="699" y="316" id="1158" />
+<TGConnectingPoint num="0" id="1051" />
+<P1  x="699" y="289" id="1190" />
+<P2  x="699" y="316" id="1162" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1046" >
-<father id="1048" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1050" >
+<father id="1052" num="0" />
 <cdparam x="691" y="328" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1042" />
-<TGConnectingPoint num="1" id="1043" />
-<TGConnectingPoint num="2" id="1044" />
-<TGConnectingPoint num="3" id="1045" />
+<TGConnectingPoint num="0" id="1046" />
+<TGConnectingPoint num="1" id="1047" />
+<TGConnectingPoint num="2" id="1048" />
+<TGConnectingPoint num="3" id="1049" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2026,25 +2061,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1055" >
+<CONNECTOR type="5102" id="1059" >
 <cdparam x="481" y="501" />
 <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="1054" />
-<P1  x="437" y="525" id="1453" />
-<P2  x="323" y="748" id="1314" />
+<TGConnectingPoint num="0" id="1058" />
+<P1  x="442" y="527" id="1392" />
+<P2  x="323" y="748" id="1318" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1053" >
-<father id="1055" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1057" >
+<father id="1059" num="0" />
 <cdparam x="420" y="552" />
 <sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1049" />
-<TGConnectingPoint num="1" id="1050" />
-<TGConnectingPoint num="2" id="1051" />
-<TGConnectingPoint num="3" id="1052" />
+<TGConnectingPoint num="0" id="1053" />
+<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="2" id="1055" />
+<TGConnectingPoint num="3" id="1056" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2056,25 +2091,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1062" >
+<CONNECTOR type="5102" id="1066" >
 <cdparam x="555" y="559" />
 <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="1061" />
-<P1  x="321" y="455" id="1402" />
-<P2  x="437" y="495" id="1452" />
+<TGConnectingPoint num="0" id="1065" />
+<P1  x="326" y="457" id="1419" />
+<P2  x="442" y="497" id="1391" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1060" >
-<father id="1062" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1064" >
+<father id="1066" num="0" />
 <cdparam x="395" y="448" />
 <sizeparam width="94" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1056" />
-<TGConnectingPoint num="1" id="1057" />
-<TGConnectingPoint num="2" id="1058" />
-<TGConnectingPoint num="3" id="1059" />
+<TGConnectingPoint num="0" id="1060" />
+<TGConnectingPoint num="1" id="1061" />
+<TGConnectingPoint num="2" id="1062" />
+<TGConnectingPoint num="3" id="1063" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
@@ -2085,25 +2120,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1069" >
+<CONNECTOR type="5102" id="1073" >
 <cdparam x="355" y="545" />
 <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="1068" />
-<P1  x="293" y="552" id="1388" />
-<P2  x="289" y="748" id="1306" />
+<TGConnectingPoint num="0" id="1072" />
+<P1  x="298" y="554" id="1457" />
+<P2  x="289" y="748" id="1310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1067" >
-<father id="1069" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1071" >
+<father id="1073" num="0" />
 <cdparam x="284" y="594" />
 <sizeparam width="228" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1063" />
-<TGConnectingPoint num="1" id="1064" />
-<TGConnectingPoint num="2" id="1065" />
-<TGConnectingPoint num="3" id="1066" />
+<TGConnectingPoint num="0" id="1067" />
+<TGConnectingPoint num="1" id="1068" />
+<TGConnectingPoint num="2" id="1069" />
+<TGConnectingPoint num="3" id="1070" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2116,25 +2151,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1076" >
+<CONNECTOR type="5102" id="1080" >
 <cdparam x="295" y="465" />
 <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="1075" />
-<P1  x="288" y="475" id="1413" />
-<P2  x="293" y="522" id="1387" />
+<TGConnectingPoint num="0" id="1079" />
+<P1  x="293" y="477" id="1430" />
+<P2  x="298" y="524" id="1456" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1074" >
-<father id="1076" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1078" >
+<father id="1080" num="0" />
 <cdparam x="295" y="505" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1070" />
-<TGConnectingPoint num="1" id="1071" />
-<TGConnectingPoint num="2" id="1072" />
-<TGConnectingPoint num="3" id="1073" />
+<TGConnectingPoint num="0" id="1074" />
+<TGConnectingPoint num="1" id="1075" />
+<TGConnectingPoint num="2" id="1076" />
+<TGConnectingPoint num="3" id="1077" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2145,25 +2180,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1083" >
+<CONNECTOR type="5102" id="1087" >
 <cdparam x="148" y="549" />
 <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="1082" />
-<P1  x="121" y="552" id="1442" />
-<P2  x="255" y="748" id="1313" />
+<TGConnectingPoint num="0" id="1086" />
+<P1  x="126" y="554" id="1403" />
+<P2  x="255" y="748" id="1317" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1081" >
-<father id="1083" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1085" >
+<father id="1087" num="0" />
 <cdparam x="32" y="587" />
 <sizeparam width="262" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1077" />
-<TGConnectingPoint num="1" id="1078" />
-<TGConnectingPoint num="2" id="1079" />
-<TGConnectingPoint num="3" id="1080" />
+<TGConnectingPoint num="0" id="1081" />
+<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="2" id="1083" />
+<TGConnectingPoint num="3" id="1084" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2176,25 +2211,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1090" >
+<CONNECTOR type="5102" id="1094" >
 <cdparam x="229" y="465" />
 <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="1089" />
-<P1  x="222" y="475" id="1412" />
-<P2  x="121" y="522" id="1441" />
+<TGConnectingPoint num="0" id="1093" />
+<P1  x="227" y="477" id="1429" />
+<P2  x="126" y="524" id="1402" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1088" >
-<father id="1090" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1092" >
+<father id="1094" num="0" />
 <cdparam x="229" y="505" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1084" />
-<TGConnectingPoint num="1" id="1085" />
-<TGConnectingPoint num="2" id="1086" />
-<TGConnectingPoint num="3" id="1087" />
+<TGConnectingPoint num="0" id="1088" />
+<TGConnectingPoint num="1" id="1089" />
+<TGConnectingPoint num="2" id="1090" />
+<TGConnectingPoint num="3" id="1091" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2205,25 +2240,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1097" >
+<CONNECTOR type="5102" id="1101" >
 <cdparam x="280" y="420" />
 <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="1096" />
-<P1  x="256" y="419" id="1439" />
-<P2  x="255" y="435" id="1399" />
+<TGConnectingPoint num="0" id="1100" />
+<P1  x="261" y="421" id="1413" />
+<P2  x="260" y="437" id="1416" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1095" >
-<father id="1097" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1099" >
+<father id="1101" num="0" />
 <cdparam x="280" y="460" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1091" />
-<TGConnectingPoint num="1" id="1092" />
-<TGConnectingPoint num="2" id="1093" />
-<TGConnectingPoint num="3" id="1094" />
+<TGConnectingPoint num="0" id="1095" />
+<TGConnectingPoint num="1" id="1096" />
+<TGConnectingPoint num="2" id="1097" />
+<TGConnectingPoint num="3" id="1098" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2234,25 +2269,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1104" >
+<CONNECTOR type="5102" id="1108" >
 <cdparam x="667" y="346" />
 <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="1103" />
-<P1  x="699" y="346" id="1159" />
-<P2  x="699" y="381" id="1347" />
+<TGConnectingPoint num="0" id="1107" />
+<P1  x="699" y="346" id="1163" />
+<P2  x="699" y="381" id="1351" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1102" >
-<father id="1104" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1106" >
+<father id="1108" num="0" />
 <cdparam x="707" y="368" />
 <sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1098" />
-<TGConnectingPoint num="1" id="1099" />
-<TGConnectingPoint num="2" id="1100" />
-<TGConnectingPoint num="3" id="1101" />
+<TGConnectingPoint num="0" id="1102" />
+<TGConnectingPoint num="1" id="1103" />
+<TGConnectingPoint num="2" id="1104" />
+<TGConnectingPoint num="3" id="1105" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2264,25 +2299,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1111" >
+<CONNECTOR type="5102" id="1115" >
 <cdparam x="348" y="228" />
 <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="1110" />
-<P1  x="388" y="208" id="1225" />
-<P2  x="649" y="264" id="1183" />
+<TGConnectingPoint num="0" id="1114" />
+<P1  x="388" y="208" id="1229" />
+<P2  x="649" y="264" id="1187" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1109" >
-<father id="1111" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1113" >
+<father id="1115" num="0" />
 <cdparam x="411" y="206" />
 <sizeparam width="94" 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="1105" />
-<TGConnectingPoint num="1" id="1106" />
-<TGConnectingPoint num="2" id="1107" />
-<TGConnectingPoint num="3" id="1108" />
+<TGConnectingPoint num="0" id="1109" />
+<TGConnectingPoint num="1" id="1110" />
+<TGConnectingPoint num="2" id="1111" />
+<TGConnectingPoint num="3" id="1112" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
@@ -2293,25 +2328,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1118" >
+<CONNECTOR type="5102" id="1122" >
 <cdparam x="243" y="319" />
 <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="1117" />
-<P1  x="277" y="305" id="1170" />
-<P2  x="306" y="370" id="1464" />
+<TGConnectingPoint num="0" id="1121" />
+<P1  x="277" y="305" id="1174" />
+<P2  x="311" y="372" id="1468" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1116" >
-<father id="1118" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1120" >
+<father id="1122" num="0" />
 <cdparam x="243" y="359" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1112" />
-<TGConnectingPoint num="1" id="1113" />
-<TGConnectingPoint num="2" id="1114" />
-<TGConnectingPoint num="3" id="1115" />
+<TGConnectingPoint num="0" id="1116" />
+<TGConnectingPoint num="1" id="1117" />
+<TGConnectingPoint num="2" id="1118" />
+<TGConnectingPoint num="3" id="1119" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2322,25 +2357,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1125" >
+<CONNECTOR type="5102" id="1129" >
 <cdparam x="270" y="224" />
 <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="1124" />
-<P1  x="270" y="228" id="1235" />
-<P2  x="277" y="275" id="1169" />
+<TGConnectingPoint num="0" id="1128" />
+<P1  x="270" y="228" id="1239" />
+<P2  x="277" y="275" id="1173" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1123" >
-<father id="1125" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1127" >
+<father id="1129" num="0" />
 <cdparam x="270" y="264" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1119" />
-<TGConnectingPoint num="1" id="1120" />
-<TGConnectingPoint num="2" id="1121" />
-<TGConnectingPoint num="3" id="1122" />
+<TGConnectingPoint num="0" id="1123" />
+<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="2" id="1125" />
+<TGConnectingPoint num="3" id="1126" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2351,25 +2386,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1132" >
+<CONNECTOR type="5102" id="1136" >
 <cdparam x="309" y="160" />
 <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="1131" />
-<P1  x="306" y="166" id="1148" />
-<P2  x="309" y="188" id="1222" />
+<TGConnectingPoint num="0" id="1135" />
+<P1  x="306" y="166" id="1152" />
+<P2  x="309" y="188" id="1226" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1130" >
-<father id="1132" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1134" >
+<father id="1136" num="0" />
 <cdparam x="328" y="178" />
 <sizeparam width="161" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1126" />
-<TGConnectingPoint num="1" id="1127" />
-<TGConnectingPoint num="2" id="1128" />
-<TGConnectingPoint num="3" id="1129" />
+<TGConnectingPoint num="0" id="1130" />
+<TGConnectingPoint num="1" id="1131" />
+<TGConnectingPoint num="2" id="1132" />
+<TGConnectingPoint num="3" id="1133" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2381,25 +2416,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1139" >
+<CONNECTOR type="5102" id="1143" >
 <cdparam x="303" y="103" />
 <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="1138" />
-<P1  x="303" y="103" id="1270" />
-<P2  x="306" y="136" id="1147" />
+<TGConnectingPoint num="0" id="1142" />
+<P1  x="302" y="102" id="1274" />
+<P2  x="306" y="136" id="1151" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1137" >
-<father id="1139" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1141" >
+<father id="1143" num="0" />
 <cdparam x="303" y="143" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1133" />
-<TGConnectingPoint num="1" id="1134" />
-<TGConnectingPoint num="2" id="1135" />
-<TGConnectingPoint num="3" id="1136" />
+<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="1" id="1138" />
+<TGConnectingPoint num="2" id="1139" />
+<TGConnectingPoint num="3" id="1140" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2410,25 +2445,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1146" >
+<CONNECTOR type="5102" id="1150" >
 <cdparam x="303" y="40" />
 <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="1145" />
-<P1  x="303" y="40" id="1262" />
-<P2  x="303" y="63" id="1265" />
+<TGConnectingPoint num="0" id="1149" />
+<P1  x="303" y="40" id="1266" />
+<P2  x="302" y="62" id="1269" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1144" >
-<father id="1146" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1148" >
+<father id="1150" num="0" />
 <cdparam x="303" y="80" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1140" />
-<TGConnectingPoint num="1" id="1141" />
-<TGConnectingPoint num="2" id="1142" />
-<TGConnectingPoint num="3" id="1143" />
+<TGConnectingPoint num="0" id="1144" />
+<TGConnectingPoint num="1" id="1145" />
+<TGConnectingPoint num="2" id="1146" />
+<TGConnectingPoint num="3" id="1147" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2439,512 +2474,514 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1157" >
+<COMPONENT type="5104" id="1161" >
 <cdparam x="268" y="141" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1147" />
-<TGConnectingPoint num="1" id="1148" />
-<TGConnectingPoint num="2" id="1149" />
-<TGConnectingPoint num="3" id="1150" />
-<TGConnectingPoint num="4" id="1151" />
-<TGConnectingPoint num="5" id="1152" />
-<TGConnectingPoint num="6" id="1153" />
-<TGConnectingPoint num="7" id="1154" />
-<TGConnectingPoint num="8" id="1155" />
-<TGConnectingPoint num="9" id="1156" />
+<TGConnectingPoint num="0" id="1151" />
+<TGConnectingPoint num="1" id="1152" />
+<TGConnectingPoint num="2" id="1153" />
+<TGConnectingPoint num="3" id="1154" />
+<TGConnectingPoint num="4" id="1155" />
+<TGConnectingPoint num="5" id="1156" />
+<TGConnectingPoint num="6" id="1157" />
+<TGConnectingPoint num="7" id="1158" />
+<TGConnectingPoint num="8" id="1159" />
+<TGConnectingPoint num="9" id="1160" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1168" >
+<COMPONENT type="5103" id="1172" >
 <cdparam x="634" y="321" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1158" />
-<TGConnectingPoint num="1" id="1159" />
-<TGConnectingPoint num="2" id="1160" />
-<TGConnectingPoint num="3" id="1161" />
-<TGConnectingPoint num="4" id="1162" />
-<TGConnectingPoint num="5" id="1163" />
-<TGConnectingPoint num="6" id="1164" />
-<TGConnectingPoint num="7" id="1165" />
-<TGConnectingPoint num="8" id="1166" />
-<TGConnectingPoint num="9" id="1167" />
+<TGConnectingPoint num="0" id="1162" />
+<TGConnectingPoint num="1" id="1163" />
+<TGConnectingPoint num="2" id="1164" />
+<TGConnectingPoint num="3" id="1165" />
+<TGConnectingPoint num="4" id="1166" />
+<TGConnectingPoint num="5" id="1167" />
+<TGConnectingPoint num="6" id="1168" />
+<TGConnectingPoint num="7" id="1169" />
+<TGConnectingPoint num="8" id="1170" />
+<TGConnectingPoint num="9" id="1171" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1179" >
+<COMPONENT type="5104" id="1183" >
 <cdparam x="239" y="280" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1169" />
-<TGConnectingPoint num="1" id="1170" />
-<TGConnectingPoint num="2" id="1171" />
-<TGConnectingPoint num="3" id="1172" />
-<TGConnectingPoint num="4" id="1173" />
-<TGConnectingPoint num="5" id="1174" />
-<TGConnectingPoint num="6" id="1175" />
-<TGConnectingPoint num="7" id="1176" />
-<TGConnectingPoint num="8" id="1177" />
-<TGConnectingPoint num="9" id="1178" />
+<TGConnectingPoint num="0" id="1173" />
+<TGConnectingPoint num="1" id="1174" />
+<TGConnectingPoint num="2" id="1175" />
+<TGConnectingPoint num="3" id="1176" />
+<TGConnectingPoint num="4" id="1177" />
+<TGConnectingPoint num="5" id="1178" />
+<TGConnectingPoint num="6" id="1179" />
+<TGConnectingPoint num="7" id="1180" />
+<TGConnectingPoint num="8" id="1181" />
+<TGConnectingPoint num="9" id="1182" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1220" >
+<COMPONENT type="5106" id="1224" >
 <cdparam x="649" y="239" />
 <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="1400" />
 <infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
-<TGConnectingPoint num="2" id="1182" />
-<TGConnectingPoint num="3" id="1183" />
-<TGConnectingPoint num="4" id="1184" />
-<TGConnectingPoint num="5" id="1185" />
-<TGConnectingPoint num="6" id="1186" />
-<TGConnectingPoint num="7" id="1187" />
-<TGConnectingPoint num="8" id="1188" />
-<TGConnectingPoint num="9" id="1189" />
-<TGConnectingPoint num="10" id="1190" />
-<TGConnectingPoint num="11" id="1191" />
-<TGConnectingPoint num="12" id="1192" />
-<TGConnectingPoint num="13" id="1193" />
-<TGConnectingPoint num="14" id="1194" />
-<TGConnectingPoint num="15" id="1195" />
-<TGConnectingPoint num="16" id="1196" />
-<TGConnectingPoint num="17" id="1197" />
-<TGConnectingPoint num="18" id="1198" />
-<TGConnectingPoint num="19" id="1199" />
-<TGConnectingPoint num="20" id="1200" />
-<TGConnectingPoint num="21" id="1201" />
-<TGConnectingPoint num="22" id="1202" />
-<TGConnectingPoint num="23" id="1203" />
-<TGConnectingPoint num="24" id="1204" />
-<TGConnectingPoint num="25" id="1205" />
-<TGConnectingPoint num="26" id="1206" />
-<TGConnectingPoint num="27" id="1207" />
-<TGConnectingPoint num="28" id="1208" />
-<TGConnectingPoint num="29" id="1209" />
-<TGConnectingPoint num="30" id="1210" />
-<TGConnectingPoint num="31" id="1211" />
-<TGConnectingPoint num="32" id="1212" />
-<TGConnectingPoint num="33" id="1213" />
-<TGConnectingPoint num="34" id="1214" />
-<TGConnectingPoint num="35" id="1215" />
-<TGConnectingPoint num="36" id="1216" />
-<TGConnectingPoint num="37" id="1217" />
-<TGConnectingPoint num="38" id="1218" />
-<TGConnectingPoint num="39" id="1219" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="2" id="1186" />
+<TGConnectingPoint num="3" id="1187" />
+<TGConnectingPoint num="4" id="1188" />
+<TGConnectingPoint num="5" id="1189" />
+<TGConnectingPoint num="6" id="1190" />
+<TGConnectingPoint num="7" id="1191" />
+<TGConnectingPoint num="8" id="1192" />
+<TGConnectingPoint num="9" id="1193" />
+<TGConnectingPoint num="10" id="1194" />
+<TGConnectingPoint num="11" id="1195" />
+<TGConnectingPoint num="12" id="1196" />
+<TGConnectingPoint num="13" id="1197" />
+<TGConnectingPoint num="14" id="1198" />
+<TGConnectingPoint num="15" id="1199" />
+<TGConnectingPoint num="16" id="1200" />
+<TGConnectingPoint num="17" id="1201" />
+<TGConnectingPoint num="18" id="1202" />
+<TGConnectingPoint num="19" id="1203" />
+<TGConnectingPoint num="20" id="1204" />
+<TGConnectingPoint num="21" id="1205" />
+<TGConnectingPoint num="22" id="1206" />
+<TGConnectingPoint num="23" id="1207" />
+<TGConnectingPoint num="24" id="1208" />
+<TGConnectingPoint num="25" id="1209" />
+<TGConnectingPoint num="26" id="1210" />
+<TGConnectingPoint num="27" id="1211" />
+<TGConnectingPoint num="28" id="1212" />
+<TGConnectingPoint num="29" id="1213" />
+<TGConnectingPoint num="30" id="1214" />
+<TGConnectingPoint num="31" id="1215" />
+<TGConnectingPoint num="32" id="1216" />
+<TGConnectingPoint num="33" id="1217" />
+<TGConnectingPoint num="34" id="1218" />
+<TGConnectingPoint num="35" id="1219" />
+<TGConnectingPoint num="36" id="1220" />
+<TGConnectingPoint num="37" id="1221" />
+<TGConnectingPoint num="38" id="1222" />
+<TGConnectingPoint num="39" id="1223" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1261" >
+<COMPONENT type="5106" id="1265" >
 <cdparam x="231" y="188" />
 <sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1221" />
-<TGConnectingPoint num="1" id="1222" />
-<TGConnectingPoint num="2" id="1223" />
-<TGConnectingPoint num="3" id="1224" />
-<TGConnectingPoint num="4" id="1225" />
-<TGConnectingPoint num="5" id="1226" />
-<TGConnectingPoint num="6" id="1227" />
-<TGConnectingPoint num="7" id="1228" />
-<TGConnectingPoint num="8" id="1229" />
-<TGConnectingPoint num="9" id="1230" />
-<TGConnectingPoint num="10" id="1231" />
-<TGConnectingPoint num="11" id="1232" />
-<TGConnectingPoint num="12" id="1233" />
-<TGConnectingPoint num="13" id="1234" />
-<TGConnectingPoint num="14" id="1235" />
-<TGConnectingPoint num="15" id="1236" />
-<TGConnectingPoint num="16" id="1237" />
-<TGConnectingPoint num="17" id="1238" />
-<TGConnectingPoint num="18" id="1239" />
-<TGConnectingPoint num="19" id="1240" />
-<TGConnectingPoint num="20" id="1241" />
-<TGConnectingPoint num="21" id="1242" />
-<TGConnectingPoint num="22" id="1243" />
-<TGConnectingPoint num="23" id="1244" />
-<TGConnectingPoint num="24" id="1245" />
-<TGConnectingPoint num="25" id="1246" />
-<TGConnectingPoint num="26" id="1247" />
-<TGConnectingPoint num="27" id="1248" />
-<TGConnectingPoint num="28" id="1249" />
-<TGConnectingPoint num="29" id="1250" />
-<TGConnectingPoint num="30" id="1251" />
-<TGConnectingPoint num="31" id="1252" />
-<TGConnectingPoint num="32" id="1253" />
-<TGConnectingPoint num="33" id="1254" />
-<TGConnectingPoint num="34" id="1255" />
-<TGConnectingPoint num="35" id="1256" />
-<TGConnectingPoint num="36" id="1257" />
-<TGConnectingPoint num="37" id="1258" />
-<TGConnectingPoint num="38" id="1259" />
-<TGConnectingPoint num="39" id="1260" />
+<TGConnectingPoint num="0" id="1225" />
+<TGConnectingPoint num="1" id="1226" />
+<TGConnectingPoint num="2" id="1227" />
+<TGConnectingPoint num="3" id="1228" />
+<TGConnectingPoint num="4" id="1229" />
+<TGConnectingPoint num="5" id="1230" />
+<TGConnectingPoint num="6" id="1231" />
+<TGConnectingPoint num="7" id="1232" />
+<TGConnectingPoint num="8" id="1233" />
+<TGConnectingPoint num="9" id="1234" />
+<TGConnectingPoint num="10" id="1235" />
+<TGConnectingPoint num="11" id="1236" />
+<TGConnectingPoint num="12" id="1237" />
+<TGConnectingPoint num="13" id="1238" />
+<TGConnectingPoint num="14" id="1239" />
+<TGConnectingPoint num="15" id="1240" />
+<TGConnectingPoint num="16" id="1241" />
+<TGConnectingPoint num="17" id="1242" />
+<TGConnectingPoint num="18" id="1243" />
+<TGConnectingPoint num="19" id="1244" />
+<TGConnectingPoint num="20" id="1245" />
+<TGConnectingPoint num="21" id="1246" />
+<TGConnectingPoint num="22" id="1247" />
+<TGConnectingPoint num="23" id="1248" />
+<TGConnectingPoint num="24" id="1249" />
+<TGConnectingPoint num="25" id="1250" />
+<TGConnectingPoint num="26" id="1251" />
+<TGConnectingPoint num="27" id="1252" />
+<TGConnectingPoint num="28" id="1253" />
+<TGConnectingPoint num="29" id="1254" />
+<TGConnectingPoint num="30" id="1255" />
+<TGConnectingPoint num="31" id="1256" />
+<TGConnectingPoint num="32" id="1257" />
+<TGConnectingPoint num="33" id="1258" />
+<TGConnectingPoint num="34" id="1259" />
+<TGConnectingPoint num="35" id="1260" />
+<TGConnectingPoint num="36" id="1261" />
+<TGConnectingPoint num="37" id="1262" />
+<TGConnectingPoint num="38" id="1263" />
+<TGConnectingPoint num="39" id="1264" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1263" >
+<COMPONENT type="5100" id="1267" >
 <cdparam x="296" y="20" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1262" />
+<TGConnectingPoint num="0" id="1266" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1304" >
-<cdparam x="235" y="63" />
-<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1308" >
+<cdparam x="192" y="62" />
+<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1264" />
-<TGConnectingPoint num="1" id="1265" />
-<TGConnectingPoint num="2" id="1266" />
-<TGConnectingPoint num="3" id="1267" />
-<TGConnectingPoint num="4" id="1268" />
-<TGConnectingPoint num="5" id="1269" />
-<TGConnectingPoint num="6" id="1270" />
-<TGConnectingPoint num="7" id="1271" />
-<TGConnectingPoint num="8" id="1272" />
-<TGConnectingPoint num="9" id="1273" />
-<TGConnectingPoint num="10" id="1274" />
-<TGConnectingPoint num="11" id="1275" />
-<TGConnectingPoint num="12" id="1276" />
-<TGConnectingPoint num="13" id="1277" />
-<TGConnectingPoint num="14" id="1278" />
-<TGConnectingPoint num="15" id="1279" />
-<TGConnectingPoint num="16" id="1280" />
-<TGConnectingPoint num="17" id="1281" />
-<TGConnectingPoint num="18" id="1282" />
-<TGConnectingPoint num="19" id="1283" />
-<TGConnectingPoint num="20" id="1284" />
-<TGConnectingPoint num="21" id="1285" />
-<TGConnectingPoint num="22" id="1286" />
-<TGConnectingPoint num="23" id="1287" />
-<TGConnectingPoint num="24" id="1288" />
-<TGConnectingPoint num="25" id="1289" />
-<TGConnectingPoint num="26" id="1290" />
-<TGConnectingPoint num="27" id="1291" />
-<TGConnectingPoint num="28" id="1292" />
-<TGConnectingPoint num="29" id="1293" />
-<TGConnectingPoint num="30" id="1294" />
-<TGConnectingPoint num="31" id="1295" />
-<TGConnectingPoint num="32" id="1296" />
-<TGConnectingPoint num="33" id="1297" />
-<TGConnectingPoint num="34" id="1298" />
-<TGConnectingPoint num="35" id="1299" />
-<TGConnectingPoint num="36" id="1300" />
-<TGConnectingPoint num="37" id="1301" />
-<TGConnectingPoint num="38" id="1302" />
-<TGConnectingPoint num="39" id="1303" />
+<TGConnectingPoint num="0" id="1268" />
+<TGConnectingPoint num="1" id="1269" />
+<TGConnectingPoint num="2" id="1270" />
+<TGConnectingPoint num="3" id="1271" />
+<TGConnectingPoint num="4" id="1272" />
+<TGConnectingPoint num="5" id="1273" />
+<TGConnectingPoint num="6" id="1274" />
+<TGConnectingPoint num="7" id="1275" />
+<TGConnectingPoint num="8" id="1276" />
+<TGConnectingPoint num="9" id="1277" />
+<TGConnectingPoint num="10" id="1278" />
+<TGConnectingPoint num="11" id="1279" />
+<TGConnectingPoint num="12" id="1280" />
+<TGConnectingPoint num="13" id="1281" />
+<TGConnectingPoint num="14" id="1282" />
+<TGConnectingPoint num="15" id="1283" />
+<TGConnectingPoint num="16" id="1284" />
+<TGConnectingPoint num="17" id="1285" />
+<TGConnectingPoint num="18" id="1286" />
+<TGConnectingPoint num="19" id="1287" />
+<TGConnectingPoint num="20" id="1288" />
+<TGConnectingPoint num="21" id="1289" />
+<TGConnectingPoint num="22" id="1290" />
+<TGConnectingPoint num="23" id="1291" />
+<TGConnectingPoint num="24" id="1292" />
+<TGConnectingPoint num="25" id="1293" />
+<TGConnectingPoint num="26" id="1294" />
+<TGConnectingPoint num="27" id="1295" />
+<TGConnectingPoint num="28" id="1296" />
+<TGConnectingPoint num="29" id="1297" />
+<TGConnectingPoint num="30" id="1298" />
+<TGConnectingPoint num="31" id="1299" />
+<TGConnectingPoint num="32" id="1300" />
+<TGConnectingPoint num="33" id="1301" />
+<TGConnectingPoint num="34" id="1302" />
+<TGConnectingPoint num="35" id="1303" />
+<TGConnectingPoint num="36" id="1304" />
+<TGConnectingPoint num="37" id="1305" />
+<TGConnectingPoint num="38" id="1306" />
+<TGConnectingPoint num="39" id="1307" />
+<latencyCheck />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1345" >
+<COMPONENT type="5106" id="1349" >
 <cdparam x="221" y="748" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1305" />
-<TGConnectingPoint num="1" id="1306" />
-<TGConnectingPoint num="2" id="1307" />
-<TGConnectingPoint num="3" id="1308" />
-<TGConnectingPoint num="4" id="1309" />
-<TGConnectingPoint num="5" id="1310" />
-<TGConnectingPoint num="6" id="1311" />
-<TGConnectingPoint num="7" id="1312" />
-<TGConnectingPoint num="8" id="1313" />
-<TGConnectingPoint num="9" id="1314" />
-<TGConnectingPoint num="10" id="1315" />
-<TGConnectingPoint num="11" id="1316" />
-<TGConnectingPoint num="12" id="1317" />
-<TGConnectingPoint num="13" id="1318" />
-<TGConnectingPoint num="14" id="1319" />
-<TGConnectingPoint num="15" id="1320" />
-<TGConnectingPoint num="16" id="1321" />
-<TGConnectingPoint num="17" id="1322" />
-<TGConnectingPoint num="18" id="1323" />
-<TGConnectingPoint num="19" id="1324" />
-<TGConnectingPoint num="20" id="1325" />
-<TGConnectingPoint num="21" id="1326" />
-<TGConnectingPoint num="22" id="1327" />
-<TGConnectingPoint num="23" id="1328" />
-<TGConnectingPoint num="24" id="1329" />
-<TGConnectingPoint num="25" id="1330" />
-<TGConnectingPoint num="26" id="1331" />
-<TGConnectingPoint num="27" id="1332" />
-<TGConnectingPoint num="28" id="1333" />
-<TGConnectingPoint num="29" id="1334" />
-<TGConnectingPoint num="30" id="1335" />
-<TGConnectingPoint num="31" id="1336" />
-<TGConnectingPoint num="32" id="1337" />
-<TGConnectingPoint num="33" id="1338" />
-<TGConnectingPoint num="34" id="1339" />
-<TGConnectingPoint num="35" id="1340" />
-<TGConnectingPoint num="36" id="1341" />
-<TGConnectingPoint num="37" id="1342" />
-<TGConnectingPoint num="38" id="1343" />
-<TGConnectingPoint num="39" id="1344" />
+<TGConnectingPoint num="0" id="1309" />
+<TGConnectingPoint num="1" id="1310" />
+<TGConnectingPoint num="2" id="1311" />
+<TGConnectingPoint num="3" id="1312" />
+<TGConnectingPoint num="4" id="1313" />
+<TGConnectingPoint num="5" id="1314" />
+<TGConnectingPoint num="6" id="1315" />
+<TGConnectingPoint num="7" id="1316" />
+<TGConnectingPoint num="8" id="1317" />
+<TGConnectingPoint num="9" id="1318" />
+<TGConnectingPoint num="10" id="1319" />
+<TGConnectingPoint num="11" id="1320" />
+<TGConnectingPoint num="12" id="1321" />
+<TGConnectingPoint num="13" id="1322" />
+<TGConnectingPoint num="14" id="1323" />
+<TGConnectingPoint num="15" id="1324" />
+<TGConnectingPoint num="16" id="1325" />
+<TGConnectingPoint num="17" id="1326" />
+<TGConnectingPoint num="18" id="1327" />
+<TGConnectingPoint num="19" id="1328" />
+<TGConnectingPoint num="20" id="1329" />
+<TGConnectingPoint num="21" id="1330" />
+<TGConnectingPoint num="22" id="1331" />
+<TGConnectingPoint num="23" id="1332" />
+<TGConnectingPoint num="24" id="1333" />
+<TGConnectingPoint num="25" id="1334" />
+<TGConnectingPoint num="26" id="1335" />
+<TGConnectingPoint num="27" id="1336" />
+<TGConnectingPoint num="28" id="1337" />
+<TGConnectingPoint num="29" id="1338" />
+<TGConnectingPoint num="30" id="1339" />
+<TGConnectingPoint num="31" id="1340" />
+<TGConnectingPoint num="32" id="1341" />
+<TGConnectingPoint num="33" id="1342" />
+<TGConnectingPoint num="34" id="1343" />
+<TGConnectingPoint num="35" id="1344" />
+<TGConnectingPoint num="36" id="1345" />
+<TGConnectingPoint num="37" id="1346" />
+<TGConnectingPoint num="38" id="1347" />
+<TGConnectingPoint num="39" id="1348" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1386" >
+<COMPONENT type="5106" id="1390" >
 <cdparam x="631" y="381" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1346" />
-<TGConnectingPoint num="1" id="1347" />
-<TGConnectingPoint num="2" id="1348" />
-<TGConnectingPoint num="3" id="1349" />
-<TGConnectingPoint num="4" id="1350" />
-<TGConnectingPoint num="5" id="1351" />
-<TGConnectingPoint num="6" id="1352" />
-<TGConnectingPoint num="7" id="1353" />
-<TGConnectingPoint num="8" id="1354" />
-<TGConnectingPoint num="9" id="1355" />
-<TGConnectingPoint num="10" id="1356" />
-<TGConnectingPoint num="11" id="1357" />
-<TGConnectingPoint num="12" id="1358" />
-<TGConnectingPoint num="13" id="1359" />
-<TGConnectingPoint num="14" id="1360" />
-<TGConnectingPoint num="15" id="1361" />
-<TGConnectingPoint num="16" id="1362" />
-<TGConnectingPoint num="17" id="1363" />
-<TGConnectingPoint num="18" id="1364" />
-<TGConnectingPoint num="19" id="1365" />
-<TGConnectingPoint num="20" id="1366" />
-<TGConnectingPoint num="21" id="1367" />
-<TGConnectingPoint num="22" id="1368" />
-<TGConnectingPoint num="23" id="1369" />
-<TGConnectingPoint num="24" id="1370" />
-<TGConnectingPoint num="25" id="1371" />
-<TGConnectingPoint num="26" id="1372" />
-<TGConnectingPoint num="27" id="1373" />
-<TGConnectingPoint num="28" id="1374" />
-<TGConnectingPoint num="29" id="1375" />
-<TGConnectingPoint num="30" id="1376" />
-<TGConnectingPoint num="31" id="1377" />
-<TGConnectingPoint num="32" id="1378" />
-<TGConnectingPoint num="33" id="1379" />
-<TGConnectingPoint num="34" id="1380" />
-<TGConnectingPoint num="35" id="1381" />
-<TGConnectingPoint num="36" id="1382" />
-<TGConnectingPoint num="37" id="1383" />
-<TGConnectingPoint num="38" id="1384" />
-<TGConnectingPoint num="39" id="1385" />
+<TGConnectingPoint num="0" id="1350" />
+<TGConnectingPoint num="1" id="1351" />
+<TGConnectingPoint num="2" id="1352" />
+<TGConnectingPoint num="3" id="1353" />
+<TGConnectingPoint num="4" id="1354" />
+<TGConnectingPoint num="5" id="1355" />
+<TGConnectingPoint num="6" id="1356" />
+<TGConnectingPoint num="7" id="1357" />
+<TGConnectingPoint num="8" id="1358" />
+<TGConnectingPoint num="9" id="1359" />
+<TGConnectingPoint num="10" id="1360" />
+<TGConnectingPoint num="11" id="1361" />
+<TGConnectingPoint num="12" id="1362" />
+<TGConnectingPoint num="13" id="1363" />
+<TGConnectingPoint num="14" id="1364" />
+<TGConnectingPoint num="15" id="1365" />
+<TGConnectingPoint num="16" id="1366" />
+<TGConnectingPoint num="17" id="1367" />
+<TGConnectingPoint num="18" id="1368" />
+<TGConnectingPoint num="19" id="1369" />
+<TGConnectingPoint num="20" id="1370" />
+<TGConnectingPoint num="21" id="1371" />
+<TGConnectingPoint num="22" id="1372" />
+<TGConnectingPoint num="23" id="1373" />
+<TGConnectingPoint num="24" id="1374" />
+<TGConnectingPoint num="25" id="1375" />
+<TGConnectingPoint num="26" id="1376" />
+<TGConnectingPoint num="27" id="1377" />
+<TGConnectingPoint num="28" id="1378" />
+<TGConnectingPoint num="29" id="1379" />
+<TGConnectingPoint num="30" id="1380" />
+<TGConnectingPoint num="31" id="1381" />
+<TGConnectingPoint num="32" id="1382" />
+<TGConnectingPoint num="33" id="1383" />
+<TGConnectingPoint num="34" id="1384" />
+<TGConnectingPoint num="35" id="1385" />
+<TGConnectingPoint num="36" id="1386" />
+<TGConnectingPoint num="37" id="1387" />
+<TGConnectingPoint num="38" id="1388" />
+<TGConnectingPoint num="39" id="1389" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1503" >
-<cdparam x="18" y="370" />
+<COMPONENT type="5106" id="1507" >
+<cdparam x="23" y="372" />
 <sizeparam width="577" height="354" 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="Beverage" />
-<TGConnectingPoint num="0" id="1463" />
-<TGConnectingPoint num="1" id="1464" />
-<TGConnectingPoint num="2" id="1465" />
-<TGConnectingPoint num="3" id="1466" />
-<TGConnectingPoint num="4" id="1467" />
-<TGConnectingPoint num="5" id="1468" />
-<TGConnectingPoint num="6" id="1469" />
-<TGConnectingPoint num="7" id="1470" />
-<TGConnectingPoint num="8" id="1471" />
-<TGConnectingPoint num="9" id="1472" />
-<TGConnectingPoint num="10" id="1473" />
-<TGConnectingPoint num="11" id="1474" />
-<TGConnectingPoint num="12" id="1475" />
-<TGConnectingPoint num="13" id="1476" />
-<TGConnectingPoint num="14" id="1477" />
-<TGConnectingPoint num="15" id="1478" />
-<TGConnectingPoint num="16" id="1479" />
-<TGConnectingPoint num="17" id="1480" />
-<TGConnectingPoint num="18" id="1481" />
-<TGConnectingPoint num="19" id="1482" />
-<TGConnectingPoint num="20" id="1483" />
-<TGConnectingPoint num="21" id="1484" />
-<TGConnectingPoint num="22" id="1485" />
-<TGConnectingPoint num="23" id="1486" />
-<TGConnectingPoint num="24" id="1487" />
-<TGConnectingPoint num="25" id="1488" />
-<TGConnectingPoint num="26" id="1489" />
-<TGConnectingPoint num="27" id="1490" />
-<TGConnectingPoint num="28" id="1491" />
-<TGConnectingPoint num="29" id="1492" />
-<TGConnectingPoint num="30" id="1493" />
-<TGConnectingPoint num="31" id="1494" />
-<TGConnectingPoint num="32" id="1495" />
-<TGConnectingPoint num="33" id="1496" />
-<TGConnectingPoint num="34" id="1497" />
-<TGConnectingPoint num="35" id="1498" />
-<TGConnectingPoint num="36" id="1499" />
-<TGConnectingPoint num="37" id="1500" />
-<TGConnectingPoint num="38" id="1501" />
-<TGConnectingPoint num="39" id="1502" />
+<TGConnectingPoint num="0" id="1467" />
+<TGConnectingPoint num="1" id="1468" />
+<TGConnectingPoint num="2" id="1469" />
+<TGConnectingPoint num="3" id="1470" />
+<TGConnectingPoint num="4" id="1471" />
+<TGConnectingPoint num="5" id="1472" />
+<TGConnectingPoint num="6" id="1473" />
+<TGConnectingPoint num="7" id="1474" />
+<TGConnectingPoint num="8" id="1475" />
+<TGConnectingPoint num="9" id="1476" />
+<TGConnectingPoint num="10" id="1477" />
+<TGConnectingPoint num="11" id="1478" />
+<TGConnectingPoint num="12" id="1479" />
+<TGConnectingPoint num="13" id="1480" />
+<TGConnectingPoint num="14" id="1481" />
+<TGConnectingPoint num="15" id="1482" />
+<TGConnectingPoint num="16" id="1483" />
+<TGConnectingPoint num="17" id="1484" />
+<TGConnectingPoint num="18" id="1485" />
+<TGConnectingPoint num="19" id="1486" />
+<TGConnectingPoint num="20" id="1487" />
+<TGConnectingPoint num="21" id="1488" />
+<TGConnectingPoint num="22" id="1489" />
+<TGConnectingPoint num="23" id="1490" />
+<TGConnectingPoint num="24" id="1491" />
+<TGConnectingPoint num="25" id="1492" />
+<TGConnectingPoint num="26" id="1493" />
+<TGConnectingPoint num="27" id="1494" />
+<TGConnectingPoint num="28" id="1495" />
+<TGConnectingPoint num="29" id="1496" />
+<TGConnectingPoint num="30" id="1497" />
+<TGConnectingPoint num="31" id="1498" />
+<TGConnectingPoint num="32" id="1499" />
+<TGConnectingPoint num="33" id="1500" />
+<TGConnectingPoint num="34" id="1501" />
+<TGConnectingPoint num="35" id="1502" />
+<TGConnectingPoint num="36" id="1503" />
+<TGConnectingPoint num="37" id="1504" />
+<TGConnectingPoint num="38" id="1505" />
+<TGConnectingPoint num="39" id="1506" />
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5104" id="1397" >
-<father id="1503" num="0" />
-<cdparam x="237" y="527" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5103" id="1401" >
+<father id="1507" num="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1387" />
-<TGConnectingPoint num="1" id="1388" />
-<TGConnectingPoint num="2" id="1389" />
-<TGConnectingPoint num="3" id="1390" />
-<TGConnectingPoint num="4" id="1391" />
-<TGConnectingPoint num="5" id="1392" />
-<TGConnectingPoint num="6" id="1393" />
-<TGConnectingPoint num="7" id="1394" />
-<TGConnectingPoint num="8" id="1395" />
-<TGConnectingPoint num="9" id="1396" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="1391" />
+<TGConnectingPoint num="1" id="1392" />
+<TGConnectingPoint num="2" id="1393" />
+<TGConnectingPoint num="3" id="1394" />
+<TGConnectingPoint num="4" id="1395" />
+<TGConnectingPoint num="5" id="1396" />
+<TGConnectingPoint num="6" id="1397" />
+<TGConnectingPoint num="7" id="1398" />
+<TGConnectingPoint num="8" id="1399" />
+<TGConnectingPoint num="9" id="1400" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1438" >
-<father id="1503" num="1" />
-<cdparam x="189" y="435" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1412" >
+<father id="1507" num="1" />
+<cdparam x="63" y="529" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1398" />
-<TGConnectingPoint num="1" id="1399" />
-<TGConnectingPoint num="2" id="1400" />
-<TGConnectingPoint num="3" id="1401" />
-<TGConnectingPoint num="4" id="1402" />
-<TGConnectingPoint num="5" id="1403" />
-<TGConnectingPoint num="6" id="1404" />
-<TGConnectingPoint num="7" id="1405" />
-<TGConnectingPoint num="8" id="1406" />
-<TGConnectingPoint num="9" id="1407" />
-<TGConnectingPoint num="10" id="1408" />
-<TGConnectingPoint num="11" id="1409" />
-<TGConnectingPoint num="12" id="1410" />
-<TGConnectingPoint num="13" id="1411" />
-<TGConnectingPoint num="14" id="1412" />
-<TGConnectingPoint num="15" id="1413" />
-<TGConnectingPoint num="16" id="1414" />
-<TGConnectingPoint num="17" id="1415" />
-<TGConnectingPoint num="18" id="1416" />
-<TGConnectingPoint num="19" id="1417" />
-<TGConnectingPoint num="20" id="1418" />
-<TGConnectingPoint num="21" id="1419" />
-<TGConnectingPoint num="22" id="1420" />
-<TGConnectingPoint num="23" id="1421" />
-<TGConnectingPoint num="24" id="1422" />
-<TGConnectingPoint num="25" id="1423" />
-<TGConnectingPoint num="26" id="1424" />
-<TGConnectingPoint num="27" id="1425" />
-<TGConnectingPoint num="28" id="1426" />
-<TGConnectingPoint num="29" id="1427" />
-<TGConnectingPoint num="30" id="1428" />
-<TGConnectingPoint num="31" id="1429" />
-<TGConnectingPoint num="32" id="1430" />
-<TGConnectingPoint num="33" id="1431" />
-<TGConnectingPoint num="34" id="1432" />
-<TGConnectingPoint num="35" id="1433" />
-<TGConnectingPoint num="36" id="1434" />
-<TGConnectingPoint num="37" id="1435" />
-<TGConnectingPoint num="38" id="1436" />
-<TGConnectingPoint num="39" id="1437" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1402" />
+<TGConnectingPoint num="1" id="1403" />
+<TGConnectingPoint num="2" id="1404" />
+<TGConnectingPoint num="3" id="1405" />
+<TGConnectingPoint num="4" id="1406" />
+<TGConnectingPoint num="5" id="1407" />
+<TGConnectingPoint num="6" id="1408" />
+<TGConnectingPoint num="7" id="1409" />
+<TGConnectingPoint num="8" id="1410" />
+<TGConnectingPoint num="9" id="1411" />
+<accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1440" >
-<father id="1503" num="2" />
-<cdparam x="249" y="399" />
+<SUBCOMPONENT type="5100" id="1414" >
+<father id="1507" num="2" />
+<cdparam x="254" y="401" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1439" />
+<TGConnectingPoint num="0" id="1413" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1451" >
-<father id="1503" num="3" />
-<cdparam x="58" y="527" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5106" id="1455" >
+<father id="1507" num="3" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1441" />
-<TGConnectingPoint num="1" id="1442" />
-<TGConnectingPoint num="2" id="1443" />
-<TGConnectingPoint num="3" id="1444" />
-<TGConnectingPoint num="4" id="1445" />
-<TGConnectingPoint num="5" id="1446" />
-<TGConnectingPoint num="6" id="1447" />
-<TGConnectingPoint num="7" id="1448" />
-<TGConnectingPoint num="8" id="1449" />
-<TGConnectingPoint num="9" id="1450" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="1415" />
+<TGConnectingPoint num="1" id="1416" />
+<TGConnectingPoint num="2" id="1417" />
+<TGConnectingPoint num="3" id="1418" />
+<TGConnectingPoint num="4" id="1419" />
+<TGConnectingPoint num="5" id="1420" />
+<TGConnectingPoint num="6" id="1421" />
+<TGConnectingPoint num="7" id="1422" />
+<TGConnectingPoint num="8" id="1423" />
+<TGConnectingPoint num="9" id="1424" />
+<TGConnectingPoint num="10" id="1425" />
+<TGConnectingPoint num="11" id="1426" />
+<TGConnectingPoint num="12" id="1427" />
+<TGConnectingPoint num="13" id="1428" />
+<TGConnectingPoint num="14" id="1429" />
+<TGConnectingPoint num="15" id="1430" />
+<TGConnectingPoint num="16" id="1431" />
+<TGConnectingPoint num="17" id="1432" />
+<TGConnectingPoint num="18" id="1433" />
+<TGConnectingPoint num="19" id="1434" />
+<TGConnectingPoint num="20" id="1435" />
+<TGConnectingPoint num="21" id="1436" />
+<TGConnectingPoint num="22" id="1437" />
+<TGConnectingPoint num="23" id="1438" />
+<TGConnectingPoint num="24" id="1439" />
+<TGConnectingPoint num="25" id="1440" />
+<TGConnectingPoint num="26" id="1441" />
+<TGConnectingPoint num="27" id="1442" />
+<TGConnectingPoint num="28" id="1443" />
+<TGConnectingPoint num="29" id="1444" />
+<TGConnectingPoint num="30" id="1445" />
+<TGConnectingPoint num="31" id="1446" />
+<TGConnectingPoint num="32" id="1447" />
+<TGConnectingPoint num="33" id="1448" />
+<TGConnectingPoint num="34" id="1449" />
+<TGConnectingPoint num="35" id="1450" />
+<TGConnectingPoint num="36" id="1451" />
+<TGConnectingPoint num="37" id="1452" />
+<TGConnectingPoint num="38" id="1453" />
+<TGConnectingPoint num="39" id="1454" />
+<latencyCheck />
+<extraparam>
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1462" >
-<father id="1503" num="4" />
-<cdparam x="372" y="500" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1466" >
+<father id="1507" num="4" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1452" />
-<TGConnectingPoint num="1" id="1453" />
-<TGConnectingPoint num="2" id="1454" />
-<TGConnectingPoint num="3" id="1455" />
-<TGConnectingPoint num="4" id="1456" />
-<TGConnectingPoint num="5" id="1457" />
-<TGConnectingPoint num="6" id="1458" />
-<TGConnectingPoint num="7" id="1459" />
-<TGConnectingPoint num="8" id="1460" />
-<TGConnectingPoint num="9" id="1461" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="1456" />
+<TGConnectingPoint num="1" id="1457" />
+<TGConnectingPoint num="2" id="1458" />
+<TGConnectingPoint num="3" id="1459" />
+<TGConnectingPoint num="4" id="1460" />
+<TGConnectingPoint num="5" id="1461" />
+<TGConnectingPoint num="6" id="1462" />
+<TGConnectingPoint num="7" id="1463" />
+<TGConnectingPoint num="8" id="1464" />
+<TGConnectingPoint num="9" id="1465" />
 <accessibility />
 </SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1510" >
-<cdparam x="363" y="193" />
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1514" >
+<cdparam x="177" y="199" />
 <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="1509" />
-<P1  x="363" y="204" id="1526" />
-<P2  x="362" y="257" id="1537" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1513" />
+<P1  x="340" y="233" id="1620" />
+<P2  x="353" y="252" id="1622" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1508" >
-<father id="1510" num="0" />
-<cdparam x="380" y="228" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1512" >
+<father id="1514" num="0" />
+<cdparam x="177" y="239" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1504" />
-<TGConnectingPoint num="1" id="1505" />
-<TGConnectingPoint num="2" id="1506" />
-<TGConnectingPoint num="3" id="1507" />
+<TGConnectingPoint num="0" id="1508" />
+<TGConnectingPoint num="1" id="1509" />
+<TGConnectingPoint num="2" id="1510" />
+<TGConnectingPoint num="3" id="1511" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
+<afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
@@ -2952,25 +2989,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1517" >
-<cdparam x="363" y="150" />
+<CONNECTOR type="5102" id="1521" >
+<cdparam x="322" y="69" />
 <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="1516" />
-<P1  x="363" y="150" id="1583" />
-<P2  x="363" y="174" id="1525" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1520" />
+<P1  x="322" y="69" id="1618" />
+<P2  x="323" y="88" id="1578" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1515" >
-<father id="1517" num="0" />
-<cdparam x="363" y="190" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1519" >
+<father id="1521" num="0" />
+<cdparam x="322" y="109" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1511" />
-<TGConnectingPoint num="1" id="1512" />
-<TGConnectingPoint num="2" id="1513" />
-<TGConnectingPoint num="3" id="1514" />
+<TGConnectingPoint num="0" id="1515" />
+<TGConnectingPoint num="1" id="1516" />
+<TGConnectingPoint num="2" id="1517" />
+<TGConnectingPoint num="3" id="1518" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2981,25 +3018,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1524" >
-<cdparam x="362" y="101" />
+<CONNECTOR type="5102" id="1528" >
+<cdparam x="377" y="144" />
 <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="1523" />
-<P1  x="362" y="101" id="1618" />
-<P2  x="363" y="120" id="1578" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1527" />
+<P1  x="323" y="118" id="1583" />
+<P2  x="356" y="174" id="1634" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1522" >
-<father id="1524" num="0" />
-<cdparam x="362" y="141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1526" >
+<father id="1528" num="0" />
+<cdparam x="377" y="184" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1518" />
-<TGConnectingPoint num="1" id="1519" />
-<TGConnectingPoint num="2" id="1520" />
-<TGConnectingPoint num="3" id="1521" />
+<TGConnectingPoint num="0" id="1522" />
+<TGConnectingPoint num="1" id="1523" />
+<TGConnectingPoint num="2" id="1524" />
+<TGConnectingPoint num="3" id="1525" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3010,26 +3047,37 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1535" >
-<cdparam x="340" y="179" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1535" >
+<cdparam x="377" y="187" />
+<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="1534" />
+<P1  x="353" y="282" id="1623" />
+<P2  x="399" y="352" id="1537" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1533" >
+<father id="1535" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1525" />
-<TGConnectingPoint num="1" id="1526" />
-<TGConnectingPoint num="2" id="1527" />
-<TGConnectingPoint num="3" id="1528" />
-<TGConnectingPoint num="4" id="1529" />
-<TGConnectingPoint num="5" id="1530" />
-<TGConnectingPoint num="6" id="1531" />
-<TGConnectingPoint num="7" id="1532" />
-<TGConnectingPoint num="8" id="1533" />
-<TGConnectingPoint num="9" id="1534" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1529" />
+<TGConnectingPoint num="1" id="1530" />
+<TGConnectingPoint num="2" id="1531" />
+<TGConnectingPoint num="3" id="1532" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
 
 <COMPONENT type="5106" id="1576" >
-<cdparam x="337" y="257" />
+<cdparam x="374" y="352" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -3079,7 +3127,7 @@
 </COMPONENT>
 
 <COMPONENT type="5106" id="1617" >
-<cdparam x="338" y="120" />
+<cdparam x="298" y="88" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -3129,7 +3177,7 @@
 </COMPONENT>
 
 <COMPONENT type="5100" id="1619" >
-<cdparam x="355" y="81" />
+<cdparam x="315" y="49" />
 <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" />
@@ -3137,32 +3185,109 @@
 <TGConnectingPoint num="0" id="1618" />
 </COMPONENT>
 
+<COMPONENT type="5106" id="1673" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" 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="state0" />
+<TGConnectingPoint num="0" id="1633" />
+<TGConnectingPoint num="1" id="1634" />
+<TGConnectingPoint num="2" id="1635" />
+<TGConnectingPoint num="3" id="1636" />
+<TGConnectingPoint num="4" id="1637" />
+<TGConnectingPoint num="5" id="1638" />
+<TGConnectingPoint num="6" id="1639" />
+<TGConnectingPoint num="7" id="1640" />
+<TGConnectingPoint num="8" id="1641" />
+<TGConnectingPoint num="9" id="1642" />
+<TGConnectingPoint num="10" id="1643" />
+<TGConnectingPoint num="11" id="1644" />
+<TGConnectingPoint num="12" id="1645" />
+<TGConnectingPoint num="13" id="1646" />
+<TGConnectingPoint num="14" id="1647" />
+<TGConnectingPoint num="15" id="1648" />
+<TGConnectingPoint num="16" id="1649" />
+<TGConnectingPoint num="17" id="1650" />
+<TGConnectingPoint num="18" id="1651" />
+<TGConnectingPoint num="19" id="1652" />
+<TGConnectingPoint num="20" id="1653" />
+<TGConnectingPoint num="21" id="1654" />
+<TGConnectingPoint num="22" id="1655" />
+<TGConnectingPoint num="23" id="1656" />
+<TGConnectingPoint num="24" id="1657" />
+<TGConnectingPoint num="25" id="1658" />
+<TGConnectingPoint num="26" id="1659" />
+<TGConnectingPoint num="27" id="1660" />
+<TGConnectingPoint num="28" id="1661" />
+<TGConnectingPoint num="29" id="1662" />
+<TGConnectingPoint num="30" id="1663" />
+<TGConnectingPoint num="31" id="1664" />
+<TGConnectingPoint num="32" id="1665" />
+<TGConnectingPoint num="33" id="1666" />
+<TGConnectingPoint num="34" id="1667" />
+<TGConnectingPoint num="35" id="1668" />
+<TGConnectingPoint num="36" id="1669" />
+<TGConnectingPoint num="37" id="1670" />
+<TGConnectingPoint num="38" id="1671" />
+<TGConnectingPoint num="39" id="1672" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5100" id="1621" >
+<father id="1673" num="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1620" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="1632" >
+<father id="1673" num="1" />
+<cdparam x="330" y="257" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1622" />
+<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="2" id="1624" />
+<TGConnectingPoint num="3" id="1625" />
+<TGConnectingPoint num="4" id="1626" />
+<TGConnectingPoint num="5" id="1627" />
+<TGConnectingPoint num="6" id="1628" />
+<TGConnectingPoint num="7" id="1629" />
+<TGConnectingPoint num="8" id="1630" />
+<TGConnectingPoint num="9" id="1631" />
+</SUBCOMPONENT>
+
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1626" >
-<cdparam x="177" y="199" />
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1680" >
+<cdparam x="363" y="193" />
 <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="1625" />
-<P1  x="340" y="233" id="1743" />
-<P2  x="353" y="252" id="1732" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1679" />
+<P1  x="363" y="204" id="1696" />
+<P2  x="362" y="257" id="1707" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1624" >
-<father id="1626" num="0" />
-<cdparam x="177" y="239" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1678" >
+<father id="1680" num="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1620" />
-<TGConnectingPoint num="1" id="1621" />
-<TGConnectingPoint num="2" id="1622" />
-<TGConnectingPoint num="3" id="1623" />
+<TGConnectingPoint num="0" id="1674" />
+<TGConnectingPoint num="1" id="1675" />
+<TGConnectingPoint num="2" id="1676" />
+<TGConnectingPoint num="3" id="1677" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
@@ -3170,25 +3295,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1633" >
-<cdparam x="322" y="69" />
+<CONNECTOR type="5102" id="1687" >
+<cdparam x="363" y="150" />
 <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="1632" />
-<P1  x="322" y="69" id="1730" />
-<P2  x="323" y="88" id="1690" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1686" />
+<P1  x="363" y="150" id="1753" />
+<P2  x="363" y="174" id="1695" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1631" >
-<father id="1633" num="0" />
-<cdparam x="322" y="109" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1685" >
+<father id="1687" num="0" />
+<cdparam x="363" y="190" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1627" />
-<TGConnectingPoint num="1" id="1628" />
-<TGConnectingPoint num="2" id="1629" />
-<TGConnectingPoint num="3" id="1630" />
+<TGConnectingPoint num="0" id="1681" />
+<TGConnectingPoint num="1" id="1682" />
+<TGConnectingPoint num="2" id="1683" />
+<TGConnectingPoint num="3" id="1684" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3199,25 +3324,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1640" >
-<cdparam x="377" y="144" />
+<CONNECTOR type="5102" id="1694" >
+<cdparam x="362" y="101" />
 <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="1639" />
-<P1  x="323" y="118" id="1695" />
-<P2  x="356" y="174" id="1746" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1693" />
+<P1  x="362" y="101" id="1788" />
+<P2  x="363" y="120" id="1748" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1638" >
-<father id="1640" num="0" />
-<cdparam x="377" y="184" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1692" >
+<father id="1694" num="0" />
+<cdparam x="362" 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="1634" />
-<TGConnectingPoint num="1" id="1635" />
-<TGConnectingPoint num="2" id="1636" />
-<TGConnectingPoint num="3" id="1637" />
+<TGConnectingPoint num="0" id="1688" />
+<TGConnectingPoint num="1" id="1689" />
+<TGConnectingPoint num="2" id="1690" />
+<TGConnectingPoint num="3" id="1691" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3228,220 +3353,132 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1647" >
-<cdparam x="377" y="187" />
-<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="1646" />
-<P1  x="353" y="282" id="1733" />
-<P2  x="399" y="352" id="1649" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1645" >
-<father id="1647" num="0" />
-<cdparam x="417" y="335" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1705" >
+<cdparam x="340" y="179" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1641" />
-<TGConnectingPoint num="1" id="1642" />
-<TGConnectingPoint num="2" id="1643" />
-<TGConnectingPoint num="3" id="1644" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1695" />
+<TGConnectingPoint num="1" id="1696" />
+<TGConnectingPoint num="2" id="1697" />
+<TGConnectingPoint num="3" id="1698" />
+<TGConnectingPoint num="4" id="1699" />
+<TGConnectingPoint num="5" id="1700" />
+<TGConnectingPoint num="6" id="1701" />
+<TGConnectingPoint num="7" id="1702" />
+<TGConnectingPoint num="8" id="1703" />
+<TGConnectingPoint num="9" id="1704" />
+</COMPONENT>
 
-<COMPONENT type="5106" id="1688" >
-<cdparam x="374" y="352" />
+<COMPONENT type="5106" id="1746" >
+<cdparam x="337" y="257" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1648" />
-<TGConnectingPoint num="1" id="1649" />
-<TGConnectingPoint num="2" id="1650" />
-<TGConnectingPoint num="3" id="1651" />
-<TGConnectingPoint num="4" id="1652" />
-<TGConnectingPoint num="5" id="1653" />
-<TGConnectingPoint num="6" id="1654" />
-<TGConnectingPoint num="7" id="1655" />
-<TGConnectingPoint num="8" id="1656" />
-<TGConnectingPoint num="9" id="1657" />
-<TGConnectingPoint num="10" id="1658" />
-<TGConnectingPoint num="11" id="1659" />
-<TGConnectingPoint num="12" id="1660" />
-<TGConnectingPoint num="13" id="1661" />
-<TGConnectingPoint num="14" id="1662" />
-<TGConnectingPoint num="15" id="1663" />
-<TGConnectingPoint num="16" id="1664" />
-<TGConnectingPoint num="17" id="1665" />
-<TGConnectingPoint num="18" id="1666" />
-<TGConnectingPoint num="19" id="1667" />
-<TGConnectingPoint num="20" id="1668" />
-<TGConnectingPoint num="21" id="1669" />
-<TGConnectingPoint num="22" id="1670" />
-<TGConnectingPoint num="23" id="1671" />
-<TGConnectingPoint num="24" id="1672" />
-<TGConnectingPoint num="25" id="1673" />
-<TGConnectingPoint num="26" id="1674" />
-<TGConnectingPoint num="27" id="1675" />
-<TGConnectingPoint num="28" id="1676" />
-<TGConnectingPoint num="29" id="1677" />
-<TGConnectingPoint num="30" id="1678" />
-<TGConnectingPoint num="31" id="1679" />
-<TGConnectingPoint num="32" id="1680" />
-<TGConnectingPoint num="33" id="1681" />
-<TGConnectingPoint num="34" id="1682" />
-<TGConnectingPoint num="35" id="1683" />
-<TGConnectingPoint num="36" id="1684" />
-<TGConnectingPoint num="37" id="1685" />
-<TGConnectingPoint num="38" id="1686" />
-<TGConnectingPoint num="39" id="1687" />
+<TGConnectingPoint num="0" id="1706" />
+<TGConnectingPoint num="1" id="1707" />
+<TGConnectingPoint num="2" id="1708" />
+<TGConnectingPoint num="3" id="1709" />
+<TGConnectingPoint num="4" id="1710" />
+<TGConnectingPoint num="5" id="1711" />
+<TGConnectingPoint num="6" id="1712" />
+<TGConnectingPoint num="7" id="1713" />
+<TGConnectingPoint num="8" id="1714" />
+<TGConnectingPoint num="9" id="1715" />
+<TGConnectingPoint num="10" id="1716" />
+<TGConnectingPoint num="11" id="1717" />
+<TGConnectingPoint num="12" id="1718" />
+<TGConnectingPoint num="13" id="1719" />
+<TGConnectingPoint num="14" id="1720" />
+<TGConnectingPoint num="15" id="1721" />
+<TGConnectingPoint num="16" id="1722" />
+<TGConnectingPoint num="17" id="1723" />
+<TGConnectingPoint num="18" id="1724" />
+<TGConnectingPoint num="19" id="1725" />
+<TGConnectingPoint num="20" id="1726" />
+<TGConnectingPoint num="21" id="1727" />
+<TGConnectingPoint num="22" id="1728" />
+<TGConnectingPoint num="23" id="1729" />
+<TGConnectingPoint num="24" id="1730" />
+<TGConnectingPoint num="25" id="1731" />
+<TGConnectingPoint num="26" id="1732" />
+<TGConnectingPoint num="27" id="1733" />
+<TGConnectingPoint num="28" id="1734" />
+<TGConnectingPoint num="29" id="1735" />
+<TGConnectingPoint num="30" id="1736" />
+<TGConnectingPoint num="31" id="1737" />
+<TGConnectingPoint num="32" id="1738" />
+<TGConnectingPoint num="33" id="1739" />
+<TGConnectingPoint num="34" id="1740" />
+<TGConnectingPoint num="35" id="1741" />
+<TGConnectingPoint num="36" id="1742" />
+<TGConnectingPoint num="37" id="1743" />
+<TGConnectingPoint num="38" id="1744" />
+<TGConnectingPoint num="39" id="1745" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1729" >
-<cdparam x="298" y="88" />
+<COMPONENT type="5106" id="1787" >
+<cdparam x="338" y="120" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1689" />
-<TGConnectingPoint num="1" id="1690" />
-<TGConnectingPoint num="2" id="1691" />
-<TGConnectingPoint num="3" id="1692" />
-<TGConnectingPoint num="4" id="1693" />
-<TGConnectingPoint num="5" id="1694" />
-<TGConnectingPoint num="6" id="1695" />
-<TGConnectingPoint num="7" id="1696" />
-<TGConnectingPoint num="8" id="1697" />
-<TGConnectingPoint num="9" id="1698" />
-<TGConnectingPoint num="10" id="1699" />
-<TGConnectingPoint num="11" id="1700" />
-<TGConnectingPoint num="12" id="1701" />
-<TGConnectingPoint num="13" id="1702" />
-<TGConnectingPoint num="14" id="1703" />
-<TGConnectingPoint num="15" id="1704" />
-<TGConnectingPoint num="16" id="1705" />
-<TGConnectingPoint num="17" id="1706" />
-<TGConnectingPoint num="18" id="1707" />
-<TGConnectingPoint num="19" id="1708" />
-<TGConnectingPoint num="20" id="1709" />
-<TGConnectingPoint num="21" id="1710" />
-<TGConnectingPoint num="22" id="1711" />
-<TGConnectingPoint num="23" id="1712" />
-<TGConnectingPoint num="24" id="1713" />
-<TGConnectingPoint num="25" id="1714" />
-<TGConnectingPoint num="26" id="1715" />
-<TGConnectingPoint num="27" id="1716" />
-<TGConnectingPoint num="28" id="1717" />
-<TGConnectingPoint num="29" id="1718" />
-<TGConnectingPoint num="30" id="1719" />
-<TGConnectingPoint num="31" id="1720" />
-<TGConnectingPoint num="32" id="1721" />
-<TGConnectingPoint num="33" id="1722" />
-<TGConnectingPoint num="34" id="1723" />
-<TGConnectingPoint num="35" id="1724" />
-<TGConnectingPoint num="36" id="1725" />
-<TGConnectingPoint num="37" id="1726" />
-<TGConnectingPoint num="38" id="1727" />
-<TGConnectingPoint num="39" id="1728" />
+<TGConnectingPoint num="0" id="1747" />
+<TGConnectingPoint num="1" id="1748" />
+<TGConnectingPoint num="2" id="1749" />
+<TGConnectingPoint num="3" id="1750" />
+<TGConnectingPoint num="4" id="1751" />
+<TGConnectingPoint num="5" id="1752" />
+<TGConnectingPoint num="6" id="1753" />
+<TGConnectingPoint num="7" id="1754" />
+<TGConnectingPoint num="8" id="1755" />
+<TGConnectingPoint num="9" id="1756" />
+<TGConnectingPoint num="10" id="1757" />
+<TGConnectingPoint num="11" id="1758" />
+<TGConnectingPoint num="12" id="1759" />
+<TGConnectingPoint num="13" id="1760" />
+<TGConnectingPoint num="14" id="1761" />
+<TGConnectingPoint num="15" id="1762" />
+<TGConnectingPoint num="16" id="1763" />
+<TGConnectingPoint num="17" id="1764" />
+<TGConnectingPoint num="18" id="1765" />
+<TGConnectingPoint num="19" id="1766" />
+<TGConnectingPoint num="20" id="1767" />
+<TGConnectingPoint num="21" id="1768" />
+<TGConnectingPoint num="22" id="1769" />
+<TGConnectingPoint num="23" id="1770" />
+<TGConnectingPoint num="24" id="1771" />
+<TGConnectingPoint num="25" id="1772" />
+<TGConnectingPoint num="26" id="1773" />
+<TGConnectingPoint num="27" id="1774" />
+<TGConnectingPoint num="28" id="1775" />
+<TGConnectingPoint num="29" id="1776" />
+<TGConnectingPoint num="30" id="1777" />
+<TGConnectingPoint num="31" id="1778" />
+<TGConnectingPoint num="32" id="1779" />
+<TGConnectingPoint num="33" id="1780" />
+<TGConnectingPoint num="34" id="1781" />
+<TGConnectingPoint num="35" id="1782" />
+<TGConnectingPoint num="36" id="1783" />
+<TGConnectingPoint num="37" id="1784" />
+<TGConnectingPoint num="38" id="1785" />
+<TGConnectingPoint num="39" id="1786" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1731" >
-<cdparam x="315" y="49" />
+<COMPONENT type="5100" id="1789" >
+<cdparam x="355" 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="1730" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1785" >
-<cdparam x="264" y="174" />
-<sizeparam width="184" height="130" 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="state0" />
-<TGConnectingPoint num="0" id="1745" />
-<TGConnectingPoint num="1" id="1746" />
-<TGConnectingPoint num="2" id="1747" />
-<TGConnectingPoint num="3" id="1748" />
-<TGConnectingPoint num="4" id="1749" />
-<TGConnectingPoint num="5" id="1750" />
-<TGConnectingPoint num="6" id="1751" />
-<TGConnectingPoint num="7" id="1752" />
-<TGConnectingPoint num="8" id="1753" />
-<TGConnectingPoint num="9" id="1754" />
-<TGConnectingPoint num="10" id="1755" />
-<TGConnectingPoint num="11" id="1756" />
-<TGConnectingPoint num="12" id="1757" />
-<TGConnectingPoint num="13" id="1758" />
-<TGConnectingPoint num="14" id="1759" />
-<TGConnectingPoint num="15" id="1760" />
-<TGConnectingPoint num="16" id="1761" />
-<TGConnectingPoint num="17" id="1762" />
-<TGConnectingPoint num="18" id="1763" />
-<TGConnectingPoint num="19" id="1764" />
-<TGConnectingPoint num="20" id="1765" />
-<TGConnectingPoint num="21" id="1766" />
-<TGConnectingPoint num="22" id="1767" />
-<TGConnectingPoint num="23" id="1768" />
-<TGConnectingPoint num="24" id="1769" />
-<TGConnectingPoint num="25" id="1770" />
-<TGConnectingPoint num="26" id="1771" />
-<TGConnectingPoint num="27" id="1772" />
-<TGConnectingPoint num="28" id="1773" />
-<TGConnectingPoint num="29" id="1774" />
-<TGConnectingPoint num="30" id="1775" />
-<TGConnectingPoint num="31" id="1776" />
-<TGConnectingPoint num="32" id="1777" />
-<TGConnectingPoint num="33" id="1778" />
-<TGConnectingPoint num="34" id="1779" />
-<TGConnectingPoint num="35" id="1780" />
-<TGConnectingPoint num="36" id="1781" />
-<TGConnectingPoint num="37" id="1782" />
-<TGConnectingPoint num="38" id="1783" />
-<TGConnectingPoint num="39" id="1784" />
-<extraparam>
-</extraparam>
+<TGConnectingPoint num="0" id="1788" />
 </COMPONENT>
-<SUBCOMPONENT type="5103" id="1742" >
-<father id="1785" num="0" />
-<cdparam x="330" y="257" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1732" />
-<TGConnectingPoint num="1" id="1733" />
-<TGConnectingPoint num="2" id="1734" />
-<TGConnectingPoint num="3" id="1735" />
-<TGConnectingPoint num="4" id="1736" />
-<TGConnectingPoint num="5" id="1737" />
-<TGConnectingPoint num="6" id="1738" />
-<TGConnectingPoint num="7" id="1739" />
-<TGConnectingPoint num="8" id="1740" />
-<TGConnectingPoint num="9" id="1741" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1744" >
-<father id="1785" num="1" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1743" />
-</SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index 69f21fe11e225ac21b038f1314e35b2c202cd433..605cd44377fca4e81f9626250db404c2b5e1e7ce 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -440,7 +440,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
                 // Setting stereotype
                 s = dialog.getStereotype().trim();
 
-                if (!TAttribute.isAValidId(s.substring(2, s.length()-2), false, false)) {
+                if (!TAttribute.isAValidId(s, false, false)) {
                     JOptionPane.showMessageDialog(frame,
                             "Could not use the new stereotype: the new stereotype name is not valid",
                             "Error",