diff --git a/modeling/CoffeeMachine_Avatar.xml b/modeling/CoffeeMachine_Avatar.xml
index 8c1ede62a7cb93640e0783f85a554b5d9c9d52a4..0cc58a6b7bc878b7ff8711c7b2d72af97941f48a 100644
--- a/modeling/CoffeeMachine_Avatar.xml
+++ b/modeling/CoffeeMachine_Avatar.xml
@@ -46,6 +46,7 @@
 <textline data="must be ejected" />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
@@ -94,6 +95,7 @@
 <textline data="no less than 99.99%" />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
@@ -141,6 +143,7 @@
 <textline data="Requirements of the coffee machine" />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
@@ -235,6 +238,7 @@
 <textline data="negative number of coins" />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
@@ -306,6 +310,7 @@
 <textline data=" inserted more than 50 units of time" />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="123" />
 <satisfied data="false" />
 <verified data="false" />
@@ -357,72 +362,81 @@
 <textline data="machine." />
 <kind data="Functional" />
 <criticality data="Low" />
+<reqType data="0" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="5202" id="241" >
+<CONNECTOR type="5202" id="242" >
 <cdparam x="659" y="79" />
 <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;deriveReqt&gt;&gt;" />
+<TGConnectingPoint num="0" id="241" />
 <P1  x="661" y="47" id="1" />
 <P2  x="496" y="43" id="180" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="242" >
+<CONNECTOR type="5205" id="244" >
 <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="243" />
 <P1  x="122" y="457" id="39" />
 <P2  x="122" y="302" id="76" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="243" >
+<CONNECTOR type="5205" id="246" >
 <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="245" />
 <P1  x="206" y="327" id="209" />
 <P2  x="160" y="272" id="70" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="244" >
+<CONNECTOR type="5205" id="248" >
 <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="247" />
 <P1  x="234" y="199" id="130" />
 <P2  x="160" y="212" id="68" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="245" >
+<CONNECTOR type="5205" id="250" >
 <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="249" />
 <P1  x="192" y="98" id="179" />
 <P2  x="122" y="182" id="73" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="246" >
+<CONNECTOR type="5203" id="252" >
 <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="251" />
 <P1  x="627" y="391" id="98" />
 <P2  x="563" y="361" id="225" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="247" >
+<CONNECTOR type="5203" id="254" >
 <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="253" />
 <P1  x="580" y="261" id="114" />
 <P2  x="505" y="199" id="145" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="248" >
+<CONNECTOR type="5203" id="256" >
 <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="255" />
 <P1  x="582" y="170" id="162" />
 <P2  x="496" y="98" id="194" />
 <AutomaticDrawing  data="true" />
@@ -431,33 +445,37 @@
 </AvatarRDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="249" >
+<CONNECTOR type="5312" id="258" >
 <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" />
-<P1  x="502" y="258" id="368" />
-<P2  x="502" y="334" id="256" />
+<TGConnectingPoint num="0" id="257" />
+<P1  x="502" y="258" id="383" />
+<P2  x="502" y="334" id="271" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="252" >
+<CONNECTOR type="5310" id="264" >
 <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="" />
-<P1  x="492" y="126" id="331" />
-<P2  x="492" y="209" id="372" />
+<TGConnectingPoint num="0" id="261" />
+<TGConnectingPoint num="1" id="262" />
+<TGConnectingPoint num="2" id="263" />
+<P1  x="492" y="126" id="346" />
+<P2  x="492" y="209" id="387" />
 <Point x="467" y="147" />
 <Point x="467" y="192" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="250" >
-<father id="252" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="259" >
+<father id="264" num="0" />
 <cdparam x="467" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" 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="251" >
-<father id="252" num="1" />
+<SUBCOMPONENT type="-1" id="260" >
+<father id="264" num="1" />
 <cdparam x="467" y="192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -465,226 +483,229 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="253" >
+<CONNECTOR type="5311" id="266" >
 <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="" />
-<P1  x="313" y="261" id="294" />
-<P2  x="361" y="261" id="269" />
+<TGConnectingPoint num="0" id="265" />
+<P1  x="313" y="261" id="296" />
+<P2  x="361" y="261" id="284" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="254" >
+<CONNECTOR type="5312" id="268" >
 <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" />
-<P1  x="390" y="286" id="267" />
-<P2  x="390" y="331" id="261" />
+<TGConnectingPoint num="0" id="267" />
+<P1  x="390" y="286" id="282" />
+<P2  x="390" y="331" id="276" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="255" >
+<CONNECTOR type="5311" id="270" >
 <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="" />
-<P1  x="309" y="211" id="281" />
-<P2  x="361" y="211" id="268" />
+<TGConnectingPoint num="0" id="269" />
+<P1  x="309" y="211" id="309" />
+<P2  x="361" y="211" id="283" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="260" >
+<COMPONENT type="5308" id="275" >
 <cdparam x="446" y="334" />
 <sizeparam width="112" height="55" minWidth="100" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="256" />
-<TGConnectingPoint num="1" id="257" />
-<TGConnectingPoint num="2" id="258" />
-<TGConnectingPoint num="3" id="259" />
+<TGConnectingPoint num="0" id="271" />
+<TGConnectingPoint num="1" id="272" />
+<TGConnectingPoint num="2" id="273" />
+<TGConnectingPoint num="3" id="274" />
 <extraparam>
 <liveness data="true" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="265" >
+<COMPONENT type="5308" id="280" >
 <cdparam x="340" y="331" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="261" />
-<TGConnectingPoint num="1" id="262" />
-<TGConnectingPoint num="2" id="263" />
-<TGConnectingPoint num="3" id="264" />
+<TGConnectingPoint num="0" id="276" />
+<TGConnectingPoint num="1" id="277" />
+<TGConnectingPoint num="2" id="278" />
+<TGConnectingPoint num="3" id="279" />
 <extraparam>
 <liveness data="false" />
 <not data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="278" >
+<COMPONENT type="5302" id="293" >
 <cdparam x="361" y="187" />
 <sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="&gt;50" />
-<TGConnectingPoint num="0" id="266" />
-<TGConnectingPoint num="1" id="267" />
-<TGConnectingPoint num="2" id="268" />
-<TGConnectingPoint num="3" id="269" />
-<TGConnectingPoint num="4" id="270" />
-<TGConnectingPoint num="5" id="271" />
-<TGConnectingPoint num="6" id="272" />
-<TGConnectingPoint num="7" id="273" />
-<TGConnectingPoint num="8" id="274" />
-<TGConnectingPoint num="9" id="275" />
-<TGConnectingPoint num="10" id="276" />
-<TGConnectingPoint num="11" id="277" />
+<TGConnectingPoint num="0" id="281" />
+<TGConnectingPoint num="1" id="282" />
+<TGConnectingPoint num="2" id="283" />
+<TGConnectingPoint num="3" id="284" />
+<TGConnectingPoint num="4" id="285" />
+<TGConnectingPoint num="5" id="286" />
+<TGConnectingPoint num="6" id="287" />
+<TGConnectingPoint num="7" id="288" />
+<TGConnectingPoint num="8" id="289" />
+<TGConnectingPoint num="9" id="290" />
+<TGConnectingPoint num="10" id="291" />
+<TGConnectingPoint num="11" id="292" />
 </COMPONENT>
 
-<COMPONENT type="5300" id="329" >
+<COMPONENT type="5300" id="344" >
 <cdparam x="150" y="142" />
 <sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="1000" 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="305" />
-<TGConnectingPoint num="1" id="306" />
-<TGConnectingPoint num="2" id="307" />
-<TGConnectingPoint num="3" id="308" />
-<TGConnectingPoint num="4" id="309" />
-<TGConnectingPoint num="5" id="310" />
-<TGConnectingPoint num="6" id="311" />
-<TGConnectingPoint num="7" id="312" />
-<TGConnectingPoint num="8" id="313" />
-<TGConnectingPoint num="9" id="314" />
-<TGConnectingPoint num="10" id="315" />
-<TGConnectingPoint num="11" id="316" />
-<TGConnectingPoint num="12" id="317" />
-<TGConnectingPoint num="13" id="318" />
-<TGConnectingPoint num="14" id="319" />
-<TGConnectingPoint num="15" id="320" />
-<TGConnectingPoint num="16" id="321" />
-<TGConnectingPoint num="17" id="322" />
-<TGConnectingPoint num="18" id="323" />
-<TGConnectingPoint num="19" id="324" />
-<TGConnectingPoint num="20" id="325" />
-<TGConnectingPoint num="21" id="326" />
-<TGConnectingPoint num="22" id="327" />
-<TGConnectingPoint num="23" id="328" />
+<TGConnectingPoint num="0" id="320" />
+<TGConnectingPoint num="1" id="321" />
+<TGConnectingPoint num="2" id="322" />
+<TGConnectingPoint num="3" id="323" />
+<TGConnectingPoint num="4" id="324" />
+<TGConnectingPoint num="5" id="325" />
+<TGConnectingPoint num="6" id="326" />
+<TGConnectingPoint num="7" id="327" />
+<TGConnectingPoint num="8" id="328" />
+<TGConnectingPoint num="9" id="329" />
+<TGConnectingPoint num="10" id="330" />
+<TGConnectingPoint num="11" id="331" />
+<TGConnectingPoint num="12" id="332" />
+<TGConnectingPoint num="13" id="333" />
+<TGConnectingPoint num="14" id="334" />
+<TGConnectingPoint num="15" id="335" />
+<TGConnectingPoint num="16" id="336" />
+<TGConnectingPoint num="17" id="337" />
+<TGConnectingPoint num="18" id="338" />
+<TGConnectingPoint num="19" id="339" />
+<TGConnectingPoint num="20" id="340" />
+<TGConnectingPoint num="21" id="341" />
+<TGConnectingPoint num="22" id="342" />
+<TGConnectingPoint num="23" id="343" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="291" >
-<father id="329" num="0" />
-<cdparam x="170" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="1000" 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="279" />
-<TGConnectingPoint num="1" id="280" />
-<TGConnectingPoint num="2" id="281" />
-<TGConnectingPoint num="3" id="282" />
-<TGConnectingPoint num="4" id="283" />
-<TGConnectingPoint num="5" id="284" />
-<TGConnectingPoint num="6" id="285" />
-<TGConnectingPoint num="7" id="286" />
-<TGConnectingPoint num="8" id="287" />
-<TGConnectingPoint num="9" id="288" />
-<TGConnectingPoint num="10" id="289" />
-<TGConnectingPoint num="11" id="290" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="304" >
-<father id="329" num="1" />
+<SUBCOMPONENT type="5304" id="306" >
+<father id="344" num="0" />
 <cdparam x="165" y="241" />
 <sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="1000" 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="292" />
-<TGConnectingPoint num="1" id="293" />
-<TGConnectingPoint num="2" id="294" />
-<TGConnectingPoint num="3" id="295" />
-<TGConnectingPoint num="4" id="296" />
-<TGConnectingPoint num="5" id="297" />
-<TGConnectingPoint num="6" id="298" />
-<TGConnectingPoint num="7" id="299" />
-<TGConnectingPoint num="8" id="300" />
-<TGConnectingPoint num="9" id="301" />
-<TGConnectingPoint num="10" id="302" />
-<TGConnectingPoint num="11" id="303" />
+<TGConnectingPoint num="0" id="294" />
+<TGConnectingPoint num="1" id="295" />
+<TGConnectingPoint num="2" id="296" />
+<TGConnectingPoint num="3" id="297" />
+<TGConnectingPoint num="4" id="298" />
+<TGConnectingPoint num="5" id="299" />
+<TGConnectingPoint num="6" id="300" />
+<TGConnectingPoint num="7" id="301" />
+<TGConnectingPoint num="8" id="302" />
+<TGConnectingPoint num="9" id="303" />
+<TGConnectingPoint num="10" id="304" />
+<TGConnectingPoint num="11" id="305" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="319" >
+<father id="344" num="1" />
+<cdparam x="170" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="1000" 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="307" />
+<TGConnectingPoint num="1" id="308" />
+<TGConnectingPoint num="2" id="309" />
+<TGConnectingPoint num="3" id="310" />
+<TGConnectingPoint num="4" id="311" />
+<TGConnectingPoint num="5" id="312" />
+<TGConnectingPoint num="6" id="313" />
+<TGConnectingPoint num="7" id="314" />
+<TGConnectingPoint num="8" id="315" />
+<TGConnectingPoint num="9" id="316" />
+<TGConnectingPoint num="10" id="317" />
+<TGConnectingPoint num="11" id="318" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="367" >
+<COMPONENT type="5300" id="382" >
 <cdparam x="459" y="61" />
 <sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="1000" 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="343" />
-<TGConnectingPoint num="1" id="344" />
-<TGConnectingPoint num="2" id="345" />
-<TGConnectingPoint num="3" id="346" />
-<TGConnectingPoint num="4" id="347" />
-<TGConnectingPoint num="5" id="348" />
-<TGConnectingPoint num="6" id="349" />
-<TGConnectingPoint num="7" id="350" />
-<TGConnectingPoint num="8" id="351" />
-<TGConnectingPoint num="9" id="352" />
-<TGConnectingPoint num="10" id="353" />
-<TGConnectingPoint num="11" id="354" />
-<TGConnectingPoint num="12" id="355" />
-<TGConnectingPoint num="13" id="356" />
-<TGConnectingPoint num="14" id="357" />
-<TGConnectingPoint num="15" id="358" />
-<TGConnectingPoint num="16" id="359" />
-<TGConnectingPoint num="17" id="360" />
-<TGConnectingPoint num="18" id="361" />
-<TGConnectingPoint num="19" id="362" />
-<TGConnectingPoint num="20" id="363" />
-<TGConnectingPoint num="21" id="364" />
-<TGConnectingPoint num="22" id="365" />
-<TGConnectingPoint num="23" id="366" />
+<TGConnectingPoint num="0" id="358" />
+<TGConnectingPoint num="1" id="359" />
+<TGConnectingPoint num="2" id="360" />
+<TGConnectingPoint num="3" id="361" />
+<TGConnectingPoint num="4" id="362" />
+<TGConnectingPoint num="5" id="363" />
+<TGConnectingPoint num="6" id="364" />
+<TGConnectingPoint num="7" id="365" />
+<TGConnectingPoint num="8" id="366" />
+<TGConnectingPoint num="9" id="367" />
+<TGConnectingPoint num="10" id="368" />
+<TGConnectingPoint num="11" id="369" />
+<TGConnectingPoint num="12" id="370" />
+<TGConnectingPoint num="13" id="371" />
+<TGConnectingPoint num="14" id="372" />
+<TGConnectingPoint num="15" id="373" />
+<TGConnectingPoint num="16" id="374" />
+<TGConnectingPoint num="17" id="375" />
+<TGConnectingPoint num="18" id="376" />
+<TGConnectingPoint num="19" id="377" />
+<TGConnectingPoint num="20" id="378" />
+<TGConnectingPoint num="21" id="379" />
+<TGConnectingPoint num="22" id="380" />
+<TGConnectingPoint num="23" id="381" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="342" >
-<father id="367" num="0" />
+<SUBCOMPONENT type="5303" id="357" >
+<father id="382" num="0" />
 <cdparam x="492" y="102" />
 <sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="1000" 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="330" />
-<TGConnectingPoint num="1" id="331" />
-<TGConnectingPoint num="2" id="332" />
-<TGConnectingPoint num="3" id="333" />
-<TGConnectingPoint num="4" id="334" />
-<TGConnectingPoint num="5" id="335" />
-<TGConnectingPoint num="6" id="336" />
-<TGConnectingPoint num="7" id="337" />
-<TGConnectingPoint num="8" id="338" />
-<TGConnectingPoint num="9" id="339" />
-<TGConnectingPoint num="10" id="340" />
-<TGConnectingPoint num="11" id="341" />
+<TGConnectingPoint num="0" id="345" />
+<TGConnectingPoint num="1" id="346" />
+<TGConnectingPoint num="2" id="347" />
+<TGConnectingPoint num="3" id="348" />
+<TGConnectingPoint num="4" id="349" />
+<TGConnectingPoint num="5" id="350" />
+<TGConnectingPoint num="6" id="351" />
+<TGConnectingPoint num="7" id="352" />
+<TGConnectingPoint num="8" id="353" />
+<TGConnectingPoint num="9" id="354" />
+<TGConnectingPoint num="10" id="355" />
+<TGConnectingPoint num="11" id="356" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5306" id="379" >
+<COMPONENT type="5306" id="394" >
 <cdparam x="467" y="209" />
 <sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="nbOfCoins &gt;= 0" />
