diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 9f85e98087ba959b798c50afe9bd7f05942bb80f..fe0beb5b0e8d9947be276af03da853b347557847 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -2,64 +2,212 @@
 
 <TURTLEGMODELING version="1.0beta">
 
+<Modeling type="Avatar Analysis" nameTab="Analysis" >
+<AvatarADPanel name="Activity Diagram 0" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="5500" id="1" >
+<cdparam x="480" y="386" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="480" y="386" id="8" />
+<P2  x="482" y="435" id="4" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5500" id="2" >
+<cdparam x="231" y="294" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="237" y="293" id="11" />
+<P2  x="480" y="356" id="7" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5500" id="3" >
+<cdparam x="238" y="215" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="238" y="215" id="33" />
+<P2  x="237" y="263" id="10" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<COMPONENT type="5506" id="6" >
+<cdparam x="460" y="440" />
+<sizeparam width="44" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="action state" value="action" />
+<TGConnectingPoint num="0" id="4" />
+<TGConnectingPoint num="1" id="5" />
+</COMPONENT>
+
+<COMPONENT type="5510" id="9" >
+<cdparam x="459" y="361" />
+<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="event" value="event" />
+<TGConnectingPoint num="0" id="7" />
+<TGConnectingPoint num="1" id="8" />
+</COMPONENT>
+
+<COMPONENT type="5509" id="12" >
+<cdparam x="216" y="268" />
+<sizeparam width="43" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="signal" />
+<TGConnectingPoint num="0" id="10" />
+<TGConnectingPoint num="1" id="11" />
+</COMPONENT>
+
+<COMPONENT type="301" id="29" >
+<cdparam x="198" y="109" />
+<sizeparam width="42" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="UML Note" value="Elt1
+" />
+<TGConnectingPoint num="0" id="13" />
+<TGConnectingPoint num="1" id="14" />
+<TGConnectingPoint num="2" id="15" />
+<TGConnectingPoint num="3" id="16" />
+<TGConnectingPoint num="4" id="17" />
+<TGConnectingPoint num="5" id="18" />
+<TGConnectingPoint num="6" id="19" />
+<TGConnectingPoint num="7" id="20" />
+<TGConnectingPoint num="8" id="21" />
+<TGConnectingPoint num="9" id="22" />
+<TGConnectingPoint num="10" id="23" />
+<TGConnectingPoint num="11" id="24" />
+<TGConnectingPoint num="12" id="25" />
+<TGConnectingPoint num="13" id="26" />
+<TGConnectingPoint num="14" id="27" />
+<TGConnectingPoint num="15" id="28" />
+<extraparam>
+<Line value="Elt1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5511" id="30" >
+<cdparam x="664" y="146" />
+<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="30" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+</COMPONENT>
+
+<COMPONENT type="5511" id="31" >
+<cdparam x="362" y="146" />
+<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="30" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+</COMPONENT>
+
+<COMPONENT type="5511" id="32" >
+<cdparam x="128" y="146" />
+<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="30" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+</COMPONENT>
+
+<COMPONENT type="5501" id="34" >
+<cdparam x="231" y="195" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="33" />
+</COMPONENT>
+
+
+</AvatarADPanel>
+
+</Modeling>
+
+
+
+
 <Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
 <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="5200" id="44" >
-<cdparam x="661" y="17" />
+<COMPONENT type="5207" id="50" >
+<cdparam x="627" y="206" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarElementReference" value="Wallet" />
+<TGConnectingPoint num="0" id="35" />
+<TGConnectingPoint num="1" id="36" />
+<TGConnectingPoint num="2" id="37" />
+<TGConnectingPoint num="3" id="38" />
+<TGConnectingPoint num="4" id="39" />
+<TGConnectingPoint num="5" id="40" />
+<TGConnectingPoint num="6" id="41" />
+<TGConnectingPoint num="7" id="42" />
+<TGConnectingPoint num="8" id="43" />
+<TGConnectingPoint num="9" id="44" />
+<TGConnectingPoint num="10" id="45" />
+<TGConnectingPoint num="11" id="46" />
+<TGConnectingPoint num="12" id="47" />
+<TGConnectingPoint num="13" id="48" />
+<TGConnectingPoint num="14" id="49" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="94" >
+<cdparam x="661" y="16" />
 <sizeparam width="278" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="req00" />
-<TGConnectingPoint num="0" id="1" />
-<TGConnectingPoint num="1" id="2" />
-<TGConnectingPoint num="2" id="3" />
-<TGConnectingPoint num="3" id="4" />
-<TGConnectingPoint num="4" id="5" />
-<TGConnectingPoint num="5" id="6" />
-<TGConnectingPoint num="6" id="7" />
-<TGConnectingPoint num="7" id="8" />
-<TGConnectingPoint num="8" id="9" />
-<TGConnectingPoint num="9" id="10" />
-<TGConnectingPoint num="10" id="11" />
-<TGConnectingPoint num="11" id="12" />
-<TGConnectingPoint num="12" id="13" />
-<TGConnectingPoint num="13" id="14" />
-<TGConnectingPoint num="14" id="15" />
-<TGConnectingPoint num="15" id="16" />
-<TGConnectingPoint num="16" id="17" />
-<TGConnectingPoint num="17" id="18" />
-<TGConnectingPoint num="18" id="19" />
-<TGConnectingPoint num="19" id="20" />
-<TGConnectingPoint num="20" id="21" />
-<TGConnectingPoint num="21" id="22" />
-<TGConnectingPoint num="22" id="23" />
-<TGConnectingPoint num="23" id="24" />
-<TGConnectingPoint num="24" id="25" />
-<TGConnectingPoint num="25" id="26" />
-<TGConnectingPoint num="26" id="27" />
-<TGConnectingPoint num="27" id="28" />
-<TGConnectingPoint num="28" id="29" />
-<TGConnectingPoint num="29" id="30" />
-<TGConnectingPoint num="30" id="31" />
-<TGConnectingPoint num="31" id="32" />
-<TGConnectingPoint num="32" id="33" />
-<TGConnectingPoint num="33" id="34" />
-<TGConnectingPoint num="34" id="35" />
-<TGConnectingPoint num="35" id="36" />
-<TGConnectingPoint num="36" id="37" />
-<TGConnectingPoint num="37" id="38" />
-<TGConnectingPoint num="38" id="39" />
-<TGConnectingPoint num="39" id="40" />
-<TGConnectingPoint num="40" id="41" />
-<TGConnectingPoint num="41" id="42" />
-<TGConnectingPoint num="42" id="43" />
+<TGConnectingPoint num="0" id="51" />
+<TGConnectingPoint num="1" id="52" />
+<TGConnectingPoint num="2" id="53" />
+<TGConnectingPoint num="3" id="54" />
+<TGConnectingPoint num="4" id="55" />
+<TGConnectingPoint num="5" id="56" />
+<TGConnectingPoint num="6" id="57" />
+<TGConnectingPoint num="7" id="58" />
+<TGConnectingPoint num="8" id="59" />
+<TGConnectingPoint num="9" id="60" />
+<TGConnectingPoint num="10" id="61" />
+<TGConnectingPoint num="11" id="62" />
+<TGConnectingPoint num="12" id="63" />
+<TGConnectingPoint num="13" id="64" />
+<TGConnectingPoint num="14" id="65" />
+<TGConnectingPoint num="15" id="66" />
+<TGConnectingPoint num="16" id="67" />
+<TGConnectingPoint num="17" id="68" />
+<TGConnectingPoint num="18" id="69" />
+<TGConnectingPoint num="19" id="70" />
+<TGConnectingPoint num="20" id="71" />
+<TGConnectingPoint num="21" id="72" />
+<TGConnectingPoint num="22" id="73" />
+<TGConnectingPoint num="23" id="74" />
+<TGConnectingPoint num="24" id="75" />
+<TGConnectingPoint num="25" id="76" />
+<TGConnectingPoint num="26" id="77" />
+<TGConnectingPoint num="27" id="78" />
+<TGConnectingPoint num="28" id="79" />
+<TGConnectingPoint num="29" id="80" />
+<TGConnectingPoint num="30" id="81" />
+<TGConnectingPoint num="31" id="82" />
+<TGConnectingPoint num="32" id="83" />
+<TGConnectingPoint num="33" id="84" />
+<TGConnectingPoint num="34" id="85" />
+<TGConnectingPoint num="35" id="86" />
+<TGConnectingPoint num="36" id="87" />
+<TGConnectingPoint num="37" id="88" />
+<TGConnectingPoint num="38" id="89" />
+<TGConnectingPoint num="39" id="90" />
+<TGConnectingPoint num="40" id="91" />
+<TGConnectingPoint num="41" id="92" />
+<TGConnectingPoint num="42" id="93" />
 <extraparam>
 <textline data="A coin not used within 50 seconds " />
 <textline data="must be ejected" />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
-<id data="0" />
+<reqType data="Requirement" />
+<id data="0.1.1" />
 <satisfied data="false" />
 <verified data="false" />
 <attackTreeNode data="" />
@@ -68,62 +216,62 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5200" id="88" >
-<cdparam x="47" y="457" />
+<COMPONENT type="5200" id="138" >
+<cdparam x="46" y="491" />
 <sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="Req_Availability" />
-<TGConnectingPoint num="0" id="45" />
-<TGConnectingPoint num="1" id="46" />
-<TGConnectingPoint num="2" id="47" />
-<TGConnectingPoint num="3" id="48" />
-<TGConnectingPoint num="4" id="49" />
-<TGConnectingPoint num="5" id="50" />
-<TGConnectingPoint num="6" id="51" />
-<TGConnectingPoint num="7" id="52" />
-<TGConnectingPoint num="8" id="53" />
-<TGConnectingPoint num="9" id="54" />
-<TGConnectingPoint num="10" id="55" />
-<TGConnectingPoint num="11" id="56" />
-<TGConnectingPoint num="12" id="57" />
-<TGConnectingPoint num="13" id="58" />
-<TGConnectingPoint num="14" id="59" />
-<TGConnectingPoint num="15" id="60" />
-<TGConnectingPoint num="16" id="61" />
-<TGConnectingPoint num="17" id="62" />
-<TGConnectingPoint num="18" id="63" />
-<TGConnectingPoint num="19" id="64" />
-<TGConnectingPoint num="20" id="65" />
-<TGConnectingPoint num="21" id="66" />
-<TGConnectingPoint num="22" id="67" />
-<TGConnectingPoint num="23" id="68" />
-<TGConnectingPoint num="24" id="69" />
-<TGConnectingPoint num="25" id="70" />
-<TGConnectingPoint num="26" id="71" />
-<TGConnectingPoint num="27" id="72" />
-<TGConnectingPoint num="28" id="73" />
-<TGConnectingPoint num="29" id="74" />
-<TGConnectingPoint num="30" id="75" />
-<TGConnectingPoint num="31" id="76" />
-<TGConnectingPoint num="32" id="77" />
-<TGConnectingPoint num="33" id="78" />
-<TGConnectingPoint num="34" id="79" />
-<TGConnectingPoint num="35" id="80" />
-<TGConnectingPoint num="36" id="81" />
-<TGConnectingPoint num="37" id="82" />
-<TGConnectingPoint num="38" id="83" />
-<TGConnectingPoint num="39" id="84" />
-<TGConnectingPoint num="40" id="85" />
-<TGConnectingPoint num="41" id="86" />
-<TGConnectingPoint num="42" id="87" />
+<TGConnectingPoint num="0" id="95" />
+<TGConnectingPoint num="1" id="96" />
+<TGConnectingPoint num="2" id="97" />
+<TGConnectingPoint num="3" id="98" />
+<TGConnectingPoint num="4" id="99" />
+<TGConnectingPoint num="5" id="100" />
+<TGConnectingPoint num="6" id="101" />
+<TGConnectingPoint num="7" id="102" />
+<TGConnectingPoint num="8" id="103" />
+<TGConnectingPoint num="9" id="104" />
+<TGConnectingPoint num="10" id="105" />
+<TGConnectingPoint num="11" id="106" />
+<TGConnectingPoint num="12" id="107" />
+<TGConnectingPoint num="13" id="108" />
+<TGConnectingPoint num="14" id="109" />
+<TGConnectingPoint num="15" id="110" />
+<TGConnectingPoint num="16" id="111" />
+<TGConnectingPoint num="17" id="112" />
+<TGConnectingPoint num="18" id="113" />
+<TGConnectingPoint num="19" id="114" />
+<TGConnectingPoint num="20" id="115" />
+<TGConnectingPoint num="21" id="116" />
+<TGConnectingPoint num="22" id="117" />
+<TGConnectingPoint num="23" id="118" />
+<TGConnectingPoint num="24" id="119" />
+<TGConnectingPoint num="25" id="120" />
+<TGConnectingPoint num="26" id="121" />
+<TGConnectingPoint num="27" id="122" />
+<TGConnectingPoint num="28" id="123" />
+<TGConnectingPoint num="29" id="124" />
+<TGConnectingPoint num="30" id="125" />
+<TGConnectingPoint num="31" id="126" />
+<TGConnectingPoint num="32" id="127" />
+<TGConnectingPoint num="33" id="128" />
+<TGConnectingPoint num="34" id="129" />
+<TGConnectingPoint num="35" id="130" />
+<TGConnectingPoint num="36" id="131" />
+<TGConnectingPoint num="37" id="132" />
+<TGConnectingPoint num="38" id="133" />
+<TGConnectingPoint num="39" id="134" />
+<TGConnectingPoint num="40" id="135" />
+<TGConnectingPoint num="41" id="136" />
+<TGConnectingPoint num="42" id="137" />
 <extraparam>
 <textline data="The availability of the machine shall be" />
 <textline data="no less than 99.99%" />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
-<id data="0" />
+<reqType data="Requirement" />
+<id data="0.4" />
 <satisfied data="false" />
 <verified data="false" />
 <attackTreeNode data="" />
@@ -132,60 +280,60 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5200" id="132" >
+<COMPONENT type="5200" id="182" >
 <cdparam x="10" y="182" />
 <sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="Req_CoffeeMachine" />
-<TGConnectingPoint num="0" id="89" />
-<TGConnectingPoint num="1" id="90" />
-<TGConnectingPoint num="2" id="91" />
-<TGConnectingPoint num="3" id="92" />
-<TGConnectingPoint num="4" id="93" />
-<TGConnectingPoint num="5" id="94" />
-<TGConnectingPoint num="6" id="95" />
-<TGConnectingPoint num="7" id="96" />
-<TGConnectingPoint num="8" id="97" />
-<TGConnectingPoint num="9" id="98" />
-<TGConnectingPoint num="10" id="99" />
-<TGConnectingPoint num="11" id="100" />
-<TGConnectingPoint num="12" id="101" />
-<TGConnectingPoint num="13" id="102" />
-<TGConnectingPoint num="14" id="103" />
-<TGConnectingPoint num="15" id="104" />
-<TGConnectingPoint num="16" id="105" />
-<TGConnectingPoint num="17" id="106" />
-<TGConnectingPoint num="18" id="107" />
-<TGConnectingPoint num="19" id="108" />
-<TGConnectingPoint num="20" id="109" />
-<TGConnectingPoint num="21" id="110" />
-<TGConnectingPoint num="22" id="111" />
-<TGConnectingPoint num="23" id="112" />
-<TGConnectingPoint num="24" id="113" />
-<TGConnectingPoint num="25" id="114" />
-<TGConnectingPoint num="26" id="115" />
-<TGConnectingPoint num="27" id="116" />
-<TGConnectingPoint num="28" id="117" />
-<TGConnectingPoint num="29" id="118" />
-<TGConnectingPoint num="30" id="119" />
-<TGConnectingPoint num="31" id="120" />
-<TGConnectingPoint num="32" id="121" />
-<TGConnectingPoint num="33" id="122" />
-<TGConnectingPoint num="34" id="123" />
-<TGConnectingPoint num="35" id="124" />
-<TGConnectingPoint num="36" id="125" />
-<TGConnectingPoint num="37" id="126" />
-<TGConnectingPoint num="38" id="127" />
-<TGConnectingPoint num="39" id="128" />
-<TGConnectingPoint num="40" id="129" />
-<TGConnectingPoint num="41" id="130" />
-<TGConnectingPoint num="42" id="131" />
+<TGConnectingPoint num="0" id="139" />
+<TGConnectingPoint num="1" id="140" />
+<TGConnectingPoint num="2" id="141" />
+<TGConnectingPoint num="3" id="142" />
+<TGConnectingPoint num="4" id="143" />
+<TGConnectingPoint num="5" id="144" />
+<TGConnectingPoint num="6" id="145" />
+<TGConnectingPoint num="7" id="146" />
+<TGConnectingPoint num="8" id="147" />
+<TGConnectingPoint num="9" id="148" />
+<TGConnectingPoint num="10" id="149" />
+<TGConnectingPoint num="11" id="150" />
+<TGConnectingPoint num="12" id="151" />
+<TGConnectingPoint num="13" id="152" />
+<TGConnectingPoint num="14" id="153" />
+<TGConnectingPoint num="15" id="154" />
+<TGConnectingPoint num="16" id="155" />
+<TGConnectingPoint num="17" id="156" />
+<TGConnectingPoint num="18" id="157" />
+<TGConnectingPoint num="19" id="158" />
+<TGConnectingPoint num="20" id="159" />
+<TGConnectingPoint num="21" id="160" />
+<TGConnectingPoint num="22" id="161" />
+<TGConnectingPoint num="23" id="162" />
+<TGConnectingPoint num="24" id="163" />
+<TGConnectingPoint num="25" id="164" />
+<TGConnectingPoint num="26" id="165" />
+<TGConnectingPoint num="27" id="166" />
+<TGConnectingPoint num="28" id="167" />
+<TGConnectingPoint num="29" id="168" />
+<TGConnectingPoint num="30" id="169" />
+<TGConnectingPoint num="31" id="170" />
+<TGConnectingPoint num="32" id="171" />
+<TGConnectingPoint num="33" id="172" />
+<TGConnectingPoint num="34" id="173" />
+<TGConnectingPoint num="35" id="174" />
+<TGConnectingPoint num="36" id="175" />
+<TGConnectingPoint num="37" id="176" />
+<TGConnectingPoint num="38" id="177" />
+<TGConnectingPoint num="39" id="178" />
+<TGConnectingPoint num="40" id="179" />
+<TGConnectingPoint num="41" id="180" />
+<TGConnectingPoint num="42" id="181" />
 <extraparam>
 <textline data="Requirements of the coffee machine" />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
+<reqType data="Requirement" />
 <id data="0" />
 <satisfied data="false" />
 <verified data="false" />
@@ -195,195 +343,195 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5201" id="148" >
-<cdparam x="627" y="376" />
+<COMPONENT type="5201" id="198" >
+<cdparam x="705" y="405" />
 <sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="133" />
-<TGConnectingPoint num="1" id="134" />
-<TGConnectingPoint num="2" id="135" />
-<TGConnectingPoint num="3" id="136" />
-<TGConnectingPoint num="4" id="137" />
-<TGConnectingPoint num="5" id="138" />
-<TGConnectingPoint num="6" id="139" />
-<TGConnectingPoint num="7" id="140" />
-<TGConnectingPoint num="8" id="141" />
-<TGConnectingPoint num="9" id="142" />
-<TGConnectingPoint num="10" id="143" />
-<TGConnectingPoint num="11" id="144" />
-<TGConnectingPoint num="12" id="145" />
-<TGConnectingPoint num="13" id="146" />
-<TGConnectingPoint num="14" id="147" />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
+<TGConnectingPoint num="2" id="185" />
+<TGConnectingPoint num="3" id="186" />
+<TGConnectingPoint num="4" id="187" />
+<TGConnectingPoint num="5" id="188" />
+<TGConnectingPoint num="6" id="189" />
+<TGConnectingPoint num="7" id="190" />
+<TGConnectingPoint num="8" id="191" />
+<TGConnectingPoint num="9" id="192" />
+<TGConnectingPoint num="10" id="193" />
+<TGConnectingPoint num="11" id="194" />
+<TGConnectingPoint num="12" id="195" />
+<TGConnectingPoint num="13" id="196" />
+<TGConnectingPoint num="14" id="197" />
 </COMPONENT>
 
-<COMPONENT type="5201" id="164" >
-<cdparam x="580" y="246" />
+<COMPONENT type="5201" id="214" >
+<cdparam x="599" y="264" />
 <sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="AvatarProperty" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="149" />
-<TGConnectingPoint num="1" id="150" />
-<TGConnectingPoint num="2" id="151" />
-<TGConnectingPoint num="3" id="152" />
-<TGConnectingPoint num="4" id="153" />
-<TGConnectingPoint num="5" id="154" />
-<TGConnectingPoint num="6" id="155" />
-<TGConnectingPoint num="7" id="156" />
-<TGConnectingPoint num="8" id="157" />
-<TGConnectingPoint num="9" id="158" />
-<TGConnectingPoint num="10" id="159" />
-<TGConnectingPoint num="11" id="160" />
-<TGConnectingPoint num="12" id="161" />
-<TGConnectingPoint num="13" id="162" />
-<TGConnectingPoint num="14" id="163" />
+<TGConnectingPoint num="0" id="199" />
+<TGConnectingPoint num="1" id="200" />
+<TGConnectingPoint num="2" id="201" />
+<TGConnectingPoint num="3" id="202" />
+<TGConnectingPoint num="4" id="203" />
+<TGConnectingPoint num="5" id="204" />
+<TGConnectingPoint num="6" id="205" />
+<TGConnectingPoint num="7" id="206" />
+<TGConnectingPoint num="8" id="207" />
+<TGConnectingPoint num="9" id="208" />
+<TGConnectingPoint num="10" id="209" />
+<TGConnectingPoint num="11" id="210" />
+<TGConnectingPoint num="12" id="211" />
+<TGConnectingPoint num="13" id="212" />
+<TGConnectingPoint num="14" id="213" />
 </COMPONENT>
 
-<COMPONENT type="5200" id="208" >
-<cdparam x="234" y="147" />
+<COMPONENT type="5200" id="258" >
+<cdparam x="233" y="147" />
 <sizeparam width="271" height="104" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="req1" />