-<TGConnectingPoint num="0" id="368" />
-<TGConnectingPoint num="1" id="369" />
-<TGConnectingPoint num="2" id="370" />
-<TGConnectingPoint num="3" id="371" />
-<TGConnectingPoint num="4" id="372" />
-<TGConnectingPoint num="5" id="373" />
-<TGConnectingPoint num="6" id="374" />
-<TGConnectingPoint num="7" id="375" />
-<TGConnectingPoint num="8" id="376" />
-<TGConnectingPoint num="9" id="377" />
-<TGConnectingPoint num="10" id="378" />
+<TGConnectingPoint num="0" id="383" />
+<TGConnectingPoint num="1" id="384" />
+<TGConnectingPoint num="2" id="385" />
+<TGConnectingPoint num="3" id="386" />
+<TGConnectingPoint num="4" id="387" />
+<TGConnectingPoint num="5" id="388" />
+<TGConnectingPoint num="6" id="389" />
+<TGConnectingPoint num="7" id="390" />
+<TGConnectingPoint num="8" id="391" />
+<TGConnectingPoint num="9" id="392" />
+<TGConnectingPoint num="10" id="393" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
@@ -694,49 +715,55 @@
 </AvatarPDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="380" >
+<CONNECTOR type="5312" id="396" >
 <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" />
-<P1  x="634" y="535" id="542" />
-<P2  x="635" y="562" id="399" />
+<TGConnectingPoint num="0" id="395" />
+<P1  x="634" y="495" id="571" />
+<P2  x="635" y="562" id="428" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="381" >
+<CONNECTOR type="5312" id="398" >
 <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" />
-<P1  x="577" y="471" id="553" />
-<P2  x="614" y="495" id="543" />
+<TGConnectingPoint num="0" id="397" />
+<P1  x="577" y="471" id="582" />
+<P2  x="654" y="495" id="572" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="382" >
+<CONNECTOR type="5312" id="400" >
 <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" />
-<P1  x="694" y="472" id="395" />
-<P2  x="654" y="495" id="544" />
+<TGConnectingPoint num="0" id="399" />
+<P1  x="694" y="472" id="424" />
+<P2  x="674" y="505" id="573" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="385" >
+<CONNECTOR type="5311" id="406" >
 <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="" />
-<P1  x="581" y="154" id="450" />
-<P2  x="546" y="305" id="520" />
+<TGConnectingPoint num="0" id="403" />
+<TGConnectingPoint num="1" id="404" />
+<TGConnectingPoint num="2" id="405" />
+<P1  x="581" y="154" id="492" />
+<P2  x="546" y="305" id="549" />
 <Point x="518" y="154" />
 <Point x="518" y="305" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="383" >
-<father id="385" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="401" >
+<father id="406" num="0" />
 <cdparam x="518" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" 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="384" >
-<father id="385" num="1" />
+<SUBCOMPONENT type="-1" id="402" >
+<father id="406" num="1" />
 <cdparam x="518" y="305" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -744,16 +771,18 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="387" >
+<CONNECTOR type="5311" id="410" >
 <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="" />
-<P1  x="631" y="164" id="445" />
-<P2  x="667" y="310" id="507" />
+<TGConnectingPoint num="0" id="408" />
+<TGConnectingPoint num="1" id="409" />
+<P1  x="631" y="164" id="487" />
+<P2  x="667" y="310" id="536" />
 <Point x="631" y="310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="386" >
-<father id="387" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="407" >
+<father id="410" num="0" />
 <cdparam x="631" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -761,24 +790,27 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="388" >
+<CONNECTOR type="5312" id="412" >
 <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" />
-<P1  x="696" y="385" id="506" />
-<P2  x="694" y="417" id="394" />
+<TGConnectingPoint num="0" id="411" />
+<P1  x="696" y="385" id="535" />
+<P2  x="694" y="417" id="423" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="390" >
+<CONNECTOR type="5310" id="416" >
 <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="" />
-<P1  x="721" y="158" id="456" />
-<P2  x="700" y="204" id="497" />
+<TGConnectingPoint num="0" id="414" />
+<TGConnectingPoint num="1" id="415" />
+<P1  x="721" y="158" id="472" />
+<P2  x="700" y="204" id="526" />
 <Point x="700" y="158" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="389" >
-<father id="390" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="413" >
+<father id="416" num="0" />
 <cdparam x="700" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -786,289 +818,292 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="391" >
+<CONNECTOR type="5312" id="418" >
 <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" />
-<P1  x="710" y="254" id="493" />
-<P2  x="711" y="285" id="505" />
+<TGConnectingPoint num="0" id="417" />
+<P1  x="710" y="254" id="522" />
+<P2  x="711" y="285" id="534" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="392" >
+<CONNECTOR type="5312" id="420" >
 <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" />
-<P1  x="576" y="385" id="519" />
-<P2  x="577" y="416" id="552" />
+<TGConnectingPoint num="0" id="419" />
+<P1  x="576" y="385" id="548" />
+<P2  x="577" y="416" id="581" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="393" >
+<CONNECTOR type="5311" id="422" >
 <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="" />
-<P1  x="491" y="345" id="406" />
-<P2  x="546" y="345" id="524" />
+<TGConnectingPoint num="0" id="421" />
+<P1  x="491" y="345" id="435" />
+<P2  x="546" y="345" id="553" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="398" >
+<COMPONENT type="5308" id="427" >
 <cdparam x="644" y="417" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="1000" 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="394" />
-<TGConnectingPoint num="1" id="395" />
-<TGConnectingPoint num="2" id="396" />
-<TGConnectingPoint num="3" id="397" />
+<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="1" id="424" />
+<TGConnectingPoint num="2" id="425" />
+<TGConnectingPoint num="3" id="426" />
 <extraparam>
 <liveness data="false" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="403" >
+<COMPONENT type="5308" id="432" >
 <cdparam x="562" y="562" />
 <sizeparam width="146" height="54" minWidth="100" minHeight="0" maxWidth="1000" 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="399" />
-<TGConnectingPoint num="1" id="400" />
-<TGConnectingPoint num="2" id="401" />
-<TGConnectingPoint num="3" id="402" />
+<TGConnectingPoint num="0" id="428" />
+<TGConnectingPoint num="1" id="429" />
+<TGConnectingPoint num="2" id="430" />
+<TGConnectingPoint num="3" id="431" />
 <extraparam>
 <liveness data="true" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5300" id="441" >
+<COMPONENT type="5300" id="470" >
 <cdparam x="372" y="227" />
 <sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="1000" 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="417" />
-<TGConnectingPoint num="1" id="418" />
-<TGConnectingPoint num="2" id="419" />
-<TGConnectingPoint num="3" id="420" />
-<TGConnectingPoint num="4" id="421" />
-<TGConnectingPoint num="5" id="422" />
-<TGConnectingPoint num="6" id="423" />
-<TGConnectingPoint num="7" id="424" />
-<TGConnectingPoint num="8" id="425" />
-<TGConnectingPoint num="9" id="426" />
-<TGConnectingPoint num="10" id="427" />
-<TGConnectingPoint num="11" id="428" />
-<TGConnectingPoint num="12" id="429" />
-<TGConnectingPoint num="13" id="430" />
-<TGConnectingPoint num="14" id="431" />
-<TGConnectingPoint num="15" id="432" />
-<TGConnectingPoint num="16" id="433" />
-<TGConnectingPoint num="17" id="434" />
-<TGConnectingPoint num="18" id="435" />
-<TGConnectingPoint num="19" id="436" />
-<TGConnectingPoint num="20" id="437" />
-<TGConnectingPoint num="21" id="438" />
-<TGConnectingPoint num="22" id="439" />
-<TGConnectingPoint num="23" id="440" />
+<TGConnectingPoint num="0" id="446" />
+<TGConnectingPoint num="1" id="447" />
+<TGConnectingPoint num="2" id="448" />
+<TGConnectingPoint num="3" id="449" />
+<TGConnectingPoint num="4" id="450" />
+<TGConnectingPoint num="5" id="451" />
+<TGConnectingPoint num="6" id="452" />
+<TGConnectingPoint num="7" id="453" />
+<TGConnectingPoint num="8" id="454" />
+<TGConnectingPoint num="9" id="455" />
+<TGConnectingPoint num="10" id="456" />
+<TGConnectingPoint num="11" id="457" />
+<TGConnectingPoint num="12" id="458" />
+<TGConnectingPoint num="13" id="459" />
+<TGConnectingPoint num="14" id="460" />
+<TGConnectingPoint num="15" id="461" />
+<TGConnectingPoint num="16" id="462" />
+<TGConnectingPoint num="17" id="463" />
+<TGConnectingPoint num="18" id="464" />
+<TGConnectingPoint num="19" id="465" />
+<TGConnectingPoint num="20" id="466" />
+<TGConnectingPoint num="21" id="467" />
+<TGConnectingPoint num="22" id="468" />
+<TGConnectingPoint num="23" id="469" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="416" >
-<father id="441" num="0" />
+<SUBCOMPONENT type="5304" id="445" >
+<father id="470" num="0" />
 <cdparam x="391" y="326" />
 <sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="1000" 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="404" />
-<TGConnectingPoint num="1" id="405" />
-<TGConnectingPoint num="2" id="406" />
-<TGConnectingPoint num="3" id="407" />
-<TGConnectingPoint num="4" id="408" />
-<TGConnectingPoint num="5" id="409" />
-<TGConnectingPoint num="6" id="410" />
-<TGConnectingPoint num="7" id="411" />
-<TGConnectingPoint num="8" id="412" />
-<TGConnectingPoint num="9" id="413" />
-<TGConnectingPoint num="10" id="414" />
-<TGConnectingPoint num="11" id="415" />
+<TGConnectingPoint num="0" id="433" />
+<TGConnectingPoint num="1" id="434" />
+<TGConnectingPoint num="2" id="435" />
+<TGConnectingPoint num="3" id="436" />
+<TGConnectingPoint num="4" id="437" />
+<TGConnectingPoint num="5" id="438" />
+<TGConnectingPoint num="6" id="439" />
+<TGConnectingPoint num="7" id="440" />
+<TGConnectingPoint num="8" id="441" />
+<TGConnectingPoint num="9" id="442" />
+<TGConnectingPoint num="10" id="443" />
+<TGConnectingPoint num="11" id="444" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="492" >
+<COMPONENT type="5300" id="521" >
 <cdparam x="563" y="78" />
 <sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="1000" 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="468" />
-<TGConnectingPoint num="1" id="469" />
-<TGConnectingPoint num="2" id="470" />
-<TGConnectingPoint num="3" id="471" />
-<TGConnectingPoint num="4" id="472" />
-<TGConnectingPoint num="5" id="473" />
-<TGConnectingPoint num="6" id="474" />
-<TGConnectingPoint num="7" id="475" />
-<TGConnectingPoint num="8" id="476" />
-<TGConnectingPoint num="9" id="477" />
-<TGConnectingPoint num="10" id="478" />
-<TGConnectingPoint num="11" id="479" />
-<TGConnectingPoint num="12" id="480" />
-<TGConnectingPoint num="13" id="481" />
-<TGConnectingPoint num="14" id="482" />
-<TGConnectingPoint num="15" id="483" />
-<TGConnectingPoint num="16" id="484" />
-<TGConnectingPoint num="17" id="485" />
-<TGConnectingPoint num="18" id="486" />
-<TGConnectingPoint num="19" id="487" />
-<TGConnectingPoint num="20" id="488" />
-<TGConnectingPoint num="21" id="489" />
-<TGConnectingPoint num="22" id="490" />
-<TGConnectingPoint num="23" id="491" />
+<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="1" id="498" />
+<TGConnectingPoint num="2" id="499" />
+<TGConnectingPoint num="3" id="500" />
+<TGConnectingPoint num="4" id="501" />
+<TGConnectingPoint num="5" id="502" />
+<TGConnectingPoint num="6" id="503" />
+<TGConnectingPoint num="7" id="504" />
+<TGConnectingPoint num="8" id="505" />
+<TGConnectingPoint num="9" id="506" />
+<TGConnectingPoint num="10" id="507" />
+<TGConnectingPoint num="11" id="508" />
+<TGConnectingPoint num="12" id="509" />
+<TGConnectingPoint num="13" id="510" />
+<TGConnectingPoint num="14" id="511" />
+<TGConnectingPoint num="15" id="512" />
+<TGConnectingPoint num="16" id="513" />
+<TGConnectingPoint num="17" id="514" />
+<TGConnectingPoint num="18" id="515" />
+<TGConnectingPoint num="19" id="516" />
+<TGConnectingPoint num="20" id="517" />
+<TGConnectingPoint num="21" id="518" />
+<TGConnectingPoint num="22" id="519" />
+<TGConnectingPoint num="23" id="520" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="454" >
-<father id="492" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="1000" 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="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
-<TGConnectingPoint num="4" id="446" />
-<TGConnectingPoint num="5" id="447" />
-<TGConnectingPoint num="6" id="448" />
-<TGConnectingPoint num="7" id="449" />
-<TGConnectingPoint num="8" id="450" />
-<TGConnectingPoint num="9" id="451" />
-<TGConnectingPoint num="10" id="452" />
-<TGConnectingPoint num="11" id="453" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="467" >
-<father id="492" num="1" />
+<SUBCOMPONENT type="5303" id="483" >
+<father id="521" num="0" />
 <cdparam x="721" y="133" />
 <sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="1000" 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="455" />
-<TGConnectingPoint num="1" id="456" />
-<TGConnectingPoint num="2" id="457" />
-<TGConnectingPoint num="3" id="458" />
-<TGConnectingPoint num="4" id="459" />
-<TGConnectingPoint num="5" id="460" />
-<TGConnectingPoint num="6" id="461" />
-<TGConnectingPoint num="7" id="462" />
-<TGConnectingPoint num="8" id="463" />
-<TGConnectingPoint num="9" id="464" />
-<TGConnectingPoint num="10" id="465" />
-<TGConnectingPoint num="11" id="466" />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<TGConnectingPoint num="2" id="473" />
+<TGConnectingPoint num="3" id="474" />
+<TGConnectingPoint num="4" id="475" />
+<TGConnectingPoint num="5" id="476" />
+<TGConnectingPoint num="6" id="477" />
+<TGConnectingPoint num="7" id="478" />
+<TGConnectingPoint num="8" id="479" />
+<TGConnectingPoint num="9" id="480" />
+<TGConnectingPoint num="10" id="481" />
+<TGConnectingPoint num="11" id="482" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="496" >
+<father id="521" num="1" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="1000" 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="484" />
+<TGConnectingPoint num="1" id="485" />
+<TGConnectingPoint num="2" id="486" />
+<TGConnectingPoint num="3" id="487" />
+<TGConnectingPoint num="4" id="488" />
+<TGConnectingPoint num="5" id="489" />
+<TGConnectingPoint num="6" id="490" />
+<TGConnectingPoint num="7" id="491" />
+<TGConnectingPoint num="8" id="492" />
+<TGConnectingPoint num="9" id="493" />
+<TGConnectingPoint num="10" id="494" />
+<TGConnectingPoint num="11" id="495" />
+</SUBCOMPONENT>
 
-<COMPONENT type="5306" id="504" >
+<COMPONENT type="5306" id="533" >
 <cdparam x="675" y="204" />
 <sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="1000" 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="493" />
-<TGConnectingPoint num="1" id="494" />
-<TGConnectingPoint num="2" id="495" />
-<TGConnectingPoint num="3" id="496" />
-<TGConnectingPoint num="4" id="497" />
-<TGConnectingPoint num="5" id="498" />
-<TGConnectingPoint num="6" id="499" />
-<TGConnectingPoint num="7" id="500" />
-<TGConnectingPoint num="8" id="501" />
-<TGConnectingPoint num="9" id="502" />
-<TGConnectingPoint num="10" id="503" />
+<TGConnectingPoint num="0" id="522" />
+<TGConnectingPoint num="1" id="523" />
+<TGConnectingPoint num="2" id="524" />
+<TGConnectingPoint num="3" id="525" />
+<TGConnectingPoint num="4" id="526" />
+<TGConnectingPoint num="5" id="527" />
+<TGConnectingPoint num="6" id="528" />
+<TGConnectingPoint num="7" id="529" />
+<TGConnectingPoint num="8" id="530" />
+<TGConnectingPoint num="9" id="531" />
+<TGConnectingPoint num="10" id="532" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="517" >
+<COMPONENT type="5302" id="546" >
 <cdparam x="667" y="285" />
 <sizeparam width="59" height="100" minWidth="50" minHeight="0" maxWidth="1000" 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="505" />
-<TGConnectingPoint num="1" id="506" />
-<TGConnectingPoint num="2" id="507" />
-<TGConnectingPoint num="3" id="508" />
-<TGConnectingPoint num="4" id="509" />
-<TGConnectingPoint num="5" id="510" />
-<TGConnectingPoint num="6" id="511" />
-<TGConnectingPoint num="7" id="512" />
-<TGConnectingPoint num="8" id="513" />
-<TGConnectingPoint num="9" id="514" />
-<TGConnectingPoint num="10" id="515" />
-<TGConnectingPoint num="11" id="516" />
+<TGConnectingPoint num="0" id="534" />
+<TGConnectingPoint num="1" id="535" />
+<TGConnectingPoint num="2" id="536" />
+<TGConnectingPoint num="3" id="537" />
+<TGConnectingPoint num="4" id="538" />
+<TGConnectingPoint num="5" id="539" />
+<TGConnectingPoint num="6" id="540" />
+<TGConnectingPoint num="7" id="541" />
+<TGConnectingPoint num="8" id="542" />
+<TGConnectingPoint num="9" id="543" />
+<TGConnectingPoint num="10" id="544" />
+<TGConnectingPoint num="11" id="545" />
 </COMPONENT>
 
-<COMPONENT type="5301" id="538" >
+<COMPONENT type="5301" id="567" >
 <cdparam x="546" y="285" />
 <sizeparam width="60" height="100" minWidth="50" minHeight="0" maxWidth="1000" 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="518" />
-<TGConnectingPoint num="1" id="519" />
-<TGConnectingPoint num="2" id="520" />
-<TGConnectingPoint num="3" id="521" />
-<TGConnectingPoint num="4" id="522" />
-<TGConnectingPoint num="5" id="523" />
-<TGConnectingPoint num="6" id="524" />
-<TGConnectingPoint num="7" id="525" />
-<TGConnectingPoint num="8" id="526" />
-<TGConnectingPoint num="9" id="527" />
-<TGConnectingPoint num="10" id="528" />
-<TGConnectingPoint num="11" id="529" />
-<TGConnectingPoint num="12" id="530" />
-<TGConnectingPoint num="13" id="531" />
-<TGConnectingPoint num="14" id="532" />
-<TGConnectingPoint num="15" id="533" />
-<TGConnectingPoint num="16" id="534" />
-<TGConnectingPoint num="17" id="535" />
-<TGConnectingPoint num="18" id="536" />
-<TGConnectingPoint num="19" id="537" />
+<TGConnectingPoint num="0" id="547" />
+<TGConnectingPoint num="1" id="548" />
+<TGConnectingPoint num="2" id="549" />
+<TGConnectingPoint num="3" id="550" />
+<TGConnectingPoint num="4" id="551" />
+<TGConnectingPoint num="5" id="552" />
+<TGConnectingPoint num="6" id="553" />
+<TGConnectingPoint num="7" id="554" />
+<TGConnectingPoint num="8" id="555" />
+<TGConnectingPoint num="9" id="556" />
+<TGConnectingPoint num="10" id="557" />
+<TGConnectingPoint num="11" id="558" />
+<TGConnectingPoint num="12" id="559" />
+<TGConnectingPoint num="13" id="560" />
+<TGConnectingPoint num="14" id="561" />
+<TGConnectingPoint num="15" id="562" />
+<TGConnectingPoint num="16" id="563" />
+<TGConnectingPoint num="17" id="564" />
+<TGConnectingPoint num="18" id="565" />
+<TGConnectingPoint num="19" id="566" />
 </COMPONENT>
 
-<COMPONENT type="5309" id="551" >
+<COMPONENT type="5309" id="580" >
 <cdparam x="594" y="495" />
 <sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="1000" 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="539" />
-<TGConnectingPoint num="1" id="540" />
-<TGConnectingPoint num="2" id="541" />
-<TGConnectingPoint num="3" id="542" />
-<TGConnectingPoint num="4" id="543" />
-<TGConnectingPoint num="5" id="544" />
-<TGConnectingPoint num="6" id="545" />
-<TGConnectingPoint num="7" id="546" />
-<TGConnectingPoint num="8" id="547" />
-<TGConnectingPoint num="9" id="548" />
-<TGConnectingPoint num="10" id="549" />
-<TGConnectingPoint num="11" id="550" />
+<TGConnectingPoint num="0" id="568" />
+<TGConnectingPoint num="1" id="569" />
+<TGConnectingPoint num="2" id="570" />
+<TGConnectingPoint num="3" id="571" />
+<TGConnectingPoint num="4" id="572" />
+<TGConnectingPoint num="5" id="573" />
+<TGConnectingPoint num="6" id="574" />
+<TGConnectingPoint num="7" id="575" />
+<TGConnectingPoint num="8" id="576" />
+<TGConnectingPoint num="9" id="577" />
+<TGConnectingPoint num="10" id="578" />
+<TGConnectingPoint num="11" id="579" />
 </COMPONENT>
 
-<COMPONENT type="5308" id="556" >
+<COMPONENT type="5308" id="585" >
 <cdparam x="527" y="416" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="1000" 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="552" />
-<TGConnectingPoint num="1" id="553" />
-<TGConnectingPoint num="2" id="554" />
-<TGConnectingPoint num="3" id="555" />
+<TGConnectingPoint num="0" id="581" />
+<TGConnectingPoint num="1" id="582" />
+<TGConnectingPoint num="2" id="583" />
+<TGConnectingPoint num="3" id="584" />
 <extraparam>
 <liveness data="false" />
 <not data="false" />
@@ -1085,77 +1120,80 @@
 
 <Modeling type="AVATAR Design" nameTab="AVATAR Design" >
 <AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5002" id="557" >
+<CONNECTOR type="5002" id="587" >
 <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="" />
-<P1  x="559" y="330" id="616" />
-<P2  x="560" y="377" id="649" />
+<TGConnectingPoint num="0" id="586" />
+<P1  x="559" y="330" id="623" />
+<P2  x="560" y="377" id="681" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushCoffeeButton()" />
 <oso value="out push()" />
-<FIFOType asynchronous="false" size="1024" blocking="false" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="558" >
+<CONNECTOR type="5002" id="589" >
 <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="" />
-<P1  x="306" y="109" id="571" />
-<P2  x="445" y="108" id="645" />
+<TGConnectingPoint num="0" id="588" />
+<P1  x="306" y="109" id="603" />
+<P2  x="445" y="108" id="677" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getCoin(int nbOfCoins)" />
 <osd value="out ejectCoin(int nbOfCoins)" />
 <isd value="in getCoin(int nbOfCoins)" />
 <oso value="out putCoin(int nbOfCoins)" />
-<FIFOType asynchronous="false" size="1024" blocking="false" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="559" >
+<CONNECTOR type="5002" id="591" >
 <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="" />
-<P1  x="789" y="326" id="591" />
-<P2  x="790" y="377" id="650" />
+<TGConnectingPoint num="0" id="590" />
+<P1  x="789" y="326" id="648" />
+<P2  x="790" y="377" id="682" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushTeaButton()" />
 <oso value="out push()" />
-<FIFOType asynchronous="false" size="1024" blocking="false" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="584" >
+<COMPONENT type="5000" id="616" >
 <cdparam x="106" y="55" />
 <sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="1000" 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="560" />
-<TGConnectingPoint num="1" id="561" />
-<TGConnectingPoint num="2" id="562" />
-<TGConnectingPoint num="3" id="563" />
-<TGConnectingPoint num="4" id="564" />
-<TGConnectingPoint num="5" id="565" />
-<TGConnectingPoint num="6" id="566" />
-<TGConnectingPoint num="7" id="567" />
-<TGConnectingPoint num="8" id="568" />
-<TGConnectingPoint num="9" id="569" />
-<TGConnectingPoint num="10" id="570" />
-<TGConnectingPoint num="11" id="571" />
-<TGConnectingPoint num="12" id="572" />
-<TGConnectingPoint num="13" id="573" />
-<TGConnectingPoint num="14" id="574" />
-<TGConnectingPoint num="15" id="575" />
-<TGConnectingPoint num="16" id="576" />
-<TGConnectingPoint num="17" id="577" />
-<TGConnectingPoint num="18" id="578" />
-<TGConnectingPoint num="19" id="579" />
-<TGConnectingPoint num="20" id="580" />
-<TGConnectingPoint num="21" id="581" />
-<TGConnectingPoint num="22" id="582" />
-<TGConnectingPoint num="23" id="583" />
+<TGConnectingPoint num="0" id="592" />
+<TGConnectingPoint num="1" id="593" />
+<TGConnectingPoint num="2" id="594" />
+<TGConnectingPoint num="3" id="595" />
+<TGConnectingPoint num="4" id="596" />
+<TGConnectingPoint num="5" id="597" />
+<TGConnectingPoint num="6" id="598" />
+<TGConnectingPoint num="7" id="599" />
+<TGConnectingPoint num="8" id="600" />
+<TGConnectingPoint num="9" id="601" />
+<TGConnectingPoint num="10" id="602" />
+<TGConnectingPoint num="11" id="603" />
+<TGConnectingPoint num="12" id="604" />
+<TGConnectingPoint num="13" id="605" />
+<TGConnectingPoint num="14" id="606" />
+<TGConnectingPoint num="15" id="607" />
+<TGConnectingPoint num="16" id="608" />
+<TGConnectingPoint num="17" id="609" />
+<TGConnectingPoint num="18" id="610" />
+<TGConnectingPoint num="19" id="611" />
+<TGConnectingPoint num="20" id="612" />
+<TGConnectingPoint num="21" id="613" />
+<TGConnectingPoint num="22" id="614" />
+<TGConnectingPoint num="23" id="615" />
 <extraparam>
 <Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
 <Attribute access="0" id="x" value="1" type="8" typeOther="" />
@@ -1167,36 +1205,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="659" >
+<COMPONENT type="5000" id="691" >
 <cdparam x="445" y="19" />
 <sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="1000" 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="635" />
-<TGConnectingPoint num="1" id="636" />
-<TGConnectingPoint num="2" id="637" />
-<TGConnectingPoint num="3" id="638" />
-<TGConnectingPoint num="4" id="639" />
-<TGConnectingPoint num="5" id="640" />
-<TGConnectingPoint num="6" id="641" />
-<TGConnectingPoint num="7" id="642" />
-<TGConnectingPoint num="8" id="643" />
-<TGConnectingPoint num="9" id="644" />
-<TGConnectingPoint num="10" id="645" />
-<TGConnectingPoint num="11" id="646" />
-<TGConnectingPoint num="12" id="647" />
-<TGConnectingPoint num="13" id="648" />
-<TGConnectingPoint num="14" id="649" />
-<TGConnectingPoint num="15" id="650" />
-<TGConnectingPoint num="16" id="651" />
-<TGConnectingPoint num="17" id="652" />
-<TGConnectingPoint num="18" id="653" />
-<TGConnectingPoint num="19" id="654" />
-<TGConnectingPoint num="20" id="655" />
-<TGConnectingPoint num="21" id="656" />
-<TGConnectingPoint num="22" id="657" />
-<TGConnectingPoint num="23" id="658" />
+<TGConnectingPoint num="0" id="667" />
+<TGConnectingPoint num="1" id="668" />
+<TGConnectingPoint num="2" id="669" />
+<TGConnectingPoint num="3" id="670" />
+<TGConnectingPoint num="4" id="671" />
+<TGConnectingPoint num="5" id="672" />
+<TGConnectingPoint num="6" id="673" />
+<TGConnectingPoint num="7" id="674" />
+<TGConnectingPoint num="8" id="675" />
+<TGConnectingPoint num="9" id="676" />
+<TGConnectingPoint num="10" id="677" />
+<TGConnectingPoint num="11" id="678" />
+<TGConnectingPoint num="12" id="679" />
+<TGConnectingPoint num="13" id="680" />
+<TGConnectingPoint num="14" id="681" />
+<TGConnectingPoint num="15" id="682" />
+<TGConnectingPoint num="16" id="683" />
+<TGConnectingPoint num="17" id="684" />
+<TGConnectingPoint num="18" id="685" />
+<TGConnectingPoint num="19" id="686" />
+<TGConnectingPoint num="20" id="687" />
+<TGConnectingPoint num="21" id="688" />
+<TGConnectingPoint num="22" id="689" />
+<TGConnectingPoint num="23" id="690" />
 <extraparam>
 <Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
 <Attribute access="0" id="teaMaxDelay" value="8" type="8" typeOther="" />
@@ -1212,77 +1250,77 @@
 <Signal value="out ejectCoin(int nbOfCoins)" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="609" >