-<TGConnectingPoint num="0" id="165" />
-<TGConnectingPoint num="1" id="166" />
-<TGConnectingPoint num="2" id="167" />
-<TGConnectingPoint num="3" id="168" />
-<TGConnectingPoint num="4" id="169" />
-<TGConnectingPoint num="5" id="170" />
-<TGConnectingPoint num="6" id="171" />
-<TGConnectingPoint num="7" id="172" />
-<TGConnectingPoint num="8" id="173" />
-<TGConnectingPoint num="9" id="174" />
-<TGConnectingPoint num="10" id="175" />
-<TGConnectingPoint num="11" id="176" />
-<TGConnectingPoint num="12" id="177" />
-<TGConnectingPoint num="13" id="178" />
-<TGConnectingPoint num="14" id="179" />
-<TGConnectingPoint num="15" id="180" />
-<TGConnectingPoint num="16" id="181" />
-<TGConnectingPoint num="17" id="182" />
-<TGConnectingPoint num="18" id="183" />
-<TGConnectingPoint num="19" id="184" />
-<TGConnectingPoint num="20" id="185" />
-<TGConnectingPoint num="21" id="186" />
-<TGConnectingPoint num="22" id="187" />
-<TGConnectingPoint num="23" id="188" />
-<TGConnectingPoint num="24" id="189" />
-<TGConnectingPoint num="25" id="190" />
-<TGConnectingPoint num="26" id="191" />
-<TGConnectingPoint num="27" id="192" />
-<TGConnectingPoint num="28" id="193" />
-<TGConnectingPoint num="29" id="194" />
-<TGConnectingPoint num="30" id="195" />
-<TGConnectingPoint num="31" id="196" />
-<TGConnectingPoint num="32" id="197" />
-<TGConnectingPoint num="33" id="198" />
-<TGConnectingPoint num="34" id="199" />
-<TGConnectingPoint num="35" id="200" />
-<TGConnectingPoint num="36" id="201" />
-<TGConnectingPoint num="37" id="202" />
-<TGConnectingPoint num="38" id="203" />
-<TGConnectingPoint num="39" id="204" />
-<TGConnectingPoint num="40" id="205" />
-<TGConnectingPoint num="41" id="206" />
-<TGConnectingPoint num="42" id="207" />
+<TGConnectingPoint num="0" id="215" />
+<TGConnectingPoint num="1" id="216" />
+<TGConnectingPoint num="2" id="217" />
+<TGConnectingPoint num="3" id="218" />
+<TGConnectingPoint num="4" id="219" />
+<TGConnectingPoint num="5" id="220" />
+<TGConnectingPoint num="6" id="221" />
+<TGConnectingPoint num="7" id="222" />
+<TGConnectingPoint num="8" id="223" />
+<TGConnectingPoint num="9" id="224" />
+<TGConnectingPoint num="10" id="225" />
+<TGConnectingPoint num="11" id="226" />
+<TGConnectingPoint num="12" id="227" />
+<TGConnectingPoint num="13" id="228" />
+<TGConnectingPoint num="14" id="229" />
+<TGConnectingPoint num="15" id="230" />
+<TGConnectingPoint num="16" id="231" />
+<TGConnectingPoint num="17" id="232" />
+<TGConnectingPoint num="18" id="233" />
+<TGConnectingPoint num="19" id="234" />
+<TGConnectingPoint num="20" id="235" />
+<TGConnectingPoint num="21" id="236" />
+<TGConnectingPoint num="22" id="237" />
+<TGConnectingPoint num="23" id="238" />
+<TGConnectingPoint num="24" id="239" />
+<TGConnectingPoint num="25" id="240" />
+<TGConnectingPoint num="26" id="241" />
+<TGConnectingPoint num="27" id="242" />
+<TGConnectingPoint num="28" id="243" />
+<TGConnectingPoint num="29" id="244" />
+<TGConnectingPoint num="30" id="245" />
+<TGConnectingPoint num="31" id="246" />
+<TGConnectingPoint num="32" id="247" />
+<TGConnectingPoint num="33" id="248" />
+<TGConnectingPoint num="34" id="249" />
+<TGConnectingPoint num="35" id="250" />
+<TGConnectingPoint num="36" id="251" />
+<TGConnectingPoint num="37" id="252" />
+<TGConnectingPoint num="38" id="253" />
+<TGConnectingPoint num="39" id="254" />
+<TGConnectingPoint num="40" id="255" />
+<TGConnectingPoint num="41" id="256" />
+<TGConnectingPoint num="42" id="257" />
 <extraparam>
 <textline data="A wallet must never contain a " />
 <textline data="negative number of coins" />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
-<id data="0" />
-<satisfied data="false" />
-<verified data="false" />
+<reqType data="Requirement" />
+<id data="0.2" />
+<satisfied data="true" />
+<verified data="true" />
 <attackTreeNode data="" />
 <violatedAction data="" />
 <referenceElements data="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5201" id="224" >
-<cdparam x="582" y="155" />
+<COMPONENT type="5201" id="274" >
+<cdparam x="626" y="153" />
 <sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="AvatarProperty" value="OneCoinProperty" />
-<TGConnectingPoint num="0" id="209" />
-<TGConnectingPoint num="1" id="210" />
-<TGConnectingPoint num="2" id="211" />
-<TGConnectingPoint num="3" id="212" />
-<TGConnectingPoint num="4" id="213" />
-<TGConnectingPoint num="5" id="214" />
-<TGConnectingPoint num="6" id="215" />
-<TGConnectingPoint num="7" id="216" />
-<TGConnectingPoint num="8" id="217" />
-<TGConnectingPoint num="9" id="218" />
-<TGConnectingPoint num="10" id="219" />
-<TGConnectingPoint num="11" id="220" />
-<TGConnectingPoint num="12" id="221" />
-<TGConnectingPoint num="13" id="222" />
-<TGConnectingPoint num="14" id="223" />
+<TGConnectingPoint num="0" id="259" />
+<TGConnectingPoint num="1" id="260" />
+<TGConnectingPoint num="2" id="261" />
+<TGConnectingPoint num="3" id="262" />
+<TGConnectingPoint num="4" id="263" />
+<TGConnectingPoint num="5" id="264" />
+<TGConnectingPoint num="6" id="265" />
+<TGConnectingPoint num="7" id="266" />
+<TGConnectingPoint num="8" id="267" />
+<TGConnectingPoint num="9" id="268" />
+<TGConnectingPoint num="10" id="269" />
+<TGConnectingPoint num="11" id="270" />
+<TGConnectingPoint num="12" id="271" />
+<TGConnectingPoint num="13" id="272" />
+<TGConnectingPoint num="14" id="273" />
 </COMPONENT>
 
-<COMPONENT type="5200" id="268" >
-<cdparam x="192" y="16" />
-<sizeparam width="304" height="110" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<COMPONENT type="5200" id="318" >
+<cdparam x="192" y="15" />
+<sizeparam width="304" height="110" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="75" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="req0" />
-<TGConnectingPoint num="0" id="225" />
-<TGConnectingPoint num="1" id="226" />
-<TGConnectingPoint num="2" id="227" />
-<TGConnectingPoint num="3" id="228" />
-<TGConnectingPoint num="4" id="229" />
-<TGConnectingPoint num="5" id="230" />
-<TGConnectingPoint num="6" id="231" />
-<TGConnectingPoint num="7" id="232" />
-<TGConnectingPoint num="8" id="233" />
-<TGConnectingPoint num="9" id="234" />
-<TGConnectingPoint num="10" id="235" />
-<TGConnectingPoint num="11" id="236" />
-<TGConnectingPoint num="12" id="237" />
-<TGConnectingPoint num="13" id="238" />
-<TGConnectingPoint num="14" id="239" />
-<TGConnectingPoint num="15" id="240" />
-<TGConnectingPoint num="16" id="241" />
-<TGConnectingPoint num="17" id="242" />
-<TGConnectingPoint num="18" id="243" />
-<TGConnectingPoint num="19" id="244" />
-<TGConnectingPoint num="20" id="245" />
-<TGConnectingPoint num="21" id="246" />
-<TGConnectingPoint num="22" id="247" />
-<TGConnectingPoint num="23" id="248" />
-<TGConnectingPoint num="24" id="249" />
-<TGConnectingPoint num="25" id="250" />
-<TGConnectingPoint num="26" id="251" />
-<TGConnectingPoint num="27" id="252" />
-<TGConnectingPoint num="28" id="253" />
-<TGConnectingPoint num="29" id="254" />
-<TGConnectingPoint num="30" id="255" />
-<TGConnectingPoint num="31" id="256" />
-<TGConnectingPoint num="32" id="257" />
-<TGConnectingPoint num="33" id="258" />
-<TGConnectingPoint num="34" id="259" />
-<TGConnectingPoint num="35" id="260" />
-<TGConnectingPoint num="36" id="261" />
-<TGConnectingPoint num="37" id="262" />
-<TGConnectingPoint num="38" id="263" />
-<TGConnectingPoint num="39" id="264" />
-<TGConnectingPoint num="40" id="265" />
-<TGConnectingPoint num="41" id="266" />
-<TGConnectingPoint num="42" id="267" />
+<infoparam name="Requirement" value="req3456" />
+<TGConnectingPoint num="0" id="275" />
+<TGConnectingPoint num="1" id="276" />
+<TGConnectingPoint num="2" id="277" />
+<TGConnectingPoint num="3" id="278" />
+<TGConnectingPoint num="4" id="279" />
+<TGConnectingPoint num="5" id="280" />
+<TGConnectingPoint num="6" id="281" />
+<TGConnectingPoint num="7" id="282" />
+<TGConnectingPoint num="8" id="283" />
+<TGConnectingPoint num="9" id="284" />
+<TGConnectingPoint num="10" id="285" />
+<TGConnectingPoint num="11" id="286" />
+<TGConnectingPoint num="12" id="287" />
+<TGConnectingPoint num="13" id="288" />
+<TGConnectingPoint num="14" id="289" />
+<TGConnectingPoint num="15" id="290" />
+<TGConnectingPoint num="16" id="291" />
+<TGConnectingPoint num="17" id="292" />
+<TGConnectingPoint num="18" id="293" />
+<TGConnectingPoint num="19" id="294" />
+<TGConnectingPoint num="20" id="295" />
+<TGConnectingPoint num="21" id="296" />
+<TGConnectingPoint num="22" id="297" />
+<TGConnectingPoint num="23" id="298" />
+<TGConnectingPoint num="24" id="299" />
+<TGConnectingPoint num="25" id="300" />
+<TGConnectingPoint num="26" id="301" />
+<TGConnectingPoint num="27" id="302" />
+<TGConnectingPoint num="28" id="303" />
+<TGConnectingPoint num="29" id="304" />
+<TGConnectingPoint num="30" id="305" />
+<TGConnectingPoint num="31" id="306" />
+<TGConnectingPoint num="32" id="307" />
+<TGConnectingPoint num="33" id="308" />
+<TGConnectingPoint num="34" id="309" />
+<TGConnectingPoint num="35" id="310" />
+<TGConnectingPoint num="36" id="311" />
+<TGConnectingPoint num="37" id="312" />
+<TGConnectingPoint num="38" id="313" />
+<TGConnectingPoint num="39" id="314" />
+<TGConnectingPoint num="40" id="315" />
+<TGConnectingPoint num="41" id="316" />
+<TGConnectingPoint num="42" id="317" />
 <extraparam>
 <textline data="The coffee machine never has one coin " />
 <textline data=" inserted more than 50 units of time" />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
-<id data="123" />
+<reqType data="AMSRequirement" />
+<id data="0.1" />
 <satisfied data="false" />
 <verified data="false" />
 <attackTreeNode data="" />
@@ -392,55 +540,55 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5200" id="312" >
-<cdparam x="206" y="294" />
-<sizeparam width="357" height="135" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<COMPONENT type="5200" id="362" >
+<cdparam x="206" y="295" />
+<sizeparam width="357" height="157" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="req2" />
-<TGConnectingPoint num="0" id="269" />
-<TGConnectingPoint num="1" id="270" />
-<TGConnectingPoint num="2" id="271" />
-<TGConnectingPoint num="3" id="272" />
-<TGConnectingPoint num="4" id="273" />
-<TGConnectingPoint num="5" id="274" />
-<TGConnectingPoint num="6" id="275" />
-<TGConnectingPoint num="7" id="276" />
-<TGConnectingPoint num="8" id="277" />
-<TGConnectingPoint num="9" id="278" />
-<TGConnectingPoint num="10" id="279" />
-<TGConnectingPoint num="11" id="280" />
-<TGConnectingPoint num="12" id="281" />
-<TGConnectingPoint num="13" id="282" />
-<TGConnectingPoint num="14" id="283" />
-<TGConnectingPoint num="15" id="284" />
-<TGConnectingPoint num="16" id="285" />
-<TGConnectingPoint num="17" id="286" />
-<TGConnectingPoint num="18" id="287" />
-<TGConnectingPoint num="19" id="288" />
-<TGConnectingPoint num="20" id="289" />
-<TGConnectingPoint num="21" id="290" />
-<TGConnectingPoint num="22" id="291" />
-<TGConnectingPoint num="23" id="292" />
-<TGConnectingPoint num="24" id="293" />
-<TGConnectingPoint num="25" id="294" />
-<TGConnectingPoint num="26" id="295" />
-<TGConnectingPoint num="27" id="296" />
-<TGConnectingPoint num="28" id="297" />
-<TGConnectingPoint num="29" id="298" />
-<TGConnectingPoint num="30" id="299" />
-<TGConnectingPoint num="31" id="300" />
-<TGConnectingPoint num="32" id="301" />
-<TGConnectingPoint num="33" id="302" />
-<TGConnectingPoint num="34" id="303" />
-<TGConnectingPoint num="35" id="304" />
-<TGConnectingPoint num="36" id="305" />
-<TGConnectingPoint num="37" id="306" />
-<TGConnectingPoint num="38" id="307" />
-<TGConnectingPoint num="39" id="308" />
-<TGConnectingPoint num="40" id="309" />
-<TGConnectingPoint num="41" id="310" />
-<TGConnectingPoint num="42" id="311" />
+<TGConnectingPoint num="0" id="319" />
+<TGConnectingPoint num="1" id="320" />
+<TGConnectingPoint num="2" id="321" />
+<TGConnectingPoint num="3" id="322" />
+<TGConnectingPoint num="4" id="323" />
+<TGConnectingPoint num="5" id="324" />
+<TGConnectingPoint num="6" id="325" />
+<TGConnectingPoint num="7" id="326" />
+<TGConnectingPoint num="8" id="327" />
+<TGConnectingPoint num="9" id="328" />
+<TGConnectingPoint num="10" id="329" />
+<TGConnectingPoint num="11" id="330" />
+<TGConnectingPoint num="12" id="331" />
+<TGConnectingPoint num="13" id="332" />
+<TGConnectingPoint num="14" id="333" />
+<TGConnectingPoint num="15" id="334" />
+<TGConnectingPoint num="16" id="335" />
+<TGConnectingPoint num="17" id="336" />
+<TGConnectingPoint num="18" id="337" />
+<TGConnectingPoint num="19" id="338" />
+<TGConnectingPoint num="20" id="339" />
+<TGConnectingPoint num="21" id="340" />
+<TGConnectingPoint num="22" id="341" />
+<TGConnectingPoint num="23" id="342" />
+<TGConnectingPoint num="24" id="343" />
+<TGConnectingPoint num="25" id="344" />
+<TGConnectingPoint num="26" id="345" />
+<TGConnectingPoint num="27" id="346" />
+<TGConnectingPoint num="28" id="347" />
+<TGConnectingPoint num="29" id="348" />
+<TGConnectingPoint num="30" id="349" />
+<TGConnectingPoint num="31" id="350" />
+<TGConnectingPoint num="32" id="351" />
+<TGConnectingPoint num="33" id="352" />
+<TGConnectingPoint num="34" id="353" />
+<TGConnectingPoint num="35" id="354" />
+<TGConnectingPoint num="36" id="355" />
+<TGConnectingPoint num="37" id="356" />
+<TGConnectingPoint num="38" id="357" />
+<TGConnectingPoint num="39" id="358" />
+<TGConnectingPoint num="40" id="359" />
+<TGConnectingPoint num="41" id="360" />
+<TGConnectingPoint num="42" id="361" />
 <extraparam>
 <textline data="When the application starts, if the wallet contains " />
 <textline data="at least 2 coins, then a beverage may be delivered. " />
@@ -449,123 +597,133 @@
 <textline data="machine." />
 <kind data="Functional" />
 <criticality data="Low" />
-<reqType data="0" />
-<id data="0" />
+<reqType data="Requirement" />
+<id data="0.3" />
 <satisfied data="false" />
 <verified data="false" />
 <attackTreeNode data="" />
 <violatedAction data="" />
 <referenceElements data="" />
+<extraAttribute id="Hypothèse" value="le système ..." />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="5202" id="314" >
+<CONNECTOR type="5208" id="364" >
+<cdparam x="783" y="223" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
+<TGConnectingPoint num="0" id="363" />
+<P1  x="627" y="228" id="37" />
+<P2  x="504" y="173" id="246" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5202" id="366" >
 <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="313" />
-<P1  x="661" y="47" id="1" />
-<P2  x="496" y="43" id="228" />
+<TGConnectingPoint num="0" id="365" />
+<P1  x="661" y="46" id="51" />
+<P2  x="496" y="42" id="278" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="316" >
+<CONNECTOR type="5205" id="368" >
 <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="315" />
-<P1  x="122" y="457" id="51" />
-<P2  x="122" y="302" id="100" />
+<TGConnectingPoint num="0" id="367" />
+<P1  x="121" y="491" id="101" />
+<P2  x="122" y="302" id="150" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="318" >
+<CONNECTOR type="5205" id="370" >
 <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="317" />
-<P1  x="206" y="327" id="269" />
-<P2  x="160" y="272" id="94" />
+<TGConnectingPoint num="0" id="369" />
+<P1  x="206" y="334" id="319" />
+<P2  x="160" y="272" id="144" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="320" >
+<CONNECTOR type="5205" id="372" >
 <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="319" />
-<P1  x="234" y="199" id="166" />
-<P2  x="160" y="212" id="92" />
+<TGConnectingPoint num="0" id="371" />
+<P1  x="233" y="199" id="216" />
+<P2  x="160" y="212" id="142" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5205" id="322" >
+<CONNECTOR type="5205" id="374" >
 <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="321" />
-<P1  x="192" y="98" id="227" />
-<P2  x="122" y="182" id="97" />
+<TGConnectingPoint num="0" id="373" />
+<P1  x="192" y="97" id="277" />
+<P2  x="122" y="182" id="147" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="324" >
+<CONNECTOR type="5203" id="376" >
 <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="323" />
-<P1  x="627" y="391" id="134" />
-<P2  x="563" y="361" id="285" />
+<TGConnectingPoint num="0" id="375" />
+<P1  x="705" y="420" id="184" />
+<P2  x="563" y="373" id="335" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="326" >
+<CONNECTOR type="5203" id="378" >
 <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="325" />
-<P1  x="580" y="261" id="150" />
-<P2  x="505" y="199" id="181" />
+<TGConnectingPoint num="0" id="377" />
+<P1  x="599" y="279" id="200" />
+<P2  x="504" y="199" id="231" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5203" id="328" >
+<CONNECTOR type="5203" id="380" >
 <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="327" />
-<P1  x="582" y="170" id="210" />
-<P2  x="496" y="98" id="242" />
+<TGConnectingPoint num="0" id="379" />
+<P1  x="626" y="168" id="260" />
+<P2  x="496" y="97" id="292" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </AvatarRDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="330" >
+<CONNECTOR type="5312" id="382" >
 <cdparam x="582" y="248" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="329" />
-<P1  x="503" y="258" id="455" />
-<P2  x="507" y="334" id="343" />
+<TGConnectingPoint num="0" id="381" />
+<P1  x="503" y="258" id="507" />
+<P2  x="507" y="334" id="395" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="336" >
+<CONNECTOR type="5310" id="388" >
 <cdparam x="247" y="616" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="333" />
-<TGConnectingPoint num="1" id="334" />
-<TGConnectingPoint num="2" id="335" />
-<P1  x="492" y="126" id="418" />
-<P2  x="492" y="209" id="459" />
+<TGConnectingPoint num="0" id="385" />
+<TGConnectingPoint num="1" id="386" />
+<TGConnectingPoint num="2" id="387" />
+<P1  x="492" y="126" id="470" />
+<P2  x="492" y="209" id="511" />
 <Point x="467" y="147" />
 <Point x="467" y="192" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="331" >
-<father id="336" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="383" >
+<father id="388" num="0" />
 <cdparam x="467" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="332" >
-<father id="336" num="1" />
+<SUBCOMPONENT type="-1" id="384" >
+<father id="388" num="1" />
 <cdparam x="467" y="192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -573,229 +731,229 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="338" >
+<CONNECTOR type="5311" id="390" >
 <cdparam x="280" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="337" />
-<P1  x="318" y="261" id="368" />
-<P2  x="361" y="261" id="356" />
+<TGConnectingPoint num="0" id="389" />
+<P1  x="318" y="261" id="433" />
+<P2  x="361" y="261" id="408" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="340" >
+<CONNECTOR type="5312" id="392" >
 <cdparam x="473" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="339" />
-<P1  x="390" y="286" id="354" />
-<P2  x="394" y="331" id="348" />
+<TGConnectingPoint num="0" id="391" />
+<P1  x="390" y="286" id="406" />
+<P2  x="394" y="331" id="400" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="342" >
+<CONNECTOR type="5311" id="394" >
 <cdparam x="276" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="341" />
-<P1  x="318" y="211" id="381" />
-<P2  x="361" y="211" id="355" />
+<TGConnectingPoint num="0" id="393" />
+<P1  x="318" y="211" id="420" />
+<P2  x="361" y="211" id="407" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="347" >
+<COMPONENT type="5308" id="399" >
 <cdparam x="446" y="334" />
 <sizeparam width="122" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="343" />
-<TGConnectingPoint num="1" id="344" />
-<TGConnectingPoint num="2" id="345" />
-<TGConnectingPoint num="3" id="346" />
+<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="1" id="396" />
+<TGConnectingPoint num="2" id="397" />
+<TGConnectingPoint num="3" id="398" />
 <extraparam>
 <liveness data="0" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="352" >
+<COMPONENT type="5308" id="404" >
 <cdparam x="340" y="331" />
 <sizeparam width="108" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="348" />
-<TGConnectingPoint num="1" id="349" />
-<TGConnectingPoint num="2" id="350" />
-<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="0" id="400" />
+<TGConnectingPoint num="1" id="401" />
+<TGConnectingPoint num="2" id="402" />
+<TGConnectingPoint num="3" id="403" />
 <extraparam>
 <liveness data="1" />
 <not data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="365" >
+<COMPONENT type="5302" id="417" >
 <cdparam x="361" y="187" />
 <sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="&gt;50" />
-<TGConnectingPoint num="0" id="353" />
-<TGConnectingPoint num="1" id="354" />
-<TGConnectingPoint num="2" id="355" />
-<TGConnectingPoint num="3" id="356" />
-<TGConnectingPoint num="4" id="357" />
-<TGConnectingPoint num="5" id="358" />
-<TGConnectingPoint num="6" id="359" />
-<TGConnectingPoint num="7" id="360" />
-<TGConnectingPoint num="8" id="361" />
-<TGConnectingPoint num="9" id="362" />
-<TGConnectingPoint num="10" id="363" />
-<TGConnectingPoint num="11" id="364" />
+<TGConnectingPoint num="0" id="405" />
+<TGConnectingPoint num="1" id="406" />
+<TGConnectingPoint num="2" id="407" />
+<TGConnectingPoint num="3" id="408" />
+<TGConnectingPoint num="4" id="409" />
+<TGConnectingPoint num="5" id="410" />
+<TGConnectingPoint num="6" id="411" />
+<TGConnectingPoint num="7" id="412" />
+<TGConnectingPoint num="8" id="413" />
+<TGConnectingPoint num="9" id="414" />
+<TGConnectingPoint num="10" id="415" />
+<TGConnectingPoint num="11" id="416" />
 </COMPONENT>
 
-<COMPONENT type="5300" id="416" >
+<COMPONENT type="5300" id="468" >
 <cdparam x="150" y="142" />
 <sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="392" />