-<father id="659" num="0" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="641" >
+<father id="691" num="0" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="1000" 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="585" />
-<TGConnectingPoint num="1" id="586" />
-<TGConnectingPoint num="2" id="587" />
-<TGConnectingPoint num="3" id="588" />
-<TGConnectingPoint num="4" id="589" />
-<TGConnectingPoint num="5" id="590" />
-<TGConnectingPoint num="6" id="591" />
-<TGConnectingPoint num="7" id="592" />
-<TGConnectingPoint num="8" id="593" />
-<TGConnectingPoint num="9" id="594" />
-<TGConnectingPoint num="10" id="595" />
-<TGConnectingPoint num="11" id="596" />
-<TGConnectingPoint num="12" id="597" />
-<TGConnectingPoint num="13" id="598" />
-<TGConnectingPoint num="14" id="599" />
-<TGConnectingPoint num="15" id="600" />
-<TGConnectingPoint num="16" id="601" />
-<TGConnectingPoint num="17" id="602" />
-<TGConnectingPoint num="18" id="603" />
-<TGConnectingPoint num="19" id="604" />
-<TGConnectingPoint num="20" id="605" />
-<TGConnectingPoint num="21" id="606" />
-<TGConnectingPoint num="22" id="607" />
-<TGConnectingPoint num="23" id="608" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="617" />
+<TGConnectingPoint num="1" id="618" />
+<TGConnectingPoint num="2" id="619" />
+<TGConnectingPoint num="3" id="620" />
+<TGConnectingPoint num="4" id="621" />
+<TGConnectingPoint num="5" id="622" />
+<TGConnectingPoint num="6" id="623" />
+<TGConnectingPoint num="7" id="624" />
+<TGConnectingPoint num="8" id="625" />
+<TGConnectingPoint num="9" id="626" />
+<TGConnectingPoint num="10" id="627" />
+<TGConnectingPoint num="11" id="628" />
+<TGConnectingPoint num="12" id="629" />
+<TGConnectingPoint num="13" id="630" />
+<TGConnectingPoint num="14" id="631" />
+<TGConnectingPoint num="15" id="632" />
+<TGConnectingPoint num="16" id="633" />
+<TGConnectingPoint num="17" id="634" />
+<TGConnectingPoint num="18" id="635" />
+<TGConnectingPoint num="19" id="636" />
+<TGConnectingPoint num="20" id="637" />
+<TGConnectingPoint num="21" id="638" />
+<TGConnectingPoint num="22" id="639" />
+<TGConnectingPoint num="23" id="640" />
 <extraparam>
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" />
+<Signal value="out push()" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="634" >
-<father id="659" num="1" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="666" >
+<father id="691" num="1" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="1000" 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="610" />
-<TGConnectingPoint num="1" id="611" />
-<TGConnectingPoint num="2" id="612" />
-<TGConnectingPoint num="3" id="613" />
-<TGConnectingPoint num="4" id="614" />
-<TGConnectingPoint num="5" id="615" />
-<TGConnectingPoint num="6" id="616" />
-<TGConnectingPoint num="7" id="617" />
-<TGConnectingPoint num="8" id="618" />
-<TGConnectingPoint num="9" id="619" />
-<TGConnectingPoint num="10" id="620" />
-<TGConnectingPoint num="11" id="621" />
-<TGConnectingPoint num="12" id="622" />
-<TGConnectingPoint num="13" id="623" />
-<TGConnectingPoint num="14" id="624" />
-<TGConnectingPoint num="15" id="625" />
-<TGConnectingPoint num="16" id="626" />
-<TGConnectingPoint num="17" id="627" />
-<TGConnectingPoint num="18" id="628" />
-<TGConnectingPoint num="19" id="629" />
-<TGConnectingPoint num="20" id="630" />
-<TGConnectingPoint num="21" id="631" />
-<TGConnectingPoint num="22" id="632" />
-<TGConnectingPoint num="23" id="633" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="642" />
+<TGConnectingPoint num="1" id="643" />
+<TGConnectingPoint num="2" id="644" />
+<TGConnectingPoint num="3" id="645" />
+<TGConnectingPoint num="4" id="646" />
+<TGConnectingPoint num="5" id="647" />
+<TGConnectingPoint num="6" id="648" />
+<TGConnectingPoint num="7" id="649" />
+<TGConnectingPoint num="8" id="650" />
+<TGConnectingPoint num="9" id="651" />
+<TGConnectingPoint num="10" id="652" />
+<TGConnectingPoint num="11" id="653" />
+<TGConnectingPoint num="12" id="654" />
+<TGConnectingPoint num="13" id="655" />
+<TGConnectingPoint num="14" id="656" />
+<TGConnectingPoint num="15" id="657" />
+<TGConnectingPoint num="16" id="658" />
+<TGConnectingPoint num="17" id="659" />
+<TGConnectingPoint num="18" id="660" />
+<TGConnectingPoint num="19" id="661" />
+<TGConnectingPoint num="20" id="662" />
+<TGConnectingPoint num="21" id="663" />
+<TGConnectingPoint num="22" id="664" />
+<TGConnectingPoint num="23" id="665" />
 <extraparam>
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" />
-<Signal value="out push()" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1290,20 +1328,25 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="661" >
+<CONNECTOR type="5102" id="698" >
 <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" />
-<P1  x="485" y="219" id="682" />
-<P2  x="485" y="274" id="693" />
+<TGConnectingPoint num="0" id="697" />
+<P1  x="485" y="219" id="739" />
+<P2  x="485" y="274" id="750" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="660" >
-<father id="661" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="696" >
+<father id="698" num="0" />
 <cdparam x="493" y="251" />
 <sizeparam width="161" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="692" />
+<TGConnectingPoint num="1" id="693" />
+<TGConnectingPoint num="2" id="694" />
+<TGConnectingPoint num="3" id="695" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1312,46 +1355,60 @@
 <computeMax value="" />
 <actions value="nbOfCoins = nbOfCoins + x" />
 <actions value="contentOfWallet(nbOfCoins)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="663" >
+<CONNECTOR type="5102" id="705" >
 <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" />
-<P1  x="382" y="165" id="757" />
-<P2  x="485" y="189" id="681" />
+<TGConnectingPoint num="0" id="704" />
+<P1  x="382" y="165" id="814" />
+<P2  x="485" y="189" id="738" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="662" >
-<father id="663" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="703" >
+<father id="705" num="0" />
 <cdparam x="382" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="699" />
+<TGConnectingPoint num="1" id="700" />
+<TGConnectingPoint num="2" id="701" />
+<TGConnectingPoint num="3" id="702" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="665" >
+<CONNECTOR type="5102" id="712" >
 <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" />
-<P1  x="251" y="231" id="671" />
-<P2  x="252" y="300" id="718" />
+<TGConnectingPoint num="0" id="711" />
+<P1  x="251" y="231" id="728" />
+<P2  x="252" y="300" id="775" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="664" >
-<father id="665" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="710" >
+<father id="712" num="0" />
 <cdparam x="175" y="246" />
 <sizeparam width="205" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="706" />
+<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="2" id="708" />
+<TGConnectingPoint num="3" id="709" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="minUserDelay" />
@@ -1360,46 +1417,60 @@
 <computeMax value="" />
 <actions value="nbOfCoins = nbOfCoins - x" />
 <actions value="contentOfWallet(nbOfCoins)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="667" >
+<CONNECTOR type="5102" id="719" >
 <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" />
-<P1  x="357" y="165" id="756" />
-<P2  x="251" y="201" id="670" />
+<TGConnectingPoint num="0" id="718" />
+<P1  x="357" y="165" id="813" />
+<P2  x="251" y="201" id="727" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="666" >
-<father id="667" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="717" >
+<father id="719" num="0" />
 <cdparam x="220" y="174" />
 <sizeparam width="93" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="713" />
+<TGConnectingPoint num="1" id="714" />
+<TGConnectingPoint num="2" id="715" />
+<TGConnectingPoint num="3" id="716" />
 <extraparam>
 <guard value="[nbOfCoins &gt; 0]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="669" >
+<CONNECTOR type="5102" id="726" >
 <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" />
-<P1  x="370" y="64" id="767" />
-<P2  x="370" y="135" id="743" />
+<TGConnectingPoint num="0" id="725" />
+<P1  x="370" y="64" id="824" />
+<P2  x="370" y="135" id="800" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="668" >
-<father id="669" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="724" >
+<father id="726" num="0" />
 <cdparam x="376" y="105" />
 <sizeparam width="156" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="720" />
+<TGConnectingPoint num="1" id="721" />
+<TGConnectingPoint num="2" id="722" />
+<TGConnectingPoint num="3" id="723" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1407,191 +1478,205 @@
 <computeMin value="" />
 <computeMax value="" />
 <actions value="contentOfWallet(nbOfCoins)" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="680" >
+<COMPONENT type="5103" id="737" >
 <cdparam x="218" y="206" />
 <sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="670" />
-<TGConnectingPoint num="1" id="671" />
-<TGConnectingPoint num="2" id="672" />
-<TGConnectingPoint num="3" id="673" />
-<TGConnectingPoint num="4" id="674" />
-<TGConnectingPoint num="5" id="675" />
-<TGConnectingPoint num="6" id="676" />
-<TGConnectingPoint num="7" id="677" />
-<TGConnectingPoint num="8" id="678" />
-<TGConnectingPoint num="9" id="679" />
+<TGConnectingPoint num="0" id="727" />
+<TGConnectingPoint num="1" id="728" />
+<TGConnectingPoint num="2" id="729" />
+<TGConnectingPoint num="3" id="730" />
+<TGConnectingPoint num="4" id="731" />
+<TGConnectingPoint num="5" id="732" />
+<TGConnectingPoint num="6" id="733" />
+<TGConnectingPoint num="7" id="734" />
+<TGConnectingPoint num="8" id="735" />
+<TGConnectingPoint num="9" id="736" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="691" >
+<COMPONENT type="5104" id="748" >
 <cdparam x="449" y="194" />
 <sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="681" />
-<TGConnectingPoint num="1" id="682" />
-<TGConnectingPoint num="2" id="683" />
-<TGConnectingPoint num="3" id="684" />
-<TGConnectingPoint num="4" id="685" />
-<TGConnectingPoint num="5" id="686" />
-<TGConnectingPoint num="6" id="687" />
-<TGConnectingPoint num="7" id="688" />
-<TGConnectingPoint num="8" id="689" />
-<TGConnectingPoint num="9" id="690" />
+<TGConnectingPoint num="0" id="738" />
+<TGConnectingPoint num="1" id="739" />
+<TGConnectingPoint num="2" id="740" />
+<TGConnectingPoint num="3" id="741" />
+<TGConnectingPoint num="4" id="742" />
+<TGConnectingPoint num="5" id="743" />
+<TGConnectingPoint num="6" id="744" />
+<TGConnectingPoint num="7" id="745" />
+<TGConnectingPoint num="8" id="746" />
+<TGConnectingPoint num="9" id="747" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="716" >
+<COMPONENT type="5106" id="773" >
 <cdparam x="460" y="274" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="692" />
-<TGConnectingPoint num="1" id="693" />
-<TGConnectingPoint num="2" id="694" />
-<TGConnectingPoint num="3" id="695" />
-<TGConnectingPoint num="4" id="696" />
-<TGConnectingPoint num="5" id="697" />
-<TGConnectingPoint num="6" id="698" />
-<TGConnectingPoint num="7" id="699" />
-<TGConnectingPoint num="8" id="700" />
-<TGConnectingPoint num="9" id="701" />
-<TGConnectingPoint num="10" id="702" />
-<TGConnectingPoint num="11" id="703" />
-<TGConnectingPoint num="12" id="704" />
-<TGConnectingPoint num="13" id="705" />
-<TGConnectingPoint num="14" id="706" />
-<TGConnectingPoint num="15" id="707" />
-<TGConnectingPoint num="16" id="708" />
-<TGConnectingPoint num="17" id="709" />
-<TGConnectingPoint num="18" id="710" />
-<TGConnectingPoint num="19" id="711" />
-<TGConnectingPoint num="20" id="712" />
-<TGConnectingPoint num="21" id="713" />
-<TGConnectingPoint num="22" id="714" />
-<TGConnectingPoint num="23" id="715" />
+<TGConnectingPoint num="0" id="749" />
+<TGConnectingPoint num="1" id="750" />
+<TGConnectingPoint num="2" id="751" />
+<TGConnectingPoint num="3" id="752" />
+<TGConnectingPoint num="4" id="753" />
+<TGConnectingPoint num="5" id="754" />
+<TGConnectingPoint num="6" id="755" />
+<TGConnectingPoint num="7" id="756" />
+<TGConnectingPoint num="8" id="757" />
+<TGConnectingPoint num="9" id="758" />
+<TGConnectingPoint num="10" id="759" />
+<TGConnectingPoint num="11" id="760" />
+<TGConnectingPoint num="12" id="761" />
+<TGConnectingPoint num="13" id="762" />
+<TGConnectingPoint num="14" id="763" />
+<TGConnectingPoint num="15" id="764" />
+<TGConnectingPoint num="16" id="765" />
+<TGConnectingPoint num="17" id="766" />
+<TGConnectingPoint num="18" id="767" />
+<TGConnectingPoint num="19" id="768" />
+<TGConnectingPoint num="20" id="769" />
+<TGConnectingPoint num="21" id="770" />
+<TGConnectingPoint num="22" id="771" />
+<TGConnectingPoint num="23" id="772" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="741" >
+<COMPONENT type="5106" id="798" >
 <cdparam x="227" y="300" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="717" />
-<TGConnectingPoint num="1" id="718" />
-<TGConnectingPoint num="2" id="719" />
-<TGConnectingPoint num="3" id="720" />
-<TGConnectingPoint num="4" id="721" />
-<TGConnectingPoint num="5" id="722" />
-<TGConnectingPoint num="6" id="723" />
-<TGConnectingPoint num="7" id="724" />
-<TGConnectingPoint num="8" id="725" />
-<TGConnectingPoint num="9" id="726" />
-<TGConnectingPoint num="10" id="727" />
-<TGConnectingPoint num="11" id="728" />
-<TGConnectingPoint num="12" id="729" />
-<TGConnectingPoint num="13" id="730" />
-<TGConnectingPoint num="14" id="731" />
-<TGConnectingPoint num="15" id="732" />
-<TGConnectingPoint num="16" id="733" />
-<TGConnectingPoint num="17" id="734" />
-<TGConnectingPoint num="18" id="735" />
-<TGConnectingPoint num="19" id="736" />
-<TGConnectingPoint num="20" id="737" />
-<TGConnectingPoint num="21" id="738" />
-<TGConnectingPoint num="22" id="739" />
-<TGConnectingPoint num="23" id="740" />
+<TGConnectingPoint num="0" id="774" />
+<TGConnectingPoint num="1" id="775" />
+<TGConnectingPoint num="2" id="776" />
+<TGConnectingPoint num="3" id="777" />
+<TGConnectingPoint num="4" id="778" />
+<TGConnectingPoint num="5" id="779" />
+<TGConnectingPoint num="6" id="780" />
+<TGConnectingPoint num="7" id="781" />
+<TGConnectingPoint num="8" id="782" />
+<TGConnectingPoint num="9" id="783" />
+<TGConnectingPoint num="10" id="784" />
+<TGConnectingPoint num="11" id="785" />
+<TGConnectingPoint num="12" id="786" />
+<TGConnectingPoint num="13" id="787" />
+<TGConnectingPoint num="14" id="788" />
+<TGConnectingPoint num="15" id="789" />
+<TGConnectingPoint num="16" id="790" />
+<TGConnectingPoint num="17" id="791" />
+<TGConnectingPoint num="18" id="792" />
+<TGConnectingPoint num="19" id="793" />
+<TGConnectingPoint num="20" id="794" />
+<TGConnectingPoint num="21" id="795" />
+<TGConnectingPoint num="22" id="796" />
+<TGConnectingPoint num="23" id="797" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="766" >
+<COMPONENT type="5106" id="823" >
 <cdparam x="345" y="135" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="742" />
-<TGConnectingPoint num="1" id="743" />
-<TGConnectingPoint num="2" id="744" />
-<TGConnectingPoint num="3" id="745" />
-<TGConnectingPoint num="4" id="746" />
-<TGConnectingPoint num="5" id="747" />
-<TGConnectingPoint num="6" id="748" />
-<TGConnectingPoint num="7" id="749" />
-<TGConnectingPoint num="8" id="750" />
-<TGConnectingPoint num="9" id="751" />
-<TGConnectingPoint num="10" id="752" />
-<TGConnectingPoint num="11" id="753" />
-<TGConnectingPoint num="12" id="754" />
-<TGConnectingPoint num="13" id="755" />
-<TGConnectingPoint num="14" id="756" />
-<TGConnectingPoint num="15" id="757" />
-<TGConnectingPoint num="16" id="758" />
-<TGConnectingPoint num="17" id="759" />
-<TGConnectingPoint num="18" id="760" />
-<TGConnectingPoint num="19" id="761" />
-<TGConnectingPoint num="20" id="762" />
-<TGConnectingPoint num="21" id="763" />
-<TGConnectingPoint num="22" id="764" />
-<TGConnectingPoint num="23" id="765" />
+<TGConnectingPoint num="0" id="799" />
+<TGConnectingPoint num="1" id="800" />
+<TGConnectingPoint num="2" id="801" />
+<TGConnectingPoint num="3" id="802" />
+<TGConnectingPoint num="4" id="803" />
+<TGConnectingPoint num="5" id="804" />
+<TGConnectingPoint num="6" id="805" />
+<TGConnectingPoint num="7" id="806" />
+<TGConnectingPoint num="8" id="807" />
+<TGConnectingPoint num="9" id="808" />
+<TGConnectingPoint num="10" id="809" />
+<TGConnectingPoint num="11" id="810" />
+<TGConnectingPoint num="12" id="811" />
+<TGConnectingPoint num="13" id="812" />
+<TGConnectingPoint num="14" id="813" />
+<TGConnectingPoint num="15" id="814" />
+<TGConnectingPoint num="16" id="815" />
+<TGConnectingPoint num="17" id="816" />
+<TGConnectingPoint num="18" id="817" />
+<TGConnectingPoint num="19" id="818" />
+<TGConnectingPoint num="20" id="819" />
+<TGConnectingPoint num="21" id="820" />
+<TGConnectingPoint num="22" id="821" />
+<TGConnectingPoint num="23" id="822" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="768" >
+<COMPONENT type="5100" id="825" >
 <cdparam x="363" y="44" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="767" />