-<TGConnectingPoint num="1" id="393" />
-<TGConnectingPoint num="2" id="394" />
-<TGConnectingPoint num="3" id="395" />
-<TGConnectingPoint num="4" id="396" />
-<TGConnectingPoint num="5" id="397" />
-<TGConnectingPoint num="6" id="398" />
-<TGConnectingPoint num="7" id="399" />
-<TGConnectingPoint num="8" id="400" />
-<TGConnectingPoint num="9" id="401" />
-<TGConnectingPoint num="10" id="402" />
-<TGConnectingPoint num="11" id="403" />
-<TGConnectingPoint num="12" id="404" />
-<TGConnectingPoint num="13" id="405" />
-<TGConnectingPoint num="14" id="406" />
-<TGConnectingPoint num="15" id="407" />
-<TGConnectingPoint num="16" id="408" />
-<TGConnectingPoint num="17" id="409" />
-<TGConnectingPoint num="18" id="410" />
-<TGConnectingPoint num="19" id="411" />
-<TGConnectingPoint num="20" id="412" />
-<TGConnectingPoint num="21" id="413" />
-<TGConnectingPoint num="22" id="414" />
-<TGConnectingPoint num="23" id="415" />
+<TGConnectingPoint num="0" id="444" />
+<TGConnectingPoint num="1" id="445" />
+<TGConnectingPoint num="2" id="446" />
+<TGConnectingPoint num="3" id="447" />
+<TGConnectingPoint num="4" id="448" />
+<TGConnectingPoint num="5" id="449" />
+<TGConnectingPoint num="6" id="450" />
+<TGConnectingPoint num="7" id="451" />
+<TGConnectingPoint num="8" id="452" />
+<TGConnectingPoint num="9" id="453" />
+<TGConnectingPoint num="10" id="454" />
+<TGConnectingPoint num="11" id="455" />
+<TGConnectingPoint num="12" id="456" />
+<TGConnectingPoint num="13" id="457" />
+<TGConnectingPoint num="14" id="458" />
+<TGConnectingPoint num="15" id="459" />
+<TGConnectingPoint num="16" id="460" />
+<TGConnectingPoint num="17" id="461" />
+<TGConnectingPoint num="18" id="462" />
+<TGConnectingPoint num="19" id="463" />
+<TGConnectingPoint num="20" id="464" />
+<TGConnectingPoint num="21" id="465" />
+<TGConnectingPoint num="22" id="466" />
+<TGConnectingPoint num="23" id="467" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="378" >
-<father id="416" num="0" />
-<cdparam x="154" y="241" />
-<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="4" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
-<TGConnectingPoint num="0" id="366" />
-<TGConnectingPoint num="1" id="367" />
-<TGConnectingPoint num="2" id="368" />
-<TGConnectingPoint num="3" id="369" />
-<TGConnectingPoint num="4" id="370" />
-<TGConnectingPoint num="5" id="371" />
-<TGConnectingPoint num="6" id="372" />
-<TGConnectingPoint num="7" id="373" />
-<TGConnectingPoint num="8" id="374" />
-<TGConnectingPoint num="9" id="375" />
-<TGConnectingPoint num="10" id="376" />
-<TGConnectingPoint num="11" id="377" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="391" >
-<father id="416" num="1" />
+<SUBCOMPONENT type="5304" id="430" >
+<father id="468" num="0" />
 <cdparam x="166" y="191" />
 <sizeparam width="152" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="16" minY="0" maxY="114" />
 <infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<TGConnectingPoint num="2" id="381" />
-<TGConnectingPoint num="3" id="382" />
-<TGConnectingPoint num="4" id="383" />
-<TGConnectingPoint num="5" id="384" />
-<TGConnectingPoint num="6" id="385" />
-<TGConnectingPoint num="7" id="386" />
-<TGConnectingPoint num="8" id="387" />
-<TGConnectingPoint num="9" id="388" />
-<TGConnectingPoint num="10" id="389" />
-<TGConnectingPoint num="11" id="390" />
+<TGConnectingPoint num="0" id="418" />
+<TGConnectingPoint num="1" id="419" />
+<TGConnectingPoint num="2" id="420" />
+<TGConnectingPoint num="3" id="421" />
+<TGConnectingPoint num="4" id="422" />
+<TGConnectingPoint num="5" id="423" />
+<TGConnectingPoint num="6" id="424" />
+<TGConnectingPoint num="7" id="425" />
+<TGConnectingPoint num="8" id="426" />
+<TGConnectingPoint num="9" id="427" />
+<TGConnectingPoint num="10" id="428" />
+<TGConnectingPoint num="11" id="429" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="443" >
+<father id="468" num="1" />
+<cdparam x="154" y="241" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="4" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<TGConnectingPoint num="0" id="431" />
+<TGConnectingPoint num="1" id="432" />
+<TGConnectingPoint num="2" id="433" />
+<TGConnectingPoint num="3" id="434" />
+<TGConnectingPoint num="4" id="435" />
+<TGConnectingPoint num="5" id="436" />
+<TGConnectingPoint num="6" id="437" />
+<TGConnectingPoint num="7" id="438" />
+<TGConnectingPoint num="8" id="439" />
+<TGConnectingPoint num="9" id="440" />
+<TGConnectingPoint num="10" id="441" />
+<TGConnectingPoint num="11" id="442" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="454" >
+<COMPONENT type="5300" id="506" >
 <cdparam x="459" y="61" />
 <sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="430" />
-<TGConnectingPoint num="1" id="431" />
-<TGConnectingPoint num="2" id="432" />
-<TGConnectingPoint num="3" id="433" />
-<TGConnectingPoint num="4" id="434" />
-<TGConnectingPoint num="5" id="435" />
-<TGConnectingPoint num="6" id="436" />
-<TGConnectingPoint num="7" id="437" />
-<TGConnectingPoint num="8" id="438" />
-<TGConnectingPoint num="9" id="439" />
-<TGConnectingPoint num="10" id="440" />
-<TGConnectingPoint num="11" id="441" />
-<TGConnectingPoint num="12" id="442" />
-<TGConnectingPoint num="13" id="443" />
-<TGConnectingPoint num="14" id="444" />
-<TGConnectingPoint num="15" id="445" />
-<TGConnectingPoint num="16" id="446" />
-<TGConnectingPoint num="17" id="447" />
-<TGConnectingPoint num="18" id="448" />
-<TGConnectingPoint num="19" id="449" />
-<TGConnectingPoint num="20" id="450" />
-<TGConnectingPoint num="21" id="451" />
-<TGConnectingPoint num="22" id="452" />
-<TGConnectingPoint num="23" id="453" />
+<TGConnectingPoint num="0" id="482" />
+<TGConnectingPoint num="1" id="483" />
+<TGConnectingPoint num="2" id="484" />
+<TGConnectingPoint num="3" id="485" />
+<TGConnectingPoint num="4" id="486" />
+<TGConnectingPoint num="5" id="487" />
+<TGConnectingPoint num="6" id="488" />
+<TGConnectingPoint num="7" id="489" />
+<TGConnectingPoint num="8" id="490" />
+<TGConnectingPoint num="9" id="491" />
+<TGConnectingPoint num="10" id="492" />
+<TGConnectingPoint num="11" id="493" />
+<TGConnectingPoint num="12" id="494" />
+<TGConnectingPoint num="13" id="495" />
+<TGConnectingPoint num="14" id="496" />
+<TGConnectingPoint num="15" id="497" />
+<TGConnectingPoint num="16" id="498" />
+<TGConnectingPoint num="17" id="499" />
+<TGConnectingPoint num="18" id="500" />
+<TGConnectingPoint num="19" id="501" />
+<TGConnectingPoint num="20" id="502" />
+<TGConnectingPoint num="21" id="503" />
+<TGConnectingPoint num="22" id="504" />
+<TGConnectingPoint num="23" id="505" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="429" >
-<father id="454" num="0" />
+<SUBCOMPONENT type="5303" id="481" >
+<father id="506" num="0" />
 <cdparam x="492" y="102" />
 <sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
 <infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="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="0" id="469" />
+<TGConnectingPoint num="1" id="470" />
+<TGConnectingPoint num="2" id="471" />
+<TGConnectingPoint num="3" id="472" />
+<TGConnectingPoint num="4" id="473" />
+<TGConnectingPoint num="5" id="474" />
+<TGConnectingPoint num="6" id="475" />
+<TGConnectingPoint num="7" id="476" />
+<TGConnectingPoint num="8" id="477" />
+<TGConnectingPoint num="9" id="478" />
+<TGConnectingPoint num="10" id="479" />
+<TGConnectingPoint num="11" id="480" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5306" id="466" >
+<COMPONENT type="5306" id="518" >
 <cdparam x="467" y="209" />
 <sizeparam width="103" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
 <infoparam name="TGComponent" value="nbOfCoins &gt;= 0" />
-<TGConnectingPoint num="0" id="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="0" id="507" />
+<TGConnectingPoint num="1" id="508" />
+<TGConnectingPoint num="2" id="509" />
+<TGConnectingPoint num="3" id="510" />
+<TGConnectingPoint num="4" id="511" />
+<TGConnectingPoint num="5" id="512" />
+<TGConnectingPoint num="6" id="513" />
+<TGConnectingPoint num="7" id="514" />
+<TGConnectingPoint num="8" id="515" />
+<TGConnectingPoint num="9" id="516" />
+<TGConnectingPoint num="10" id="517" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
@@ -805,55 +963,55 @@
 </AvatarPDPanel>
 
 <AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="468" >
+<CONNECTOR type="5312" id="520" >
 <cdparam x="580" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="467" />
-<P1  x="637" y="538" id="649" />
-<P2  x="638" y="563" id="500" />
+<TGConnectingPoint num="0" id="519" />
+<P1  x="637" y="538" id="701" />
+<P2  x="638" y="563" id="552" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="470" >
+<CONNECTOR type="5312" id="522" >
 <cdparam x="506" y="493" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="469" />
-<P1  x="577" y="471" id="654" />
-<P2  x="617" y="498" id="642" />
+<TGConnectingPoint num="0" id="521" />
+<P1  x="577" y="471" id="706" />
+<P2  x="617" y="498" id="694" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="472" >
+<CONNECTOR type="5312" id="524" >
 <cdparam x="694" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="471" />
-<P1  x="694" y="472" id="496" />
-<P2  x="657" y="498" id="644" />
+<TGConnectingPoint num="0" id="523" />
+<P1  x="694" y="472" id="548" />
+<P2  x="657" y="498" id="696" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="478" >
+<CONNECTOR type="5311" id="530" >
 <cdparam x="581" y="133" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
-<TGConnectingPoint num="2" id="477" />
-<P1  x="581" y="154" id="564" />
-<P2  x="546" y="305" id="621" />
+<TGConnectingPoint num="0" id="527" />
+<TGConnectingPoint num="1" id="528" />
+<TGConnectingPoint num="2" id="529" />
+<P1  x="581" y="154" id="603" />
+<P2  x="546" y="305" id="673" />
 <Point x="518" y="154" />
 <Point x="518" y="305" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="473" >
-<father id="478" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="525" >
+<father id="530" num="0" />
 <cdparam x="518" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="474" >
-<father id="478" num="1" />
+<SUBCOMPONENT type="-1" id="526" >
+<father id="530" num="1" />
 <cdparam x="518" y="305" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -861,18 +1019,18 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="482" >
+<CONNECTOR type="5311" id="534" >
 <cdparam x="631" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="480" />
-<TGConnectingPoint num="1" id="481" />
-<P1  x="631" y="164" id="559" />
-<P2  x="667" y="310" id="608" />
+<TGConnectingPoint num="0" id="532" />
+<TGConnectingPoint num="1" id="533" />
+<P1  x="631" y="164" id="598" />
+<P2  x="667" y="310" id="660" />
 <Point x="631" y="310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="479" >
-<father id="482" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="531" >
+<father id="534" num="0" />
 <cdparam x="631" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -880,27 +1038,27 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="484" >
+<CONNECTOR type="5312" id="536" >
 <cdparam x="695" y="396" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="483" />
-<P1  x="696" y="385" id="607" />
-<P2  x="694" y="417" id="495" />
+<TGConnectingPoint num="0" id="535" />
+<P1  x="696" y="385" id="659" />
+<P2  x="694" y="417" id="547" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5310" id="488" >
+<CONNECTOR type="5310" id="540" >
 <cdparam x="877" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="486" />
-<TGConnectingPoint num="1" id="487" />
-<P1  x="721" y="158" id="544" />
-<P2  x="700" y="204" id="598" />
+<TGConnectingPoint num="0" id="538" />
+<TGConnectingPoint num="1" id="539" />
+<P1  x="721" y="158" id="609" />
+<P2  x="700" y="204" id="650" />
 <Point x="700" y="158" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="485" >
-<father id="488" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="537" >
+<father id="540" num="0" />
 <cdparam x="700" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -908,292 +1066,292 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="490" >
+<CONNECTOR type="5312" id="542" >
 <cdparam x="915" y="307" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="489" />
-<P1  x="710" y="254" id="594" />
-<P2  x="711" y="285" id="606" />
+<TGConnectingPoint num="0" id="541" />
+<P1  x="710" y="254" id="646" />
+<P2  x="711" y="285" id="658" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5312" id="492" >
+<CONNECTOR type="5312" id="544" >
 <cdparam x="993" y="581" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="491" />
-<P1  x="576" y="385" id="620" />
-<P2  x="577" y="416" id="653" />
+<TGConnectingPoint num="0" id="543" />
+<P1  x="576" y="385" id="672" />
+<P2  x="577" y="416" id="705" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="5311" id="494" >
+<CONNECTOR type="5311" id="546" >
 <cdparam x="426" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="493" />
-<P1  x="492" y="345" id="507" />
-<P2  x="546" y="345" id="625" />
+<TGConnectingPoint num="0" id="545" />
+<P1  x="492" y="345" id="559" />
+<P2  x="546" y="345" id="677" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="5308" id="499" >
+<COMPONENT type="5308" id="551" >
 <cdparam x="644" y="417" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="prop01" />
-<TGConnectingPoint num="0" id="495" />
-<TGConnectingPoint num="1" id="496" />
-<TGConnectingPoint num="2" id="497" />
-<TGConnectingPoint num="3" id="498" />
+<TGConnectingPoint num="0" id="547" />
+<TGConnectingPoint num="1" id="548" />
+<TGConnectingPoint num="2" id="549" />
+<TGConnectingPoint num="3" id="550" />
 <extraparam>
 <liveness data="1" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="504" >
+<COMPONENT type="5308" id="556" >
 <cdparam x="559" y="563" />
 <sizeparam width="158" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="500" />
-<TGConnectingPoint num="1" id="501" />
-<TGConnectingPoint num="2" id="502" />
-<TGConnectingPoint num="3" id="503" />
+<TGConnectingPoint num="0" id="552" />
+<TGConnectingPoint num="1" id="553" />
+<TGConnectingPoint num="2" id="554" />
+<TGConnectingPoint num="3" id="555" />
 <extraparam>
 <liveness data="0" />
 <not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5300" id="542" >
+<COMPONENT type="5300" id="594" >
 <cdparam x="372" y="227" />
 <sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="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="20" id="538" />
-<TGConnectingPoint num="21" id="539" />
-<TGConnectingPoint num="22" id="540" />
-<TGConnectingPoint num="23" id="541" />
+<TGConnectingPoint num="0" id="570" />
+<TGConnectingPoint num="1" id="571" />
+<TGConnectingPoint num="2" id="572" />
+<TGConnectingPoint num="3" id="573" />
+<TGConnectingPoint num="4" id="574" />
+<TGConnectingPoint num="5" id="575" />
+<TGConnectingPoint num="6" id="576" />
+<TGConnectingPoint num="7" id="577" />
+<TGConnectingPoint num="8" id="578" />
+<TGConnectingPoint num="9" id="579" />
+<TGConnectingPoint num="10" id="580" />
+<TGConnectingPoint num="11" id="581" />
+<TGConnectingPoint num="12" id="582" />
+<TGConnectingPoint num="13" id="583" />
+<TGConnectingPoint num="14" id="584" />
+<TGConnectingPoint num="15" id="585" />
+<TGConnectingPoint num="16" id="586" />
+<TGConnectingPoint num="17" id="587" />
+<TGConnectingPoint num="18" id="588" />
+<TGConnectingPoint num="19" id="589" />
+<TGConnectingPoint num="20" id="590" />
+<TGConnectingPoint num="21" id="591" />
+<TGConnectingPoint num="22" id="592" />
+<TGConnectingPoint num="23" id="593" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="517" >
-<father id="542" num="0" />
+<SUBCOMPONENT type="5304" id="569" >
+<father id="594" num="0" />
 <cdparam x="391" y="326" />
 <sizeparam width="101" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="31" minY="0" maxY="114" />
 <infoparam name="TGComponent" value="beverageReady" />
-<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="557" />
+<TGConnectingPoint num="1" id="558" />
+<TGConnectingPoint num="2" id="559" />
+<TGConnectingPoint num="3" id="560" />
+<TGConnectingPoint num="4" id="561" />
+<TGConnectingPoint num="5" id="562" />
+<TGConnectingPoint num="6" id="563" />
+<TGConnectingPoint num="7" id="564" />
+<TGConnectingPoint num="8" id="565" />
+<TGConnectingPoint num="9" id="566" />
+<TGConnectingPoint num="10" id="567" />
+<TGConnectingPoint num="11" id="568" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="593" >
+<COMPONENT type="5300" id="645" >
 <cdparam x="563" y="78" />
 <sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="569" />
-<TGConnectingPoint num="1" id="570" />
-<TGConnectingPoint num="2" id="571" />
-<TGConnectingPoint num="3" id="572" />
-<TGConnectingPoint num="4" id="573" />
-<TGConnectingPoint num="5" id="574" />
-<TGConnectingPoint num="6" id="575" />
-<TGConnectingPoint num="7" id="576" />
-<TGConnectingPoint num="8" id="577" />
-<TGConnectingPoint num="9" id="578" />
-<TGConnectingPoint num="10" id="579" />
-<TGConnectingPoint num="11" id="580" />
-<TGConnectingPoint num="12" id="581" />
-<TGConnectingPoint num="13" id="582" />
-<TGConnectingPoint num="14" id="583" />
-<TGConnectingPoint num="15" id="584" />
-<TGConnectingPoint num="16" id="585" />
-<TGConnectingPoint num="17" id="586" />
-<TGConnectingPoint num="18" id="587" />
-<TGConnectingPoint num="19" id="588" />
-<TGConnectingPoint num="20" id="589" />
-<TGConnectingPoint num="21" id="590" />
-<TGConnectingPoint num="22" id="591" />
-<TGConnectingPoint num="23" id="592" />
+<TGConnectingPoint num="0" id="621" />
+<TGConnectingPoint num="1" id="622" />
+<TGConnectingPoint num="2" id="623" />
+<TGConnectingPoint num="3" id="624" />
+<TGConnectingPoint num="4" id="625" />
+<TGConnectingPoint num="5" id="626" />
+<TGConnectingPoint num="6" id="627" />
+<TGConnectingPoint num="7" id="628" />
+<TGConnectingPoint num="8" id="629" />
+<TGConnectingPoint num="9" id="630" />
+<TGConnectingPoint num="10" id="631" />
+<TGConnectingPoint num="11" id="632" />
+<TGConnectingPoint num="12" id="633" />
+<TGConnectingPoint num="13" id="634" />
+<TGConnectingPoint num="14" id="635" />
+<TGConnectingPoint num="15" id="636" />
+<TGConnectingPoint num="16" id="637" />
+<TGConnectingPoint num="17" id="638" />
+<TGConnectingPoint num="18" id="639" />
+<TGConnectingPoint num="19" id="640" />
+<TGConnectingPoint num="20" id="641" />
+<TGConnectingPoint num="21" id="642" />
+<TGConnectingPoint num="22" id="643" />
+<TGConnectingPoint num="23" id="644" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="555" >
-<father id="593" num="0" />
+<SUBCOMPONENT type="5304" id="607" >
+<father id="645" num="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
+<TGConnectingPoint num="0" id="595" />
+<TGConnectingPoint num="1" id="596" />
+<TGConnectingPoint num="2" id="597" />
+<TGConnectingPoint num="3" id="598" />
+<TGConnectingPoint num="4" id="599" />
+<TGConnectingPoint num="5" id="600" />
+<TGConnectingPoint num="6" id="601" />
+<TGConnectingPoint num="7" id="602" />
+<TGConnectingPoint num="8" id="603" />
+<TGConnectingPoint num="9" id="604" />
+<TGConnectingPoint num="10" id="605" />
+<TGConnectingPoint num="11" id="606" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5303" id="620" >
+<father id="645" num="1" />
 <cdparam x="721" y="133" />
 <sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
 <infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="543" />
-<TGConnectingPoint num="1" id="544" />
-<TGConnectingPoint num="2" id="545" />
-<TGConnectingPoint num="3" id="546" />
-<TGConnectingPoint num="4" id="547" />
-<TGConnectingPoint num="5" id="548" />
-<TGConnectingPoint num="6" id="549" />
-<TGConnectingPoint num="7" id="550" />
-<TGConnectingPoint num="8" id="551" />
-<TGConnectingPoint num="9" id="552" />
-<TGConnectingPoint num="10" id="553" />
-<TGConnectingPoint num="11" id="554" />
+<TGConnectingPoint num="0" id="608" />
+<TGConnectingPoint num="1" id="609" />
+<TGConnectingPoint num="2" id="610" />
+<TGConnectingPoint num="3" id="611" />
+<TGConnectingPoint num="4" id="612" />
+<TGConnectingPoint num="5" id="613" />
+<TGConnectingPoint num="6" id="614" />
+<TGConnectingPoint num="7" id="615" />
+<TGConnectingPoint num="8" id="616" />
+<TGConnectingPoint num="9" id="617" />
+<TGConnectingPoint num="10" id="618" />
+<TGConnectingPoint num="11" id="619" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="568" >
-<father id="593" num="1" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
-<TGConnectingPoint num="0" id="556" />
-<TGConnectingPoint num="1" id="557" />
-<TGConnectingPoint num="2" id="558" />
-<TGConnectingPoint num="3" id="559" />
-<TGConnectingPoint num="4" id="560" />
-<TGConnectingPoint num="5" id="561" />
-<TGConnectingPoint num="6" id="562" />
-<TGConnectingPoint num="7" id="563" />
-<TGConnectingPoint num="8" id="564" />
-<TGConnectingPoint num="9" id="565" />
-<TGConnectingPoint num="10" id="566" />
-<TGConnectingPoint num="11" id="567" />
-</SUBCOMPONENT>
 
-<COMPONENT type="5306" id="605" >
+<COMPONENT type="5306" id="657" >
 <cdparam x="675" y="204" />
 <sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="nbOfCoins &gt; 1" />
-<TGConnectingPoint num="0" id="594" />
-<TGConnectingPoint num="1" id="595" />
-<TGConnectingPoint num="2" id="596" />
-<TGConnectingPoint num="3" id="597" />
-<TGConnectingPoint num="4" id="598" />
-<TGConnectingPoint num="5" id="599" />
-<TGConnectingPoint num="6" id="600" />
-<TGConnectingPoint num="7" id="601" />
-<TGConnectingPoint num="8" id="602" />
-<TGConnectingPoint num="9" id="603" />
-<TGConnectingPoint num="10" id="604" />
+<TGConnectingPoint num="0" id="646" />
+<TGConnectingPoint num="1" id="647" />
+<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="3" id="649" />
+<TGConnectingPoint num="4" id="650" />
+<TGConnectingPoint num="5" id="651" />
+<TGConnectingPoint num="6" id="652" />
+<TGConnectingPoint num="7" id="653" />
+<TGConnectingPoint num="8" id="654" />
+<TGConnectingPoint num="9" id="655" />
+<TGConnectingPoint num="10" id="656" />
 <extraparam>
 <Toggle value="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="618" >
+<COMPONENT type="5302" id="670" >
 <cdparam x="667" y="285" />
 <sizeparam width="59" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="=0" />
-<TGConnectingPoint num="0" id="606" />
-<TGConnectingPoint num="1" id="607" />
-<TGConnectingPoint num="2" id="608" />
-<TGConnectingPoint num="3" id="609" />
-<TGConnectingPoint num="4" id="610" />
-<TGConnectingPoint num="5" id="611" />
-<TGConnectingPoint num="6" id="612" />
-<TGConnectingPoint num="7" id="613" />
-<TGConnectingPoint num="8" id="614" />
-<TGConnectingPoint num="9" id="615" />
-<TGConnectingPoint num="10" id="616" />
-<TGConnectingPoint num="11" id="617" />
+<TGConnectingPoint num="0" id="658" />
+<TGConnectingPoint num="1" id="659" />
+<TGConnectingPoint num="2" id="660" />
+<TGConnectingPoint num="3" id="661" />
+<TGConnectingPoint num="4" id="662" />
+<TGConnectingPoint num="5" id="663" />
+<TGConnectingPoint num="6" id="664" />
+<TGConnectingPoint num="7" id="665" />
+<TGConnectingPoint num="8" id="666" />
+<TGConnectingPoint num="9" id="667" />
+<TGConnectingPoint num="10" id="668" />
+<TGConnectingPoint num="11" id="669" />
 </COMPONENT>
 
-<COMPONENT type="5301" id="639" >
+<COMPONENT type="5301" id="691" >
 <cdparam x="546" y="285" />
 <sizeparam width="60" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="&lt;&lt;LS&gt;&gt;" />
-<TGConnectingPoint num="0" id="619" />
-<TGConnectingPoint num="1" id="620" />
-<TGConnectingPoint num="2" id="621" />
-<TGConnectingPoint num="3" id="622" />
-<TGConnectingPoint num="4" id="623" />
-<TGConnectingPoint num="5" id="624" />
-<TGConnectingPoint num="6" id="625" />
-<TGConnectingPoint num="7" id="626" />
-<TGConnectingPoint num="8" id="627" />
-<TGConnectingPoint num="9" id="628" />
-<TGConnectingPoint num="10" id="629" />
-<TGConnectingPoint num="11" id="630" />
-<TGConnectingPoint num="12" id="631" />
-<TGConnectingPoint num="13" id="632" />
-<TGConnectingPoint num="14" id="633" />
-<TGConnectingPoint num="15" id="634" />
-<TGConnectingPoint num="16" id="635" />
-<TGConnectingPoint num="17" id="636" />
-<TGConnectingPoint num="18" id="637" />
-<TGConnectingPoint num="19" id="638" />
+<TGConnectingPoint num="0" id="671" />
+<TGConnectingPoint num="1" id="672" />
+<TGConnectingPoint num="2" id="673" />
+<TGConnectingPoint num="3" id="674" />
+<TGConnectingPoint num="4" id="675" />
+<TGConnectingPoint num="5" id="676" />
+<TGConnectingPoint num="6" id="677" />
+<TGConnectingPoint num="7" id="678" />
+<TGConnectingPoint num="8" id="679" />
+<TGConnectingPoint num="9" id="680" />
+<TGConnectingPoint num="10" id="681" />
+<TGConnectingPoint num="11" id="682" />
+<TGConnectingPoint num="12" id="683" />
+<TGConnectingPoint num="13" id="684" />
+<TGConnectingPoint num="14" id="685" />
+<TGConnectingPoint num="15" id="686" />
+<TGConnectingPoint num="16" id="687" />
+<TGConnectingPoint num="17" id="688" />
+<TGConnectingPoint num="18" id="689" />
+<TGConnectingPoint num="19" id="690" />
 </COMPONENT>
 
-<COMPONENT type="5309" id="652" >
+<COMPONENT type="5309" id="704" >
 <cdparam x="597" y="498" />
 <sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="&lt;=&gt;" />
-<TGConnectingPoint num="0" id="640" />
-<TGConnectingPoint num="1" id="641" />
-<TGConnectingPoint num="2" id="642" />
-<TGConnectingPoint num="3" id="643" />
-<TGConnectingPoint num="4" id="644" />
-<TGConnectingPoint num="5" id="645" />
-<TGConnectingPoint num="6" id="646" />
-<TGConnectingPoint num="7" id="647" />
-<TGConnectingPoint num="8" id="648" />
-<TGConnectingPoint num="9" id="649" />
-<TGConnectingPoint num="10" id="650" />
-<TGConnectingPoint num="11" id="651" />
+<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" />
 </COMPONENT>
 
-<COMPONENT type="5308" id="657" >
+<COMPONENT type="5308" id="709" >
 <cdparam x="527" y="416" />
 <sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="TGComponent" value="prop02" />
-<TGConnectingPoint num="0" id="653" />
-<TGConnectingPoint num="1" id="654" />
-<TGConnectingPoint num="2" id="655" />
-<TGConnectingPoint num="3" id="656" />
+<TGConnectingPoint num="0" id="705" />
+<TGConnectingPoint num="1" id="706" />
+<TGConnectingPoint num="2" id="707" />
+<TGConnectingPoint num="3" id="708" />
 <extraparam>
 <liveness data="1" />
 <not data="false" />
@@ -1213,16 +1371,16 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="Wallet;CoffeeMachine;TeaButton;CoffeeButton;" />
+<Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="659" >
+<CONNECTOR type="5002" id="711" >
 <cdparam x="321" y="567" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="658" />
-<P1  x="559" y="330" id="695" />
-<P2  x="560" y="377" id="753" />
+<TGConnectingPoint num="0" id="710" />
+<P1  x="559" y="330" id="772" />
+<P2  x="560" y="377" id="805" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushCoffeeButton()" />
@@ -1230,13 +1388,13 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="661" >
+<CONNECTOR type="5002" id="713" >
 <cdparam x="275" y="114" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="660" />
-<P1  x="306" y="110" id="675" />
-<P2  x="445" y="108" id="749" />
+<TGConnectingPoint num="0" id="712" />
+<P1  x="306" y="110" id="727" />
+<P2  x="445" y="108" id="801" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getCoin(int nbOfCoins)" />
@@ -1246,13 +1404,13 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="663" >
+<CONNECTOR type="5002" id="715" >
 <cdparam x="623" y="565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="662" />
-<P1  x="789" y="326" id="720" />
-<P2  x="790" y="377" id="754" />
+<TGConnectingPoint num="0" id="714" />
+<P1  x="789" y="326" id="747" />
+<P2  x="790" y="377" id="806" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushTeaButton()" />
@@ -1260,36 +1418,36 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="688" >
+<COMPONENT type="5000" id="740" >
 <cdparam x="106" y="56" />
 <sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="664" />
-<TGConnectingPoint num="1" id="665" />
-<TGConnectingPoint num="2" id="666" />
-<TGConnectingPoint num="3" id="667" />
-<TGConnectingPoint num="4" id="668" />
-<TGConnectingPoint num="5" id="669" />
-<TGConnectingPoint num="6" id="670" />
-<TGConnectingPoint num="7" id="671" />
-<TGConnectingPoint num="8" id="672" />
-<TGConnectingPoint num="9" id="673" />
-<TGConnectingPoint num="10" id="674" />
-<TGConnectingPoint num="11" id="675" />
-<TGConnectingPoint num="12" id="676" />
-<TGConnectingPoint num="13" id="677" />
-<TGConnectingPoint num="14" id="678" />
-<TGConnectingPoint num="15" id="679" />
-<TGConnectingPoint num="16" id="680" />
-<TGConnectingPoint num="17" id="681" />
-<TGConnectingPoint num="18" id="682" />
-<TGConnectingPoint num="19" id="683" />
-<TGConnectingPoint num="20" id="684" />
-<TGConnectingPoint num="21" id="685" />
-<TGConnectingPoint num="22" id="686" />
-<TGConnectingPoint num="23" id="687" />
+<TGConnectingPoint num="0" id="716" />
+<TGConnectingPoint num="1" id="717" />
+<TGConnectingPoint num="2" id="718" />
+<TGConnectingPoint num="3" id="719" />
+<TGConnectingPoint num="4" id="720" />
+<TGConnectingPoint num="5" id="721" />
+<TGConnectingPoint num="6" id="722" />
+<TGConnectingPoint num="7" id="723" />
+<TGConnectingPoint num="8" id="724" />
+<TGConnectingPoint num="9" id="725" />
+<TGConnectingPoint num="10" id="726" />
+<TGConnectingPoint num="11" id="727" />
+<TGConnectingPoint num="12" id="728" />
+<TGConnectingPoint num="13" id="729" />
+<TGConnectingPoint num="14" id="730" />
+<TGConnectingPoint num="15" id="731" />
+<TGConnectingPoint num="16" id="732" />
+<TGConnectingPoint num="17" id="733" />
+<TGConnectingPoint num="18" id="734" />
+<TGConnectingPoint num="19" id="735" />
+<TGConnectingPoint num="20" id="736" />
+<TGConnectingPoint num="21" id="737" />
+<TGConnectingPoint num="22" id="738" />
+<TGConnectingPoint num="23" id="739" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
@@ -1302,36 +1460,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="763" >
+<COMPONENT type="5000" id="815" >
 <cdparam x="445" y="19" />
 <sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="739" />
-<TGConnectingPoint num="1" id="740" />
-<TGConnectingPoint num="2" id="741" />
-<TGConnectingPoint num="3" id="742" />
-<TGConnectingPoint num="4" id="743" />
-<TGConnectingPoint num="5" id="744" />
-<TGConnectingPoint num="6" id="745" />
-<TGConnectingPoint num="7" id="746" />
-<TGConnectingPoint num="8" id="747" />
-<TGConnectingPoint num="9" id="748" />
-<TGConnectingPoint num="10" id="749" />
-<TGConnectingPoint num="11" id="750" />
-<TGConnectingPoint num="12" id="751" />
-<TGConnectingPoint num="13" id="752" />
-<TGConnectingPoint num="14" id="753" />
-<TGConnectingPoint num="15" id="754" />
-<TGConnectingPoint num="16" id="755" />
-<TGConnectingPoint num="17" id="756" />
-<TGConnectingPoint num="18" id="757" />
-<TGConnectingPoint num="19" id="758" />
-<TGConnectingPoint num="20" id="759" />
-<TGConnectingPoint num="21" id="760" />
-<TGConnectingPoint num="22" id="761" />
-<TGConnectingPoint num="23" id="762" />
+<TGConnectingPoint num="0" id="791" />
+<TGConnectingPoint num="1" id="792" />
+<TGConnectingPoint num="2" id="793" />
+<TGConnectingPoint num="3" id="794" />
+<TGConnectingPoint num="4" id="795" />
+<TGConnectingPoint num="5" id="796" />
+<TGConnectingPoint num="6" id="797" />
+<TGConnectingPoint num="7" id="798" />
+<TGConnectingPoint num="8" id="799" />
+<TGConnectingPoint num="9" id="800" />
+<TGConnectingPoint num="10" id="801" />
+<TGConnectingPoint num="11" id="802" />
+<TGConnectingPoint num="12" id="803" />
+<TGConnectingPoint num="13" id="804" />
+<TGConnectingPoint num="14" id="805" />
+<TGConnectingPoint num="15" id="806" />
+<TGConnectingPoint num="16" id="807" />
+<TGConnectingPoint num="17" id="808" />
+<TGConnectingPoint num="18" id="809" />
+<TGConnectingPoint num="19" id="810" />
+<TGConnectingPoint num="20" id="811" />
+<TGConnectingPoint num="21" id="812" />
+<TGConnectingPoint num="22" id="813" />
+<TGConnectingPoint num="23" id="814" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
@@ -1348,74 +1506,74 @@
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="713" >
-<father id="763" num="0" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="765" >
+<father id="815" num="0" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="689" />
-<TGConnectingPoint num="1" id="690" />
-<TGConnectingPoint num="2" id="691" />
-<TGConnectingPoint num="3" id="692" />
-<TGConnectingPoint num="4" id="693" />
-<TGConnectingPoint num="5" id="694" />
-<TGConnectingPoint num="6" id="695" />
-<TGConnectingPoint num="7" id="696" />
-<TGConnectingPoint num="8" id="697" />
-<TGConnectingPoint num="9" id="698" />
-<TGConnectingPoint num="10" id="699" />
-<TGConnectingPoint num="11" id="700" />
-<TGConnectingPoint num="12" id="701" />
-<TGConnectingPoint num="13" id="702" />
-<TGConnectingPoint num="14" id="703" />
-<TGConnectingPoint num="15" id="704" />
-<TGConnectingPoint num="16" id="705" />
-<TGConnectingPoint num="17" id="706" />
-<TGConnectingPoint num="18" id="707" />
-<TGConnectingPoint num="19" id="708" />
-<TGConnectingPoint num="20" id="709" />
-<TGConnectingPoint num="21" id="710" />
-<TGConnectingPoint num="22" id="711" />
-<TGConnectingPoint num="23" id="712" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="741" />
+<TGConnectingPoint num="1" id="742" />
+<TGConnectingPoint num="2" id="743" />
+<TGConnectingPoint num="3" id="744" />
+<TGConnectingPoint num="4" id="745" />
+<TGConnectingPoint num="5" id="746" />
+<TGConnectingPoint num="6" id="747" />
+<TGConnectingPoint num="7" id="748" />
+<TGConnectingPoint num="8" id="749" />
+<TGConnectingPoint num="9" id="750" />
+<TGConnectingPoint num="10" id="751" />
+<TGConnectingPoint num="11" id="752" />
+<TGConnectingPoint num="12" id="753" />
+<TGConnectingPoint num="13" id="754" />
+<TGConnectingPoint num="14" id="755" />
+<TGConnectingPoint num="15" id="756" />
+<TGConnectingPoint num="16" id="757" />
+<TGConnectingPoint num="17" id="758" />
+<TGConnectingPoint num="18" id="759" />
+<TGConnectingPoint num="19" id="760" />
+<TGConnectingPoint num="20" id="761" />
+<TGConnectingPoint num="21" id="762" />
+<TGConnectingPoint num="22" id="763" />
+<TGConnectingPoint num="23" id="764" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="738" >
-<father id="763" num="1" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="790" >
+<father id="815" num="1" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="714" />
-<TGConnectingPoint num="1" id="715" />
-<TGConnectingPoint num="2" id="716" />
-<TGConnectingPoint num="3" id="717" />
-<TGConnectingPoint num="4" id="718" />
-<TGConnectingPoint num="5" id="719" />
-<TGConnectingPoint num="6" id="720" />
-<TGConnectingPoint num="7" id="721" />
-<TGConnectingPoint num="8" id="722" />
-<TGConnectingPoint num="9" id="723" />
-<TGConnectingPoint num="10" id="724" />
-<TGConnectingPoint num="11" id="725" />
-<TGConnectingPoint num="12" id="726" />
-<TGConnectingPoint num="13" id="727" />
-<TGConnectingPoint num="14" id="728" />
-<TGConnectingPoint num="15" id="729" />
-<TGConnectingPoint num="16" id="730" />
-<TGConnectingPoint num="17" id="731" />
-<TGConnectingPoint num="18" id="732" />
-<TGConnectingPoint num="19" id="733" />
-<TGConnectingPoint num="20" id="734" />
-<TGConnectingPoint num="21" id="735" />
-<TGConnectingPoint num="22" id="736" />
-<TGConnectingPoint num="23" id="737" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="766" />
+<TGConnectingPoint num="1" id="767" />
+<TGConnectingPoint num="2" id="768" />
+<TGConnectingPoint num="3" id="769" />
+<TGConnectingPoint num="4" id="770" />
+<TGConnectingPoint num="5" id="771" />
+<TGConnectingPoint num="6" id="772" />
+<TGConnectingPoint num="7" id="773" />
+<TGConnectingPoint num="8" id="774" />
+<TGConnectingPoint num="9" id="775" />
+<TGConnectingPoint num="10" id="776" />
+<TGConnectingPoint num="11" id="777" />
+<TGConnectingPoint num="12" id="778" />
+<TGConnectingPoint num="13" id="779" />
+<TGConnectingPoint num="14" id="780" />
+<TGConnectingPoint num="15" id="781" />
+<TGConnectingPoint num="16" id="782" />
+<TGConnectingPoint num="17" id="783" />
+<TGConnectingPoint num="18" id="784" />
+<TGConnectingPoint num="19" id="785" />
+<TGConnectingPoint num="20" id="786" />
+<TGConnectingPoint num="21" id="787" />
+<TGConnectingPoint num="22" id="788" />
+<TGConnectingPoint num="23" id="789" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
@@ -1427,25 +1585,25 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="770" >
+<CONNECTOR type="5102" id="822" >
 <cdparam x="516" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="769" />
-<P1  x="485" y="219" id="811" />
-<P2  x="485" y="275" id="822" />
+<TGConnectingPoint num="0" id="821" />
+<P1  x="485" y="219" id="863" />
+<P2  x="485" y="275" id="874" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="768" >
-<father id="770" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="820" >
+<father id="822" num="0" />
 <cdparam x="493" y="251" />
 <sizeparam width="161" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="764" />
-<TGConnectingPoint num="1" id="765" />
-<TGConnectingPoint num="2" id="766" />
-<TGConnectingPoint num="3" id="767" />
+<TGConnectingPoint num="0" id="816" />
+<TGConnectingPoint num="1" id="817" />
+<TGConnectingPoint num="2" id="818" />
+<TGConnectingPoint num="3" id="819" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1458,25 +1616,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="777" >
+<CONNECTOR type="5102" id="829" >
 <cdparam x="382" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="776" />
-<P1  x="382" y="165" id="918" />
-<P2  x="485" y="189" id="810" />
+<TGConnectingPoint num="0" id="828" />
+<P1  x="382" y="165" id="970" />
+<P2  x="485" y="189" id="862" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="775" >
-<father id="777" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="827" >
+<father id="829" num="0" />
 <cdparam x="382" y="205" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="771" />
-<TGConnectingPoint num="1" id="772" />
-<TGConnectingPoint num="2" id="773" />
-<TGConnectingPoint num="3" id="774" />
+<TGConnectingPoint num="0" id="823" />
+<TGConnectingPoint num="1" id="824" />
+<TGConnectingPoint num="2" id="825" />
+<TGConnectingPoint num="3" id="826" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1487,25 +1645,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="784" >
+<CONNECTOR type="5102" id="836" >
 <cdparam x="223" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="783" />
-<P1  x="251" y="231" id="800" />
-<P2  x="252" y="300" id="863" />
+<TGConnectingPoint num="0" id="835" />
+<P1  x="251" y="231" id="852" />
+<P2  x="252" y="300" id="915" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="782" >
-<father id="784" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="834" >
+<father id="836" num="0" />
 <cdparam x="175" y="246" />
 <sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="778" />
-<TGConnectingPoint num="1" id="779" />
-<TGConnectingPoint num="2" id="780" />
-<TGConnectingPoint num="3" id="781" />
+<TGConnectingPoint num="0" id="830" />
+<TGConnectingPoint num="1" id="831" />
+<TGConnectingPoint num="2" id="832" />
+<TGConnectingPoint num="3" id="833" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="minUserDelay" />
@@ -1518,25 +1676,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="791" >
+<CONNECTOR type="5102" id="843" >
 <cdparam x="357" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="790" />
-<P1  x="357" y="165" id="917" />
-<P2  x="251" y="201" id="799" />
+<TGConnectingPoint num="0" id="842" />
+<P1  x="357" y="165" id="969" />
+<P2  x="251" y="201" id="851" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="789" >
-<father id="791" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="841" >
+<father id="843" num="0" />
 <cdparam x="220" y="174" />
 <sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="785" />
-<TGConnectingPoint num="1" id="786" />
-<TGConnectingPoint num="2" id="787" />
-<TGConnectingPoint num="3" id="788" />
+<TGConnectingPoint num="0" id="837" />
+<TGConnectingPoint num="1" id="838" />
+<TGConnectingPoint num="2" id="839" />
+<TGConnectingPoint num="3" id="840" />
 <extraparam>
 <guard value="[nbOfCoins &gt; 0]" />
 <afterMin value="" />
@@ -1547,25 +1705,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="798" >
+<CONNECTOR type="5102" id="850" >
 <cdparam x="369" y="115" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="797" />
-<P1  x="370" y="64" id="944" />
-<P2  x="370" y="135" id="904" />
+<TGConnectingPoint num="0" id="849" />
+<P1  x="370" y="64" id="996" />
+<P2  x="370" y="135" id="956" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="796" >
-<father id="798" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="848" >
+<father id="850" num="0" />
 <cdparam x="376" y="105" />
 <sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="792" />
-<TGConnectingPoint num="1" id="793" />
-<TGConnectingPoint num="2" id="794" />
-<TGConnectingPoint num="3" id="795" />
+<TGConnectingPoint num="0" id="844" />
+<TGConnectingPoint num="1" id="845" />
+<TGConnectingPoint num="2" id="846" />
+<TGConnectingPoint num="3" id="847" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1577,224 +1735,224 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="809" >
+<COMPONENT type="5103" id="861" >
 <cdparam x="217" y="206" />
 <sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="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="851" />
+<TGConnectingPoint num="1" id="852" />
+<TGConnectingPoint num="2" id="853" />
+<TGConnectingPoint num="3" id="854" />
+<TGConnectingPoint num="4" id="855" />
+<TGConnectingPoint num="5" id="856" />
+<TGConnectingPoint num="6" id="857" />
+<TGConnectingPoint num="7" id="858" />
+<TGConnectingPoint num="8" id="859" />
+<TGConnectingPoint num="9" id="860" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="820" >
+<COMPONENT type="5104" id="872" >
 <cdparam x="447" y="194" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="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="862" />
+<TGConnectingPoint num="1" id="863" />
+<TGConnectingPoint num="2" id="864" />
+<TGConnectingPoint num="3" id="865" />
+<TGConnectingPoint num="4" id="866" />
+<TGConnectingPoint num="5" id="867" />
+<TGConnectingPoint num="6" id="868" />
+<TGConnectingPoint num="7" id="869" />
+<TGConnectingPoint num="8" id="870" />
+<TGConnectingPoint num="9" id="871" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="861" >
+<COMPONENT type="5106" id="913" >
 <cdparam x="460" y="275" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="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="10" id="831" />
-<TGConnectingPoint num="11" id="832" />
-<TGConnectingPoint num="12" id="833" />
-<TGConnectingPoint num="13" id="834" />
-<TGConnectingPoint num="14" id="835" />
-<TGConnectingPoint num="15" id="836" />
-<TGConnectingPoint num="16" id="837" />
-<TGConnectingPoint num="17" id="838" />
-<TGConnectingPoint num="18" id="839" />
-<TGConnectingPoint num="19" id="840" />
-<TGConnectingPoint num="20" id="841" />
-<TGConnectingPoint num="21" id="842" />
-<TGConnectingPoint num="22" id="843" />
-<TGConnectingPoint num="23" id="844" />
-<TGConnectingPoint num="24" id="845" />
-<TGConnectingPoint num="25" id="846" />
-<TGConnectingPoint num="26" id="847" />
-<TGConnectingPoint num="27" id="848" />
-<TGConnectingPoint num="28" id="849" />
-<TGConnectingPoint num="29" id="850" />
-<TGConnectingPoint num="30" id="851" />
-<TGConnectingPoint num="31" id="852" />
-<TGConnectingPoint num="32" id="853" />
-<TGConnectingPoint num="33" id="854" />
-<TGConnectingPoint num="34" id="855" />
-<TGConnectingPoint num="35" id="856" />
-<TGConnectingPoint num="36" id="857" />
-<TGConnectingPoint num="37" id="858" />
-<TGConnectingPoint num="38" id="859" />
-<TGConnectingPoint num="39" id="860" />
+<TGConnectingPoint num="0" id="873" />
+<TGConnectingPoint num="1" id="874" />
+<TGConnectingPoint num="2" id="875" />
+<TGConnectingPoint num="3" id="876" />
+<TGConnectingPoint num="4" id="877" />
+<TGConnectingPoint num="5" id="878" />
+<TGConnectingPoint num="6" id="879" />
+<TGConnectingPoint num="7" id="880" />
+<TGConnectingPoint num="8" id="881" />
+<TGConnectingPoint num="9" id="882" />
+<TGConnectingPoint num="10" id="883" />
+<TGConnectingPoint num="11" id="884" />
+<TGConnectingPoint num="12" id="885" />
+<TGConnectingPoint num="13" id="886" />
+<TGConnectingPoint num="14" id="887" />
+<TGConnectingPoint num="15" id="888" />
+<TGConnectingPoint num="16" id="889" />
+<TGConnectingPoint num="17" id="890" />
+<TGConnectingPoint num="18" id="891" />
+<TGConnectingPoint num="19" id="892" />
+<TGConnectingPoint num="20" id="893" />
+<TGConnectingPoint num="21" id="894" />
+<TGConnectingPoint num="22" id="895" />
+<TGConnectingPoint num="23" id="896" />
+<TGConnectingPoint num="24" id="897" />
+<TGConnectingPoint num="25" id="898" />
+<TGConnectingPoint num="26" id="899" />
+<TGConnectingPoint num="27" id="900" />
+<TGConnectingPoint num="28" id="901" />
+<TGConnectingPoint num="29" id="902" />
+<TGConnectingPoint num="30" id="903" />
+<TGConnectingPoint num="31" id="904" />
+<TGConnectingPoint num="32" id="905" />
+<TGConnectingPoint num="33" id="906" />
+<TGConnectingPoint num="34" id="907" />
+<TGConnectingPoint num="35" id="908" />
+<TGConnectingPoint num="36" id="909" />
+<TGConnectingPoint num="37" id="910" />
+<TGConnectingPoint num="38" id="911" />
+<TGConnectingPoint num="39" id="912" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="902" >
+<COMPONENT type="5106" id="954" >
 <cdparam x="227" y="300" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="862" />