+<TGConnectingPoint num="0" id="824" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="770" >
+<CONNECTOR type="5102" id="832" >
 <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" />
-<P1  x="699" y="289" id="838" />
-<P2  x="699" y="316" id="810" />
+<TGConnectingPoint num="0" id="831" />
+<P1  x="699" y="289" id="970" />
+<P2  x="699" y="316" id="942" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="769" >
-<father id="770" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="830" >
+<father id="832" num="0" />
 <cdparam x="691" y="328" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" 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="826" />
+<TGConnectingPoint num="1" id="827" />
+<TGConnectingPoint num="2" id="828" />
+<TGConnectingPoint num="3" id="829" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="772" >
+<CONNECTOR type="5102" id="839" >
 <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" />
-<P1  x="437" y="525" id="960" />
-<P2  x="323" y="748" id="918" />
+<TGConnectingPoint num="0" id="838" />
+<P1  x="437" y="525" id="1141" />
+<P2  x="323" y="748" id="1050" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="771" >
-<father id="772" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="837" >
+<father id="839" num="0" />
 <cdparam x="420" y="552" />
 <sizeparam width="85" height="16" minWidth="0" minHeight="0" maxWidth="1000" 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="833" />
+<TGConnectingPoint num="1" id="834" />
+<TGConnectingPoint num="2" id="835" />
+<TGConnectingPoint num="3" id="836" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1599,46 +1684,60 @@
 <computeMin value="" />
 <computeMax value="" />
 <actions value="nbOfCoins = 0" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="774" >
+<CONNECTOR type="5102" id="846" >
 <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" />
-<P1  x="321" y="455" id="987" />
-<P2  x="437" y="495" id="959" />
+<TGConnectingPoint num="0" id="845" />
+<P1  x="321" y="455" id="1106" />
+<P2  x="437" y="495" id="1140" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="773" >
-<father id="774" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="844" >
+<father id="846" num="0" />
 <cdparam x="395" y="448" />
 <sizeparam width="94" height="16" minWidth="0" minHeight="0" maxWidth="1000" 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="840" />
+<TGConnectingPoint num="1" id="841" />
+<TGConnectingPoint num="2" id="842" />
+<TGConnectingPoint num="3" id="843" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="776" >
+<CONNECTOR type="5102" id="853" >
 <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" />
-<P1  x="293" y="552" id="1009" />
-<P2  x="289" y="748" id="910" />
+<TGConnectingPoint num="0" id="852" />
+<P1  x="293" y="552" id="1092" />
+<P2  x="289" y="748" id="1042" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="775" >
-<father id="776" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="851" >
+<father id="853" num="0" />
 <cdparam x="284" y="594" />
 <sizeparam width="228" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="847" />
+<TGConnectingPoint num="1" id="848" />
+<TGConnectingPoint num="2" id="849" />
+<TGConnectingPoint num="3" id="850" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1647,46 +1746,60 @@
 <computeMax value="teaMaxDelay" />
 <actions value="nbOfCoins = 0" />
 <actions value="beverageReady()" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="778" >
+<CONNECTOR type="5102" id="860" >
 <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" />
-<P1  x="288" y="475" id="998" />
-<P2  x="293" y="522" id="1008" />
+<TGConnectingPoint num="0" id="859" />
+<P1  x="288" y="475" id="1117" />
+<P2  x="293" y="522" id="1091" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="777" >
-<father id="778" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="858" >
+<father id="860" num="0" />
 <cdparam x="295" y="505" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="854" />
+<TGConnectingPoint num="1" id="855" />
+<TGConnectingPoint num="2" id="856" />
+<TGConnectingPoint num="3" id="857" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="780" >
+<CONNECTOR type="5102" id="867" >
 <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" />
-<P1  x="121" y="552" id="971" />
-<P2  x="255" y="748" id="917" />
+<TGConnectingPoint num="0" id="866" />
+<P1  x="121" y="552" id="1130" />
+<P2  x="255" y="748" id="1049" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="779" >
-<father id="780" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="865" >
+<father id="867" num="0" />
 <cdparam x="32" y="587" />
 <sizeparam width="262" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="861" />
+<TGConnectingPoint num="1" id="862" />
+<TGConnectingPoint num="2" id="863" />
+<TGConnectingPoint num="3" id="864" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1695,69 +1808,90 @@
 <computeMax value="coffeeMaxDelay" />
 <actions value="nbOfCoins = 0" />
 <actions value="beverageReady()" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="782" >
+<CONNECTOR type="5102" id="874" >
 <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" />
-<P1  x="222" y="475" id="997" />
-<P2  x="121" y="522" id="970" />
+<TGConnectingPoint num="0" id="873" />
+<P1  x="222" y="475" id="1116" />
+<P2  x="121" y="522" id="1129" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="781" >
-<father id="782" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="872" >
+<father id="874" num="0" />
 <cdparam x="229" y="505" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="868" />
+<TGConnectingPoint num="1" id="869" />
+<TGConnectingPoint num="2" id="870" />
+<TGConnectingPoint num="3" id="871" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="784" >
+<CONNECTOR type="5102" id="881" >
 <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" />
-<P1  x="256" y="419" id="981" />
-<P2  x="255" y="435" id="984" />
+<TGConnectingPoint num="0" id="880" />
+<P1  x="256" y="419" id="1127" />
+<P2  x="255" y="435" id="1103" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="783" >
-<father id="784" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="879" >
+<father id="881" num="0" />
 <cdparam x="280" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="875" />
+<TGConnectingPoint num="1" id="876" />
+<TGConnectingPoint num="2" id="877" />
+<TGConnectingPoint num="3" id="878" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="786" >
+<CONNECTOR type="5102" id="888" >
 <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" />
-<P1  x="699" y="346" id="811" />
-<P2  x="699" y="381" id="935" />
+<TGConnectingPoint num="0" id="887" />
+<P1  x="699" y="346" id="943" />
+<P2  x="699" y="381" id="1067" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="785" >
-<father id="786" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="886" >
+<father id="888" num="0" />
 <cdparam x="707" y="368" />
 <sizeparam width="85" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="882" />
+<TGConnectingPoint num="1" id="883" />
+<TGConnectingPoint num="2" id="884" />
+<TGConnectingPoint num="3" id="885" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1765,92 +1899,120 @@
 <computeMin value="" />
 <computeMax value="" />
 <actions value="nbOfCoins = 0" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="788" >
+<CONNECTOR type="5102" id="895" >
 <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" />
-<P1  x="388" y="208" id="861" />
-<P2  x="649" y="264" id="835" />
+<TGConnectingPoint num="0" id="894" />
+<P1  x="388" y="208" id="993" />
+<P2  x="649" y="264" id="967" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="787" >
-<father id="788" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="893" >
+<father id="895" num="0" />
 <cdparam x="411" y="206" />
 <sizeparam width="94" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="889" />
+<TGConnectingPoint num="1" id="890" />
+<TGConnectingPoint num="2" id="891" />
+<TGConnectingPoint num="3" id="892" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="790" >
+<CONNECTOR type="5102" id="902" >
 <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" />
-<P1  x="277" y="305" id="822" />
-<P2  x="306" y="370" id="1020" />
+<TGConnectingPoint num="0" id="901" />
+<P1  x="277" y="305" id="954" />
+<P2  x="306" y="370" id="1152" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="789" >
-<father id="790" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="900" >
+<father id="902" num="0" />
 <cdparam x="243" y="359" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="896" />
+<TGConnectingPoint num="1" id="897" />
+<TGConnectingPoint num="2" id="898" />
+<TGConnectingPoint num="3" id="899" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="792" >
+<CONNECTOR type="5102" id="909" >
 <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" />
-<P1  x="270" y="228" id="871" />
-<P2  x="277" y="275" id="821" />
+<TGConnectingPoint num="0" id="908" />
+<P1  x="270" y="228" id="1003" />
+<P2  x="277" y="275" id="953" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="791" >
-<father id="792" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="907" >
+<father id="909" num="0" />
 <cdparam x="270" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="903" />
+<TGConnectingPoint num="1" id="904" />
+<TGConnectingPoint num="2" id="905" />
+<TGConnectingPoint num="3" id="906" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="794" >
+<CONNECTOR type="5102" id="916" >
 <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" />
-<P1  x="306" y="166" id="800" />
-<P2  x="309" y="188" id="858" />
+<TGConnectingPoint num="0" id="915" />
+<P1  x="306" y="166" id="932" />
+<P2  x="309" y="188" id="990" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="793" >
-<father id="794" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="914" >
+<father id="916" num="0" />
 <cdparam x="313" y="173" />
 <sizeparam width="161" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="910" />
+<TGConnectingPoint num="1" id="911" />
+<TGConnectingPoint num="2" id="912" />
+<TGConnectingPoint num="3" id="913" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1858,799 +2020,980 @@
 <computeMin value="" />
 <computeMax value="" />
 <actions value="nbOfCoins = nbOfCoins + x" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="796" >
+<CONNECTOR type="5102" id="923" >
 <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" />
-<P1  x="303" y="103" id="890" />
-<P2  x="306" y="136" id="799" />
+<TGConnectingPoint num="0" id="922" />
+<P1  x="303" y="103" id="1022" />
+<P2  x="306" y="136" id="931" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="795" >
-<father id="796" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="921" >
+<father id="923" num="0" />
 <cdparam x="303" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="917" />
+<TGConnectingPoint num="1" id="918" />
+<TGConnectingPoint num="2" id="919" />
+<TGConnectingPoint num="3" id="920" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="798" >
+<CONNECTOR type="5102" id="930" >
 <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" />
-<P1  x="303" y="40" id="882" />
-<P2  x="303" y="63" id="885" />
+<TGConnectingPoint num="0" id="929" />
+<P1  x="303" y="40" id="1014" />
+<P2  x="303" y="63" id="1017" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="797" >
-<father id="798" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="928" >
+<father id="930" num="0" />
 <cdparam x="303" y="80" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="924" />
+<TGConnectingPoint num="1" id="925" />
+<TGConnectingPoint num="2" id="926" />
+<TGConnectingPoint num="3" id="927" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="809" >
+<COMPONENT type="5104" id="941" >
 <cdparam x="243" y="141" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="799" />
-<TGConnectingPoint num="1" id="800" />
-<TGConnectingPoint num="2" id="801" />
-<TGConnectingPoint num="3" id="802" />
-<TGConnectingPoint num="4" id="803" />
-<TGConnectingPoint num="5" id="804" />
-<TGConnectingPoint num="6" id="805" />
-<TGConnectingPoint num="7" id="806" />
-<TGConnectingPoint num="8" id="807" />
-<TGConnectingPoint num="9" id="808" />
+<TGConnectingPoint num="0" id="931" />
+<TGConnectingPoint num="1" id="932" />
+<TGConnectingPoint num="2" id="933" />
+<TGConnectingPoint num="3" id="934" />
+<TGConnectingPoint num="4" id="935" />
+<TGConnectingPoint num="5" id="936" />
+<TGConnectingPoint num="6" id="937" />
+<TGConnectingPoint num="7" id="938" />
+<TGConnectingPoint num="8" id="939" />
+<TGConnectingPoint num="9" id="940" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="820" >
+<COMPONENT type="5103" id="952" >
 <cdparam x="635" y="321" />
 <sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="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="0" id="942" />
+<TGConnectingPoint num="1" id="943" />
+<TGConnectingPoint num="2" id="944" />
+<TGConnectingPoint num="3" id="945" />
+<TGConnectingPoint num="4" id="946" />
+<TGConnectingPoint num="5" id="947" />
+<TGConnectingPoint num="6" id="948" />
+<TGConnectingPoint num="7" id="949" />
+<TGConnectingPoint num="8" id="950" />
+<TGConnectingPoint num="9" id="951" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="831" >
+<COMPONENT type="5104" id="963" >
 <cdparam x="241" y="280" />
 <sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="821" />
-<TGConnectingPoint num="1" id="822" />
-<TGConnectingPoint num="2" id="823" />
-<TGConnectingPoint num="3" id="824" />
-<TGConnectingPoint num="4" id="825" />
-<TGConnectingPoint num="5" id="826" />
-<TGConnectingPoint num="6" id="827" />
-<TGConnectingPoint num="7" id="828" />
-<TGConnectingPoint num="8" id="829" />
-<TGConnectingPoint num="9" id="830" />
+<TGConnectingPoint num="0" id="953" />
+<TGConnectingPoint num="1" id="954" />
+<TGConnectingPoint num="2" id="955" />
+<TGConnectingPoint num="3" id="956" />
+<TGConnectingPoint num="4" id="957" />
+<TGConnectingPoint num="5" id="958" />
+<TGConnectingPoint num="6" id="959" />
+<TGConnectingPoint num="7" id="960" />
+<TGConnectingPoint num="8" id="961" />
+<TGConnectingPoint num="9" id="962" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5106" id="856" >
+<COMPONENT type="5106" id="988" >
 <cdparam x="649" y="239" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="1000" 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="832" />
-<TGConnectingPoint num="1" id="833" />
-<TGConnectingPoint num="2" id="834" />
-<TGConnectingPoint num="3" id="835" />
-<TGConnectingPoint num="4" id="836" />
-<TGConnectingPoint num="5" id="837" />
-<TGConnectingPoint num="6" id="838" />
-<TGConnectingPoint num="7" id="839" />
-<TGConnectingPoint num="8" id="840" />
-<TGConnectingPoint num="9" id="841" />
-<TGConnectingPoint num="10" id="842" />
-<TGConnectingPoint num="11" id="843" />
-<TGConnectingPoint num="12" id="844" />
-<TGConnectingPoint num="13" id="845" />
-<TGConnectingPoint num="14" id="846" />
-<TGConnectingPoint num="15" id="847" />
-<TGConnectingPoint num="16" id="848" />
-<TGConnectingPoint num="17" id="849" />
-<TGConnectingPoint num="18" id="850" />
-<TGConnectingPoint num="19" id="851" />
-<TGConnectingPoint num="20" id="852" />
-<TGConnectingPoint num="21" id="853" />
-<TGConnectingPoint num="22" id="854" />
-<TGConnectingPoint num="23" id="855" />
+<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="2" id="966" />
+<TGConnectingPoint num="3" id="967" />
+<TGConnectingPoint num="4" id="968" />
+<TGConnectingPoint num="5" id="969" />
+<TGConnectingPoint num="6" id="970" />
+<TGConnectingPoint num="7" id="971" />
+<TGConnectingPoint num="8" id="972" />
+<TGConnectingPoint num="9" id="973" />
+<TGConnectingPoint num="10" id="974" />
+<TGConnectingPoint num="11" id="975" />
+<TGConnectingPoint num="12" id="976" />
+<TGConnectingPoint num="13" id="977" />
+<TGConnectingPoint num="14" id="978" />
+<TGConnectingPoint num="15" id="979" />
+<TGConnectingPoint num="16" id="980" />
+<TGConnectingPoint num="17" id="981" />
+<TGConnectingPoint num="18" id="982" />
+<TGConnectingPoint num="19" id="983" />
+<TGConnectingPoint num="20" id="984" />
+<TGConnectingPoint num="21" id="985" />
+<TGConnectingPoint num="22" id="986" />
+<TGConnectingPoint num="23" id="987" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="881" >
+<COMPONENT type="5106" id="1013" >
 <cdparam x="231" y="188" />
 <sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="857" />
-<TGConnectingPoint num="1" id="858" />
-<TGConnectingPoint num="2" id="859" />
-<TGConnectingPoint num="3" id="860" />
-<TGConnectingPoint num="4" id="861" />
-<TGConnectingPoint num="5" id="862" />
-<TGConnectingPoint num="6" id="863" />
-<TGConnectingPoint num="7" id="864" />
-<TGConnectingPoint num="8" id="865" />
-<TGConnectingPoint num="9" id="866" />
-<TGConnectingPoint num="10" id="867" />
-<TGConnectingPoint num="11" id="868" />
-<TGConnectingPoint num="12" id="869" />
-<TGConnectingPoint num="13" id="870" />
-<TGConnectingPoint num="14" id="871" />
-<TGConnectingPoint num="15" id="872" />
-<TGConnectingPoint num="16" id="873" />
-<TGConnectingPoint num="17" id="874" />
-<TGConnectingPoint num="18" id="875" />
-<TGConnectingPoint num="19" id="876" />
-<TGConnectingPoint num="20" id="877" />
-<TGConnectingPoint num="21" id="878" />
-<TGConnectingPoint num="22" id="879" />
-<TGConnectingPoint num="23" id="880" />
+<TGConnectingPoint num="0" id="989" />
+<TGConnectingPoint num="1" id="990" />
+<TGConnectingPoint num="2" id="991" />
+<TGConnectingPoint num="3" id="992" />
+<TGConnectingPoint num="4" id="993" />
+<TGConnectingPoint num="5" id="994" />
+<TGConnectingPoint num="6" id="995" />
+<TGConnectingPoint num="7" id="996" />
+<TGConnectingPoint num="8" id="997" />
+<TGConnectingPoint num="9" id="998" />
+<TGConnectingPoint num="10" id="999" />
+<TGConnectingPoint num="11" id="1000" />
+<TGConnectingPoint num="12" id="1001" />
+<TGConnectingPoint num="13" id="1002" />
+<TGConnectingPoint num="14" id="1003" />
+<TGConnectingPoint num="15" id="1004" />
+<TGConnectingPoint num="16" id="1005" />
+<TGConnectingPoint num="17" id="1006" />
+<TGConnectingPoint num="18" id="1007" />
+<TGConnectingPoint num="19" id="1008" />
+<TGConnectingPoint num="20" id="1009" />
+<TGConnectingPoint num="21" id="1010" />
+<TGConnectingPoint num="22" id="1011" />
+<TGConnectingPoint num="23" id="1012" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="883" >
+<COMPONENT type="5100" id="1015" >
 <cdparam x="296" y="20" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="882" />
+<TGConnectingPoint num="0" id="1014" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="908" >
+<COMPONENT type="5106" id="1040" >
 <cdparam x="235" y="63" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="884" />
-<TGConnectingPoint num="1" id="885" />
-<TGConnectingPoint num="2" id="886" />
-<TGConnectingPoint num="3" id="887" />
-<TGConnectingPoint num="4" id="888" />
-<TGConnectingPoint num="5" id="889" />
-<TGConnectingPoint num="6" id="890" />
-<TGConnectingPoint num="7" id="891" />
-<TGConnectingPoint num="8" id="892" />
-<TGConnectingPoint num="9" id="893" />
-<TGConnectingPoint num="10" id="894" />
-<TGConnectingPoint num="11" id="895" />
-<TGConnectingPoint num="12" id="896" />
-<TGConnectingPoint num="13" id="897" />
-<TGConnectingPoint num="14" id="898" />
-<TGConnectingPoint num="15" id="899" />
-<TGConnectingPoint num="16" id="900" />
-<TGConnectingPoint num="17" id="901" />
-<TGConnectingPoint num="18" id="902" />
-<TGConnectingPoint num="19" id="903" />
-<TGConnectingPoint num="20" id="904" />
-<TGConnectingPoint num="21" id="905" />
-<TGConnectingPoint num="22" id="906" />
-<TGConnectingPoint num="23" id="907" />
+<TGConnectingPoint num="0" id="1016" />
+<TGConnectingPoint num="1" id="1017" />
+<TGConnectingPoint num="2" id="1018" />
+<TGConnectingPoint num="3" id="1019" />
+<TGConnectingPoint num="4" id="1020" />
+<TGConnectingPoint num="5" id="1021" />
+<TGConnectingPoint num="6" id="1022" />
+<TGConnectingPoint num="7" id="1023" />
+<TGConnectingPoint num="8" id="1024" />
+<TGConnectingPoint num="9" id="1025" />
+<TGConnectingPoint num="10" id="1026" />
+<TGConnectingPoint num="11" id="1027" />
+<TGConnectingPoint num="12" id="1028" />
+<TGConnectingPoint num="13" id="1029" />
+<TGConnectingPoint num="14" id="1030" />
+<TGConnectingPoint num="15" id="1031" />
+<TGConnectingPoint num="16" id="1032" />
+<TGConnectingPoint num="17" id="1033" />
+<TGConnectingPoint num="18" id="1034" />
+<TGConnectingPoint num="19" id="1035" />
+<TGConnectingPoint num="20" id="1036" />
+<TGConnectingPoint num="21" id="1037" />
+<TGConnectingPoint num="22" id="1038" />
+<TGConnectingPoint num="23" id="1039" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="933" >
+<COMPONENT type="5106" id="1065" >
 <cdparam x="221" y="748" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="909" />
-<TGConnectingPoint num="1" id="910" />
-<TGConnectingPoint num="2" id="911" />
-<TGConnectingPoint num="3" id="912" />
-<TGConnectingPoint num="4" id="913" />
-<TGConnectingPoint num="5" id="914" />
-<TGConnectingPoint num="6" id="915" />
-<TGConnectingPoint num="7" id="916" />
-<TGConnectingPoint num="8" id="917" />
-<TGConnectingPoint num="9" id="918" />
-<TGConnectingPoint num="10" id="919" />
-<TGConnectingPoint num="11" id="920" />
-<TGConnectingPoint num="12" id="921" />
-<TGConnectingPoint num="13" id="922" />
-<TGConnectingPoint num="14" id="923" />
-<TGConnectingPoint num="15" id="924" />
-<TGConnectingPoint num="16" id="925" />
-<TGConnectingPoint num="17" id="926" />
-<TGConnectingPoint num="18" id="927" />
-<TGConnectingPoint num="19" id="928" />
-<TGConnectingPoint num="20" id="929" />
-<TGConnectingPoint num="21" id="930" />
-<TGConnectingPoint num="22" id="931" />
-<TGConnectingPoint num="23" id="932" />
+<TGConnectingPoint num="0" id="1041" />
+<TGConnectingPoint num="1" id="1042" />
+<TGConnectingPoint num="2" id="1043" />
+<TGConnectingPoint num="3" id="1044" />
+<TGConnectingPoint num="4" id="1045" />
+<TGConnectingPoint num="5" id="1046" />
+<TGConnectingPoint num="6" id="1047" />
+<TGConnectingPoint num="7" id="1048" />
+<TGConnectingPoint num="8" id="1049" />
+<TGConnectingPoint num="9" id="1050" />
+<TGConnectingPoint num="10" id="1051" />
+<TGConnectingPoint num="11" id="1052" />
+<TGConnectingPoint num="12" id="1053" />
+<TGConnectingPoint num="13" id="1054" />
+<TGConnectingPoint num="14" id="1055" />
+<TGConnectingPoint num="15" id="1056" />
+<TGConnectingPoint num="16" id="1057" />
+<TGConnectingPoint num="17" id="1058" />
+<TGConnectingPoint num="18" id="1059" />
+<TGConnectingPoint num="19" id="1060" />
+<TGConnectingPoint num="20" id="1061" />
+<TGConnectingPoint num="21" id="1062" />
+<TGConnectingPoint num="22" id="1063" />
+<TGConnectingPoint num="23" id="1064" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="958" >
+<COMPONENT type="5106" id="1090" >
 <cdparam x="631" y="381" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="934" />
-<TGConnectingPoint num="1" id="935" />
-<TGConnectingPoint num="2" id="936" />
-<TGConnectingPoint num="3" id="937" />
-<TGConnectingPoint num="4" id="938" />
-<TGConnectingPoint num="5" id="939" />
-<TGConnectingPoint num="6" id="940" />
-<TGConnectingPoint num="7" id="941" />
-<TGConnectingPoint num="8" id="942" />
-<TGConnectingPoint num="9" id="943" />
-<TGConnectingPoint num="10" id="944" />
-<TGConnectingPoint num="11" id="945" />
-<TGConnectingPoint num="12" id="946" />
-<TGConnectingPoint num="13" id="947" />
-<TGConnectingPoint num="14" id="948" />
-<TGConnectingPoint num="15" id="949" />
-<TGConnectingPoint num="16" id="950" />
-<TGConnectingPoint num="17" id="951" />
-<TGConnectingPoint num="18" id="952" />
-<TGConnectingPoint num="19" id="953" />
-<TGConnectingPoint num="20" id="954" />
-<TGConnectingPoint num="21" id="955" />
-<TGConnectingPoint num="22" id="956" />
-<TGConnectingPoint num="23" id="957" />
+<TGConnectingPoint num="0" id="1066" />
+<TGConnectingPoint num="1" id="1067" />
+<TGConnectingPoint num="2" id="1068" />
+<TGConnectingPoint num="3" id="1069" />
+<TGConnectingPoint num="4" id="1070" />
+<TGConnectingPoint num="5" id="1071" />
+<TGConnectingPoint num="6" id="1072" />
+<TGConnectingPoint num="7" id="1073" />
+<TGConnectingPoint num="8" id="1074" />
+<TGConnectingPoint num="9" id="1075" />
+<TGConnectingPoint num="10" id="1076" />
+<TGConnectingPoint num="11" id="1077" />
+<TGConnectingPoint num="12" id="1078" />
+<TGConnectingPoint num="13" id="1079" />
+<TGConnectingPoint num="14" id="1080" />
+<TGConnectingPoint num="15" id="1081" />
+<TGConnectingPoint num="16" id="1082" />
+<TGConnectingPoint num="17" id="1083" />
+<TGConnectingPoint num="18" id="1084" />
+<TGConnectingPoint num="19" id="1085" />
+<TGConnectingPoint num="20" id="1086" />
+<TGConnectingPoint num="21" id="1087" />
+<TGConnectingPoint num="22" id="1088" />
+<TGConnectingPoint num="23" id="1089" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1043" >
+<COMPONENT type="5106" id="1175" >
 <cdparam x="18" y="370" />
 <sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="1000" 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="1019" />
-<TGConnectingPoint num="1" id="1020" />
-<TGConnectingPoint num="2" id="1021" />
-<TGConnectingPoint num="3" id="1022" />
-<TGConnectingPoint num="4" id="1023" />
-<TGConnectingPoint num="5" id="1024" />
-<TGConnectingPoint num="6" id="1025" />
-<TGConnectingPoint num="7" id="1026" />
-<TGConnectingPoint num="8" id="1027" />
-<TGConnectingPoint num="9" id="1028" />
-<TGConnectingPoint num="10" id="1029" />
-<TGConnectingPoint num="11" id="1030" />
-<TGConnectingPoint num="12" id="1031" />
-<TGConnectingPoint num="13" id="1032" />
-<TGConnectingPoint num="14" id="1033" />
-<TGConnectingPoint num="15" id="1034" />
-<TGConnectingPoint num="16" id="1035" />
-<TGConnectingPoint num="17" id="1036" />
-<TGConnectingPoint num="18" id="1037" />
-<TGConnectingPoint num="19" id="1038" />
-<TGConnectingPoint num="20" id="1039" />
-<TGConnectingPoint num="21" id="1040" />
-<TGConnectingPoint num="22" id="1041" />
-<TGConnectingPoint num="23" id="1042" />
+<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" />
+<TGConnectingPoint num="10" id="1161" />
+<TGConnectingPoint num="11" id="1162" />
+<TGConnectingPoint num="12" id="1163" />
+<TGConnectingPoint num="13" id="1164" />
+<TGConnectingPoint num="14" id="1165" />
+<TGConnectingPoint num="15" id="1166" />
+<TGConnectingPoint num="16" id="1167" />
+<TGConnectingPoint num="17" id="1168" />
+<TGConnectingPoint num="18" id="1169" />
+<TGConnectingPoint num="19" id="1170" />
+<TGConnectingPoint num="20" id="1171" />
+<TGConnectingPoint num="21" id="1172" />
+<TGConnectingPoint num="22" id="1173" />
+<TGConnectingPoint num="23" id="1174" />
 </COMPONENT>
-<SUBCOMPONENT type="5103" id="969" >
-<father id="1043" num="0" />
-<cdparam x="373" y="500" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1101" >
+<father id="1175" num="0" />
+<cdparam x="239" y="527" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="959" />
-<TGConnectingPoint num="1" id="960" />
-<TGConnectingPoint num="2" id="961" />
-<TGConnectingPoint num="3" id="962" />
-<TGConnectingPoint num="4" id="963" />
-<TGConnectingPoint num="5" id="964" />
-<TGConnectingPoint num="6" id="965" />
-<TGConnectingPoint num="7" id="966" />
-<TGConnectingPoint num="8" id="967" />
-<TGConnectingPoint num="9" id="968" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="1091" />
+<TGConnectingPoint num="1" id="1092" />
+<TGConnectingPoint num="2" id="1093" />
+<TGConnectingPoint num="3" id="1094" />
+<TGConnectingPoint num="4" id="1095" />
+<TGConnectingPoint num="5" id="1096" />
+<TGConnectingPoint num="6" id="1097" />
+<TGConnectingPoint num="7" id="1098" />
+<TGConnectingPoint num="8" id="1099" />
+<TGConnectingPoint num="9" id="1100" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="980" >
-<father id="1043" num="1" />
-<cdparam x="59" y="527" />
-<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5106" id="1126" >
+<father id="1175" num="1" />
+<cdparam x="189" y="435" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="1000" 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="970" />
-<TGConnectingPoint num="1" id="971" />
-<TGConnectingPoint num="2" id="972" />
-<TGConnectingPoint num="3" id="973" />
-<TGConnectingPoint num="4" id="974" />
-<TGConnectingPoint num="5" id="975" />
-<TGConnectingPoint num="6" id="976" />
-<TGConnectingPoint num="7" id="977" />
-<TGConnectingPoint num="8" id="978" />
-<TGConnectingPoint num="9" id="979" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="1102" />
+<TGConnectingPoint num="1" id="1103" />
+<TGConnectingPoint num="2" id="1104" />
+<TGConnectingPoint num="3" id="1105" />
+<TGConnectingPoint num="4" id="1106" />
+<TGConnectingPoint num="5" id="1107" />
+<TGConnectingPoint num="6" id="1108" />
+<TGConnectingPoint num="7" id="1109" />
+<TGConnectingPoint num="8" id="1110" />
+<TGConnectingPoint num="9" id="1111" />
+<TGConnectingPoint num="10" id="1112" />
+<TGConnectingPoint num="11" id="1113" />
+<TGConnectingPoint num="12" id="1114" />
+<TGConnectingPoint num="13" id="1115" />
+<TGConnectingPoint num="14" id="1116" />
+<TGConnectingPoint num="15" id="1117" />
+<TGConnectingPoint num="16" id="1118" />
+<TGConnectingPoint num="17" id="1119" />
+<TGConnectingPoint num="18" id="1120" />
+<TGConnectingPoint num="19" id="1121" />
+<TGConnectingPoint num="20" id="1122" />
+<TGConnectingPoint num="21" id="1123" />
+<TGConnectingPoint num="22" id="1124" />
+<TGConnectingPoint num="23" id="1125" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="982" >
-<father id="1043" num="2" />
+<SUBCOMPONENT type="5100" id="1128" >
+<father id="1175" num="2" />
 <cdparam x="249" y="399" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="981" />