-<TGConnectingPoint num="1" id="863" />
-<TGConnectingPoint num="2" id="864" />
-<TGConnectingPoint num="3" id="865" />
-<TGConnectingPoint num="4" id="866" />
-<TGConnectingPoint num="5" id="867" />
-<TGConnectingPoint num="6" id="868" />
-<TGConnectingPoint num="7" id="869" />
-<TGConnectingPoint num="8" id="870" />
-<TGConnectingPoint num="9" id="871" />
-<TGConnectingPoint num="10" id="872" />
-<TGConnectingPoint num="11" id="873" />
-<TGConnectingPoint num="12" id="874" />
-<TGConnectingPoint num="13" id="875" />
-<TGConnectingPoint num="14" id="876" />
-<TGConnectingPoint num="15" id="877" />
-<TGConnectingPoint num="16" id="878" />
-<TGConnectingPoint num="17" id="879" />
-<TGConnectingPoint num="18" id="880" />
-<TGConnectingPoint num="19" id="881" />
-<TGConnectingPoint num="20" id="882" />
-<TGConnectingPoint num="21" id="883" />
-<TGConnectingPoint num="22" id="884" />
-<TGConnectingPoint num="23" id="885" />
-<TGConnectingPoint num="24" id="886" />
-<TGConnectingPoint num="25" id="887" />
-<TGConnectingPoint num="26" id="888" />
-<TGConnectingPoint num="27" id="889" />
-<TGConnectingPoint num="28" id="890" />
-<TGConnectingPoint num="29" id="891" />
-<TGConnectingPoint num="30" id="892" />
-<TGConnectingPoint num="31" id="893" />
-<TGConnectingPoint num="32" id="894" />
-<TGConnectingPoint num="33" id="895" />
-<TGConnectingPoint num="34" id="896" />
-<TGConnectingPoint num="35" id="897" />
-<TGConnectingPoint num="36" id="898" />
-<TGConnectingPoint num="37" id="899" />
-<TGConnectingPoint num="38" id="900" />
-<TGConnectingPoint num="39" id="901" />
+<TGConnectingPoint num="0" id="914" />
+<TGConnectingPoint num="1" id="915" />
+<TGConnectingPoint num="2" id="916" />
+<TGConnectingPoint num="3" id="917" />
+<TGConnectingPoint num="4" id="918" />
+<TGConnectingPoint num="5" id="919" />
+<TGConnectingPoint num="6" id="920" />
+<TGConnectingPoint num="7" id="921" />
+<TGConnectingPoint num="8" id="922" />
+<TGConnectingPoint num="9" id="923" />
+<TGConnectingPoint num="10" id="924" />
+<TGConnectingPoint num="11" id="925" />
+<TGConnectingPoint num="12" id="926" />
+<TGConnectingPoint num="13" id="927" />
+<TGConnectingPoint num="14" id="928" />
+<TGConnectingPoint num="15" id="929" />
+<TGConnectingPoint num="16" id="930" />
+<TGConnectingPoint num="17" id="931" />
+<TGConnectingPoint num="18" id="932" />
+<TGConnectingPoint num="19" id="933" />
+<TGConnectingPoint num="20" id="934" />
+<TGConnectingPoint num="21" id="935" />
+<TGConnectingPoint num="22" id="936" />
+<TGConnectingPoint num="23" id="937" />
+<TGConnectingPoint num="24" id="938" />
+<TGConnectingPoint num="25" id="939" />
+<TGConnectingPoint num="26" id="940" />
+<TGConnectingPoint num="27" id="941" />
+<TGConnectingPoint num="28" id="942" />
+<TGConnectingPoint num="29" id="943" />
+<TGConnectingPoint num="30" id="944" />
+<TGConnectingPoint num="31" id="945" />
+<TGConnectingPoint num="32" id="946" />
+<TGConnectingPoint num="33" id="947" />
+<TGConnectingPoint num="34" id="948" />
+<TGConnectingPoint num="35" id="949" />
+<TGConnectingPoint num="36" id="950" />
+<TGConnectingPoint num="37" id="951" />
+<TGConnectingPoint num="38" id="952" />
+<TGConnectingPoint num="39" id="953" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="943" >
+<COMPONENT type="5106" id="995" >
 <cdparam x="345" y="135" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="903" />
-<TGConnectingPoint num="1" id="904" />
-<TGConnectingPoint num="2" id="905" />
-<TGConnectingPoint num="3" id="906" />
-<TGConnectingPoint num="4" id="907" />
-<TGConnectingPoint num="5" id="908" />
-<TGConnectingPoint num="6" id="909" />
-<TGConnectingPoint num="7" id="910" />
-<TGConnectingPoint num="8" id="911" />
-<TGConnectingPoint num="9" id="912" />
-<TGConnectingPoint num="10" id="913" />
-<TGConnectingPoint num="11" id="914" />
-<TGConnectingPoint num="12" id="915" />
-<TGConnectingPoint num="13" id="916" />
-<TGConnectingPoint num="14" id="917" />
-<TGConnectingPoint num="15" id="918" />
-<TGConnectingPoint num="16" id="919" />
-<TGConnectingPoint num="17" id="920" />
-<TGConnectingPoint num="18" id="921" />
-<TGConnectingPoint num="19" id="922" />
-<TGConnectingPoint num="20" id="923" />
-<TGConnectingPoint num="21" id="924" />
-<TGConnectingPoint num="22" id="925" />
-<TGConnectingPoint num="23" id="926" />
-<TGConnectingPoint num="24" id="927" />
-<TGConnectingPoint num="25" id="928" />
-<TGConnectingPoint num="26" id="929" />
-<TGConnectingPoint num="27" id="930" />
-<TGConnectingPoint num="28" id="931" />
-<TGConnectingPoint num="29" id="932" />
-<TGConnectingPoint num="30" id="933" />
-<TGConnectingPoint num="31" id="934" />
-<TGConnectingPoint num="32" id="935" />
-<TGConnectingPoint num="33" id="936" />
-<TGConnectingPoint num="34" id="937" />
-<TGConnectingPoint num="35" id="938" />
-<TGConnectingPoint num="36" id="939" />
-<TGConnectingPoint num="37" id="940" />
-<TGConnectingPoint num="38" id="941" />
-<TGConnectingPoint num="39" id="942" />
+<TGConnectingPoint num="0" id="955" />
+<TGConnectingPoint num="1" id="956" />
+<TGConnectingPoint num="2" id="957" />
+<TGConnectingPoint num="3" id="958" />
+<TGConnectingPoint num="4" id="959" />
+<TGConnectingPoint num="5" id="960" />
+<TGConnectingPoint num="6" id="961" />
+<TGConnectingPoint num="7" id="962" />
+<TGConnectingPoint num="8" id="963" />
+<TGConnectingPoint num="9" id="964" />
+<TGConnectingPoint num="10" id="965" />
+<TGConnectingPoint num="11" id="966" />
+<TGConnectingPoint num="12" id="967" />
+<TGConnectingPoint num="13" id="968" />
+<TGConnectingPoint num="14" id="969" />
+<TGConnectingPoint num="15" id="970" />
+<TGConnectingPoint num="16" id="971" />
+<TGConnectingPoint num="17" id="972" />
+<TGConnectingPoint num="18" id="973" />
+<TGConnectingPoint num="19" id="974" />
+<TGConnectingPoint num="20" id="975" />
+<TGConnectingPoint num="21" id="976" />
+<TGConnectingPoint num="22" id="977" />
+<TGConnectingPoint num="23" id="978" />
+<TGConnectingPoint num="24" id="979" />
+<TGConnectingPoint num="25" id="980" />
+<TGConnectingPoint num="26" id="981" />
+<TGConnectingPoint num="27" id="982" />
+<TGConnectingPoint num="28" id="983" />
+<TGConnectingPoint num="29" id="984" />
+<TGConnectingPoint num="30" id="985" />
+<TGConnectingPoint num="31" id="986" />
+<TGConnectingPoint num="32" id="987" />
+<TGConnectingPoint num="33" id="988" />
+<TGConnectingPoint num="34" id="989" />
+<TGConnectingPoint num="35" id="990" />
+<TGConnectingPoint num="36" id="991" />
+<TGConnectingPoint num="37" id="992" />
+<TGConnectingPoint num="38" id="993" />
+<TGConnectingPoint num="39" id="994" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="945" >
+<COMPONENT type="5100" id="997" >
 <cdparam x="363" y="44" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="944" />
+<TGConnectingPoint num="0" id="996" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="952" >
+<CONNECTOR type="5102" id="1004" >
 <cdparam x="691" y="288" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="951" />
-<P1  x="699" y="289" id="1090" />
-<P2  x="699" y="316" id="1062" />
+<TGConnectingPoint num="0" id="1003" />
+<P1  x="699" y="289" id="1142" />
+<P2  x="699" y="316" id="1114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="950" >
-<father id="952" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1002" >
+<father id="1004" num="0" />
 <cdparam x="691" y="328" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="946" />
-<TGConnectingPoint num="1" id="947" />
-<TGConnectingPoint num="2" id="948" />
-<TGConnectingPoint num="3" id="949" />
+<TGConnectingPoint num="0" id="998" />
+<TGConnectingPoint num="1" id="999" />
+<TGConnectingPoint num="2" id="1000" />
+<TGConnectingPoint num="3" id="1001" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1805,25 +1963,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="959" >
+<CONNECTOR type="5102" id="1011" >
 <cdparam x="481" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="958" />
-<P1  x="437" y="525" id="1357" />
-<P2  x="323" y="748" id="1218" />
+<TGConnectingPoint num="0" id="1010" />
+<P1  x="437" y="525" id="1344" />
+<P2  x="323" y="748" id="1270" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="957" >
-<father id="959" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1009" >
+<father id="1011" num="0" />
 <cdparam x="420" y="552" />
 <sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="953" />
-<TGConnectingPoint num="1" id="954" />
-<TGConnectingPoint num="2" id="955" />
-<TGConnectingPoint num="3" id="956" />
+<TGConnectingPoint num="0" id="1005" />
+<TGConnectingPoint num="1" id="1006" />
+<TGConnectingPoint num="2" id="1007" />
+<TGConnectingPoint num="3" id="1008" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1835,25 +1993,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="966" >
+<CONNECTOR type="5102" id="1018" >
 <cdparam x="555" y="559" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="965" />
-<P1  x="321" y="455" id="1306" />
-<P2  x="437" y="495" id="1356" />
+<TGConnectingPoint num="0" id="1017" />
+<P1  x="321" y="455" id="1371" />
+<P2  x="437" y="495" id="1343" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="964" >
-<father id="966" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1016" >
+<father id="1018" num="0" />
 <cdparam x="395" y="448" />
 <sizeparam width="94" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="960" />
-<TGConnectingPoint num="1" id="961" />
-<TGConnectingPoint num="2" id="962" />
-<TGConnectingPoint num="3" id="963" />
+<TGConnectingPoint num="0" id="1012" />
+<TGConnectingPoint num="1" id="1013" />
+<TGConnectingPoint num="2" id="1014" />
+<TGConnectingPoint num="3" id="1015" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
@@ -1864,25 +2022,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="973" >
+<CONNECTOR type="5102" id="1025" >
 <cdparam x="355" y="545" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="972" />
-<P1  x="293" y="552" id="1292" />
-<P2  x="289" y="748" id="1210" />
+<TGConnectingPoint num="0" id="1024" />
+<P1  x="293" y="552" id="1409" />
+<P2  x="289" y="748" id="1262" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="971" >
-<father id="973" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1023" >
+<father id="1025" num="0" />
 <cdparam x="284" y="594" />
 <sizeparam width="228" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="967" />
-<TGConnectingPoint num="1" id="968" />
-<TGConnectingPoint num="2" id="969" />
-<TGConnectingPoint num="3" id="970" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
+<TGConnectingPoint num="2" id="1021" />
+<TGConnectingPoint num="3" id="1022" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1895,25 +2053,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="980" >
+<CONNECTOR type="5102" id="1032" >
 <cdparam x="295" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="979" />
-<P1  x="288" y="475" id="1317" />
-<P2  x="293" y="522" id="1291" />
+<TGConnectingPoint num="0" id="1031" />
+<P1  x="288" y="475" id="1382" />
+<P2  x="293" y="522" id="1408" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="978" >
-<father id="980" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1030" >
+<father id="1032" num="0" />
 <cdparam x="295" y="505" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="974" />
-<TGConnectingPoint num="1" id="975" />
-<TGConnectingPoint num="2" id="976" />
-<TGConnectingPoint num="3" id="977" />
+<TGConnectingPoint num="0" id="1026" />
+<TGConnectingPoint num="1" id="1027" />
+<TGConnectingPoint num="2" id="1028" />
+<TGConnectingPoint num="3" id="1029" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1924,25 +2082,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="987" >
+<CONNECTOR type="5102" id="1039" >
 <cdparam x="148" y="549" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="986" />
-<P1  x="121" y="552" id="1346" />
-<P2  x="255" y="748" id="1217" />
+<TGConnectingPoint num="0" id="1038" />
+<P1  x="121" y="552" id="1355" />
+<P2  x="255" y="748" id="1269" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="985" >
-<father id="987" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1037" >
+<father id="1039" num="0" />
 <cdparam x="32" y="587" />
 <sizeparam width="262" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="981" />
-<TGConnectingPoint num="1" id="982" />
-<TGConnectingPoint num="2" id="983" />
-<TGConnectingPoint num="3" id="984" />
+<TGConnectingPoint num="0" id="1033" />
+<TGConnectingPoint num="1" id="1034" />
+<TGConnectingPoint num="2" id="1035" />
+<TGConnectingPoint num="3" id="1036" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1955,25 +2113,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="994" >
+<CONNECTOR type="5102" id="1046" >
 <cdparam x="229" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="993" />
-<P1  x="222" y="475" id="1316" />
-<P2  x="121" y="522" id="1345" />
+<TGConnectingPoint num="0" id="1045" />
+<P1  x="222" y="475" id="1381" />
+<P2  x="121" y="522" id="1354" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="992" >
-<father id="994" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1044" >
+<father id="1046" num="0" />
 <cdparam x="229" y="505" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="988" />
-<TGConnectingPoint num="1" id="989" />
-<TGConnectingPoint num="2" id="990" />
-<TGConnectingPoint num="3" id="991" />
+<TGConnectingPoint num="0" id="1040" />
+<TGConnectingPoint num="1" id="1041" />
+<TGConnectingPoint num="2" id="1042" />
+<TGConnectingPoint num="3" id="1043" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1984,25 +2142,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1001" >
+<CONNECTOR type="5102" id="1053" >
 <cdparam x="280" y="420" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1000" />
-<P1  x="256" y="419" id="1343" />
-<P2  x="255" y="435" id="1303" />
+<TGConnectingPoint num="0" id="1052" />
+<P1  x="256" y="419" id="1365" />
+<P2  x="255" y="435" id="1368" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="999" >
-<father id="1001" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1051" >
+<father id="1053" num="0" />
 <cdparam x="280" y="460" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="995" />
-<TGConnectingPoint num="1" id="996" />
-<TGConnectingPoint num="2" id="997" />
-<TGConnectingPoint num="3" id="998" />
+<TGConnectingPoint num="0" id="1047" />
+<TGConnectingPoint num="1" id="1048" />
+<TGConnectingPoint num="2" id="1049" />
+<TGConnectingPoint num="3" id="1050" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2013,25 +2171,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1008" >
+<CONNECTOR type="5102" id="1060" >
 <cdparam x="667" y="346" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1007" />
-<P1  x="699" y="346" id="1063" />
-<P2  x="699" y="381" id="1251" />
+<TGConnectingPoint num="0" id="1059" />
+<P1  x="699" y="346" id="1115" />
+<P2  x="699" y="381" id="1303" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1006" >
-<father id="1008" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1058" >
+<father id="1060" num="0" />
 <cdparam x="707" y="368" />
 <sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1002" />
-<TGConnectingPoint num="1" id="1003" />
-<TGConnectingPoint num="2" id="1004" />
-<TGConnectingPoint num="3" id="1005" />
+<TGConnectingPoint num="0" id="1054" />
+<TGConnectingPoint num="1" id="1055" />
+<TGConnectingPoint num="2" id="1056" />
+<TGConnectingPoint num="3" id="1057" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2043,25 +2201,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1015" >
+<CONNECTOR type="5102" id="1067" >
 <cdparam x="348" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1014" />
-<P1  x="388" y="208" id="1129" />
-<P2  x="649" y="264" id="1087" />
+<TGConnectingPoint num="0" id="1066" />
+<P1  x="388" y="208" id="1181" />
+<P2  x="649" y="264" id="1139" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1013" >
-<father id="1015" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1065" >
+<father id="1067" num="0" />
 <cdparam x="411" y="206" />
 <sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1009" />
-<TGConnectingPoint num="1" id="1010" />
-<TGConnectingPoint num="2" id="1011" />
-<TGConnectingPoint num="3" id="1012" />
+<TGConnectingPoint num="0" id="1061" />
+<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="2" id="1063" />
+<TGConnectingPoint num="3" id="1064" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="coinDelay" />
@@ -2072,25 +2230,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1022" >
+<CONNECTOR type="5102" id="1074" >
 <cdparam x="243" y="319" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1021" />
-<P1  x="277" y="305" id="1074" />
-<P2  x="306" y="370" id="1368" />
+<TGConnectingPoint num="0" id="1073" />
+<P1  x="277" y="305" id="1126" />
+<P2  x="306" y="370" id="1420" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1020" >
-<father id="1022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1072" >
+<father id="1074" num="0" />
 <cdparam x="243" y="359" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
-<TGConnectingPoint num="2" id="1018" />
-<TGConnectingPoint num="3" id="1019" />
+<TGConnectingPoint num="0" id="1068" />
+<TGConnectingPoint num="1" id="1069" />
+<TGConnectingPoint num="2" id="1070" />
+<TGConnectingPoint num="3" id="1071" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2101,25 +2259,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1029" >
+<CONNECTOR type="5102" id="1081" >
 <cdparam x="270" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1028" />
-<P1  x="270" y="228" id="1139" />
-<P2  x="277" y="275" id="1073" />
+<TGConnectingPoint num="0" id="1080" />
+<P1  x="270" y="228" id="1191" />
+<P2  x="277" y="275" id="1125" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1027" >
-<father id="1029" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1079" >
+<father id="1081" num="0" />
 <cdparam x="270" y="264" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1023" />
-<TGConnectingPoint num="1" id="1024" />
-<TGConnectingPoint num="2" id="1025" />
-<TGConnectingPoint num="3" id="1026" />
+<TGConnectingPoint num="0" id="1075" />
+<TGConnectingPoint num="1" id="1076" />
+<TGConnectingPoint num="2" id="1077" />
+<TGConnectingPoint num="3" id="1078" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2130,25 +2288,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1036" >
+<CONNECTOR type="5102" id="1088" >
 <cdparam x="309" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1035" />
-<P1  x="306" y="166" id="1052" />
-<P2  x="309" y="188" id="1126" />
+<TGConnectingPoint num="0" id="1087" />
+<P1  x="306" y="166" id="1104" />
+<P2  x="309" y="188" id="1178" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1034" >
-<father id="1036" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1086" >
+<father id="1088" num="0" />
 <cdparam x="328" y="178" />
 <sizeparam width="161" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1030" />
-<TGConnectingPoint num="1" id="1031" />
-<TGConnectingPoint num="2" id="1032" />
-<TGConnectingPoint num="3" id="1033" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
+<TGConnectingPoint num="2" id="1084" />
+<TGConnectingPoint num="3" id="1085" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2160,25 +2318,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1043" >
+<CONNECTOR type="5102" id="1095" >
 <cdparam x="303" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1042" />
-<P1  x="303" y="103" id="1174" />
-<P2  x="306" y="136" id="1051" />
+<TGConnectingPoint num="0" id="1094" />
+<P1  x="303" y="103" id="1226" />
+<P2  x="306" y="136" id="1103" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1041" >
-<father id="1043" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1093" >
+<father id="1095" num="0" />
 <cdparam x="303" y="143" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1037" />
-<TGConnectingPoint num="1" id="1038" />
-<TGConnectingPoint num="2" id="1039" />
-<TGConnectingPoint num="3" id="1040" />
+<TGConnectingPoint num="0" id="1089" />
+<TGConnectingPoint num="1" id="1090" />
+<TGConnectingPoint num="2" id="1091" />
+<TGConnectingPoint num="3" id="1092" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2189,25 +2347,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1050" >
+<CONNECTOR type="5102" id="1102" >
 <cdparam x="303" y="40" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1049" />
-<P1  x="303" y="40" id="1166" />
-<P2  x="303" y="63" id="1169" />
+<TGConnectingPoint num="0" id="1101" />
+<P1  x="303" y="40" id="1218" />
+<P2  x="303" y="63" id="1221" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1048" >
-<father id="1050" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1100" >
+<father id="1102" num="0" />
 <cdparam x="303" y="80" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1044" />
-<TGConnectingPoint num="1" id="1045" />
-<TGConnectingPoint num="2" id="1046" />
-<TGConnectingPoint num="3" id="1047" />
+<TGConnectingPoint num="0" id="1096" />
+<TGConnectingPoint num="1" id="1097" />
+<TGConnectingPoint num="2" id="1098" />
+<TGConnectingPoint num="3" id="1099" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2218,326 +2376,423 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1061" >
+<COMPONENT type="5104" id="1113" >
 <cdparam x="268" y="141" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1051" />
-<TGConnectingPoint num="1" id="1052" />
-<TGConnectingPoint num="2" id="1053" />
-<TGConnectingPoint num="3" id="1054" />
-<TGConnectingPoint num="4" id="1055" />
-<TGConnectingPoint num="5" id="1056" />
-<TGConnectingPoint num="6" id="1057" />
-<TGConnectingPoint num="7" id="1058" />
-<TGConnectingPoint num="8" id="1059" />
-<TGConnectingPoint num="9" id="1060" />
+<TGConnectingPoint num="0" id="1103" />
+<TGConnectingPoint num="1" id="1104" />
+<TGConnectingPoint num="2" id="1105" />
+<TGConnectingPoint num="3" id="1106" />
+<TGConnectingPoint num="4" id="1107" />
+<TGConnectingPoint num="5" id="1108" />
+<TGConnectingPoint num="6" id="1109" />
+<TGConnectingPoint num="7" id="1110" />
+<TGConnectingPoint num="8" id="1111" />
+<TGConnectingPoint num="9" id="1112" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1072" >
+<COMPONENT type="5103" id="1124" >
 <cdparam x="634" y="321" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1062" />
-<TGConnectingPoint num="1" id="1063" />
-<TGConnectingPoint num="2" id="1064" />
-<TGConnectingPoint num="3" id="1065" />
-<TGConnectingPoint num="4" id="1066" />
-<TGConnectingPoint num="5" id="1067" />
-<TGConnectingPoint num="6" id="1068" />
-<TGConnectingPoint num="7" id="1069" />
-<TGConnectingPoint num="8" id="1070" />
-<TGConnectingPoint num="9" id="1071" />
+<TGConnectingPoint num="0" id="1114" />
+<TGConnectingPoint num="1" id="1115" />
+<TGConnectingPoint num="2" id="1116" />
+<TGConnectingPoint num="3" id="1117" />
+<TGConnectingPoint num="4" id="1118" />
+<TGConnectingPoint num="5" id="1119" />
+<TGConnectingPoint num="6" id="1120" />
+<TGConnectingPoint num="7" id="1121" />
+<TGConnectingPoint num="8" id="1122" />
+<TGConnectingPoint num="9" id="1123" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1083" >
+<COMPONENT type="5104" id="1135" >
 <cdparam x="239" y="280" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1073" />