+<TGConnectingPoint num="0" id="1127" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1007" >
-<father id="1043" num="3" />
-<cdparam x="189" y="435" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="1139" >
+<father id="1175" num="3" />
+<cdparam x="59" y="527" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="983" />
-<TGConnectingPoint num="1" id="984" />
-<TGConnectingPoint num="2" id="985" />
-<TGConnectingPoint num="3" id="986" />
-<TGConnectingPoint num="4" id="987" />
-<TGConnectingPoint num="5" id="988" />
-<TGConnectingPoint num="6" id="989" />
-<TGConnectingPoint num="7" id="990" />
-<TGConnectingPoint num="8" id="991" />
-<TGConnectingPoint num="9" id="992" />
-<TGConnectingPoint num="10" id="993" />
-<TGConnectingPoint num="11" id="994" />
-<TGConnectingPoint num="12" id="995" />
-<TGConnectingPoint num="13" id="996" />
-<TGConnectingPoint num="14" id="997" />
-<TGConnectingPoint num="15" id="998" />
-<TGConnectingPoint num="16" id="999" />
-<TGConnectingPoint num="17" id="1000" />
-<TGConnectingPoint num="18" id="1001" />
-<TGConnectingPoint num="19" id="1002" />
-<TGConnectingPoint num="20" id="1003" />
-<TGConnectingPoint num="21" id="1004" />
-<TGConnectingPoint num="22" id="1005" />
-<TGConnectingPoint num="23" id="1006" />
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1129" />
+<TGConnectingPoint num="1" id="1130" />
+<TGConnectingPoint num="2" id="1131" />
+<TGConnectingPoint num="3" id="1132" />
+<TGConnectingPoint num="4" id="1133" />
+<TGConnectingPoint num="5" id="1134" />
+<TGConnectingPoint num="6" id="1135" />
+<TGConnectingPoint num="7" id="1136" />
+<TGConnectingPoint num="8" id="1137" />
+<TGConnectingPoint num="9" id="1138" />
+<accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1018" >
-<father id="1043" num="4" />
-<cdparam x="239" y="527" />
-<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5103" id="1150" >
+<father id="1175" num="4" />
+<cdparam x="373" y="500" />
+<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="1008" />
-<TGConnectingPoint num="1" id="1009" />
-<TGConnectingPoint num="2" id="1010" />
-<TGConnectingPoint num="3" id="1011" />
-<TGConnectingPoint num="4" id="1012" />
-<TGConnectingPoint num="5" id="1013" />
-<TGConnectingPoint num="6" id="1014" />
-<TGConnectingPoint num="7" id="1015" />
-<TGConnectingPoint num="8" id="1016" />
-<TGConnectingPoint num="9" id="1017" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="1140" />
+<TGConnectingPoint num="1" id="1141" />
+<TGConnectingPoint num="2" id="1142" />
+<TGConnectingPoint num="3" id="1143" />
+<TGConnectingPoint num="4" id="1144" />
+<TGConnectingPoint num="5" id="1145" />
+<TGConnectingPoint num="6" id="1146" />
+<TGConnectingPoint num="7" id="1147" />
+<TGConnectingPoint num="8" id="1148" />
+<TGConnectingPoint num="9" id="1149" />
 <accessibility />
 </SUBCOMPONENT>
 
 
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1182" >
+<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 Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1181" />
+<P1  x="363" y="204" id="1198" />
+<P2  x="362" y="257" id="1209" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1180" >
+<father id="1182" num="0" />
+<cdparam x="368" y="210" />
+<sizeparam width="135" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1176" />
+<TGConnectingPoint num="1" id="1177" />
+<TGConnectingPoint num="2" id="1178" />
+<TGConnectingPoint num="3" id="1179" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1189" >
+<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 state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1188" />
+<P1  x="363" y="150" id="1239" />
+<P2  x="363" y="174" id="1197" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1187" >
+<father id="1189" num="0" />
+<cdparam x="363" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1183" />
+<TGConnectingPoint num="1" id="1184" />
+<TGConnectingPoint num="2" id="1185" />
+<TGConnectingPoint num="3" id="1186" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1196" >
+<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 start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1195" />
+<P1  x="362" y="101" id="1258" />
+<P2  x="363" y="120" id="1234" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1194" >
+<father id="1196" num="0" />
+<cdparam x="362" y="141" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1190" />
+<TGConnectingPoint num="1" id="1191" />
+<TGConnectingPoint num="2" id="1192" />
+<TGConnectingPoint num="3" id="1193" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5103" id="1207" >
+<cdparam x="340" y="179" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="1197" />
+<TGConnectingPoint num="1" id="1198" />
+<TGConnectingPoint num="2" id="1199" />
+<TGConnectingPoint num="3" id="1200" />
+<TGConnectingPoint num="4" id="1201" />
+<TGConnectingPoint num="5" id="1202" />
+<TGConnectingPoint num="6" id="1203" />
+<TGConnectingPoint num="7" id="1204" />
+<TGConnectingPoint num="8" id="1205" />
+<TGConnectingPoint num="9" id="1206" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1232" >
+<cdparam x="337" y="257" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="1208" />
+<TGConnectingPoint num="1" id="1209" />
+<TGConnectingPoint num="2" id="1210" />
+<TGConnectingPoint num="3" id="1211" />
+<TGConnectingPoint num="4" id="1212" />
+<TGConnectingPoint num="5" id="1213" />
+<TGConnectingPoint num="6" id="1214" />
+<TGConnectingPoint num="7" id="1215" />
+<TGConnectingPoint num="8" id="1216" />
+<TGConnectingPoint num="9" id="1217" />
+<TGConnectingPoint num="10" id="1218" />
+<TGConnectingPoint num="11" id="1219" />
+<TGConnectingPoint num="12" id="1220" />
+<TGConnectingPoint num="13" id="1221" />
+<TGConnectingPoint num="14" id="1222" />
+<TGConnectingPoint num="15" id="1223" />
+<TGConnectingPoint num="16" id="1224" />
+<TGConnectingPoint num="17" id="1225" />
+<TGConnectingPoint num="18" id="1226" />
+<TGConnectingPoint num="19" id="1227" />
+<TGConnectingPoint num="20" id="1228" />
+<TGConnectingPoint num="21" id="1229" />
+<TGConnectingPoint num="22" id="1230" />
+<TGConnectingPoint num="23" id="1231" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1257" >
+<cdparam x="338" y="120" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="1233" />
+<TGConnectingPoint num="1" id="1234" />
+<TGConnectingPoint num="2" id="1235" />
+<TGConnectingPoint num="3" id="1236" />
+<TGConnectingPoint num="4" id="1237" />
+<TGConnectingPoint num="5" id="1238" />
+<TGConnectingPoint num="6" id="1239" />
+<TGConnectingPoint num="7" id="1240" />
+<TGConnectingPoint num="8" id="1241" />
+<TGConnectingPoint num="9" id="1242" />
+<TGConnectingPoint num="10" id="1243" />
+<TGConnectingPoint num="11" id="1244" />
+<TGConnectingPoint num="12" id="1245" />
+<TGConnectingPoint num="13" id="1246" />
+<TGConnectingPoint num="14" id="1247" />
+<TGConnectingPoint num="15" id="1248" />
+<TGConnectingPoint num="16" id="1249" />
+<TGConnectingPoint num="17" id="1250" />
+<TGConnectingPoint num="18" id="1251" />
+<TGConnectingPoint num="19" id="1252" />
+<TGConnectingPoint num="20" id="1253" />
+<TGConnectingPoint num="21" id="1254" />
+<TGConnectingPoint num="22" id="1255" />
+<TGConnectingPoint num="23" id="1256" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1259" >
+<cdparam x="355" y="81" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="1258" />
+</COMPONENT>
+
+
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1045" >
+<CONNECTOR type="5102" id="1266" >
 <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 start state to Send signal" value="null" />
-<P1  x="340" y="233" id="1104" />
-<P2  x="353" y="252" id="1106" />
+<TGConnectingPoint num="0" id="1265" />
+<P1  x="340" y="233" id="1351" />
+<P2  x="353" y="252" id="1340" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1044" >
-<father id="1045" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1264" >
+<father id="1266" num="0" />
 <cdparam x="177" y="239" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<TGConnectingPoint num="2" id="1262" />
+<TGConnectingPoint num="3" id="1263" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1047" >
+<CONNECTOR type="5102" id="1273" >
 <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 start state to state0" value="null" />
-<P1  x="322" y="69" id="1102" />
-<P2  x="323" y="88" id="1078" />
+<TGConnectingPoint num="0" id="1272" />
+<P1  x="322" y="69" id="1338" />
+<P2  x="323" y="88" id="1314" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1046" >
-<father id="1047" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1271" >
+<father id="1273" num="0" />
 <cdparam x="322" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1267" />
+<TGConnectingPoint num="1" id="1268" />
+<TGConnectingPoint num="2" id="1269" />
+<TGConnectingPoint num="3" id="1270" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1049" >
+<CONNECTOR type="5102" id="1280" >
 <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 state0 to Send signal" value="null" />
-<P1  x="323" y="118" id="1083" />
-<P2  x="356" y="174" id="1118" />
+<TGConnectingPoint num="0" id="1279" />
+<P1  x="323" y="118" id="1319" />
+<P2  x="356" y="174" id="1354" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1048" >
-<father id="1049" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1278" >
+<father id="1280" num="0" />
 <cdparam x="377" y="184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1274" />
+<TGConnectingPoint num="1" id="1275" />
+<TGConnectingPoint num="2" id="1276" />
+<TGConnectingPoint num="3" id="1277" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1051" >
+<CONNECTOR type="5102" id="1287" >
 <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" />
-<P1  x="353" y="282" id="1107" />
-<P2  x="399" y="352" id="1053" />
+<TGConnectingPoint num="0" id="1286" />
+<P1  x="353" y="282" id="1341" />
+<P2  x="399" y="352" id="1289" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1050" >
-<father id="1051" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1285" >
+<father id="1287" num="0" />
 <cdparam x="349" y="148" />
 <sizeparam width="135" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1281" />
+<TGConnectingPoint num="1" id="1282" />
+<TGConnectingPoint num="2" id="1283" />
+<TGConnectingPoint num="3" id="1284" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="mechanicalDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<filesToIncludeLine value="" />
+<codeToIncludeLine value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1076" >
+<COMPONENT type="5106" id="1312" >
 <cdparam x="374" y="352" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="1052" />
-<TGConnectingPoint num="1" id="1053" />
-<TGConnectingPoint num="2" id="1054" />
-<TGConnectingPoint num="3" id="1055" />
-<TGConnectingPoint num="4" id="1056" />
-<TGConnectingPoint num="5" id="1057" />
-<TGConnectingPoint num="6" id="1058" />
-<TGConnectingPoint num="7" id="1059" />
-<TGConnectingPoint num="8" id="1060" />
-<TGConnectingPoint num="9" id="1061" />
-<TGConnectingPoint num="10" id="1062" />
-<TGConnectingPoint num="11" id="1063" />
-<TGConnectingPoint num="12" id="1064" />
-<TGConnectingPoint num="13" id="1065" />
-<TGConnectingPoint num="14" id="1066" />
-<TGConnectingPoint num="15" id="1067" />
-<TGConnectingPoint num="16" id="1068" />
-<TGConnectingPoint num="17" id="1069" />
-<TGConnectingPoint num="18" id="1070" />
-<TGConnectingPoint num="19" id="1071" />
-<TGConnectingPoint num="20" id="1072" />
-<TGConnectingPoint num="21" id="1073" />
-<TGConnectingPoint num="22" id="1074" />
-<TGConnectingPoint num="23" id="1075" />
+<TGConnectingPoint num="0" id="1288" />
+<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="2" id="1290" />
+<TGConnectingPoint num="3" id="1291" />
+<TGConnectingPoint num="4" id="1292" />
+<TGConnectingPoint num="5" id="1293" />
+<TGConnectingPoint num="6" id="1294" />
+<TGConnectingPoint num="7" id="1295" />
+<TGConnectingPoint num="8" id="1296" />
+<TGConnectingPoint num="9" id="1297" />
+<TGConnectingPoint num="10" id="1298" />
+<TGConnectingPoint num="11" id="1299" />
+<TGConnectingPoint num="12" id="1300" />
+<TGConnectingPoint num="13" id="1301" />
+<TGConnectingPoint num="14" id="1302" />
+<TGConnectingPoint num="15" id="1303" />
+<TGConnectingPoint num="16" id="1304" />
+<TGConnectingPoint num="17" id="1305" />
+<TGConnectingPoint num="18" id="1306" />
+<TGConnectingPoint num="19" id="1307" />
+<TGConnectingPoint num="20" id="1308" />
+<TGConnectingPoint num="21" id="1309" />
+<TGConnectingPoint num="22" id="1310" />
+<TGConnectingPoint num="23" id="1311" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1101" >
+<COMPONENT type="5106" id="1337" >
 <cdparam x="298" y="88" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="1077" />
-<TGConnectingPoint num="1" id="1078" />
-<TGConnectingPoint num="2" id="1079" />
-<TGConnectingPoint num="3" id="1080" />
-<TGConnectingPoint num="4" id="1081" />
-<TGConnectingPoint num="5" id="1082" />
-<TGConnectingPoint num="6" id="1083" />
-<TGConnectingPoint num="7" id="1084" />
-<TGConnectingPoint num="8" id="1085" />
-<TGConnectingPoint num="9" id="1086" />
-<TGConnectingPoint num="10" id="1087" />
-<TGConnectingPoint num="11" id="1088" />
-<TGConnectingPoint num="12" id="1089" />
-<TGConnectingPoint num="13" id="1090" />
-<TGConnectingPoint num="14" id="1091" />
-<TGConnectingPoint num="15" id="1092" />
-<TGConnectingPoint num="16" id="1093" />
-<TGConnectingPoint num="17" id="1094" />
-<TGConnectingPoint num="18" id="1095" />
-<TGConnectingPoint num="19" id="1096" />
-<TGConnectingPoint num="20" id="1097" />
-<TGConnectingPoint num="21" id="1098" />
-<TGConnectingPoint num="22" id="1099" />
-<TGConnectingPoint num="23" id="1100" />
+<TGConnectingPoint num="0" id="1313" />
+<TGConnectingPoint num="1" id="1314" />
+<TGConnectingPoint num="2" id="1315" />
+<TGConnectingPoint num="3" id="1316" />
+<TGConnectingPoint num="4" id="1317" />
+<TGConnectingPoint num="5" id="1318" />
+<TGConnectingPoint num="6" id="1319" />
+<TGConnectingPoint num="7" id="1320" />
+<TGConnectingPoint num="8" id="1321" />
+<TGConnectingPoint num="9" id="1322" />
+<TGConnectingPoint num="10" id="1323" />
+<TGConnectingPoint num="11" id="1324" />
+<TGConnectingPoint num="12" id="1325" />
+<TGConnectingPoint num="13" id="1326" />
+<TGConnectingPoint num="14" id="1327" />
+<TGConnectingPoint num="15" id="1328" />
+<TGConnectingPoint num="16" id="1329" />
+<TGConnectingPoint num="17" id="1330" />
+<TGConnectingPoint num="18" id="1331" />
+<TGConnectingPoint num="19" id="1332" />
+<TGConnectingPoint num="20" id="1333" />
+<TGConnectingPoint num="21" id="1334" />
+<TGConnectingPoint num="22" id="1335" />
+<TGConnectingPoint num="23" id="1336" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="1103" >
+<COMPONENT type="5100" id="1339" >
 <cdparam x="315" y="49" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="1102" />
+<TGConnectingPoint num="0" id="1338" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1141" >
+<COMPONENT type="5106" id="1377" >
 <cdparam x="264" y="174" />
 <sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="1000" 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="1117" />