-<TGConnectingPoint num="1" id="1074" />
-<TGConnectingPoint num="2" id="1075" />
-<TGConnectingPoint num="3" id="1076" />
-<TGConnectingPoint num="4" id="1077" />
-<TGConnectingPoint num="5" id="1078" />
-<TGConnectingPoint num="6" id="1079" />
-<TGConnectingPoint num="7" id="1080" />
-<TGConnectingPoint num="8" id="1081" />
-<TGConnectingPoint num="9" id="1082" />
+<TGConnectingPoint num="0" id="1125" />
+<TGConnectingPoint num="1" id="1126" />
+<TGConnectingPoint num="2" id="1127" />
+<TGConnectingPoint num="3" id="1128" />
+<TGConnectingPoint num="4" id="1129" />
+<TGConnectingPoint num="5" id="1130" />
+<TGConnectingPoint num="6" id="1131" />
+<TGConnectingPoint num="7" id="1132" />
+<TGConnectingPoint num="8" id="1133" />
+<TGConnectingPoint num="9" id="1134" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1124" >
+<COMPONENT type="5106" id="1176" >
 <cdparam x="649" y="239" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1084" />
-<TGConnectingPoint num="1" id="1085" />
-<TGConnectingPoint num="2" id="1086" />
-<TGConnectingPoint num="3" id="1087" />
-<TGConnectingPoint num="4" id="1088" />
-<TGConnectingPoint num="5" id="1089" />
-<TGConnectingPoint num="6" id="1090" />
-<TGConnectingPoint num="7" id="1091" />
-<TGConnectingPoint num="8" id="1092" />
-<TGConnectingPoint num="9" id="1093" />
-<TGConnectingPoint num="10" id="1094" />
-<TGConnectingPoint num="11" id="1095" />
-<TGConnectingPoint num="12" id="1096" />
-<TGConnectingPoint num="13" id="1097" />
-<TGConnectingPoint num="14" id="1098" />
-<TGConnectingPoint num="15" id="1099" />
-<TGConnectingPoint num="16" id="1100" />
-<TGConnectingPoint num="17" id="1101" />
-<TGConnectingPoint num="18" id="1102" />
-<TGConnectingPoint num="19" id="1103" />
-<TGConnectingPoint num="20" id="1104" />
-<TGConnectingPoint num="21" id="1105" />
-<TGConnectingPoint num="22" id="1106" />
-<TGConnectingPoint num="23" id="1107" />
-<TGConnectingPoint num="24" id="1108" />
-<TGConnectingPoint num="25" id="1109" />
-<TGConnectingPoint num="26" id="1110" />
-<TGConnectingPoint num="27" id="1111" />
-<TGConnectingPoint num="28" id="1112" />
-<TGConnectingPoint num="29" id="1113" />
-<TGConnectingPoint num="30" id="1114" />
-<TGConnectingPoint num="31" id="1115" />
-<TGConnectingPoint num="32" id="1116" />
-<TGConnectingPoint num="33" id="1117" />
-<TGConnectingPoint num="34" id="1118" />
-<TGConnectingPoint num="35" id="1119" />
-<TGConnectingPoint num="36" id="1120" />
-<TGConnectingPoint num="37" id="1121" />
-<TGConnectingPoint num="38" id="1122" />
-<TGConnectingPoint num="39" id="1123" />
+<TGConnectingPoint num="0" id="1136" />
+<TGConnectingPoint num="1" id="1137" />
+<TGConnectingPoint num="2" id="1138" />
+<TGConnectingPoint num="3" id="1139" />
+<TGConnectingPoint num="4" id="1140" />
+<TGConnectingPoint num="5" id="1141" />
+<TGConnectingPoint num="6" id="1142" />
+<TGConnectingPoint num="7" id="1143" />
+<TGConnectingPoint num="8" id="1144" />
+<TGConnectingPoint num="9" id="1145" />
+<TGConnectingPoint num="10" id="1146" />
+<TGConnectingPoint num="11" id="1147" />
+<TGConnectingPoint num="12" id="1148" />
+<TGConnectingPoint num="13" id="1149" />
+<TGConnectingPoint num="14" id="1150" />
+<TGConnectingPoint num="15" id="1151" />
+<TGConnectingPoint num="16" id="1152" />
+<TGConnectingPoint num="17" id="1153" />
+<TGConnectingPoint num="18" id="1154" />
+<TGConnectingPoint num="19" id="1155" />
+<TGConnectingPoint num="20" id="1156" />
+<TGConnectingPoint num="21" id="1157" />
+<TGConnectingPoint num="22" id="1158" />
+<TGConnectingPoint num="23" id="1159" />
+<TGConnectingPoint num="24" id="1160" />
+<TGConnectingPoint num="25" id="1161" />
+<TGConnectingPoint num="26" id="1162" />
+<TGConnectingPoint num="27" id="1163" />
+<TGConnectingPoint num="28" id="1164" />
+<TGConnectingPoint num="29" id="1165" />
+<TGConnectingPoint num="30" id="1166" />
+<TGConnectingPoint num="31" id="1167" />
+<TGConnectingPoint num="32" id="1168" />
+<TGConnectingPoint num="33" id="1169" />
+<TGConnectingPoint num="34" id="1170" />
+<TGConnectingPoint num="35" id="1171" />
+<TGConnectingPoint num="36" id="1172" />
+<TGConnectingPoint num="37" id="1173" />
+<TGConnectingPoint num="38" id="1174" />
+<TGConnectingPoint num="39" id="1175" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1165" >
+<COMPONENT type="5106" id="1217" >
 <cdparam x="231" y="188" />
 <sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1125" />
-<TGConnectingPoint num="1" id="1126" />
-<TGConnectingPoint num="2" id="1127" />
-<TGConnectingPoint num="3" id="1128" />
-<TGConnectingPoint num="4" id="1129" />
-<TGConnectingPoint num="5" id="1130" />
-<TGConnectingPoint num="6" id="1131" />
-<TGConnectingPoint num="7" id="1132" />
-<TGConnectingPoint num="8" id="1133" />
-<TGConnectingPoint num="9" id="1134" />
-<TGConnectingPoint num="10" id="1135" />
-<TGConnectingPoint num="11" id="1136" />
-<TGConnectingPoint num="12" id="1137" />
-<TGConnectingPoint num="13" id="1138" />
-<TGConnectingPoint num="14" id="1139" />
-<TGConnectingPoint num="15" id="1140" />
-<TGConnectingPoint num="16" id="1141" />
-<TGConnectingPoint num="17" id="1142" />
-<TGConnectingPoint num="18" id="1143" />
-<TGConnectingPoint num="19" id="1144" />
-<TGConnectingPoint num="20" id="1145" />
-<TGConnectingPoint num="21" id="1146" />
-<TGConnectingPoint num="22" id="1147" />
-<TGConnectingPoint num="23" id="1148" />
-<TGConnectingPoint num="24" id="1149" />
-<TGConnectingPoint num="25" id="1150" />
-<TGConnectingPoint num="26" id="1151" />
-<TGConnectingPoint num="27" id="1152" />
-<TGConnectingPoint num="28" id="1153" />
-<TGConnectingPoint num="29" id="1154" />
-<TGConnectingPoint num="30" id="1155" />
-<TGConnectingPoint num="31" id="1156" />
-<TGConnectingPoint num="32" id="1157" />
-<TGConnectingPoint num="33" id="1158" />
-<TGConnectingPoint num="34" id="1159" />
-<TGConnectingPoint num="35" id="1160" />
-<TGConnectingPoint num="36" id="1161" />
-<TGConnectingPoint num="37" id="1162" />
-<TGConnectingPoint num="38" id="1163" />
-<TGConnectingPoint num="39" id="1164" />
+<TGConnectingPoint num="0" id="1177" />
+<TGConnectingPoint num="1" id="1178" />
+<TGConnectingPoint num="2" id="1179" />
+<TGConnectingPoint num="3" id="1180" />
+<TGConnectingPoint num="4" id="1181" />
+<TGConnectingPoint num="5" id="1182" />
+<TGConnectingPoint num="6" id="1183" />
+<TGConnectingPoint num="7" id="1184" />
+<TGConnectingPoint num="8" id="1185" />
+<TGConnectingPoint num="9" id="1186" />
+<TGConnectingPoint num="10" id="1187" />
+<TGConnectingPoint num="11" id="1188" />
+<TGConnectingPoint num="12" id="1189" />
+<TGConnectingPoint num="13" id="1190" />
+<TGConnectingPoint num="14" id="1191" />
+<TGConnectingPoint num="15" id="1192" />
+<TGConnectingPoint num="16" id="1193" />
+<TGConnectingPoint num="17" id="1194" />
+<TGConnectingPoint num="18" id="1195" />
+<TGConnectingPoint num="19" id="1196" />
+<TGConnectingPoint num="20" id="1197" />
+<TGConnectingPoint num="21" id="1198" />
+<TGConnectingPoint num="22" id="1199" />
+<TGConnectingPoint num="23" id="1200" />
+<TGConnectingPoint num="24" id="1201" />
+<TGConnectingPoint num="25" id="1202" />
+<TGConnectingPoint num="26" id="1203" />
+<TGConnectingPoint num="27" id="1204" />
+<TGConnectingPoint num="28" id="1205" />
+<TGConnectingPoint num="29" id="1206" />
+<TGConnectingPoint num="30" id="1207" />
+<TGConnectingPoint num="31" id="1208" />
+<TGConnectingPoint num="32" id="1209" />
+<TGConnectingPoint num="33" id="1210" />
+<TGConnectingPoint num="34" id="1211" />
+<TGConnectingPoint num="35" id="1212" />
+<TGConnectingPoint num="36" id="1213" />
+<TGConnectingPoint num="37" id="1214" />
+<TGConnectingPoint num="38" id="1215" />
+<TGConnectingPoint num="39" id="1216" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1167" >
+<COMPONENT type="5100" id="1219" >
 <cdparam x="296" y="20" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1166" />
+<TGConnectingPoint num="0" id="1218" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1208" >
+<COMPONENT type="5106" id="1260" >
 <cdparam x="235" y="63" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1168" />
-<TGConnectingPoint num="1" id="1169" />
-<TGConnectingPoint num="2" id="1170" />
-<TGConnectingPoint num="3" id="1171" />
-<TGConnectingPoint num="4" id="1172" />
-<TGConnectingPoint num="5" id="1173" />
-<TGConnectingPoint num="6" id="1174" />
-<TGConnectingPoint num="7" id="1175" />
-<TGConnectingPoint num="8" id="1176" />
-<TGConnectingPoint num="9" id="1177" />
-<TGConnectingPoint num="10" id="1178" />
-<TGConnectingPoint num="11" id="1179" />
-<TGConnectingPoint num="12" id="1180" />
-<TGConnectingPoint num="13" id="1181" />
-<TGConnectingPoint num="14" id="1182" />
-<TGConnectingPoint num="15" id="1183" />
-<TGConnectingPoint num="16" id="1184" />
-<TGConnectingPoint num="17" id="1185" />
-<TGConnectingPoint num="18" id="1186" />
-<TGConnectingPoint num="19" id="1187" />
-<TGConnectingPoint num="20" id="1188" />
-<TGConnectingPoint num="21" id="1189" />
-<TGConnectingPoint num="22" id="1190" />
-<TGConnectingPoint num="23" id="1191" />
-<TGConnectingPoint num="24" id="1192" />
-<TGConnectingPoint num="25" id="1193" />
-<TGConnectingPoint num="26" id="1194" />
-<TGConnectingPoint num="27" id="1195" />
-<TGConnectingPoint num="28" id="1196" />
-<TGConnectingPoint num="29" id="1197" />
-<TGConnectingPoint num="30" id="1198" />
-<TGConnectingPoint num="31" id="1199" />
-<TGConnectingPoint num="32" id="1200" />
-<TGConnectingPoint num="33" id="1201" />
-<TGConnectingPoint num="34" id="1202" />
-<TGConnectingPoint num="35" id="1203" />
-<TGConnectingPoint num="36" id="1204" />
-<TGConnectingPoint num="37" id="1205" />
-<TGConnectingPoint num="38" id="1206" />
-<TGConnectingPoint num="39" id="1207" />
+<TGConnectingPoint num="0" id="1220" />
+<TGConnectingPoint num="1" id="1221" />
+<TGConnectingPoint num="2" id="1222" />
+<TGConnectingPoint num="3" id="1223" />
+<TGConnectingPoint num="4" id="1224" />
+<TGConnectingPoint num="5" id="1225" />
+<TGConnectingPoint num="6" id="1226" />
+<TGConnectingPoint num="7" id="1227" />
+<TGConnectingPoint num="8" id="1228" />
+<TGConnectingPoint num="9" id="1229" />
+<TGConnectingPoint num="10" id="1230" />
+<TGConnectingPoint num="11" id="1231" />
+<TGConnectingPoint num="12" id="1232" />
+<TGConnectingPoint num="13" id="1233" />
+<TGConnectingPoint num="14" id="1234" />
+<TGConnectingPoint num="15" id="1235" />
+<TGConnectingPoint num="16" id="1236" />
+<TGConnectingPoint num="17" id="1237" />
+<TGConnectingPoint num="18" id="1238" />
+<TGConnectingPoint num="19" id="1239" />
+<TGConnectingPoint num="20" id="1240" />
+<TGConnectingPoint num="21" id="1241" />
+<TGConnectingPoint num="22" id="1242" />
+<TGConnectingPoint num="23" id="1243" />
+<TGConnectingPoint num="24" id="1244" />
+<TGConnectingPoint num="25" id="1245" />
+<TGConnectingPoint num="26" id="1246" />
+<TGConnectingPoint num="27" id="1247" />
+<TGConnectingPoint num="28" id="1248" />
+<TGConnectingPoint num="29" id="1249" />
+<TGConnectingPoint num="30" id="1250" />
+<TGConnectingPoint num="31" id="1251" />
+<TGConnectingPoint num="32" id="1252" />
+<TGConnectingPoint num="33" id="1253" />
+<TGConnectingPoint num="34" id="1254" />
+<TGConnectingPoint num="35" id="1255" />
+<TGConnectingPoint num="36" id="1256" />
+<TGConnectingPoint num="37" id="1257" />
+<TGConnectingPoint num="38" id="1258" />
+<TGConnectingPoint num="39" id="1259" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1249" >
+<COMPONENT type="5106" id="1301" >
 <cdparam x="221" y="748" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1209" />
-<TGConnectingPoint num="1" id="1210" />
-<TGConnectingPoint num="2" id="1211" />
-<TGConnectingPoint num="3" id="1212" />
-<TGConnectingPoint num="4" id="1213" />
-<TGConnectingPoint num="5" id="1214" />
-<TGConnectingPoint num="6" id="1215" />
-<TGConnectingPoint num="7" id="1216" />
-<TGConnectingPoint num="8" id="1217" />
-<TGConnectingPoint num="9" id="1218" />
-<TGConnectingPoint num="10" id="1219" />
-<TGConnectingPoint num="11" id="1220" />
-<TGConnectingPoint num="12" id="1221" />
-<TGConnectingPoint num="13" id="1222" />
-<TGConnectingPoint num="14" id="1223" />
-<TGConnectingPoint num="15" id="1224" />
-<TGConnectingPoint num="16" id="1225" />
-<TGConnectingPoint num="17" id="1226" />
-<TGConnectingPoint num="18" id="1227" />
-<TGConnectingPoint num="19" id="1228" />
-<TGConnectingPoint num="20" id="1229" />
-<TGConnectingPoint num="21" id="1230" />
-<TGConnectingPoint num="22" id="1231" />
-<TGConnectingPoint num="23" id="1232" />
-<TGConnectingPoint num="24" id="1233" />
-<TGConnectingPoint num="25" id="1234" />
-<TGConnectingPoint num="26" id="1235" />
-<TGConnectingPoint num="27" id="1236" />
-<TGConnectingPoint num="28" id="1237" />
-<TGConnectingPoint num="29" id="1238" />
-<TGConnectingPoint num="30" id="1239" />
-<TGConnectingPoint num="31" id="1240" />
-<TGConnectingPoint num="32" id="1241" />
-<TGConnectingPoint num="33" id="1242" />
-<TGConnectingPoint num="34" id="1243" />
-<TGConnectingPoint num="35" id="1244" />
-<TGConnectingPoint num="36" id="1245" />
-<TGConnectingPoint num="37" id="1246" />
-<TGConnectingPoint num="38" id="1247" />
-<TGConnectingPoint num="39" id="1248" />
+<TGConnectingPoint num="0" id="1261" />
+<TGConnectingPoint num="1" id="1262" />
+<TGConnectingPoint num="2" id="1263" />
+<TGConnectingPoint num="3" id="1264" />
+<TGConnectingPoint num="4" id="1265" />
+<TGConnectingPoint num="5" id="1266" />
+<TGConnectingPoint num="6" id="1267" />
+<TGConnectingPoint num="7" id="1268" />
+<TGConnectingPoint num="8" id="1269" />
+<TGConnectingPoint num="9" id="1270" />
+<TGConnectingPoint num="10" id="1271" />
+<TGConnectingPoint num="11" id="1272" />
+<TGConnectingPoint num="12" id="1273" />
+<TGConnectingPoint num="13" id="1274" />
+<TGConnectingPoint num="14" id="1275" />
+<TGConnectingPoint num="15" id="1276" />
+<TGConnectingPoint num="16" id="1277" />
+<TGConnectingPoint num="17" id="1278" />
+<TGConnectingPoint num="18" id="1279" />
+<TGConnectingPoint num="19" id="1280" />
+<TGConnectingPoint num="20" id="1281" />
+<TGConnectingPoint num="21" id="1282" />
+<TGConnectingPoint num="22" id="1283" />
+<TGConnectingPoint num="23" id="1284" />
+<TGConnectingPoint num="24" id="1285" />
+<TGConnectingPoint num="25" id="1286" />
+<TGConnectingPoint num="26" id="1287" />
+<TGConnectingPoint num="27" id="1288" />
+<TGConnectingPoint num="28" id="1289" />
+<TGConnectingPoint num="29" id="1290" />
+<TGConnectingPoint num="30" id="1291" />
+<TGConnectingPoint num="31" id="1292" />
+<TGConnectingPoint num="32" id="1293" />
+<TGConnectingPoint num="33" id="1294" />
+<TGConnectingPoint num="34" id="1295" />
+<TGConnectingPoint num="35" id="1296" />
+<TGConnectingPoint num="36" id="1297" />
+<TGConnectingPoint num="37" id="1298" />
+<TGConnectingPoint num="38" id="1299" />
+<TGConnectingPoint num="39" id="1300" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1290" >
+<COMPONENT type="5106" id="1342" >
 <cdparam x="631" y="381" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1250" />
-<TGConnectingPoint num="1" id="1251" />
-<TGConnectingPoint num="2" id="1252" />
-<TGConnectingPoint num="3" id="1253" />
-<TGConnectingPoint num="4" id="1254" />
-<TGConnectingPoint num="5" id="1255" />
-<TGConnectingPoint num="6" id="1256" />
-<TGConnectingPoint num="7" id="1257" />
-<TGConnectingPoint num="8" id="1258" />
-<TGConnectingPoint num="9" id="1259" />
-<TGConnectingPoint num="10" id="1260" />
-<TGConnectingPoint num="11" id="1261" />
-<TGConnectingPoint num="12" id="1262" />
-<TGConnectingPoint num="13" id="1263" />
-<TGConnectingPoint num="14" id="1264" />
-<TGConnectingPoint num="15" id="1265" />
-<TGConnectingPoint num="16" id="1266" />
-<TGConnectingPoint num="17" id="1267" />
-<TGConnectingPoint num="18" id="1268" />
-<TGConnectingPoint num="19" id="1269" />
-<TGConnectingPoint num="20" id="1270" />
-<TGConnectingPoint num="21" id="1271" />
-<TGConnectingPoint num="22" id="1272" />
-<TGConnectingPoint num="23" id="1273" />
-<TGConnectingPoint num="24" id="1274" />
-<TGConnectingPoint num="25" id="1275" />
-<TGConnectingPoint num="26" id="1276" />
-<TGConnectingPoint num="27" id="1277" />
-<TGConnectingPoint num="28" id="1278" />
-<TGConnectingPoint num="29" id="1279" />
-<TGConnectingPoint num="30" id="1280" />
-<TGConnectingPoint num="31" id="1281" />
-<TGConnectingPoint num="32" id="1282" />
-<TGConnectingPoint num="33" id="1283" />
-<TGConnectingPoint num="34" id="1284" />
-<TGConnectingPoint num="35" id="1285" />
-<TGConnectingPoint num="36" id="1286" />
-<TGConnectingPoint num="37" id="1287" />
-<TGConnectingPoint num="38" id="1288" />
-<TGConnectingPoint num="39" id="1289" />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<TGConnectingPoint num="2" id="1304" />
+<TGConnectingPoint num="3" id="1305" />
+<TGConnectingPoint num="4" id="1306" />
+<TGConnectingPoint num="5" id="1307" />
+<TGConnectingPoint num="6" id="1308" />
+<TGConnectingPoint num="7" id="1309" />
+<TGConnectingPoint num="8" id="1310" />
+<TGConnectingPoint num="9" id="1311" />
+<TGConnectingPoint num="10" id="1312" />
+<TGConnectingPoint num="11" id="1313" />
+<TGConnectingPoint num="12" id="1314" />
+<TGConnectingPoint num="13" id="1315" />
+<TGConnectingPoint num="14" id="1316" />
+<TGConnectingPoint num="15" id="1317" />
+<TGConnectingPoint num="16" id="1318" />
+<TGConnectingPoint num="17" id="1319" />
+<TGConnectingPoint num="18" id="1320" />
+<TGConnectingPoint num="19" id="1321" />
+<TGConnectingPoint num="20" id="1322" />
+<TGConnectingPoint num="21" id="1323" />
+<TGConnectingPoint num="22" id="1324" />
+<TGConnectingPoint num="23" id="1325" />
+<TGConnectingPoint num="24" id="1326" />
+<TGConnectingPoint num="25" id="1327" />
+<TGConnectingPoint num="26" id="1328" />
+<TGConnectingPoint num="27" id="1329" />
+<TGConnectingPoint num="28" id="1330" />
+<TGConnectingPoint num="29" id="1331" />
+<TGConnectingPoint num="30" id="1332" />
+<TGConnectingPoint num="31" id="1333" />
+<TGConnectingPoint num="32" id="1334" />
+<TGConnectingPoint num="33" id="1335" />
+<TGConnectingPoint num="34" id="1336" />
+<TGConnectingPoint num="35" id="1337" />
+<TGConnectingPoint num="36" id="1338" />
+<TGConnectingPoint num="37" id="1339" />
+<TGConnectingPoint num="38" id="1340" />
+<TGConnectingPoint num="39" id="1341" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1407" >
+<COMPONENT type="5106" id="1459" >
 <cdparam x="18" y="370" />
 <sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="Beverage" />
+<TGConnectingPoint num="0" id="1419" />
+<TGConnectingPoint num="1" id="1420" />
+<TGConnectingPoint num="2" id="1421" />
+<TGConnectingPoint num="3" id="1422" />
+<TGConnectingPoint num="4" id="1423" />
+<TGConnectingPoint num="5" id="1424" />
+<TGConnectingPoint num="6" id="1425" />
+<TGConnectingPoint num="7" id="1426" />
+<TGConnectingPoint num="8" id="1427" />
+<TGConnectingPoint num="9" id="1428" />
+<TGConnectingPoint num="10" id="1429" />
+<TGConnectingPoint num="11" id="1430" />
+<TGConnectingPoint num="12" id="1431" />
+<TGConnectingPoint num="13" id="1432" />
+<TGConnectingPoint num="14" id="1433" />
+<TGConnectingPoint num="15" id="1434" />
+<TGConnectingPoint num="16" id="1435" />
+<TGConnectingPoint num="17" id="1436" />
+<TGConnectingPoint num="18" id="1437" />
+<TGConnectingPoint num="19" id="1438" />
+<TGConnectingPoint num="20" id="1439" />
+<TGConnectingPoint num="21" id="1440" />
+<TGConnectingPoint num="22" id="1441" />
+<TGConnectingPoint num="23" id="1442" />
+<TGConnectingPoint num="24" id="1443" />
+<TGConnectingPoint num="25" id="1444" />
+<TGConnectingPoint num="26" id="1445" />
+<TGConnectingPoint num="27" id="1446" />
+<TGConnectingPoint num="28" id="1447" />
+<TGConnectingPoint num="29" id="1448" />
+<TGConnectingPoint num="30" id="1449" />
+<TGConnectingPoint num="31" id="1450" />
+<TGConnectingPoint num="32" id="1451" />
+<TGConnectingPoint num="33" id="1452" />
+<TGConnectingPoint num="34" id="1453" />
+<TGConnectingPoint num="35" id="1454" />
+<TGConnectingPoint num="36" id="1455" />
+<TGConnectingPoint num="37" id="1456" />
+<TGConnectingPoint num="38" id="1457" />
+<TGConnectingPoint num="39" id="1458" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5103" id="1353" >
+<father id="1459" num="0" />
+<cdparam x="372" y="500" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="1343" />
+<TGConnectingPoint num="1" id="1344" />
+<TGConnectingPoint num="2" id="1345" />
+<TGConnectingPoint num="3" id="1346" />
+<TGConnectingPoint num="4" id="1347" />
+<TGConnectingPoint num="5" id="1348" />
+<TGConnectingPoint num="6" id="1349" />
+<TGConnectingPoint num="7" id="1350" />
+<TGConnectingPoint num="8" id="1351" />
+<TGConnectingPoint num="9" id="1352" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="1364" >
+<father id="1459" num="1" />
+<cdparam x="58" y="527" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="1354" />
+<TGConnectingPoint num="1" id="1355" />
+<TGConnectingPoint num="2" id="1356" />
+<TGConnectingPoint num="3" id="1357" />
+<TGConnectingPoint num="4" id="1358" />
+<TGConnectingPoint num="5" id="1359" />
+<TGConnectingPoint num="6" id="1360" />
+<TGConnectingPoint num="7" id="1361" />
+<TGConnectingPoint num="8" id="1362" />
+<TGConnectingPoint num="9" id="1363" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1366" >
+<father id="1459" num="2" />
+<cdparam x="249" y="399" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1365" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="1407" >
+<father id="1459" num="3" />
+<cdparam x="189" y="435" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
 <TGConnectingPoint num="0" id="1367" />
 <TGConnectingPoint num="1" id="1368" />
 <TGConnectingPoint num="2" id="1369" />
@@ -2580,150 +2835,53 @@
 <TGConnectingPoint num="39" id="1406" />
 <extraparam>
 </extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5104" id="1301" >
-<father id="1407" num="0" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="1418" >
+<father id="1459" num="4" />
 <cdparam x="237" y="527" />
 <sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1291" />
-<TGConnectingPoint num="1" id="1292" />
-<TGConnectingPoint num="2" id="1293" />
-<TGConnectingPoint num="3" id="1294" />
-<TGConnectingPoint num="4" id="1295" />
-<TGConnectingPoint num="5" id="1296" />
-<TGConnectingPoint num="6" id="1297" />
-<TGConnectingPoint num="7" id="1298" />
-<TGConnectingPoint num="8" id="1299" />
-<TGConnectingPoint num="9" id="1300" />
-<accessibility />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1342" >
-<father id="1407" num="1" />
-<cdparam x="189" y="435" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1302" />
-<TGConnectingPoint num="1" id="1303" />
-<TGConnectingPoint num="2" id="1304" />
-<TGConnectingPoint num="3" id="1305" />
-<TGConnectingPoint num="4" id="1306" />
-<TGConnectingPoint num="5" id="1307" />
-<TGConnectingPoint num="6" id="1308" />
-<TGConnectingPoint num="7" id="1309" />
-<TGConnectingPoint num="8" id="1310" />
-<TGConnectingPoint num="9" id="1311" />
-<TGConnectingPoint num="10" id="1312" />
-<TGConnectingPoint num="11" id="1313" />
-<TGConnectingPoint num="12" id="1314" />
-<TGConnectingPoint num="13" id="1315" />
-<TGConnectingPoint num="14" id="1316" />
-<TGConnectingPoint num="15" id="1317" />
-<TGConnectingPoint num="16" id="1318" />
-<TGConnectingPoint num="17" id="1319" />
-<TGConnectingPoint num="18" id="1320" />
-<TGConnectingPoint num="19" id="1321" />
-<TGConnectingPoint num="20" id="1322" />
-<TGConnectingPoint num="21" id="1323" />
-<TGConnectingPoint num="22" id="1324" />
-<TGConnectingPoint num="23" id="1325" />
-<TGConnectingPoint num="24" id="1326" />
-<TGConnectingPoint num="25" id="1327" />
-<TGConnectingPoint num="26" id="1328" />
-<TGConnectingPoint num="27" id="1329" />
-<TGConnectingPoint num="28" id="1330" />
-<TGConnectingPoint num="29" id="1331" />
-<TGConnectingPoint num="30" id="1332" />
-<TGConnectingPoint num="31" id="1333" />
-<TGConnectingPoint num="32" id="1334" />
-<TGConnectingPoint num="33" id="1335" />
-<TGConnectingPoint num="34" id="1336" />
-<TGConnectingPoint num="35" id="1337" />
-<TGConnectingPoint num="36" id="1338" />
-<TGConnectingPoint num="37" id="1339" />
-<TGConnectingPoint num="38" id="1340" />
-<TGConnectingPoint num="39" id="1341" />
-<extraparam>
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1344" >
-<father id="1407" num="2" />
-<cdparam x="249" y="399" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1343" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1355" >
-<father id="1407" num="3" />
-<cdparam x="58" y="527" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
-<TGConnectingPoint num="2" id="1347" />
-<TGConnectingPoint num="3" id="1348" />
-<TGConnectingPoint num="4" id="1349" />
-<TGConnectingPoint num="5" id="1350" />
-<TGConnectingPoint num="6" id="1351" />
-<TGConnectingPoint num="7" id="1352" />
-<TGConnectingPoint num="8" id="1353" />
-<TGConnectingPoint num="9" id="1354" />
-<accessibility />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1366" >
-<father id="1407" num="4" />
-<cdparam x="372" y="500" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1356" />
-<TGConnectingPoint num="1" id="1357" />
-<TGConnectingPoint num="2" id="1358" />
-<TGConnectingPoint num="3" id="1359" />
-<TGConnectingPoint num="4" id="1360" />
-<TGConnectingPoint num="5" id="1361" />
-<TGConnectingPoint num="6" id="1362" />
-<TGConnectingPoint num="7" id="1363" />
-<TGConnectingPoint num="8" id="1364" />
-<TGConnectingPoint num="9" id="1365" />
+<TGConnectingPoint num="0" id="1408" />
+<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="2" id="1410" />
+<TGConnectingPoint num="3" id="1411" />
+<TGConnectingPoint num="4" id="1412" />
+<TGConnectingPoint num="5" id="1413" />
+<TGConnectingPoint num="6" id="1414" />
+<TGConnectingPoint num="7" id="1415" />
+<TGConnectingPoint num="8" id="1416" />
+<TGConnectingPoint num="9" id="1417" />
 <accessibility />
 </SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1414" >
-<cdparam x="363" y="193" />
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1466" >
+<cdparam x="177" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1413" />
-<P1  x="363" y="204" id="1430" />
-<P2  x="362" y="257" id="1441" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1465" />
+<P1  x="340" y="233" id="1572" />
+<P2  x="353" y="252" id="1574" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1412" >
-<father id="1414" num="0" />
-<cdparam x="380" y="228" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1464" >
+<father id="1466" num="0" />
+<cdparam x="177" y="239" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1408" />
-<TGConnectingPoint num="1" id="1409" />
-<TGConnectingPoint num="2" id="1410" />
-<TGConnectingPoint num="3" id="1411" />
+<TGConnectingPoint num="0" id="1460" />
+<TGConnectingPoint num="1" id="1461" />
+<TGConnectingPoint num="2" id="1462" />
+<TGConnectingPoint num="3" id="1463" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
+<afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
@@ -2731,25 +2889,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1421" >
-<cdparam x="363" y="150" />
+<CONNECTOR type="5102" id="1473" >
+<cdparam x="322" y="69" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1420" />
-<P1  x="363" y="150" id="1487" />
-<P2  x="363" y="174" id="1429" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1472" />
+<P1  x="322" y="69" id="1570" />
+<P2  x="323" y="88" id="1530" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1419" >
-<father id="1421" num="0" />
-<cdparam x="363" y="190" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1471" >
+<father id="1473" num="0" />
+<cdparam x="322" y="109" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1415" />
-<TGConnectingPoint num="1" id="1416" />
-<TGConnectingPoint num="2" id="1417" />
-<TGConnectingPoint num="3" id="1418" />
+<TGConnectingPoint num="0" id="1467" />
+<TGConnectingPoint num="1" id="1468" />
+<TGConnectingPoint num="2" id="1469" />
+<TGConnectingPoint num="3" id="1470" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2760,25 +2918,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1428" >
-<cdparam x="362" y="101" />
+<CONNECTOR type="5102" id="1480" >
+<cdparam x="377" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1427" />
-<P1  x="362" y="101" id="1522" />
-<P2  x="363" y="120" id="1482" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1479" />
+<P1  x="323" y="118" id="1535" />
+<P2  x="356" y="174" id="1586" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1426" >
-<father id="1428" num="0" />
-<cdparam x="362" y="141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1478" >
+<father id="1480" num="0" />
+<cdparam x="377" y="184" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1422" />
-<TGConnectingPoint num="1" id="1423" />
-<TGConnectingPoint num="2" id="1424" />
-<TGConnectingPoint num="3" id="1425" />
+<TGConnectingPoint num="0" id="1474" />
+<TGConnectingPoint num="1" id="1475" />
+<TGConnectingPoint num="2" id="1476" />
+<TGConnectingPoint num="3" id="1477" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2789,159 +2947,247 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1439" >
-<cdparam x="340" y="179" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1487" >
+<cdparam x="377" y="187" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1486" />
+<P1  x="353" y="282" id="1575" />
+<P2  x="399" y="352" id="1489" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1485" >
+<father id="1487" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1429" />
-<TGConnectingPoint num="1" id="1430" />
-<TGConnectingPoint num="2" id="1431" />
-<TGConnectingPoint num="3" id="1432" />
-<TGConnectingPoint num="4" id="1433" />
-<TGConnectingPoint num="5" id="1434" />
-<TGConnectingPoint num="6" id="1435" />
-<TGConnectingPoint num="7" id="1436" />
-<TGConnectingPoint num="8" id="1437" />
-<TGConnectingPoint num="9" id="1438" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1481" />
+<TGConnectingPoint num="1" id="1482" />
+<TGConnectingPoint num="2" id="1483" />
+<TGConnectingPoint num="3" id="1484" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="mechanicalDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1480" >
-<cdparam x="337" y="257" />
+<COMPONENT type="5106" id="1528" >
+<cdparam x="374" y="352" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1440" />
-<TGConnectingPoint num="1" id="1441" />
-<TGConnectingPoint num="2" id="1442" />
-<TGConnectingPoint num="3" id="1443" />
-<TGConnectingPoint num="4" id="1444" />
-<TGConnectingPoint num="5" id="1445" />
-<TGConnectingPoint num="6" id="1446" />
-<TGConnectingPoint num="7" id="1447" />
-<TGConnectingPoint num="8" id="1448" />
-<TGConnectingPoint num="9" id="1449" />
-<TGConnectingPoint num="10" id="1450" />
-<TGConnectingPoint num="11" id="1451" />
-<TGConnectingPoint num="12" id="1452" />
-<TGConnectingPoint num="13" id="1453" />
-<TGConnectingPoint num="14" id="1454" />
-<TGConnectingPoint num="15" id="1455" />
-<TGConnectingPoint num="16" id="1456" />
-<TGConnectingPoint num="17" id="1457" />
-<TGConnectingPoint num="18" id="1458" />
-<TGConnectingPoint num="19" id="1459" />
-<TGConnectingPoint num="20" id="1460" />
-<TGConnectingPoint num="21" id="1461" />
-<TGConnectingPoint num="22" id="1462" />
-<TGConnectingPoint num="23" id="1463" />
-<TGConnectingPoint num="24" id="1464" />
-<TGConnectingPoint num="25" id="1465" />
-<TGConnectingPoint num="26" id="1466" />
-<TGConnectingPoint num="27" id="1467" />
-<TGConnectingPoint num="28" id="1468" />
-<TGConnectingPoint num="29" id="1469" />
-<TGConnectingPoint num="30" id="1470" />
-<TGConnectingPoint num="31" id="1471" />
-<TGConnectingPoint num="32" id="1472" />
-<TGConnectingPoint num="33" id="1473" />
-<TGConnectingPoint num="34" id="1474" />
-<TGConnectingPoint num="35" id="1475" />
-<TGConnectingPoint num="36" id="1476" />
-<TGConnectingPoint num="37" id="1477" />
-<TGConnectingPoint num="38" id="1478" />
-<TGConnectingPoint num="39" id="1479" />
+<TGConnectingPoint num="0" id="1488" />
+<TGConnectingPoint num="1" id="1489" />
+<TGConnectingPoint num="2" id="1490" />
+<TGConnectingPoint num="3" id="1491" />
+<TGConnectingPoint num="4" id="1492" />
+<TGConnectingPoint num="5" id="1493" />
+<TGConnectingPoint num="6" id="1494" />
+<TGConnectingPoint num="7" id="1495" />
+<TGConnectingPoint num="8" id="1496" />
+<TGConnectingPoint num="9" id="1497" />
+<TGConnectingPoint num="10" id="1498" />
+<TGConnectingPoint num="11" id="1499" />
+<TGConnectingPoint num="12" id="1500" />
+<TGConnectingPoint num="13" id="1501" />
+<TGConnectingPoint num="14" id="1502" />
+<TGConnectingPoint num="15" id="1503" />
+<TGConnectingPoint num="16" id="1504" />
+<TGConnectingPoint num="17" id="1505" />
+<TGConnectingPoint num="18" id="1506" />
+<TGConnectingPoint num="19" id="1507" />
+<TGConnectingPoint num="20" id="1508" />
+<TGConnectingPoint num="21" id="1509" />
+<TGConnectingPoint num="22" id="1510" />
+<TGConnectingPoint num="23" id="1511" />
+<TGConnectingPoint num="24" id="1512" />
+<TGConnectingPoint num="25" id="1513" />
+<TGConnectingPoint num="26" id="1514" />
+<TGConnectingPoint num="27" id="1515" />
+<TGConnectingPoint num="28" id="1516" />
+<TGConnectingPoint num="29" id="1517" />
+<TGConnectingPoint num="30" id="1518" />
+<TGConnectingPoint num="31" id="1519" />
+<TGConnectingPoint num="32" id="1520" />
+<TGConnectingPoint num="33" id="1521" />
+<TGConnectingPoint num="34" id="1522" />
+<TGConnectingPoint num="35" id="1523" />
+<TGConnectingPoint num="36" id="1524" />
+<TGConnectingPoint num="37" id="1525" />
+<TGConnectingPoint num="38" id="1526" />
+<TGConnectingPoint num="39" id="1527" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1521" >
-<cdparam x="338" y="120" />
+<COMPONENT type="5106" id="1569" >
+<cdparam x="298" y="88" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1481" />
-<TGConnectingPoint num="1" id="1482" />
-<TGConnectingPoint num="2" id="1483" />
-<TGConnectingPoint num="3" id="1484" />
-<TGConnectingPoint num="4" id="1485" />
-<TGConnectingPoint num="5" id="1486" />
-<TGConnectingPoint num="6" id="1487" />
-<TGConnectingPoint num="7" id="1488" />
-<TGConnectingPoint num="8" id="1489" />
-<TGConnectingPoint num="9" id="1490" />
-<TGConnectingPoint num="10" id="1491" />
-<TGConnectingPoint num="11" id="1492" />
-<TGConnectingPoint num="12" id="1493" />
-<TGConnectingPoint num="13" id="1494" />
-<TGConnectingPoint num="14" id="1495" />
-<TGConnectingPoint num="15" id="1496" />
-<TGConnectingPoint num="16" id="1497" />
-<TGConnectingPoint num="17" id="1498" />
-<TGConnectingPoint num="18" id="1499" />
-<TGConnectingPoint num="19" id="1500" />
-<TGConnectingPoint num="20" id="1501" />
-<TGConnectingPoint num="21" id="1502" />
-<TGConnectingPoint num="22" id="1503" />
-<TGConnectingPoint num="23" id="1504" />
-<TGConnectingPoint num="24" id="1505" />
-<TGConnectingPoint num="25" id="1506" />
-<TGConnectingPoint num="26" id="1507" />
-<TGConnectingPoint num="27" id="1508" />
-<TGConnectingPoint num="28" id="1509" />
-<TGConnectingPoint num="29" id="1510" />
-<TGConnectingPoint num="30" id="1511" />
-<TGConnectingPoint num="31" id="1512" />
-<TGConnectingPoint num="32" id="1513" />
-<TGConnectingPoint num="33" id="1514" />
-<TGConnectingPoint num="34" id="1515" />
-<TGConnectingPoint num="35" id="1516" />
-<TGConnectingPoint num="36" id="1517" />
-<TGConnectingPoint num="37" id="1518" />
-<TGConnectingPoint num="38" id="1519" />
-<TGConnectingPoint num="39" id="1520" />
+<TGConnectingPoint num="0" id="1529" />
+<TGConnectingPoint num="1" id="1530" />
+<TGConnectingPoint num="2" id="1531" />
+<TGConnectingPoint num="3" id="1532" />
+<TGConnectingPoint num="4" id="1533" />
+<TGConnectingPoint num="5" id="1534" />
+<TGConnectingPoint num="6" id="1535" />
+<TGConnectingPoint num="7" id="1536" />
+<TGConnectingPoint num="8" id="1537" />
+<TGConnectingPoint num="9" id="1538" />
+<TGConnectingPoint num="10" id="1539" />
+<TGConnectingPoint num="11" id="1540" />
+<TGConnectingPoint num="12" id="1541" />
+<TGConnectingPoint num="13" id="1542" />
+<TGConnectingPoint num="14" id="1543" />
+<TGConnectingPoint num="15" id="1544" />
+<TGConnectingPoint num="16" id="1545" />
+<TGConnectingPoint num="17" id="1546" />
+<TGConnectingPoint num="18" id="1547" />
+<TGConnectingPoint num="19" id="1548" />
+<TGConnectingPoint num="20" id="1549" />
+<TGConnectingPoint num="21" id="1550" />
+<TGConnectingPoint num="22" id="1551" />
+<TGConnectingPoint num="23" id="1552" />
+<TGConnectingPoint num="24" id="1553" />
+<TGConnectingPoint num="25" id="1554" />
+<TGConnectingPoint num="26" id="1555" />
+<TGConnectingPoint num="27" id="1556" />
+<TGConnectingPoint num="28" id="1557" />
+<TGConnectingPoint num="29" id="1558" />
+<TGConnectingPoint num="30" id="1559" />
+<TGConnectingPoint num="31" id="1560" />
+<TGConnectingPoint num="32" id="1561" />
+<TGConnectingPoint num="33" id="1562" />
+<TGConnectingPoint num="34" id="1563" />
+<TGConnectingPoint num="35" id="1564" />
+<TGConnectingPoint num="36" id="1565" />
+<TGConnectingPoint num="37" id="1566" />
+<TGConnectingPoint num="38" id="1567" />
+<TGConnectingPoint num="39" id="1568" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1523" >
-<cdparam x="355" y="81" />
+<COMPONENT type="5100" id="1571" >
+<cdparam x="315" y="49" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1522" />
+<TGConnectingPoint num="0" id="1570" />
 </COMPONENT>
 
+<COMPONENT type="5106" id="1625" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="1585" />
+<TGConnectingPoint num="1" id="1586" />
+<TGConnectingPoint num="2" id="1587" />
+<TGConnectingPoint num="3" id="1588" />
+<TGConnectingPoint num="4" id="1589" />
+<TGConnectingPoint num="5" id="1590" />
+<TGConnectingPoint num="6" id="1591" />
+<TGConnectingPoint num="7" id="1592" />
+<TGConnectingPoint num="8" id="1593" />
+<TGConnectingPoint num="9" id="1594" />
+<TGConnectingPoint num="10" id="1595" />
+<TGConnectingPoint num="11" id="1596" />
+<TGConnectingPoint num="12" id="1597" />
+<TGConnectingPoint num="13" id="1598" />
+<TGConnectingPoint num="14" id="1599" />
+<TGConnectingPoint num="15" id="1600" />
+<TGConnectingPoint num="16" id="1601" />
+<TGConnectingPoint num="17" id="1602" />
+<TGConnectingPoint num="18" id="1603" />
+<TGConnectingPoint num="19" id="1604" />
+<TGConnectingPoint num="20" id="1605" />
+<TGConnectingPoint num="21" id="1606" />
+<TGConnectingPoint num="22" id="1607" />
+<TGConnectingPoint num="23" id="1608" />
+<TGConnectingPoint num="24" id="1609" />
+<TGConnectingPoint num="25" id="1610" />
+<TGConnectingPoint num="26" id="1611" />
+<TGConnectingPoint num="27" id="1612" />
+<TGConnectingPoint num="28" id="1613" />
+<TGConnectingPoint num="29" id="1614" />
+<TGConnectingPoint num="30" id="1615" />
+<TGConnectingPoint num="31" id="1616" />
+<TGConnectingPoint num="32" id="1617" />
+<TGConnectingPoint num="33" id="1618" />
+<TGConnectingPoint num="34" id="1619" />
+<TGConnectingPoint num="35" id="1620" />
+<TGConnectingPoint num="36" id="1621" />
+<TGConnectingPoint num="37" id="1622" />
+<TGConnectingPoint num="38" id="1623" />
+<TGConnectingPoint num="39" id="1624" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5100" id="1573" >
+<father id="1625" num="0" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1572" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="1584" >
+<father id="1625" num="1" />
+<cdparam x="330" y="257" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1574" />
+<TGConnectingPoint num="1" id="1575" />
+<TGConnectingPoint num="2" id="1576" />
+<TGConnectingPoint num="3" id="1577" />
+<TGConnectingPoint num="4" id="1578" />
+<TGConnectingPoint num="5" id="1579" />
+<TGConnectingPoint num="6" id="1580" />
+<TGConnectingPoint num="7" id="1581" />
+<TGConnectingPoint num="8" id="1582" />
+<TGConnectingPoint num="9" id="1583" />
+</SUBCOMPONENT>
+
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1530" >
-<cdparam x="177" y="199" />
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1632" >
+<cdparam x="363" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1529" />
-<P1  x="340" y="233" id="1647" />
-<P2  x="353" y="252" id="1636" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1631" />
+<P1  x="363" y="204" id="1648" />
+<P2  x="362" y="257" id="1659" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1528" >
-<father id="1530" num="0" />
-<cdparam x="177" y="239" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1630" >
+<father id="1632" num="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1524" />
-<TGConnectingPoint num="1" id="1525" />
-<TGConnectingPoint num="2" id="1526" />
-<TGConnectingPoint num="3" id="1527" />
+<TGConnectingPoint num="0" id="1626" />
+<TGConnectingPoint num="1" id="1627" />
+<TGConnectingPoint num="2" id="1628" />
+<TGConnectingPoint num="3" id="1629" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
@@ -2949,25 +3195,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1537" >
-<cdparam x="322" y="69" />
+<CONNECTOR type="5102" id="1639" >
+<cdparam x="363" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1536" />
-<P1  x="322" y="69" id="1634" />
-<P2  x="323" y="88" id="1594" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1638" />
+<P1  x="363" y="150" id="1705" />
+<P2  x="363" y="174" id="1647" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1535" >
-<father id="1537" num="0" />
-<cdparam x="322" y="109" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1637" >
+<father id="1639" num="0" />
+<cdparam x="363" y="190" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1531" />
-<TGConnectingPoint num="1" id="1532" />
-<TGConnectingPoint num="2" id="1533" />
-<TGConnectingPoint num="3" id="1534" />
+<TGConnectingPoint num="0" id="1633" />
+<TGConnectingPoint num="1" id="1634" />
+<TGConnectingPoint num="2" id="1635" />
+<TGConnectingPoint num="3" id="1636" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2978,25 +3224,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1544" >
-<cdparam x="377" y="144" />
+<CONNECTOR type="5102" id="1646" >
+<cdparam x="362" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1543" />
-<P1  x="323" y="118" id="1599" />
-<P2  x="356" y="174" id="1650" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="1645" />
+<P1  x="362" y="101" id="1740" />
+<P2  x="363" y="120" id="1700" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1542" >
-<father id="1544" num="0" />
-<cdparam x="377" y="184" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1644" >
+<father id="1646" num="0" />
+<cdparam x="362" y="141" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1538" />
-<TGConnectingPoint num="1" id="1539" />
-<TGConnectingPoint num="2" id="1540" />
-<TGConnectingPoint num="3" id="1541" />
+<TGConnectingPoint num="0" id="1640" />
+<TGConnectingPoint num="1" id="1641" />
+<TGConnectingPoint num="2" id="1642" />
+<TGConnectingPoint num="3" id="1643" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3007,220 +3253,132 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1551" >
-<cdparam x="377" y="187" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1550" />
-<P1  x="353" y="282" id="1637" />
-<P2  x="399" y="352" id="1553" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1549" >
-<father id="1551" num="0" />
-<cdparam x="417" y="335" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1657" >
+<cdparam x="340" y="179" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1545" />
-<TGConnectingPoint num="1" id="1546" />
-<TGConnectingPoint num="2" id="1547" />
-<TGConnectingPoint num="3" id="1548" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="1647" />
+<TGConnectingPoint num="1" id="1648" />
+<TGConnectingPoint num="2" id="1649" />
+<TGConnectingPoint num="3" id="1650" />
+<TGConnectingPoint num="4" id="1651" />
+<TGConnectingPoint num="5" id="1652" />
+<TGConnectingPoint num="6" id="1653" />
+<TGConnectingPoint num="7" id="1654" />
+<TGConnectingPoint num="8" id="1655" />
+<TGConnectingPoint num="9" id="1656" />
+</COMPONENT>
 