-<TGConnectingPoint num="1" id="1118" />
-<TGConnectingPoint num="2" id="1119" />
-<TGConnectingPoint num="3" id="1120" />
-<TGConnectingPoint num="4" id="1121" />
-<TGConnectingPoint num="5" id="1122" />
-<TGConnectingPoint num="6" id="1123" />
-<TGConnectingPoint num="7" id="1124" />
-<TGConnectingPoint num="8" id="1125" />
-<TGConnectingPoint num="9" id="1126" />
-<TGConnectingPoint num="10" id="1127" />
-<TGConnectingPoint num="11" id="1128" />
-<TGConnectingPoint num="12" id="1129" />
-<TGConnectingPoint num="13" id="1130" />
-<TGConnectingPoint num="14" id="1131" />
-<TGConnectingPoint num="15" id="1132" />
-<TGConnectingPoint num="16" id="1133" />
-<TGConnectingPoint num="17" id="1134" />
-<TGConnectingPoint num="18" id="1135" />
-<TGConnectingPoint num="19" id="1136" />
-<TGConnectingPoint num="20" id="1137" />
-<TGConnectingPoint num="21" id="1138" />
-<TGConnectingPoint num="22" id="1139" />
-<TGConnectingPoint num="23" id="1140" />
+<TGConnectingPoint num="0" id="1353" />
+<TGConnectingPoint num="1" id="1354" />
+<TGConnectingPoint num="2" id="1355" />
+<TGConnectingPoint num="3" id="1356" />
+<TGConnectingPoint num="4" id="1357" />
+<TGConnectingPoint num="5" id="1358" />
+<TGConnectingPoint num="6" id="1359" />
+<TGConnectingPoint num="7" id="1360" />
+<TGConnectingPoint num="8" id="1361" />
+<TGConnectingPoint num="9" id="1362" />
+<TGConnectingPoint num="10" id="1363" />
+<TGConnectingPoint num="11" id="1364" />
+<TGConnectingPoint num="12" id="1365" />
+<TGConnectingPoint num="13" id="1366" />
+<TGConnectingPoint num="14" id="1367" />
+<TGConnectingPoint num="15" id="1368" />
+<TGConnectingPoint num="16" id="1369" />
+<TGConnectingPoint num="17" id="1370" />
+<TGConnectingPoint num="18" id="1371" />
+<TGConnectingPoint num="19" id="1372" />
+<TGConnectingPoint num="20" id="1373" />
+<TGConnectingPoint num="21" id="1374" />
+<TGConnectingPoint num="22" id="1375" />
+<TGConnectingPoint num="23" id="1376" />
 </COMPONENT>
-<SUBCOMPONENT type="5100" id="1105" >
-<father id="1141" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="1104" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1116" >
-<father id="1141" num="1" />
+<SUBCOMPONENT type="5103" id="1350" >
+<father id="1377" num="0" />
 <cdparam x="330" y="257" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="1106" />
-<TGConnectingPoint num="1" id="1107" />
-<TGConnectingPoint num="2" id="1108" />
-<TGConnectingPoint num="3" id="1109" />
-<TGConnectingPoint num="4" id="1110" />
-<TGConnectingPoint num="5" id="1111" />
-<TGConnectingPoint num="6" id="1112" />
-<TGConnectingPoint num="7" id="1113" />
-<TGConnectingPoint num="8" id="1114" />
-<TGConnectingPoint num="9" id="1115" />
+<TGConnectingPoint num="0" id="1340" />
+<TGConnectingPoint num="1" id="1341" />
+<TGConnectingPoint num="2" id="1342" />
+<TGConnectingPoint num="3" id="1343" />
+<TGConnectingPoint num="4" id="1344" />
+<TGConnectingPoint num="5" id="1345" />
+<TGConnectingPoint num="6" id="1346" />
+<TGConnectingPoint num="7" id="1347" />
+<TGConnectingPoint num="8" id="1348" />
+<TGConnectingPoint num="9" id="1349" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1352" >
+<father id="1377" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="1351" />
 </SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1143" >
-<cdparam x="363" y="193" />
+</Modeling>
+
+
+
+
+<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
+<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5002" id="1433" >
+<cdparam x="509" y="208" />
 <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" />
-<P1  x="363" y="204" id="1149" />
-<P2  x="362" y="257" id="1160" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<TGConnectingPoint num="0" id="1434" />
+<P1  x="509" y="208" id="1384" />
+<P2  x="674" y="222" id="1410" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1142" >
-<father id="1143" num="0" />
-<cdparam x="368" y="210" />
-<sizeparam width="135" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" />
 </extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1145" >
-<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 state0 to Send signal" value="null" />
-<P1  x="363" y="150" id="1190" />
-<P2  x="363" y="174" id="1148" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1144" >
-<father id="1145" num="0" />
-<cdparam x="363" y="190" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR>
+<COMPONENT type="5000" id="1406" >
+<cdparam x="674" y="122" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="Block0" value="T1" />
+<TGConnectingPoint num="0" id="1407" />
+<TGConnectingPoint num="1" id="1408" />
+<TGConnectingPoint num="2" id="1409" />
+<TGConnectingPoint num="3" id="1410" />
+<TGConnectingPoint num="4" id="1411" />
+<TGConnectingPoint num="5" id="1412" />
+<TGConnectingPoint num="6" id="1413" />
+<TGConnectingPoint num="7" id="1414" />
+<TGConnectingPoint num="8" id="1415" />
+<TGConnectingPoint num="9" id="1416" />
+<TGConnectingPoint num="10" id="1417" />
+<TGConnectingPoint num="11" id="1418" />
+<TGConnectingPoint num="12" id="1419" />
+<TGConnectingPoint num="13" id="1420" />
+<TGConnectingPoint num="14" id="1421" />
+<TGConnectingPoint num="15" id="1422" />
+<TGConnectingPoint num="16" id="1423" />
+<TGConnectingPoint num="17" id="1424" />
+<TGConnectingPoint num="18" id="1425" />
+<TGConnectingPoint num="19" id="1426" />
+<TGConnectingPoint num="20" id="1427" />
+<TGConnectingPoint num="21" id="1428" />
+<TGConnectingPoint num="22" id="1429" />
+<TGConnectingPoint num="23" id="1430" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1147" >
-<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 start state to state0" value="null" />
-<P1  x="362" y="101" id="1209" />
-<P2  x="363" y="120" id="1185" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1146" >
-<father id="1147" num="0" />
-<cdparam x="362" y="141" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5000" id="1379" >
+<cdparam x="259" y="108" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="Block0" value="T0" />
+<TGConnectingPoint num="0" id="1380" />
+<TGConnectingPoint num="1" id="1381" />
+<TGConnectingPoint num="2" id="1382" />
+<TGConnectingPoint num="3" id="1383" />
+<TGConnectingPoint num="4" id="1384" />
+<TGConnectingPoint num="5" id="1385" />
+<TGConnectingPoint num="6" id="1386" />
+<TGConnectingPoint num="7" id="1387" />
+<TGConnectingPoint num="8" id="1388" />
+<TGConnectingPoint num="9" id="1389" />
+<TGConnectingPoint num="10" id="1390" />
+<TGConnectingPoint num="11" id="1391" />
+<TGConnectingPoint num="12" id="1392" />
+<TGConnectingPoint num="13" id="1393" />
+<TGConnectingPoint num="14" id="1394" />
+<TGConnectingPoint num="15" id="1395" />
+<TGConnectingPoint num="16" id="1396" />
+<TGConnectingPoint num="17" id="1397" />
+<TGConnectingPoint num="18" id="1398" />
+<TGConnectingPoint num="19" id="1399" />
+<TGConnectingPoint num="20" id="1400" />
+<TGConnectingPoint num="21" id="1401" />
+<TGConnectingPoint num="22" id="1402" />
+<TGConnectingPoint num="23" id="1403" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5103" id="1158" >
-<cdparam x="340" y="179" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="1000" 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="1148" />
-<TGConnectingPoint num="1" id="1149" />
-<TGConnectingPoint num="2" id="1150" />
-<TGConnectingPoint num="3" id="1151" />
-<TGConnectingPoint num="4" id="1152" />
-<TGConnectingPoint num="5" id="1153" />
-<TGConnectingPoint num="6" id="1154" />
-<TGConnectingPoint num="7" id="1155" />
-<TGConnectingPoint num="8" id="1156" />
-<TGConnectingPoint num="9" id="1157" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1183" >
-<cdparam x="337" y="257" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" 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="1159" />
-<TGConnectingPoint num="1" id="1160" />
-<TGConnectingPoint num="2" id="1161" />
-<TGConnectingPoint num="3" id="1162" />
-<TGConnectingPoint num="4" id="1163" />
-<TGConnectingPoint num="5" id="1164" />
-<TGConnectingPoint num="6" id="1165" />
-<TGConnectingPoint num="7" id="1166" />
-<TGConnectingPoint num="8" id="1167" />
-<TGConnectingPoint num="9" id="1168" />
-<TGConnectingPoint num="10" id="1169" />
-<TGConnectingPoint num="11" id="1170" />
-<TGConnectingPoint num="12" id="1171" />
-<TGConnectingPoint num="13" id="1172" />
-<TGConnectingPoint num="14" id="1173" />
-<TGConnectingPoint num="15" id="1174" />
-<TGConnectingPoint num="16" id="1175" />
-<TGConnectingPoint num="17" id="1176" />
-<TGConnectingPoint num="18" id="1177" />
-<TGConnectingPoint num="19" id="1178" />
-<TGConnectingPoint num="20" id="1179" />
-<TGConnectingPoint num="21" id="1180" />
-<TGConnectingPoint num="22" id="1181" />
-<TGConnectingPoint num="23" id="1182" />
-</COMPONENT>
 
-<COMPONENT type="5106" id="1208" >
-<cdparam x="338" y="120" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="T0" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="1404" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="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" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1405" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="1210" >
-<cdparam x="355" y="81" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="1431" >
+<cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" 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="1209" />
+<TGConnectingPoint num="0" id="1432" />
 </COMPONENT>
 
 
diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java
index 36dfd422bdb59d27959a5422f856167d0d633bcd..94e9c506288b789144038e16aa113883e8ae2f68 100644
--- a/src/avatartranslator/AvatarRelation.java
+++ b/src/avatartranslator/AvatarRelation.java
@@ -56,7 +56,7 @@ public class AvatarRelation extends AvatarElement {
     
     public AvatarBlock block1, block2;
 	private LinkedList<AvatarSignal> signals1, signals2;
-	private boolean blocking, asynchronous, isPrivate, isBroadcast;
+	private boolean blocking, asynchronous, isPrivate, isBroadcast, isLossy;
 	private int sizeOfFIFO; // -1 means infinite
   
 	
@@ -93,6 +93,10 @@ public class AvatarRelation extends AvatarElement {
 		isBroadcast = _b;
 	}
 	
+	public void setLossy(boolean _b) {
+		isLossy = _b;
+	}
+	
 	public void setSizeOfFIFO(int _sizeOfFIFO) {
 		sizeOfFIFO = _sizeOfFIFO;
 	}
@@ -109,6 +113,10 @@ public class AvatarRelation extends AvatarElement {
 		return isBroadcast;
 	}
 	
+	public boolean isLossy() {
+		return isLossy;
+	}
+	
 	public int getSizeOfFIFO() {
 		return sizeOfFIFO;
 	}
diff --git a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
index f27f95e96261fd83a40bcb1ff3d0afe56db30d70..1d674b476e3dbb00093cc99883040741825e6aff 100755
--- a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -454,7 +454,14 @@ public class AVATAR2UPPAAL {
 					tr = addTransition(templateAsynchronous, loc, loc);
 					setSynchronization(tr, signalToUPPAALString(sig1)+"?");
 					setGuard(tr, "size__" + name0 + " <" +  ar.getSizeOfFIFO());
-					setAssignment(tr, "enqueue__" + name0 + "()"); 
+					setAssignment(tr, "enqueue__" + name0 + "()");
+					
+					// If lossy ...
+					if (ar.isLossy()) {
+						tr = addTransition(templateAsynchronous, loc, loc);
+						setSynchronization(tr, signalToUPPAALString(sig1)+"?");
+						setGuard(tr, "size__" + name0 + " <" +  ar.getSizeOfFIFO());
+					}
 					
 					tr = addTransition(templateAsynchronous, loc, loc);
 					setSynchronization(tr, signalToUPPAALString(sig2)+"!");
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index df1876d0f848ae1ba28ef6d274df10ec50ab24a8..e9aacfdf05c4c9fe8fefcef1ddbaf477e67bb4b9 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -1194,6 +1194,7 @@ public class AvatarDesignPanelTranslator {
 					r.setSizeOfFIFO(port.getSizeOfFIFO());
 					r.setPrivate(port.isPrivate());
 					r.setBroadcast(port.isBroadcast());
+					r.setLossy(port.isLossy());
 					
 					_as.addRelation(r);
 				} else {
diff --git a/src/ui/avatarbd/AvatarBDPortConnector.java b/src/ui/avatarbd/AvatarBDPortConnector.java
index 941e83d6250966c9d4f1853a711d17117ea8523b..0ef5822000b543f856b51687f3e2edc25ad80bb1 100644
--- a/src/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/ui/avatarbd/AvatarBDPortConnector.java
@@ -78,6 +78,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 	protected boolean blockingFIFO;
 	protected boolean isPrivate = true; // isprivate = cannot be listened by an attacker
 	protected boolean isBroadcast = false;
+	protected boolean isLossy = false;
 	
     
     public AvatarBDPortConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
@@ -288,6 +289,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 		blockingFIFO = jdas.isBlocking();
 		isPrivate = jdas.isPrivate();
 		isBroadcast = jdas.isBroadcast();
+		isLossy = jdas.isLossy();
 		
 		try {
 			sizeOfFIFO = Integer.decode(jdas.getSizeOfFIFO()).intValue();
@@ -331,6 +333,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 		sb.append("\" blocking=\"" + blockingFIFO);
 		sb.append("\" private=\"" + isPrivate);
 		sb.append("\" broadcast=\"" + isBroadcast);
+		sb.append("\" lossy=\"" + isLossy);
 		sb.append("\" />\n");
 		
         sb.append("</extraparam>\n");
@@ -342,7 +345,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
             NodeList nli;
             Node n1, n2;
             Element elt;
-			String val, val1, val2, val3, val4;
+			String val, val1, val2, val3, val4, val5;
 			sizeOfFIFO = 4;
 			blockingFIFO = false;
 			asynchronous = false;
@@ -395,6 +398,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 								val2 = elt.getAttribute("blocking");
 								val3 = elt.getAttribute("private");
 								val4 = elt.getAttribute("broadcast");
+								val5 = elt.getAttribute("lossy");
                                 
                                 if ((val != null) && (!(val.equals("null")))) {
 									if (val.trim().toLowerCase().compareTo("true") == 0) {
@@ -440,8 +444,20 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 										isBroadcast = false;
 									}
                                     
-                } else {
+								} else {
 									isBroadcast = false;
+								
+								}
+								
+								if ((val5 != null) && (!(val5.equals("null")))) {
+									if (val5.trim().toLowerCase().compareTo("true") == 0) {
+										isLossy = true;
+									} else {
+										isLossy = false;
+									}
+                                    
+								} else {
+									isLossy = false;
 								}
 							}
                         }
@@ -647,5 +663,9 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
 		return isBroadcast;
 	}
 	
+	public boolean isLossy() {
+		return isLossy;
+	}
+	
     
 }
diff --git a/src/ui/window/JDialogSignalAssociation.java b/src/ui/window/JDialogSignalAssociation.java
index 1e2a38a7b74e5784d4d9a4c8c8345640dd6d0acd..2b55ccd2f5d53ea3170670121a59f9318c36036c 100644
--- a/src/ui/window/JDialogSignalAssociation.java
+++ b/src/ui/window/JDialogSignalAssociation.java
@@ -66,7 +66,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
 	private JRadioButton synchronous, asynchronous;
 	private JLabel labelFIFO;
 	private JTextField sizeOfFIFO;
-	private JCheckBox blocking, isPrivate, isBroadcast;
+	private JCheckBox blocking, isPrivate, isBroadcast, isLossy;
     private JPanel panel1, panel2, panel3, panel4;
 	
 	private boolean cancelled = false;
@@ -246,6 +246,9 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
 		bt.add(asynchronous);
 		asynchronous.setSelected(connector.isAsynchronous());
 		synchronous.setSelected(!connector.isAsynchronous());
+		isLossy = new JCheckBox("Lossy channel");
+		isLossy.setSelected(connector.isLossy());
+		panel3.add(isLossy, c3);
 		
 		c3.gridwidth = 3;
 		labelFIFO = new JLabel("Size of FIFO:");
@@ -482,5 +485,9 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
 	public boolean isBroadcast() {
 		return isBroadcast.isSelected();
 	}
+	
+	public boolean isLossy() {
+		return isLossy.isSelected();
+	}
     
 }