-<COMPONENT type="5106" id="1592" >
-<cdparam x="374" y="352" />
+<COMPONENT type="5106" id="1698" >
+<cdparam x="337" y="257" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1552" />
-<TGConnectingPoint num="1" id="1553" />
-<TGConnectingPoint num="2" id="1554" />
-<TGConnectingPoint num="3" id="1555" />
-<TGConnectingPoint num="4" id="1556" />
-<TGConnectingPoint num="5" id="1557" />
-<TGConnectingPoint num="6" id="1558" />
-<TGConnectingPoint num="7" id="1559" />
-<TGConnectingPoint num="8" id="1560" />
-<TGConnectingPoint num="9" id="1561" />
-<TGConnectingPoint num="10" id="1562" />
-<TGConnectingPoint num="11" id="1563" />
-<TGConnectingPoint num="12" id="1564" />
-<TGConnectingPoint num="13" id="1565" />
-<TGConnectingPoint num="14" id="1566" />
-<TGConnectingPoint num="15" id="1567" />
-<TGConnectingPoint num="16" id="1568" />
-<TGConnectingPoint num="17" id="1569" />
-<TGConnectingPoint num="18" id="1570" />
-<TGConnectingPoint num="19" id="1571" />
-<TGConnectingPoint num="20" id="1572" />
-<TGConnectingPoint num="21" id="1573" />
-<TGConnectingPoint num="22" id="1574" />
-<TGConnectingPoint num="23" id="1575" />
-<TGConnectingPoint num="24" id="1576" />
-<TGConnectingPoint num="25" id="1577" />
-<TGConnectingPoint num="26" id="1578" />
-<TGConnectingPoint num="27" id="1579" />
-<TGConnectingPoint num="28" id="1580" />
-<TGConnectingPoint num="29" id="1581" />
-<TGConnectingPoint num="30" id="1582" />
-<TGConnectingPoint num="31" id="1583" />
-<TGConnectingPoint num="32" id="1584" />
-<TGConnectingPoint num="33" id="1585" />
-<TGConnectingPoint num="34" id="1586" />
-<TGConnectingPoint num="35" id="1587" />
-<TGConnectingPoint num="36" id="1588" />
-<TGConnectingPoint num="37" id="1589" />
-<TGConnectingPoint num="38" id="1590" />
-<TGConnectingPoint num="39" id="1591" />
+<TGConnectingPoint num="0" id="1658" />
+<TGConnectingPoint num="1" id="1659" />
+<TGConnectingPoint num="2" id="1660" />
+<TGConnectingPoint num="3" id="1661" />
+<TGConnectingPoint num="4" id="1662" />
+<TGConnectingPoint num="5" id="1663" />
+<TGConnectingPoint num="6" id="1664" />
+<TGConnectingPoint num="7" id="1665" />
+<TGConnectingPoint num="8" id="1666" />
+<TGConnectingPoint num="9" id="1667" />
+<TGConnectingPoint num="10" id="1668" />
+<TGConnectingPoint num="11" id="1669" />
+<TGConnectingPoint num="12" id="1670" />
+<TGConnectingPoint num="13" id="1671" />
+<TGConnectingPoint num="14" id="1672" />
+<TGConnectingPoint num="15" id="1673" />
+<TGConnectingPoint num="16" id="1674" />
+<TGConnectingPoint num="17" id="1675" />
+<TGConnectingPoint num="18" id="1676" />
+<TGConnectingPoint num="19" id="1677" />
+<TGConnectingPoint num="20" id="1678" />
+<TGConnectingPoint num="21" id="1679" />
+<TGConnectingPoint num="22" id="1680" />
+<TGConnectingPoint num="23" id="1681" />
+<TGConnectingPoint num="24" id="1682" />
+<TGConnectingPoint num="25" id="1683" />
+<TGConnectingPoint num="26" id="1684" />
+<TGConnectingPoint num="27" id="1685" />
+<TGConnectingPoint num="28" id="1686" />
+<TGConnectingPoint num="29" id="1687" />
+<TGConnectingPoint num="30" id="1688" />
+<TGConnectingPoint num="31" id="1689" />
+<TGConnectingPoint num="32" id="1690" />
+<TGConnectingPoint num="33" id="1691" />
+<TGConnectingPoint num="34" id="1692" />
+<TGConnectingPoint num="35" id="1693" />
+<TGConnectingPoint num="36" id="1694" />
+<TGConnectingPoint num="37" id="1695" />
+<TGConnectingPoint num="38" id="1696" />
+<TGConnectingPoint num="39" id="1697" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1633" >
-<cdparam x="298" y="88" />
+<COMPONENT type="5106" id="1739" >
+<cdparam x="338" y="120" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1593" />
-<TGConnectingPoint num="1" id="1594" />
-<TGConnectingPoint num="2" id="1595" />
-<TGConnectingPoint num="3" id="1596" />
-<TGConnectingPoint num="4" id="1597" />
-<TGConnectingPoint num="5" id="1598" />
-<TGConnectingPoint num="6" id="1599" />
-<TGConnectingPoint num="7" id="1600" />
-<TGConnectingPoint num="8" id="1601" />
-<TGConnectingPoint num="9" id="1602" />
-<TGConnectingPoint num="10" id="1603" />
-<TGConnectingPoint num="11" id="1604" />
-<TGConnectingPoint num="12" id="1605" />
-<TGConnectingPoint num="13" id="1606" />
-<TGConnectingPoint num="14" id="1607" />
-<TGConnectingPoint num="15" id="1608" />
-<TGConnectingPoint num="16" id="1609" />
-<TGConnectingPoint num="17" id="1610" />
-<TGConnectingPoint num="18" id="1611" />
-<TGConnectingPoint num="19" id="1612" />
-<TGConnectingPoint num="20" id="1613" />
-<TGConnectingPoint num="21" id="1614" />
-<TGConnectingPoint num="22" id="1615" />
-<TGConnectingPoint num="23" id="1616" />
-<TGConnectingPoint num="24" id="1617" />
-<TGConnectingPoint num="25" id="1618" />
-<TGConnectingPoint num="26" id="1619" />
-<TGConnectingPoint num="27" id="1620" />
-<TGConnectingPoint num="28" id="1621" />
-<TGConnectingPoint num="29" id="1622" />
-<TGConnectingPoint num="30" id="1623" />
-<TGConnectingPoint num="31" id="1624" />
-<TGConnectingPoint num="32" id="1625" />
-<TGConnectingPoint num="33" id="1626" />
-<TGConnectingPoint num="34" id="1627" />
-<TGConnectingPoint num="35" id="1628" />
-<TGConnectingPoint num="36" id="1629" />
-<TGConnectingPoint num="37" id="1630" />
-<TGConnectingPoint num="38" id="1631" />
-<TGConnectingPoint num="39" id="1632" />
+<TGConnectingPoint num="0" id="1699" />
+<TGConnectingPoint num="1" id="1700" />
+<TGConnectingPoint num="2" id="1701" />
+<TGConnectingPoint num="3" id="1702" />
+<TGConnectingPoint num="4" id="1703" />
+<TGConnectingPoint num="5" id="1704" />
+<TGConnectingPoint num="6" id="1705" />
+<TGConnectingPoint num="7" id="1706" />
+<TGConnectingPoint num="8" id="1707" />
+<TGConnectingPoint num="9" id="1708" />
+<TGConnectingPoint num="10" id="1709" />
+<TGConnectingPoint num="11" id="1710" />
+<TGConnectingPoint num="12" id="1711" />
+<TGConnectingPoint num="13" id="1712" />
+<TGConnectingPoint num="14" id="1713" />
+<TGConnectingPoint num="15" id="1714" />
+<TGConnectingPoint num="16" id="1715" />
+<TGConnectingPoint num="17" id="1716" />
+<TGConnectingPoint num="18" id="1717" />
+<TGConnectingPoint num="19" id="1718" />
+<TGConnectingPoint num="20" id="1719" />
+<TGConnectingPoint num="21" id="1720" />
+<TGConnectingPoint num="22" id="1721" />
+<TGConnectingPoint num="23" id="1722" />
+<TGConnectingPoint num="24" id="1723" />
+<TGConnectingPoint num="25" id="1724" />
+<TGConnectingPoint num="26" id="1725" />
+<TGConnectingPoint num="27" id="1726" />
+<TGConnectingPoint num="28" id="1727" />
+<TGConnectingPoint num="29" id="1728" />
+<TGConnectingPoint num="30" id="1729" />
+<TGConnectingPoint num="31" id="1730" />
+<TGConnectingPoint num="32" id="1731" />
+<TGConnectingPoint num="33" id="1732" />
+<TGConnectingPoint num="34" id="1733" />
+<TGConnectingPoint num="35" id="1734" />
+<TGConnectingPoint num="36" id="1735" />
+<TGConnectingPoint num="37" id="1736" />
+<TGConnectingPoint num="38" id="1737" />
+<TGConnectingPoint num="39" id="1738" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1635" >
-<cdparam x="315" y="49" />
+<COMPONENT type="5100" id="1741" >
+<cdparam x="355" y="81" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1634" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1689" >
-<cdparam x="264" y="174" />
-<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1649" />
-<TGConnectingPoint num="1" id="1650" />
-<TGConnectingPoint num="2" id="1651" />
-<TGConnectingPoint num="3" id="1652" />
-<TGConnectingPoint num="4" id="1653" />
-<TGConnectingPoint num="5" id="1654" />
-<TGConnectingPoint num="6" id="1655" />
-<TGConnectingPoint num="7" id="1656" />
-<TGConnectingPoint num="8" id="1657" />
-<TGConnectingPoint num="9" id="1658" />
-<TGConnectingPoint num="10" id="1659" />
-<TGConnectingPoint num="11" id="1660" />
-<TGConnectingPoint num="12" id="1661" />
-<TGConnectingPoint num="13" id="1662" />
-<TGConnectingPoint num="14" id="1663" />
-<TGConnectingPoint num="15" id="1664" />
-<TGConnectingPoint num="16" id="1665" />
-<TGConnectingPoint num="17" id="1666" />
-<TGConnectingPoint num="18" id="1667" />
-<TGConnectingPoint num="19" id="1668" />
-<TGConnectingPoint num="20" id="1669" />
-<TGConnectingPoint num="21" id="1670" />
-<TGConnectingPoint num="22" id="1671" />
-<TGConnectingPoint num="23" id="1672" />
-<TGConnectingPoint num="24" id="1673" />
-<TGConnectingPoint num="25" id="1674" />
-<TGConnectingPoint num="26" id="1675" />
-<TGConnectingPoint num="27" id="1676" />
-<TGConnectingPoint num="28" id="1677" />
-<TGConnectingPoint num="29" id="1678" />
-<TGConnectingPoint num="30" id="1679" />
-<TGConnectingPoint num="31" id="1680" />
-<TGConnectingPoint num="32" id="1681" />
-<TGConnectingPoint num="33" id="1682" />
-<TGConnectingPoint num="34" id="1683" />
-<TGConnectingPoint num="35" id="1684" />
-<TGConnectingPoint num="36" id="1685" />
-<TGConnectingPoint num="37" id="1686" />
-<TGConnectingPoint num="38" id="1687" />
-<TGConnectingPoint num="39" id="1688" />
-<extraparam>
-</extraparam>
+<TGConnectingPoint num="0" id="1740" />
 </COMPONENT>
-<SUBCOMPONENT type="5103" id="1646" >
-<father id="1689" num="0" />
-<cdparam x="330" y="257" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1636" />
-<TGConnectingPoint num="1" id="1637" />
-<TGConnectingPoint num="2" id="1638" />
-<TGConnectingPoint num="3" id="1639" />
-<TGConnectingPoint num="4" id="1640" />
-<TGConnectingPoint num="5" id="1641" />
-<TGConnectingPoint num="6" id="1642" />
-<TGConnectingPoint num="7" id="1643" />
-<TGConnectingPoint num="8" id="1644" />
-<TGConnectingPoint num="9" id="1645" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1648" >
-<father id="1689" num="1" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1647" />
-</SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index ec0503ce1f1a2390f32b74332085914d8f9065ad..6c5515e68cd4425b15da18cfc2fcdc9af2cdac85 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -48,6 +48,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import ui.*;
 import ui.util.IconManager;
+import ui.window.JDialogIDAndStereotype;
 import ui.window.JDialogRequirement;
 
 import javax.swing.*;
@@ -55,6 +56,7 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 
 /**
@@ -85,8 +87,10 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
     private int currentFontSize = -1;
     private boolean displayText = true;
 
-    protected static String[] REQ_TYPE_STR = {"<<Requirement>>", "<<SafetyRequirement>>", "<<SecurityRequirement>>"};
-    protected static int NB_REQ_TYPE = 3;
+    //protected static String[] DEFAULT_REQ = {"<<Requirement>>", "<<SafetyRequirement>>", "<<SecurityRequirement>>"};
+    protected static ArrayList<String> REQ_TYPE_STR = new ArrayList<String>(Arrays.asList("Requirement", "SafetyRequirement",
+            "SecurityRequirement"));
+    //protected static int NB_REQ_TYPE = 3;
 
     protected final static int REGULAR_REQ = 0;
     protected final static int SAFETY_REQ = 1;
@@ -271,7 +275,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
             size = currentFontSize - 2;
             g.setFont(myFont.deriveFont((float) (myFont.getSize() - 2)));
 
-            drawLimitedString(g, REQ_TYPE_STR[reqType], x, y + size, width, 1);
+            drawLimitedString(g, "<<" + REQ_TYPE_STR.get(reqType) + ">>", x, y + size, width, 1);
 
             size += currentFontSize;
             g.setFont(myFontB);
@@ -376,46 +380,74 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
             if (hasFather()) {
                 text = getTopLevelName() + " / " + text;
             }
-            String s = (String) JOptionPane.showInputDialog(frame, text,
+            /*String s = (String) JOptionPane.showInputDialog(frame, text,
                     "Setting requirement name", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
                     null,
-                    getValue());
+                    getValue());*/
 
-            if ((s != null) && (s.length() > 0) && (!s.equals(oldValue))) {
+            JDialogIDAndStereotype dialog = new JDialogIDAndStereotype(frame, "Setting Requirement ID", REQ_TYPE_STR.toArray(new String[0]), getValue
+                    (), reqType);
+            //dialog.setSize(400, 300);
+            GraphicLib.centerOnParent(dialog, 400, 300);
+            // dialog.show(); // blocked until dialog has been closed
+            dialog.setVisible(true);
+
+            if (dialog.hasBeenCancelled()) {
+                return false;
+            }
+
+            String s = dialog.getName();
+
+            if ((s != null) && (s.length() > 0)){
                 //boolean b;
-                if (!TAttribute.isAValidId(s, false, false)) {
-                    JOptionPane.showMessageDialog(frame,
-                            "Could not change the name of the Requirement: the new name is not a valid name",
-                            "Error",
-                            JOptionPane.INFORMATION_MESSAGE);
-                    return false;
+                if (!s.equals(oldValue)) {
+                    if (!TAttribute.isAValidId(s, false, false)) {
+                        JOptionPane.showMessageDialog(frame,
+                                "Could not change the name of the Requirement: the new name is not a valid name",
+                                "Error",
+                                JOptionPane.INFORMATION_MESSAGE);
+                        return false;
+                    }
+
+                    if (!tdp.isRequirementNameUnique(s)) {
+                        JOptionPane.showMessageDialog(frame,
+                                "Could not change the name of the Requirement: the new name is already in use",
+                                "Error",
+                                JOptionPane.INFORMATION_MESSAGE);
+                        return false;
+                    }
+
+
+                    int size = graphics.getFontMetrics().stringWidth(s) + iconSize + 5;
+                    minDesiredWidth = Math.max(size, minWidth);
+                    if (minDesiredWidth != width) {
+                        newSizeForSon(null);
+                    }
+                    setValue(s);
                 }
 
-                if (!tdp.isRequirementNameUnique(s)) {
+                if (!(tdp.actionOnDoubleClick(this))) {
                     JOptionPane.showMessageDialog(frame,
-                            "Could not change the name of the Requirement: the new name is already in use",
+                            "Could not change the name of the Requirement: this name is already in use",
                             "Error",
                             JOptionPane.INFORMATION_MESSAGE);
+                    setValue(oldValue);
                     return false;
                 }
 
+                // Setting stereotype
+                s = dialog.getStereotype().trim();
 
-                int size = graphics.getFontMetrics().stringWidth(s) + iconSize + 5;
-                minDesiredWidth = Math.max(size, minWidth);
-                if (minDesiredWidth != width) {
-                    newSizeForSon(null);
-                }
-                setValue(s);
-
-                if (tdp.actionOnDoubleClick(this)) {
-                    return true;
-                } else {
+                if (!TAttribute.isAValidId(s.substring(2, s.length()-2), false, false)) {
                     JOptionPane.showMessageDialog(frame,
-                            "Could not change the name of the Requirement: this name is already in use",
+                            "Could not use the new stereotype: the new stereotype name is not valid",
                             "Error",
                             JOptionPane.INFORMATION_MESSAGE);
-                    setValue(oldValue);
+                    return false;
                 }
+
+                addStereotype(s);
+
             }
             return false;
         }
@@ -424,6 +456,29 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
 
     }
 
+    public boolean addStereotype(String s) {
+        int index = -1;
+        String sLower = s.toLowerCase();
+        for (int i=0; i<REQ_TYPE_STR.size(); i++) {
+            if (REQ_TYPE_STR.get(i).toLowerCase().compareTo(sLower) == 0) {
+                index = i;
+                break;
+            }
+        }
+
+        // Found stereotype
+        if (index != -1) {
+            reqType = index;
+            return false;
+
+        // Must add a new stereotype
+        } else {
+            REQ_TYPE_STR.add(s);
+            reqType = REQ_TYPE_STR.size()-1;
+            return true;
+        }
+    }
+
     public boolean editAttributes() {
         //String oldValue = value;
         String atn = null;
@@ -598,7 +653,6 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
             return editAttributes();
         }
 
-
         return true;
     }
 
@@ -635,7 +689,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
         sb.append(criticality);
         sb.append("\" />\n");
         sb.append("<reqType data=\"");
-        sb.append(reqType);
+        sb.append(REQ_TYPE_STR.get(reqType));
         sb.append("\" />\n");
         sb.append("<id data=\"");
         sb.append(id);
@@ -741,12 +795,12 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
                                     reqType = REGULAR_REQ;
                                 } else {
                                     try {
-                                        reqType = Integer.decode(s).intValue();
+                                        reqType = Integer.decode(s).intValue(); // default stereo: old way
                                     } catch (Exception e) {
-                                        reqType = REGULAR_REQ;
+                                        addStereotype(s);
                                     }
                                 }
-                                if (reqType > (NB_REQ_TYPE - 1)) {
+                                if (reqType > (REQ_TYPE_STR.size() - 1)) {
                                     reqType = REGULAR_REQ;
                                 }
 
@@ -860,7 +914,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
 
         // Must find for both modes which width is desirable
         String s0, s1;
-        s0 = REQ_TYPE_STR[reqType];
+        s0 = "<<" + REQ_TYPE_STR.get(reqType) + ">>";
         s1 = "Text=";
 
         graphics.setFont(f2);
@@ -908,7 +962,6 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
             h = ((texts.length + 5) * currentFontSize) + lineHeight;
         }
 
-
         resize(w4, h);
 
     }
diff --git a/src/main/java/ui/window/JDialogAvatarSignal.java b/src/main/java/ui/window/JDialogAvatarSignal.java
index 881ce3cb41c6d5322af0ae960161e947852c61dd..c463100117e717db09c6518b180c254d5dfd0185 100644
--- a/src/main/java/ui/window/JDialogAvatarSignal.java
+++ b/src/main/java/ui/window/JDialogAvatarSignal.java
@@ -143,18 +143,12 @@ public class JDialogAvatarSignal extends JDialogBase implements ActionListener
         c1.gridwidth = GridBagConstraints.REMAINDER; //end row
         c1.fill = GridBagConstraints.BOTH;
         c1.gridheight = 1;
-        listSignals = new JComboBox<String>(showSignals.toArray (new String[0]));
+        c1.anchor = GridBagConstraints.CENTER;
         panel1.add(new JLabel(" "), c1);
 
         // Combo box
-        c1.gridwidth = 1;
-        c1.gridheight = 1;
-        c1.weighty = 1.0;
-        c1.weightx = 1.0;
         c1.fill = GridBagConstraints.HORIZONTAL;
-        c1.anchor = GridBagConstraints.CENTER;
-        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
-        listSignals = new JComboBox<String> (showSignals.toArray (new String[0]));
+        listSignals = new JComboBox<String> (showSignals.toArray (new String[showSignals.size()]));
         panel1.add(listSignals, c1);