diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 4917eafdda96a151b03bdb102f472cafea9c5caf..64ab4c713d575ed0d2060ac6dc53b607d01d26a7 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1273,7 +1273,7 @@
 
 
 
-<Modeling type="AVATAR Design" nameTab="AVATAR Design" tabs="Block Diagram$CoffeeButton$TeaButton$CoffeeMachine$Wallet$Block0" >
+<Modeling type="AVATAR Design" nameTab="AVATAR Design" tabs="Block Diagram$CoffeeButton$TeaButton$CoffeeMachine$Wallet" >
 <AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
@@ -1281,49 +1281,13 @@
 <Validated value="" />
 <Ignored value="" />
 
-<COMPONENT type="5000" id="1745" >
-<cdparam x="222" y="451" />
-<sizeparam width="250" height="200" 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="Block0" />
-<TGConnectingPoint num="0" id="1746" />
-<TGConnectingPoint num="1" id="1747" />
-<TGConnectingPoint num="2" id="1748" />
-<TGConnectingPoint num="3" id="1749" />
-<TGConnectingPoint num="4" id="1750" />
-<TGConnectingPoint num="5" id="1751" />
-<TGConnectingPoint num="6" id="1752" />
-<TGConnectingPoint num="7" id="1753" />
-<TGConnectingPoint num="8" id="1754" />
-<TGConnectingPoint num="9" id="1755" />
-<TGConnectingPoint num="10" id="1756" />
-<TGConnectingPoint num="11" id="1757" />
-<TGConnectingPoint num="12" id="1758" />
-<TGConnectingPoint num="13" id="1759" />
-<TGConnectingPoint num="14" id="1760" />
-<TGConnectingPoint num="15" id="1761" />
-<TGConnectingPoint num="16" id="1762" />
-<TGConnectingPoint num="17" id="1763" />
-<TGConnectingPoint num="18" id="1764" />
-<TGConnectingPoint num="19" id="1765" />
-<TGConnectingPoint num="20" id="1766" />
-<TGConnectingPoint num="21" id="1767" />
-<TGConnectingPoint num="22" id="1768" />
-<TGConnectingPoint num="23" id="1769" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-</extraparam>
-</COMPONENT>
-
 <CONNECTOR type="5002" id="695" >
 <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="694" />
-<P1  x="559" y="330" id="731" />
-<P2  x="560" y="377" id="789" />
+<P1  x="559" y="330" id="756" />
+<P2  x="560" y="377" id="814" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushCoffeeButton()" />
@@ -1336,8 +1300,8 @@
 <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="696" />
-<P1  x="306" y="109" id="711" />
-<P2  x="445" y="108" id="785" />
+<P1  x="306" y="109" id="736" />
+<P2  x="445" y="108" id="810" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getCoin(int nbOfCoins)" />
@@ -1352,8 +1316,8 @@
 <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="698" />
-<P1  x="789" y="326" id="756" />
-<P2  x="790" y="377" id="790" />
+<P1  x="789" y="326" id="781" />
+<P2  x="790" y="377" id="815" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushTeaButton()" />
@@ -1361,36 +1325,36 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="724" >
+<COMPONENT type="5000" id="749" >
 <cdparam x="106" y="55" />
 <sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="700" />
-<TGConnectingPoint num="1" id="701" />
-<TGConnectingPoint num="2" id="702" />
-<TGConnectingPoint num="3" id="703" />
-<TGConnectingPoint num="4" id="704" />
-<TGConnectingPoint num="5" id="705" />
-<TGConnectingPoint num="6" id="706" />
-<TGConnectingPoint num="7" id="707" />
-<TGConnectingPoint num="8" id="708" />
-<TGConnectingPoint num="9" id="709" />
-<TGConnectingPoint num="10" id="710" />
-<TGConnectingPoint num="11" id="711" />
-<TGConnectingPoint num="12" id="712" />
-<TGConnectingPoint num="13" id="713" />
-<TGConnectingPoint num="14" id="714" />
-<TGConnectingPoint num="15" id="715" />
-<TGConnectingPoint num="16" id="716" />
-<TGConnectingPoint num="17" id="717" />
-<TGConnectingPoint num="18" id="718" />
-<TGConnectingPoint num="19" id="719" />
-<TGConnectingPoint num="20" id="720" />
-<TGConnectingPoint num="21" id="721" />
-<TGConnectingPoint num="22" id="722" />
-<TGConnectingPoint num="23" id="723" />
+<TGConnectingPoint num="0" id="725" />
+<TGConnectingPoint num="1" id="726" />
+<TGConnectingPoint num="2" id="727" />
+<TGConnectingPoint num="3" id="728" />
+<TGConnectingPoint num="4" id="729" />
+<TGConnectingPoint num="5" id="730" />
+<TGConnectingPoint num="6" id="731" />
+<TGConnectingPoint num="7" id="732" />
+<TGConnectingPoint num="8" id="733" />
+<TGConnectingPoint num="9" id="734" />
+<TGConnectingPoint num="10" id="735" />
+<TGConnectingPoint num="11" id="736" />
+<TGConnectingPoint num="12" id="737" />
+<TGConnectingPoint num="13" id="738" />
+<TGConnectingPoint num="14" id="739" />
+<TGConnectingPoint num="15" id="740" />
+<TGConnectingPoint num="16" id="741" />
+<TGConnectingPoint num="17" id="742" />
+<TGConnectingPoint num="18" id="743" />
+<TGConnectingPoint num="19" id="744" />
+<TGConnectingPoint num="20" id="745" />
+<TGConnectingPoint num="21" id="746" />
+<TGConnectingPoint num="22" id="747" />
+<TGConnectingPoint num="23" id="748" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1404,36 +1368,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="799" >
+<COMPONENT type="5000" id="824" >
 <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="775" />
-<TGConnectingPoint num="1" id="776" />
-<TGConnectingPoint num="2" id="777" />
-<TGConnectingPoint num="3" id="778" />
-<TGConnectingPoint num="4" id="779" />
-<TGConnectingPoint num="5" id="780" />
-<TGConnectingPoint num="6" id="781" />
-<TGConnectingPoint num="7" id="782" />
-<TGConnectingPoint num="8" id="783" />
-<TGConnectingPoint num="9" id="784" />
-<TGConnectingPoint num="10" id="785" />
-<TGConnectingPoint num="11" id="786" />
-<TGConnectingPoint num="12" id="787" />
-<TGConnectingPoint num="13" id="788" />
-<TGConnectingPoint num="14" id="789" />
-<TGConnectingPoint num="15" id="790" />
-<TGConnectingPoint num="16" id="791" />
-<TGConnectingPoint num="17" id="792" />
-<TGConnectingPoint num="18" id="793" />
-<TGConnectingPoint num="19" id="794" />
-<TGConnectingPoint num="20" id="795" />
-<TGConnectingPoint num="21" id="796" />
-<TGConnectingPoint num="22" id="797" />
-<TGConnectingPoint num="23" id="798" />
+<TGConnectingPoint num="0" id="800" />
+<TGConnectingPoint num="1" id="801" />
+<TGConnectingPoint num="2" id="802" />
+<TGConnectingPoint num="3" id="803" />
+<TGConnectingPoint num="4" id="804" />
+<TGConnectingPoint num="5" id="805" />
+<TGConnectingPoint num="6" id="806" />
+<TGConnectingPoint num="7" id="807" />
+<TGConnectingPoint num="8" id="808" />
+<TGConnectingPoint num="9" id="809" />
+<TGConnectingPoint num="10" id="810" />
+<TGConnectingPoint num="11" id="811" />
+<TGConnectingPoint num="12" id="812" />
+<TGConnectingPoint num="13" id="813" />
+<TGConnectingPoint num="14" id="814" />
+<TGConnectingPoint num="15" id="815" />
+<TGConnectingPoint num="16" id="816" />
+<TGConnectingPoint num="17" id="817" />
+<TGConnectingPoint num="18" id="818" />
+<TGConnectingPoint num="19" id="819" />
+<TGConnectingPoint num="20" id="820" />
+<TGConnectingPoint num="21" id="821" />
+<TGConnectingPoint num="22" id="822" />
+<TGConnectingPoint num="23" id="823" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1451,51 +1415,13 @@
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="749" >
-<father id="799" num="0" />
+<SUBCOMPONENT type="5000" id="774" >
+<father id="824" num="0" />
 <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="271" minY="0" maxY="256" />
 <infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="725" />
-<TGConnectingPoint num="1" id="726" />
-<TGConnectingPoint num="2" id="727" />
-<TGConnectingPoint num="3" id="728" />
-<TGConnectingPoint num="4" id="729" />
-<TGConnectingPoint num="5" id="730" />
-<TGConnectingPoint num="6" id="731" />
-<TGConnectingPoint num="7" id="732" />
-<TGConnectingPoint num="8" id="733" />
-<TGConnectingPoint num="9" id="734" />
-<TGConnectingPoint num="10" id="735" />
-<TGConnectingPoint num="11" id="736" />
-<TGConnectingPoint num="12" id="737" />
-<TGConnectingPoint num="13" id="738" />
-<TGConnectingPoint num="14" id="739" />
-<TGConnectingPoint num="15" id="740" />
-<TGConnectingPoint num="16" id="741" />
-<TGConnectingPoint num="17" id="742" />
-<TGConnectingPoint num="18" id="743" />
-<TGConnectingPoint num="19" id="744" />
-<TGConnectingPoint num="20" id="745" />
-<TGConnectingPoint num="21" id="746" />
-<TGConnectingPoint num="22" id="747" />
-<TGConnectingPoint num="23" id="748" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<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="774" >
-<father id="799" num="1" />
-<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="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
 <TGConnectingPoint num="0" id="750" />
 <TGConnectingPoint num="1" id="751" />
 <TGConnectingPoint num="2" id="752" />
@@ -1527,31 +1453,69 @@
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="799" >
+<father id="824" num="1" />
+<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="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="775" />
+<TGConnectingPoint num="1" id="776" />
+<TGConnectingPoint num="2" id="777" />
+<TGConnectingPoint num="3" id="778" />
+<TGConnectingPoint num="4" id="779" />
+<TGConnectingPoint num="5" id="780" />
+<TGConnectingPoint num="6" id="781" />
+<TGConnectingPoint num="7" id="782" />
+<TGConnectingPoint num="8" id="783" />
+<TGConnectingPoint num="9" id="784" />
+<TGConnectingPoint num="10" id="785" />
+<TGConnectingPoint num="11" id="786" />
+<TGConnectingPoint num="12" id="787" />
+<TGConnectingPoint num="13" id="788" />
+<TGConnectingPoint num="14" id="789" />
+<TGConnectingPoint num="15" id="790" />
+<TGConnectingPoint num="16" id="791" />
+<TGConnectingPoint num="17" id="792" />
+<TGConnectingPoint num="18" id="793" />
+<TGConnectingPoint num="19" id="794" />
+<TGConnectingPoint num="20" id="795" />
+<TGConnectingPoint num="21" id="796" />
+<TGConnectingPoint num="22" id="797" />
+<TGConnectingPoint num="23" id="798" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
+<Signal value="out push()" attached="true" />
+</extraparam>
+</SUBCOMPONENT>
 
 
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="806" >
+<CONNECTOR type="5102" id="831" >
 <cdparam x="177" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="805" />
-<P1  x="340" y="233" id="923" />
-<P2  x="353" y="252" id="912" />
+<TGConnectingPoint num="0" id="830" />
+<P1  x="340" y="233" id="948" />
+<P2  x="353" y="252" id="937" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="804" >
-<father id="806" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="829" >
+<father id="831" num="0" />
 <cdparam x="177" y="239" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="800" />
-<TGConnectingPoint num="1" id="801" />
-<TGConnectingPoint num="2" id="802" />
-<TGConnectingPoint num="3" id="803" />
+<TGConnectingPoint num="0" id="825" />
+<TGConnectingPoint num="1" id="826" />
+<TGConnectingPoint num="2" id="827" />
+<TGConnectingPoint num="3" id="828" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1562,26 +1526,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="813" >
+<CONNECTOR type="5102" id="838" >
 <cdparam x="322" y="69" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="812" />
-<P1  x="322" y="69" id="910" />
-<P2  x="322" y="88" id="870" />
+<TGConnectingPoint num="0" id="837" />
+<P1  x="322" y="69" id="935" />
+<P2  x="322" y="88" id="895" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="811" >
-<father id="813" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="836" >
+<father id="838" num="0" />
 <cdparam x="322" y="109" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="807" />
-<TGConnectingPoint num="1" id="808" />
-<TGConnectingPoint num="2" id="809" />
-<TGConnectingPoint num="3" id="810" />
+<TGConnectingPoint num="0" id="832" />
+<TGConnectingPoint num="1" id="833" />
+<TGConnectingPoint num="2" id="834" />
+<TGConnectingPoint num="3" id="835" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1592,26 +1556,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="820" >
+<CONNECTOR type="5102" id="845" >
 <cdparam x="377" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="819" />
-<P1  x="322" y="118" id="875" />
-<P2  x="356" y="174" id="926" />
+<TGConnectingPoint num="0" id="844" />
+<P1  x="322" y="118" id="900" />
+<P2  x="356" y="174" id="951" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="818" >
-<father id="820" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="843" >
+<father id="845" num="0" />
 <cdparam x="377" y="184" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="814" />
-<TGConnectingPoint num="1" id="815" />
-<TGConnectingPoint num="2" id="816" />
-<TGConnectingPoint num="3" id="817" />
+<TGConnectingPoint num="0" id="839" />
+<TGConnectingPoint num="1" id="840" />
+<TGConnectingPoint num="2" id="841" />
+<TGConnectingPoint num="3" id="842" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1622,26 +1586,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="827" >
+<CONNECTOR type="5102" id="852" >
 <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="826" />
-<P1  x="353" y="282" id="913" />
-<P2  x="399" y="352" id="829" />
+<TGConnectingPoint num="0" id="851" />
+<P1  x="353" y="282" id="938" />
+<P2  x="399" y="352" id="854" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="825" >
-<father id="827" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="850" >
+<father id="852" num="0" />
 <cdparam x="417" y="335" />
 <sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="821" />
-<TGConnectingPoint num="1" id="822" />
-<TGConnectingPoint num="2" id="823" />
-<TGConnectingPoint num="3" id="824" />
+<TGConnectingPoint num="0" id="846" />
+<TGConnectingPoint num="1" id="847" />
+<TGConnectingPoint num="2" id="848" />
+<TGConnectingPoint num="3" id="849" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="mechanicalDelay" enabled="true"/>
@@ -1652,220 +1616,220 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="868" >
+<COMPONENT type="5106" id="893" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="828" />
-<TGConnectingPoint num="1" id="829" />
-<TGConnectingPoint num="2" id="830" />
-<TGConnectingPoint num="3" id="831" />
-<TGConnectingPoint num="4" id="832" />
-<TGConnectingPoint num="5" id="833" />
-<TGConnectingPoint num="6" id="834" />
-<TGConnectingPoint num="7" id="835" />
-<TGConnectingPoint num="8" id="836" />
-<TGConnectingPoint num="9" id="837" />
-<TGConnectingPoint num="10" id="838" />
-<TGConnectingPoint num="11" id="839" />
-<TGConnectingPoint num="12" id="840" />
-<TGConnectingPoint num="13" id="841" />
-<TGConnectingPoint num="14" id="842" />
-<TGConnectingPoint num="15" id="843" />
-<TGConnectingPoint num="16" id="844" />
-<TGConnectingPoint num="17" id="845" />
-<TGConnectingPoint num="18" id="846" />
-<TGConnectingPoint num="19" id="847" />
-<TGConnectingPoint num="20" id="848" />
-<TGConnectingPoint num="21" id="849" />
-<TGConnectingPoint num="22" id="850" />
-<TGConnectingPoint num="23" id="851" />
-<TGConnectingPoint num="24" id="852" />
-<TGConnectingPoint num="25" id="853" />
-<TGConnectingPoint num="26" id="854" />
-<TGConnectingPoint num="27" id="855" />
-<TGConnectingPoint num="28" id="856" />
-<TGConnectingPoint num="29" id="857" />
-<TGConnectingPoint num="30" id="858" />
-<TGConnectingPoint num="31" id="859" />
-<TGConnectingPoint num="32" id="860" />
-<TGConnectingPoint num="33" id="861" />
-<TGConnectingPoint num="34" id="862" />
-<TGConnectingPoint num="35" id="863" />
-<TGConnectingPoint num="36" id="864" />
-<TGConnectingPoint num="37" id="865" />
-<TGConnectingPoint num="38" id="866" />
-<TGConnectingPoint num="39" id="867" />
+<TGConnectingPoint num="0" id="853" />
+<TGConnectingPoint num="1" id="854" />
+<TGConnectingPoint num="2" id="855" />
+<TGConnectingPoint num="3" id="856" />
+<TGConnectingPoint num="4" id="857" />
+<TGConnectingPoint num="5" id="858" />
+<TGConnectingPoint num="6" id="859" />
+<TGConnectingPoint num="7" id="860" />
+<TGConnectingPoint num="8" id="861" />
+<TGConnectingPoint num="9" id="862" />
+<TGConnectingPoint num="10" id="863" />
+<TGConnectingPoint num="11" id="864" />
+<TGConnectingPoint num="12" id="865" />
+<TGConnectingPoint num="13" id="866" />
+<TGConnectingPoint num="14" id="867" />
+<TGConnectingPoint num="15" id="868" />
+<TGConnectingPoint num="16" id="869" />
+<TGConnectingPoint num="17" id="870" />
+<TGConnectingPoint num="18" id="871" />
+<TGConnectingPoint num="19" id="872" />
+<TGConnectingPoint num="20" id="873" />
+<TGConnectingPoint num="21" id="874" />
+<TGConnectingPoint num="22" id="875" />
+<TGConnectingPoint num="23" id="876" />
+<TGConnectingPoint num="24" id="877" />
+<TGConnectingPoint num="25" id="878" />
+<TGConnectingPoint num="26" id="879" />
+<TGConnectingPoint num="27" id="880" />
+<TGConnectingPoint num="28" id="881" />
+<TGConnectingPoint num="29" id="882" />
+<TGConnectingPoint num="30" id="883" />
+<TGConnectingPoint num="31" id="884" />
+<TGConnectingPoint num="32" id="885" />
+<TGConnectingPoint num="33" id="886" />
+<TGConnectingPoint num="34" id="887" />
+<TGConnectingPoint num="35" id="888" />
+<TGConnectingPoint num="36" id="889" />
+<TGConnectingPoint num="37" id="890" />
+<TGConnectingPoint num="38" id="891" />
+<TGConnectingPoint num="39" id="892" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="909" >
+<COMPONENT type="5106" id="934" >
 <cdparam x="297" y="88" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="869" />
-<TGConnectingPoint num="1" id="870" />
-<TGConnectingPoint num="2" id="871" />
-<TGConnectingPoint num="3" id="872" />
-<TGConnectingPoint num="4" id="873" />
-<TGConnectingPoint num="5" id="874" />
-<TGConnectingPoint num="6" id="875" />
-<TGConnectingPoint num="7" id="876" />
-<TGConnectingPoint num="8" id="877" />
-<TGConnectingPoint num="9" id="878" />
-<TGConnectingPoint num="10" id="879" />
-<TGConnectingPoint num="11" id="880" />
-<TGConnectingPoint num="12" id="881" />
-<TGConnectingPoint num="13" id="882" />
-<TGConnectingPoint num="14" id="883" />
-<TGConnectingPoint num="15" id="884" />
-<TGConnectingPoint num="16" id="885" />
-<TGConnectingPoint num="17" id="886" />
-<TGConnectingPoint num="18" id="887" />
-<TGConnectingPoint num="19" id="888" />
-<TGConnectingPoint num="20" id="889" />
-<TGConnectingPoint num="21" id="890" />
-<TGConnectingPoint num="22" id="891" />
-<TGConnectingPoint num="23" id="892" />
-<TGConnectingPoint num="24" id="893" />
-<TGConnectingPoint num="25" id="894" />
-<TGConnectingPoint num="26" id="895" />
-<TGConnectingPoint num="27" id="896" />
-<TGConnectingPoint num="28" id="897" />
-<TGConnectingPoint num="29" id="898" />
-<TGConnectingPoint num="30" id="899" />
-<TGConnectingPoint num="31" id="900" />
-<TGConnectingPoint num="32" id="901" />
-<TGConnectingPoint num="33" id="902" />
-<TGConnectingPoint num="34" id="903" />
-<TGConnectingPoint num="35" id="904" />
-<TGConnectingPoint num="36" id="905" />
-<TGConnectingPoint num="37" id="906" />
-<TGConnectingPoint num="38" id="907" />
-<TGConnectingPoint num="39" id="908" />
+<TGConnectingPoint num="0" id="894" />
+<TGConnectingPoint num="1" id="895" />
+<TGConnectingPoint num="2" id="896" />
+<TGConnectingPoint num="3" id="897" />
+<TGConnectingPoint num="4" id="898" />
+<TGConnectingPoint num="5" id="899" />
+<TGConnectingPoint num="6" id="900" />
+<TGConnectingPoint num="7" id="901" />
+<TGConnectingPoint num="8" id="902" />
+<TGConnectingPoint num="9" id="903" />
+<TGConnectingPoint num="10" id="904" />
+<TGConnectingPoint num="11" id="905" />
+<TGConnectingPoint num="12" id="906" />
+<TGConnectingPoint num="13" id="907" />
+<TGConnectingPoint num="14" id="908" />
+<TGConnectingPoint num="15" id="909" />
+<TGConnectingPoint num="16" id="910" />
+<TGConnectingPoint num="17" id="911" />
+<TGConnectingPoint num="18" id="912" />
+<TGConnectingPoint num="19" id="913" />
+<TGConnectingPoint num="20" id="914" />
+<TGConnectingPoint num="21" id="915" />
+<TGConnectingPoint num="22" id="916" />
+<TGConnectingPoint num="23" id="917" />
+<TGConnectingPoint num="24" id="918" />
+<TGConnectingPoint num="25" id="919" />
+<TGConnectingPoint num="26" id="920" />
+<TGConnectingPoint num="27" id="921" />
+<TGConnectingPoint num="28" id="922" />
+<TGConnectingPoint num="29" id="923" />
+<TGConnectingPoint num="30" id="924" />
+<TGConnectingPoint num="31" id="925" />
+<TGConnectingPoint num="32" id="926" />
+<TGConnectingPoint num="33" id="927" />
+<TGConnectingPoint num="34" id="928" />
+<TGConnectingPoint num="35" id="929" />
+<TGConnectingPoint num="36" id="930" />
+<TGConnectingPoint num="37" id="931" />
+<TGConnectingPoint num="38" id="932" />
+<TGConnectingPoint num="39" id="933" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="911" >
+<COMPONENT type="5100" id="936" >
 <cdparam x="315" y="49" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="910" />
+<TGConnectingPoint num="0" id="935" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="965" >
+<COMPONENT type="5106" id="990" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="925" />
-<TGConnectingPoint num="1" id="926" />
-<TGConnectingPoint num="2" id="927" />
-<TGConnectingPoint num="3" id="928" />
-<TGConnectingPoint num="4" id="929" />
-<TGConnectingPoint num="5" id="930" />
-<TGConnectingPoint num="6" id="931" />
-<TGConnectingPoint num="7" id="932" />
-<TGConnectingPoint num="8" id="933" />
-<TGConnectingPoint num="9" id="934" />
-<TGConnectingPoint num="10" id="935" />
-<TGConnectingPoint num="11" id="936" />
-<TGConnectingPoint num="12" id="937" />
-<TGConnectingPoint num="13" id="938" />
-<TGConnectingPoint num="14" id="939" />
-<TGConnectingPoint num="15" id="940" />
-<TGConnectingPoint num="16" id="941" />
-<TGConnectingPoint num="17" id="942" />
-<TGConnectingPoint num="18" id="943" />
-<TGConnectingPoint num="19" id="944" />
-<TGConnectingPoint num="20" id="945" />
-<TGConnectingPoint num="21" id="946" />
-<TGConnectingPoint num="22" id="947" />
-<TGConnectingPoint num="23" id="948" />
-<TGConnectingPoint num="24" id="949" />
-<TGConnectingPoint num="25" id="950" />
-<TGConnectingPoint num="26" id="951" />
-<TGConnectingPoint num="27" id="952" />
-<TGConnectingPoint num="28" id="953" />
-<TGConnectingPoint num="29" id="954" />
-<TGConnectingPoint num="30" id="955" />
-<TGConnectingPoint num="31" id="956" />
-<TGConnectingPoint num="32" id="957" />
-<TGConnectingPoint num="33" id="958" />
-<TGConnectingPoint num="34" id="959" />
-<TGConnectingPoint num="35" id="960" />
-<TGConnectingPoint num="36" id="961" />
-<TGConnectingPoint num="37" id="962" />
-<TGConnectingPoint num="38" id="963" />
-<TGConnectingPoint num="39" id="964" />
+<TGConnectingPoint num="0" id="950" />
+<TGConnectingPoint num="1" id="951" />
+<TGConnectingPoint num="2" id="952" />
+<TGConnectingPoint num="3" id="953" />
+<TGConnectingPoint num="4" id="954" />
+<TGConnectingPoint num="5" id="955" />
+<TGConnectingPoint num="6" id="956" />
+<TGConnectingPoint num="7" id="957" />
+<TGConnectingPoint num="8" id="958" />
+<TGConnectingPoint num="9" id="959" />
+<TGConnectingPoint num="10" id="960" />
+<TGConnectingPoint num="11" id="961" />
+<TGConnectingPoint num="12" id="962" />
+<TGConnectingPoint num="13" id="963" />
+<TGConnectingPoint num="14" id="964" />
+<TGConnectingPoint num="15" id="965" />
+<TGConnectingPoint num="16" id="966" />
+<TGConnectingPoint num="17" id="967" />
+<TGConnectingPoint num="18" id="968" />
+<TGConnectingPoint num="19" id="969" />
+<TGConnectingPoint num="20" id="970" />
+<TGConnectingPoint num="21" id="971" />
+<TGConnectingPoint num="22" id="972" />
+<TGConnectingPoint num="23" id="973" />
+<TGConnectingPoint num="24" id="974" />
+<TGConnectingPoint num="25" id="975" />
+<TGConnectingPoint num="26" id="976" />
+<TGConnectingPoint num="27" id="977" />
+<TGConnectingPoint num="28" id="978" />
+<TGConnectingPoint num="29" id="979" />
+<TGConnectingPoint num="30" id="980" />
+<TGConnectingPoint num="31" id="981" />
+<TGConnectingPoint num="32" id="982" />
+<TGConnectingPoint num="33" id="983" />
+<TGConnectingPoint num="34" id="984" />
+<TGConnectingPoint num="35" id="985" />
+<TGConnectingPoint num="36" id="986" />
+<TGConnectingPoint num="37" id="987" />
+<TGConnectingPoint num="38" id="988" />
+<TGConnectingPoint num="39" id="989" />
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5103" id="922" >
-<father id="965" num="0" />
+<SUBCOMPONENT type="5103" id="947" >
+<father id="990" num="0" />
 <cdparam x="330" y="257" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
 <infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="912" />
-<TGConnectingPoint num="1" id="913" />
-<TGConnectingPoint num="2" id="914" />
-<TGConnectingPoint num="3" id="915" />
-<TGConnectingPoint num="4" id="916" />
-<TGConnectingPoint num="5" id="917" />
-<TGConnectingPoint num="6" id="918" />
-<TGConnectingPoint num="7" id="919" />
-<TGConnectingPoint num="8" id="920" />
-<TGConnectingPoint num="9" id="921" />
+<TGConnectingPoint num="0" id="937" />
+<TGConnectingPoint num="1" id="938" />
+<TGConnectingPoint num="2" id="939" />
+<TGConnectingPoint num="3" id="940" />
+<TGConnectingPoint num="4" id="941" />
+<TGConnectingPoint num="5" id="942" />
+<TGConnectingPoint num="6" id="943" />
+<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="8" id="945" />
+<TGConnectingPoint num="9" id="946" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="924" >
-<father id="965" num="1" />
+<SUBCOMPONENT type="5100" id="949" >
+<father id="990" num="1" />
 <cdparam x="333" y="213" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="923" />
+<TGConnectingPoint num="0" id="948" />
 </SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="972" >
+<CONNECTOR type="5102" id="997" >
 <cdparam x="363" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="971" />
-<P1  x="363" y="204" id="988" />
-<P2  x="362" y="257" id="999" />
+<TGConnectingPoint num="0" id="996" />
+<P1  x="363" y="204" id="1013" />
+<P2  x="362" y="257" id="1024" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="970" >
-<father id="972" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="995" >
+<father id="997" num="0" />
 <cdparam x="380" y="228" />
 <sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="966" />
-<TGConnectingPoint num="1" id="967" />
-<TGConnectingPoint num="2" id="968" />
-<TGConnectingPoint num="3" id="969" />
+<TGConnectingPoint num="0" id="991" />
+<TGConnectingPoint num="1" id="992" />
+<TGConnectingPoint num="2" id="993" />
+<TGConnectingPoint num="3" id="994" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="mechanicalDelay" enabled="true"/>
@@ -1876,26 +1840,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="979" >
+<CONNECTOR type="5102" id="1004" >
 <cdparam x="363" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="978" />
-<P1  x="363" y="150" id="1045" />
-<P2  x="363" y="174" id="987" />
+<TGConnectingPoint num="0" id="1003" />
+<P1  x="363" y="150" id="1070" />
+<P2  x="363" y="174" id="1012" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="977" >
-<father id="979" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1002" >
+<father id="1004" num="0" />
 <cdparam x="363" y="190" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="973" />
-<TGConnectingPoint num="1" id="974" />
-<TGConnectingPoint num="2" id="975" />
-<TGConnectingPoint num="3" id="976" />
+<TGConnectingPoint num="0" id="998" />
+<TGConnectingPoint num="1" id="999" />
+<TGConnectingPoint num="2" id="1000" />
+<TGConnectingPoint num="3" id="1001" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1906,26 +1870,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="986" >
+<CONNECTOR type="5102" id="1011" >
 <cdparam x="362" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="985" />
-<P1  x="362" y="101" id="1080" />
-<P2  x="363" y="120" id="1040" />
+<TGConnectingPoint num="0" id="1010" />
+<P1  x="362" y="101" id="1105" />
+<P2  x="363" y="120" id="1065" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="984" >
-<father id="986" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1009" >
+<father id="1011" num="0" />
 <cdparam x="362" y="141" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="980" />
-<TGConnectingPoint num="1" id="981" />
-<TGConnectingPoint num="2" id="982" />
-<TGConnectingPoint num="3" id="983" />
+<TGConnectingPoint num="0" id="1005" />
+<TGConnectingPoint num="1" id="1006" />
+<TGConnectingPoint num="2" id="1007" />
+<TGConnectingPoint num="3" id="1008" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1936,168 +1900,168 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="997" >
+<COMPONENT type="5103" id="1022" >
 <cdparam x="340" y="179" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="987" />
-<TGConnectingPoint num="1" id="988" />
-<TGConnectingPoint num="2" id="989" />
-<TGConnectingPoint num="3" id="990" />
-<TGConnectingPoint num="4" id="991" />
-<TGConnectingPoint num="5" id="992" />
-<TGConnectingPoint num="6" id="993" />
-<TGConnectingPoint num="7" id="994" />
-<TGConnectingPoint num="8" id="995" />
-<TGConnectingPoint num="9" id="996" />
+<TGConnectingPoint num="0" id="1012" />
+<TGConnectingPoint num="1" id="1013" />
+<TGConnectingPoint num="2" id="1014" />
+<TGConnectingPoint num="3" id="1015" />
+<TGConnectingPoint num="4" id="1016" />
+<TGConnectingPoint num="5" id="1017" />
+<TGConnectingPoint num="6" id="1018" />
+<TGConnectingPoint num="7" id="1019" />
+<TGConnectingPoint num="8" id="1020" />
+<TGConnectingPoint num="9" id="1021" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1038" >
+<COMPONENT type="5106" id="1063" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="998" />
-<TGConnectingPoint num="1" id="999" />
-<TGConnectingPoint num="2" id="1000" />
-<TGConnectingPoint num="3" id="1001" />
-<TGConnectingPoint num="4" id="1002" />
-<TGConnectingPoint num="5" id="1003" />
-<TGConnectingPoint num="6" id="1004" />
-<TGConnectingPoint num="7" id="1005" />
-<TGConnectingPoint num="8" id="1006" />
-<TGConnectingPoint num="9" id="1007" />
-<TGConnectingPoint num="10" id="1008" />
-<TGConnectingPoint num="11" id="1009" />
-<TGConnectingPoint num="12" id="1010" />
-<TGConnectingPoint num="13" id="1011" />
-<TGConnectingPoint num="14" id="1012" />
-<TGConnectingPoint num="15" id="1013" />
-<TGConnectingPoint num="16" id="1014" />
-<TGConnectingPoint num="17" id="1015" />
-<TGConnectingPoint num="18" id="1016" />
-<TGConnectingPoint num="19" id="1017" />
-<TGConnectingPoint num="20" id="1018" />
-<TGConnectingPoint num="21" id="1019" />
-<TGConnectingPoint num="22" id="1020" />
-<TGConnectingPoint num="23" id="1021" />
-<TGConnectingPoint num="24" id="1022" />
-<TGConnectingPoint num="25" id="1023" />
-<TGConnectingPoint num="26" id="1024" />
-<TGConnectingPoint num="27" id="1025" />
-<TGConnectingPoint num="28" id="1026" />
-<TGConnectingPoint num="29" id="1027" />
-<TGConnectingPoint num="30" id="1028" />
-<TGConnectingPoint num="31" id="1029" />
-<TGConnectingPoint num="32" id="1030" />
-<TGConnectingPoint num="33" id="1031" />
-<TGConnectingPoint num="34" id="1032" />
-<TGConnectingPoint num="35" id="1033" />
-<TGConnectingPoint num="36" id="1034" />
-<TGConnectingPoint num="37" id="1035" />
-<TGConnectingPoint num="38" id="1036" />
-<TGConnectingPoint num="39" id="1037" />
+<TGConnectingPoint num="0" id="1023" />
+<TGConnectingPoint num="1" id="1024" />
+<TGConnectingPoint num="2" id="1025" />
+<TGConnectingPoint num="3" id="1026" />
+<TGConnectingPoint num="4" id="1027" />
+<TGConnectingPoint num="5" id="1028" />
+<TGConnectingPoint num="6" id="1029" />
+<TGConnectingPoint num="7" id="1030" />
+<TGConnectingPoint num="8" id="1031" />
+<TGConnectingPoint num="9" id="1032" />
+<TGConnectingPoint num="10" id="1033" />
+<TGConnectingPoint num="11" id="1034" />
+<TGConnectingPoint num="12" id="1035" />
+<TGConnectingPoint num="13" id="1036" />
+<TGConnectingPoint num="14" id="1037" />
+<TGConnectingPoint num="15" id="1038" />
+<TGConnectingPoint num="16" id="1039" />
+<TGConnectingPoint num="17" id="1040" />
+<TGConnectingPoint num="18" id="1041" />
+<TGConnectingPoint num="19" id="1042" />
+<TGConnectingPoint num="20" id="1043" />
+<TGConnectingPoint num="21" id="1044" />
+<TGConnectingPoint num="22" id="1045" />
+<TGConnectingPoint num="23" id="1046" />
+<TGConnectingPoint num="24" id="1047" />
+<TGConnectingPoint num="25" id="1048" />
+<TGConnectingPoint num="26" id="1049" />
+<TGConnectingPoint num="27" id="1050" />
+<TGConnectingPoint num="28" id="1051" />
+<TGConnectingPoint num="29" id="1052" />
+<TGConnectingPoint num="30" id="1053" />
+<TGConnectingPoint num="31" id="1054" />
+<TGConnectingPoint num="32" id="1055" />
+<TGConnectingPoint num="33" id="1056" />
+<TGConnectingPoint num="34" id="1057" />
+<TGConnectingPoint num="35" id="1058" />
+<TGConnectingPoint num="36" id="1059" />
+<TGConnectingPoint num="37" id="1060" />
+<TGConnectingPoint num="38" id="1061" />
+<TGConnectingPoint num="39" id="1062" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1079" >
+<COMPONENT type="5106" id="1104" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1039" />
-<TGConnectingPoint num="1" id="1040" />
-<TGConnectingPoint num="2" id="1041" />
-<TGConnectingPoint num="3" id="1042" />
-<TGConnectingPoint num="4" id="1043" />
-<TGConnectingPoint num="5" id="1044" />
-<TGConnectingPoint num="6" id="1045" />
-<TGConnectingPoint num="7" id="1046" />
-<TGConnectingPoint num="8" id="1047" />
-<TGConnectingPoint num="9" id="1048" />
-<TGConnectingPoint num="10" id="1049" />
-<TGConnectingPoint num="11" id="1050" />
-<TGConnectingPoint num="12" id="1051" />
-<TGConnectingPoint num="13" id="1052" />
-<TGConnectingPoint num="14" id="1053" />
-<TGConnectingPoint num="15" id="1054" />
-<TGConnectingPoint num="16" id="1055" />
-<TGConnectingPoint num="17" id="1056" />
-<TGConnectingPoint num="18" id="1057" />
-<TGConnectingPoint num="19" id="1058" />
-<TGConnectingPoint num="20" id="1059" />
-<TGConnectingPoint num="21" id="1060" />
-<TGConnectingPoint num="22" id="1061" />
-<TGConnectingPoint num="23" id="1062" />
-<TGConnectingPoint num="24" id="1063" />
-<TGConnectingPoint num="25" id="1064" />
-<TGConnectingPoint num="26" id="1065" />
-<TGConnectingPoint num="27" id="1066" />
-<TGConnectingPoint num="28" id="1067" />
-<TGConnectingPoint num="29" id="1068" />
-<TGConnectingPoint num="30" id="1069" />
-<TGConnectingPoint num="31" id="1070" />
-<TGConnectingPoint num="32" id="1071" />
-<TGConnectingPoint num="33" id="1072" />
-<TGConnectingPoint num="34" id="1073" />
-<TGConnectingPoint num="35" id="1074" />
-<TGConnectingPoint num="36" id="1075" />
-<TGConnectingPoint num="37" id="1076" />
-<TGConnectingPoint num="38" id="1077" />
-<TGConnectingPoint num="39" id="1078" />
+<TGConnectingPoint num="0" id="1064" />
+<TGConnectingPoint num="1" id="1065" />
+<TGConnectingPoint num="2" id="1066" />
+<TGConnectingPoint num="3" id="1067" />
+<TGConnectingPoint num="4" id="1068" />
+<TGConnectingPoint num="5" id="1069" />
+<TGConnectingPoint num="6" id="1070" />
+<TGConnectingPoint num="7" id="1071" />
+<TGConnectingPoint num="8" id="1072" />
+<TGConnectingPoint num="9" id="1073" />
+<TGConnectingPoint num="10" id="1074" />
+<TGConnectingPoint num="11" id="1075" />
+<TGConnectingPoint num="12" id="1076" />
+<TGConnectingPoint num="13" id="1077" />
+<TGConnectingPoint num="14" id="1078" />
+<TGConnectingPoint num="15" id="1079" />
+<TGConnectingPoint num="16" id="1080" />
+<TGConnectingPoint num="17" id="1081" />
+<TGConnectingPoint num="18" id="1082" />
+<TGConnectingPoint num="19" id="1083" />
+<TGConnectingPoint num="20" id="1084" />
+<TGConnectingPoint num="21" id="1085" />
+<TGConnectingPoint num="22" id="1086" />
+<TGConnectingPoint num="23" id="1087" />
+<TGConnectingPoint num="24" id="1088" />
+<TGConnectingPoint num="25" id="1089" />
+<TGConnectingPoint num="26" id="1090" />
+<TGConnectingPoint num="27" id="1091" />
+<TGConnectingPoint num="28" id="1092" />
+<TGConnectingPoint num="29" id="1093" />
+<TGConnectingPoint num="30" id="1094" />
+<TGConnectingPoint num="31" id="1095" />
+<TGConnectingPoint num="32" id="1096" />
+<TGConnectingPoint num="33" id="1097" />
+<TGConnectingPoint num="34" id="1098" />
+<TGConnectingPoint num="35" id="1099" />
+<TGConnectingPoint num="36" id="1100" />
+<TGConnectingPoint num="37" id="1101" />
+<TGConnectingPoint num="38" id="1102" />
+<TGConnectingPoint num="39" id="1103" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1081" >
+<COMPONENT type="5100" id="1106" >
 <cdparam x="355" y="81" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1080" />
+<TGConnectingPoint num="0" id="1105" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="118" id="1082" >
+<CONNECTOR type="118" id="1107" >
 <cdparam x="372" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="412" y="82" id="1358" />
-<P2  x="472" y="82" id="1191" />
+<P1  x="412" y="82" id="1383" />
+<P2  x="472" y="82" id="1216" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="1089" >
+<CONNECTOR type="5102" id="1114" >
 <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="1088" />
-<P1  x="699" y="289" id="1244" />
-<P2  x="699" y="316" id="1216" />
+<TGConnectingPoint num="0" id="1113" />
+<P1  x="699" y="289" id="1269" />
+<P2  x="699" y="316" id="1241" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1087" >
-<father id="1089" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1112" >
+<father id="1114" num="0" />
 <cdparam x="691" y="328" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <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="1083" />
-<TGConnectingPoint num="1" id="1084" />
-<TGConnectingPoint num="2" id="1085" />
-<TGConnectingPoint num="3" id="1086" />
+<TGConnectingPoint num="0" id="1108" />
+<TGConnectingPoint num="1" id="1109" />
+<TGConnectingPoint num="2" id="1110" />
+<TGConnectingPoint num="3" id="1111" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2108,26 +2072,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1096" >
+<CONNECTOR type="5102" id="1121" >
 <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="1095" />
-<P1  x="442" y="527" id="1511" />
-<P2  x="323" y="748" id="1372" />
+<TGConnectingPoint num="0" id="1120" />
+<P1  x="442" y="527" id="1536" />
+<P2  x="323" y="748" id="1397" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1094" >
-<father id="1096" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1119" >
+<father id="1121" num="0" />
 <cdparam x="420" y="552" />
 <sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <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="1090" />
-<TGConnectingPoint num="1" id="1091" />
-<TGConnectingPoint num="2" id="1092" />
-<TGConnectingPoint num="3" id="1093" />
+<TGConnectingPoint num="0" id="1115" />
+<TGConnectingPoint num="1" id="1116" />
+<TGConnectingPoint num="2" id="1117" />
+<TGConnectingPoint num="3" id="1118" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2139,26 +2103,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1103" >
+<CONNECTOR type="5102" id="1128" >
 <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="1102" />
-<P1  x="326" y="457" id="1460" />
-<P2  x="442" y="497" id="1510" />
+<TGConnectingPoint num="0" id="1127" />
+<P1  x="326" y="457" id="1485" />
+<P2  x="442" y="497" id="1535" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1101" >
-<father id="1103" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1126" >
+<father id="1128" num="0" />
 <cdparam x="395" y="448" />
 <sizeparam width="100" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <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="1097" />
-<TGConnectingPoint num="1" id="1098" />
-<TGConnectingPoint num="2" id="1099" />
-<TGConnectingPoint num="3" id="1100" />
+<TGConnectingPoint num="0" id="1122" />
+<TGConnectingPoint num="1" id="1123" />
+<TGConnectingPoint num="2" id="1124" />
+<TGConnectingPoint num="3" id="1125" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="coinDelay" enabled="true"/>
@@ -2169,26 +2133,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1110" >
+<CONNECTOR type="5102" id="1135" >
 <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="1109" />
-<P1  x="298" y="554" id="1446" />
-<P2  x="289" y="748" id="1364" />
+<TGConnectingPoint num="0" id="1134" />
+<P1  x="298" y="554" id="1471" />
+<P2  x="289" y="748" id="1389" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1108" >
-<father id="1110" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1133" >
+<father id="1135" num="0" />
 <cdparam x="284" y="594" />
 <sizeparam width="252" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1104" />
-<TGConnectingPoint num="1" id="1105" />
-<TGConnectingPoint num="2" id="1106" />
-<TGConnectingPoint num="3" id="1107" />
+<TGConnectingPoint num="0" id="1129" />
+<TGConnectingPoint num="1" id="1130" />
+<TGConnectingPoint num="2" id="1131" />
+<TGConnectingPoint num="3" id="1132" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2201,26 +2165,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1117" >
+<CONNECTOR type="5102" id="1142" >
 <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="1116" />
-<P1  x="293" y="477" id="1471" />
-<P2  x="298" y="524" id="1445" />
+<TGConnectingPoint num="0" id="1141" />
+<P1  x="293" y="477" id="1496" />
+<P2  x="298" y="524" id="1470" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1115" >
-<father id="1117" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1140" >
+<father id="1142" num="0" />
 <cdparam x="295" y="505" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
-<TGConnectingPoint num="2" id="1113" />
-<TGConnectingPoint num="3" id="1114" />
+<TGConnectingPoint num="0" id="1136" />
+<TGConnectingPoint num="1" id="1137" />
+<TGConnectingPoint num="2" id="1138" />
+<TGConnectingPoint num="3" id="1139" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2231,26 +2195,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1124" >
+<CONNECTOR type="5102" id="1149" >
 <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="1123" />
-<P1  x="126" y="554" id="1500" />
-<P2  x="255" y="748" id="1371" />
+<TGConnectingPoint num="0" id="1148" />
+<P1  x="126" y="554" id="1525" />
+<P2  x="255" y="748" id="1396" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1122" >
-<father id="1124" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1147" >
+<father id="1149" num="0" />
 <cdparam x="32" y="587" />
 <sizeparam width="288" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1118" />
-<TGConnectingPoint num="1" id="1119" />
-<TGConnectingPoint num="2" id="1120" />
-<TGConnectingPoint num="3" id="1121" />
+<TGConnectingPoint num="0" id="1143" />
+<TGConnectingPoint num="1" id="1144" />
+<TGConnectingPoint num="2" id="1145" />
+<TGConnectingPoint num="3" id="1146" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2263,26 +2227,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1131" >
+<CONNECTOR type="5102" id="1156" >
 <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="1130" />
-<P1  x="227" y="477" id="1470" />
-<P2  x="126" y="524" id="1499" />
+<TGConnectingPoint num="0" id="1155" />
+<P1  x="227" y="477" id="1495" />
+<P2  x="126" y="524" id="1524" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1129" >
-<father id="1131" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1154" >
+<father id="1156" num="0" />
 <cdparam x="229" y="505" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1125" />
-<TGConnectingPoint num="1" id="1126" />
-<TGConnectingPoint num="2" id="1127" />
-<TGConnectingPoint num="3" id="1128" />
+<TGConnectingPoint num="0" id="1150" />
+<TGConnectingPoint num="1" id="1151" />
+<TGConnectingPoint num="2" id="1152" />
+<TGConnectingPoint num="3" id="1153" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2293,26 +2257,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1138" >
+<CONNECTOR type="5102" id="1163" >
 <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="1137" />
-<P1  x="261" y="421" id="1497" />
-<P2  x="260" y="437" id="1457" />
+<TGConnectingPoint num="0" id="1162" />
+<P1  x="261" y="421" id="1522" />
+<P2  x="260" y="437" id="1482" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1136" >
-<father id="1138" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1161" >
+<father id="1163" num="0" />
 <cdparam x="280" y="460" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1132" />
-<TGConnectingPoint num="1" id="1133" />
-<TGConnectingPoint num="2" id="1134" />
-<TGConnectingPoint num="3" id="1135" />
+<TGConnectingPoint num="0" id="1157" />
+<TGConnectingPoint num="1" id="1158" />
+<TGConnectingPoint num="2" id="1159" />
+<TGConnectingPoint num="3" id="1160" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2323,26 +2287,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1145" >
+<CONNECTOR type="5102" id="1170" >
 <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="1144" />
-<P1  x="699" y="346" id="1217" />
-<P2  x="699" y="381" id="1405" />
+<TGConnectingPoint num="0" id="1169" />
+<P1  x="699" y="346" id="1242" />
+<P2  x="699" y="381" id="1430" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1143" >
-<father id="1145" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1168" >
+<father id="1170" num="0" />
 <cdparam x="707" y="368" />
 <sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1139" />
-<TGConnectingPoint num="1" id="1140" />
-<TGConnectingPoint num="2" id="1141" />
-<TGConnectingPoint num="3" id="1142" />
+<TGConnectingPoint num="0" id="1164" />
+<TGConnectingPoint num="1" id="1165" />
+<TGConnectingPoint num="2" id="1166" />
+<TGConnectingPoint num="3" id="1167" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2354,26 +2318,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1152" >
+<CONNECTOR type="5102" id="1177" >
 <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="1151" />
-<P1  x="388" y="208" id="1283" />
-<P2  x="649" y="264" id="1241" />
+<TGConnectingPoint num="0" id="1176" />
+<P1  x="388" y="208" id="1308" />
+<P2  x="649" y="264" id="1266" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1150" >
-<father id="1152" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1175" >
+<father id="1177" num="0" />
 <cdparam x="411" y="206" />
 <sizeparam width="100" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1146" />
-<TGConnectingPoint num="1" id="1147" />
-<TGConnectingPoint num="2" id="1148" />
-<TGConnectingPoint num="3" id="1149" />
+<TGConnectingPoint num="0" id="1171" />
+<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="2" id="1173" />
+<TGConnectingPoint num="3" id="1174" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="coinDelay" enabled="true"/>
@@ -2384,26 +2348,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1159" >
+<CONNECTOR type="5102" id="1184" >
 <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="1158" />
-<P1  x="277" y="305" id="1228" />
-<P2  x="311" y="372" id="1522" />
+<TGConnectingPoint num="0" id="1183" />
+<P1  x="277" y="305" id="1253" />
+<P2  x="311" y="372" id="1547" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1157" >
-<father id="1159" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1182" >
+<father id="1184" num="0" />
 <cdparam x="243" y="359" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
-<TGConnectingPoint num="2" id="1155" />
-<TGConnectingPoint num="3" id="1156" />
+<TGConnectingPoint num="0" id="1178" />
+<TGConnectingPoint num="1" id="1179" />
+<TGConnectingPoint num="2" id="1180" />
+<TGConnectingPoint num="3" id="1181" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2414,26 +2378,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1166" >
+<CONNECTOR type="5102" id="1191" >
 <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="1165" />
-<P1  x="270" y="228" id="1293" />
-<P2  x="277" y="275" id="1227" />
+<TGConnectingPoint num="0" id="1190" />
+<P1  x="270" y="228" id="1318" />
+<P2  x="277" y="275" id="1252" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1164" >
-<father id="1166" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1189" >
+<father id="1191" num="0" />
 <cdparam x="270" y="264" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1160" />
-<TGConnectingPoint num="1" id="1161" />
-<TGConnectingPoint num="2" id="1162" />
-<TGConnectingPoint num="3" id="1163" />
+<TGConnectingPoint num="0" id="1185" />
+<TGConnectingPoint num="1" id="1186" />
+<TGConnectingPoint num="2" id="1187" />
+<TGConnectingPoint num="3" id="1188" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2444,26 +2408,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1173" >
+<CONNECTOR type="5102" id="1198" >
 <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="1172" />
-<P1  x="306" y="166" id="1206" />
-<P2  x="309" y="188" id="1280" />
+<TGConnectingPoint num="0" id="1197" />
+<P1  x="306" y="166" id="1231" />
+<P2  x="309" y="188" id="1305" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1171" >
-<father id="1173" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1196" >
+<father id="1198" num="0" />
 <cdparam x="328" y="178" />
 <sizeparam width="168" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1167" />
-<TGConnectingPoint num="1" id="1168" />
-<TGConnectingPoint num="2" id="1169" />
-<TGConnectingPoint num="3" id="1170" />
+<TGConnectingPoint num="0" id="1192" />
+<TGConnectingPoint num="1" id="1193" />
+<TGConnectingPoint num="2" id="1194" />
+<TGConnectingPoint num="3" id="1195" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2475,26 +2439,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1180" >
+<CONNECTOR type="5102" id="1205" >
 <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="1179" />
-<P1  x="302" y="102" id="1328" />
-<P2  x="306" y="136" id="1205" />
+<TGConnectingPoint num="0" id="1204" />
+<P1  x="302" y="102" id="1353" />
+<P2  x="306" y="136" id="1230" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1178" >
-<father id="1180" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1203" >
+<father id="1205" num="0" />
 <cdparam x="303" y="143" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1174" />
-<TGConnectingPoint num="1" id="1175" />
-<TGConnectingPoint num="2" id="1176" />
-<TGConnectingPoint num="3" id="1177" />
+<TGConnectingPoint num="0" id="1199" />
+<TGConnectingPoint num="1" id="1200" />
+<TGConnectingPoint num="2" id="1201" />
+<TGConnectingPoint num="3" id="1202" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2505,26 +2469,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1187" >
+<CONNECTOR type="5102" id="1212" >
 <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="1186" />
-<P1  x="303" y="40" id="1320" />
-<P2  x="302" y="62" id="1323" />
+<TGConnectingPoint num="0" id="1211" />
+<P1  x="303" y="40" id="1345" />
+<P2  x="302" y="62" id="1348" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1185" >
-<father id="1187" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1210" >
+<father id="1212" num="0" />
 <cdparam x="303" y="80" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1181" />
-<TGConnectingPoint num="1" id="1182" />
-<TGConnectingPoint num="2" id="1183" />
-<TGConnectingPoint num="3" id="1184" />
+<TGConnectingPoint num="0" id="1206" />
+<TGConnectingPoint num="1" id="1207" />
+<TGConnectingPoint num="2" id="1208" />
+<TGConnectingPoint num="3" id="1209" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -2535,526 +2499,526 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="1204" >
+<COMPONENT type="301" id="1229" >
 <cdparam x="472" y="75" />
 <sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="Activity1.docx
 " />
-<TGConnectingPoint num="0" id="1188" />
-<TGConnectingPoint num="1" id="1189" />
-<TGConnectingPoint num="2" id="1190" />
-<TGConnectingPoint num="3" id="1191" />
-<TGConnectingPoint num="4" id="1192" />
-<TGConnectingPoint num="5" id="1193" />
-<TGConnectingPoint num="6" id="1194" />
-<TGConnectingPoint num="7" id="1195" />
-<TGConnectingPoint num="8" id="1196" />
-<TGConnectingPoint num="9" id="1197" />
-<TGConnectingPoint num="10" id="1198" />
-<TGConnectingPoint num="11" id="1199" />
-<TGConnectingPoint num="12" id="1200" />
-<TGConnectingPoint num="13" id="1201" />
-<TGConnectingPoint num="14" id="1202" />
-<TGConnectingPoint num="15" id="1203" />
+<TGConnectingPoint num="0" id="1213" />
+<TGConnectingPoint num="1" id="1214" />
+<TGConnectingPoint num="2" id="1215" />
+<TGConnectingPoint num="3" id="1216" />
+<TGConnectingPoint num="4" id="1217" />
+<TGConnectingPoint num="5" id="1218" />
+<TGConnectingPoint num="6" id="1219" />
+<TGConnectingPoint num="7" id="1220" />
+<TGConnectingPoint num="8" id="1221" />
+<TGConnectingPoint num="9" id="1222" />
+<TGConnectingPoint num="10" id="1223" />
+<TGConnectingPoint num="11" id="1224" />
+<TGConnectingPoint num="12" id="1225" />
+<TGConnectingPoint num="13" id="1226" />
+<TGConnectingPoint num="14" id="1227" />
+<TGConnectingPoint num="15" id="1228" />
 <extraparam>
 <Line value="Activity1.docx" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1215" >
+<COMPONENT type="5104" id="1240" >
 <cdparam x="268" y="141" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1205" />
-<TGConnectingPoint num="1" id="1206" />
-<TGConnectingPoint num="2" id="1207" />
-<TGConnectingPoint num="3" id="1208" />
-<TGConnectingPoint num="4" id="1209" />
-<TGConnectingPoint num="5" id="1210" />
-<TGConnectingPoint num="6" id="1211" />
-<TGConnectingPoint num="7" id="1212" />
-<TGConnectingPoint num="8" id="1213" />
-<TGConnectingPoint num="9" id="1214" />
+<TGConnectingPoint num="0" id="1230" />
+<TGConnectingPoint num="1" id="1231" />
+<TGConnectingPoint num="2" id="1232" />
+<TGConnectingPoint num="3" id="1233" />
+<TGConnectingPoint num="4" id="1234" />
+<TGConnectingPoint num="5" id="1235" />
+<TGConnectingPoint num="6" id="1236" />
+<TGConnectingPoint num="7" id="1237" />
+<TGConnectingPoint num="8" id="1238" />
+<TGConnectingPoint num="9" id="1239" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1226" >
+<COMPONENT type="5103" id="1251" >
 <cdparam x="634" y="321" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1216" />
-<TGConnectingPoint num="1" id="1217" />
-<TGConnectingPoint num="2" id="1218" />
-<TGConnectingPoint num="3" id="1219" />
-<TGConnectingPoint num="4" id="1220" />
-<TGConnectingPoint num="5" id="1221" />
-<TGConnectingPoint num="6" id="1222" />
-<TGConnectingPoint num="7" id="1223" />
-<TGConnectingPoint num="8" id="1224" />
-<TGConnectingPoint num="9" id="1225" />
+<TGConnectingPoint num="0" id="1241" />
+<TGConnectingPoint num="1" id="1242" />
+<TGConnectingPoint num="2" id="1243" />
+<TGConnectingPoint num="3" id="1244" />
+<TGConnectingPoint num="4" id="1245" />
+<TGConnectingPoint num="5" id="1246" />
+<TGConnectingPoint num="6" id="1247" />
+<TGConnectingPoint num="7" id="1248" />
+<TGConnectingPoint num="8" id="1249" />
+<TGConnectingPoint num="9" id="1250" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1237" >
+<COMPONENT type="5104" id="1262" >
 <cdparam x="239" y="280" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1227" />
-<TGConnectingPoint num="1" id="1228" />
-<TGConnectingPoint num="2" id="1229" />
-<TGConnectingPoint num="3" id="1230" />
-<TGConnectingPoint num="4" id="1231" />
-<TGConnectingPoint num="5" id="1232" />
-<TGConnectingPoint num="6" id="1233" />
-<TGConnectingPoint num="7" id="1234" />
-<TGConnectingPoint num="8" id="1235" />
-<TGConnectingPoint num="9" id="1236" />
+<TGConnectingPoint num="0" id="1252" />
+<TGConnectingPoint num="1" id="1253" />
+<TGConnectingPoint num="2" id="1254" />
+<TGConnectingPoint num="3" id="1255" />
+<TGConnectingPoint num="4" id="1256" />
+<TGConnectingPoint num="5" id="1257" />
+<TGConnectingPoint num="6" id="1258" />
+<TGConnectingPoint num="7" id="1259" />
+<TGConnectingPoint num="8" id="1260" />
+<TGConnectingPoint num="9" id="1261" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1278" >
+<COMPONENT type="5106" id="1303" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1238" />
-<TGConnectingPoint num="1" id="1239" />
-<TGConnectingPoint num="2" id="1240" />
-<TGConnectingPoint num="3" id="1241" />
-<TGConnectingPoint num="4" id="1242" />
-<TGConnectingPoint num="5" id="1243" />
-<TGConnectingPoint num="6" id="1244" />
-<TGConnectingPoint num="7" id="1245" />
-<TGConnectingPoint num="8" id="1246" />
-<TGConnectingPoint num="9" id="1247" />
-<TGConnectingPoint num="10" id="1248" />
-<TGConnectingPoint num="11" id="1249" />
-<TGConnectingPoint num="12" id="1250" />
-<TGConnectingPoint num="13" id="1251" />
-<TGConnectingPoint num="14" id="1252" />
-<TGConnectingPoint num="15" id="1253" />
-<TGConnectingPoint num="16" id="1254" />
-<TGConnectingPoint num="17" id="1255" />
-<TGConnectingPoint num="18" id="1256" />
-<TGConnectingPoint num="19" id="1257" />
-<TGConnectingPoint num="20" id="1258" />
-<TGConnectingPoint num="21" id="1259" />
-<TGConnectingPoint num="22" id="1260" />
-<TGConnectingPoint num="23" id="1261" />
-<TGConnectingPoint num="24" id="1262" />
-<TGConnectingPoint num="25" id="1263" />
-<TGConnectingPoint num="26" id="1264" />
-<TGConnectingPoint num="27" id="1265" />
-<TGConnectingPoint num="28" id="1266" />
-<TGConnectingPoint num="29" id="1267" />
-<TGConnectingPoint num="30" id="1268" />
-<TGConnectingPoint num="31" id="1269" />
-<TGConnectingPoint num="32" id="1270" />
-<TGConnectingPoint num="33" id="1271" />
-<TGConnectingPoint num="34" id="1272" />
-<TGConnectingPoint num="35" id="1273" />
-<TGConnectingPoint num="36" id="1274" />
-<TGConnectingPoint num="37" id="1275" />
-<TGConnectingPoint num="38" id="1276" />
-<TGConnectingPoint num="39" id="1277" />
+<TGConnectingPoint num="0" id="1263" />
+<TGConnectingPoint num="1" id="1264" />
+<TGConnectingPoint num="2" id="1265" />
+<TGConnectingPoint num="3" id="1266" />
+<TGConnectingPoint num="4" id="1267" />
+<TGConnectingPoint num="5" id="1268" />
+<TGConnectingPoint num="6" id="1269" />
+<TGConnectingPoint num="7" id="1270" />
+<TGConnectingPoint num="8" id="1271" />
+<TGConnectingPoint num="9" id="1272" />
+<TGConnectingPoint num="10" id="1273" />
+<TGConnectingPoint num="11" id="1274" />
+<TGConnectingPoint num="12" id="1275" />
+<TGConnectingPoint num="13" id="1276" />
+<TGConnectingPoint num="14" id="1277" />
+<TGConnectingPoint num="15" id="1278" />
+<TGConnectingPoint num="16" id="1279" />
+<TGConnectingPoint num="17" id="1280" />
+<TGConnectingPoint num="18" id="1281" />
+<TGConnectingPoint num="19" id="1282" />
+<TGConnectingPoint num="20" id="1283" />
+<TGConnectingPoint num="21" id="1284" />
+<TGConnectingPoint num="22" id="1285" />
+<TGConnectingPoint num="23" id="1286" />
+<TGConnectingPoint num="24" id="1287" />
+<TGConnectingPoint num="25" id="1288" />
+<TGConnectingPoint num="26" id="1289" />
+<TGConnectingPoint num="27" id="1290" />
+<TGConnectingPoint num="28" id="1291" />
+<TGConnectingPoint num="29" id="1292" />
+<TGConnectingPoint num="30" id="1293" />
+<TGConnectingPoint num="31" id="1294" />
+<TGConnectingPoint num="32" id="1295" />
+<TGConnectingPoint num="33" id="1296" />
+<TGConnectingPoint num="34" id="1297" />
+<TGConnectingPoint num="35" id="1298" />
+<TGConnectingPoint num="36" id="1299" />
+<TGConnectingPoint num="37" id="1300" />
+<TGConnectingPoint num="38" id="1301" />
+<TGConnectingPoint num="39" id="1302" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1319" >
+<COMPONENT type="5106" id="1344" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1279" />
-<TGConnectingPoint num="1" id="1280" />
-<TGConnectingPoint num="2" id="1281" />
-<TGConnectingPoint num="3" id="1282" />
-<TGConnectingPoint num="4" id="1283" />
-<TGConnectingPoint num="5" id="1284" />
-<TGConnectingPoint num="6" id="1285" />
-<TGConnectingPoint num="7" id="1286" />
-<TGConnectingPoint num="8" id="1287" />
-<TGConnectingPoint num="9" id="1288" />
-<TGConnectingPoint num="10" id="1289" />
-<TGConnectingPoint num="11" id="1290" />
-<TGConnectingPoint num="12" id="1291" />
-<TGConnectingPoint num="13" id="1292" />
-<TGConnectingPoint num="14" id="1293" />
-<TGConnectingPoint num="15" id="1294" />
-<TGConnectingPoint num="16" id="1295" />
-<TGConnectingPoint num="17" id="1296" />
-<TGConnectingPoint num="18" id="1297" />
-<TGConnectingPoint num="19" id="1298" />
-<TGConnectingPoint num="20" id="1299" />
-<TGConnectingPoint num="21" id="1300" />
-<TGConnectingPoint num="22" id="1301" />
-<TGConnectingPoint num="23" id="1302" />
-<TGConnectingPoint num="24" id="1303" />
-<TGConnectingPoint num="25" id="1304" />
-<TGConnectingPoint num="26" id="1305" />
-<TGConnectingPoint num="27" id="1306" />
-<TGConnectingPoint num="28" id="1307" />
-<TGConnectingPoint num="29" id="1308" />
-<TGConnectingPoint num="30" id="1309" />
-<TGConnectingPoint num="31" id="1310" />
-<TGConnectingPoint num="32" id="1311" />
-<TGConnectingPoint num="33" id="1312" />
-<TGConnectingPoint num="34" id="1313" />
-<TGConnectingPoint num="35" id="1314" />
-<TGConnectingPoint num="36" id="1315" />
-<TGConnectingPoint num="37" id="1316" />
-<TGConnectingPoint num="38" id="1317" />
-<TGConnectingPoint num="39" id="1318" />
+<TGConnectingPoint num="0" id="1304" />
+<TGConnectingPoint num="1" id="1305" />
+<TGConnectingPoint num="2" id="1306" />
+<TGConnectingPoint num="3" id="1307" />
+<TGConnectingPoint num="4" id="1308" />
+<TGConnectingPoint num="5" id="1309" />
+<TGConnectingPoint num="6" id="1310" />
+<TGConnectingPoint num="7" id="1311" />
+<TGConnectingPoint num="8" id="1312" />
+<TGConnectingPoint num="9" id="1313" />
+<TGConnectingPoint num="10" id="1314" />
+<TGConnectingPoint num="11" id="1315" />
+<TGConnectingPoint num="12" id="1316" />
+<TGConnectingPoint num="13" id="1317" />
+<TGConnectingPoint num="14" id="1318" />
+<TGConnectingPoint num="15" id="1319" />
+<TGConnectingPoint num="16" id="1320" />
+<TGConnectingPoint num="17" id="1321" />
+<TGConnectingPoint num="18" id="1322" />
+<TGConnectingPoint num="19" id="1323" />
+<TGConnectingPoint num="20" id="1324" />
+<TGConnectingPoint num="21" id="1325" />
+<TGConnectingPoint num="22" id="1326" />
+<TGConnectingPoint num="23" id="1327" />
+<TGConnectingPoint num="24" id="1328" />
+<TGConnectingPoint num="25" id="1329" />
+<TGConnectingPoint num="26" id="1330" />
+<TGConnectingPoint num="27" id="1331" />
+<TGConnectingPoint num="28" id="1332" />
+<TGConnectingPoint num="29" id="1333" />
+<TGConnectingPoint num="30" id="1334" />
+<TGConnectingPoint num="31" id="1335" />
+<TGConnectingPoint num="32" id="1336" />
+<TGConnectingPoint num="33" id="1337" />
+<TGConnectingPoint num="34" id="1338" />
+<TGConnectingPoint num="35" id="1339" />
+<TGConnectingPoint num="36" id="1340" />
+<TGConnectingPoint num="37" id="1341" />
+<TGConnectingPoint num="38" id="1342" />
+<TGConnectingPoint num="39" id="1343" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1321" >
+<COMPONENT type="5100" id="1346" >
 <cdparam x="296" y="20" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1320" />
+<TGConnectingPoint num="0" id="1345" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1362" >
+<COMPONENT type="5106" id="1387" >
 <cdparam x="192" y="62" />
 <sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1322" />
-<TGConnectingPoint num="1" id="1323" />
-<TGConnectingPoint num="2" id="1324" />
-<TGConnectingPoint num="3" id="1325" />
-<TGConnectingPoint num="4" id="1326" />
-<TGConnectingPoint num="5" id="1327" />
-<TGConnectingPoint num="6" id="1328" />
-<TGConnectingPoint num="7" id="1329" />
-<TGConnectingPoint num="8" id="1330" />
-<TGConnectingPoint num="9" id="1331" />
-<TGConnectingPoint num="10" id="1332" />
-<TGConnectingPoint num="11" id="1333" />
-<TGConnectingPoint num="12" id="1334" />
-<TGConnectingPoint num="13" id="1335" />
-<TGConnectingPoint num="14" id="1336" />
-<TGConnectingPoint num="15" id="1337" />
-<TGConnectingPoint num="16" id="1338" />
-<TGConnectingPoint num="17" id="1339" />
-<TGConnectingPoint num="18" id="1340" />
-<TGConnectingPoint num="19" id="1341" />
-<TGConnectingPoint num="20" id="1342" />
-<TGConnectingPoint num="21" id="1343" />
-<TGConnectingPoint num="22" id="1344" />
-<TGConnectingPoint num="23" id="1345" />
-<TGConnectingPoint num="24" id="1346" />
-<TGConnectingPoint num="25" id="1347" />
-<TGConnectingPoint num="26" id="1348" />
-<TGConnectingPoint num="27" id="1349" />
-<TGConnectingPoint num="28" id="1350" />
-<TGConnectingPoint num="29" id="1351" />
-<TGConnectingPoint num="30" id="1352" />
-<TGConnectingPoint num="31" id="1353" />
-<TGConnectingPoint num="32" id="1354" />
-<TGConnectingPoint num="33" id="1355" />
-<TGConnectingPoint num="34" id="1356" />
-<TGConnectingPoint num="35" id="1357" />
-<TGConnectingPoint num="36" id="1358" />
-<TGConnectingPoint num="37" id="1359" />
-<TGConnectingPoint num="38" id="1360" />
-<TGConnectingPoint num="39" id="1361" />
+<TGConnectingPoint num="0" id="1347" />
+<TGConnectingPoint num="1" id="1348" />
+<TGConnectingPoint num="2" id="1349" />
+<TGConnectingPoint num="3" id="1350" />
+<TGConnectingPoint num="4" id="1351" />
+<TGConnectingPoint num="5" id="1352" />
+<TGConnectingPoint num="6" id="1353" />
+<TGConnectingPoint num="7" id="1354" />
+<TGConnectingPoint num="8" id="1355" />
+<TGConnectingPoint num="9" id="1356" />
+<TGConnectingPoint num="10" id="1357" />
+<TGConnectingPoint num="11" id="1358" />
+<TGConnectingPoint num="12" id="1359" />
+<TGConnectingPoint num="13" id="1360" />
+<TGConnectingPoint num="14" id="1361" />
+<TGConnectingPoint num="15" id="1362" />
+<TGConnectingPoint num="16" id="1363" />
+<TGConnectingPoint num="17" id="1364" />
+<TGConnectingPoint num="18" id="1365" />
+<TGConnectingPoint num="19" id="1366" />
+<TGConnectingPoint num="20" id="1367" />
+<TGConnectingPoint num="21" id="1368" />
+<TGConnectingPoint num="22" id="1369" />
+<TGConnectingPoint num="23" id="1370" />
+<TGConnectingPoint num="24" id="1371" />
+<TGConnectingPoint num="25" id="1372" />
+<TGConnectingPoint num="26" id="1373" />
+<TGConnectingPoint num="27" id="1374" />
+<TGConnectingPoint num="28" id="1375" />
+<TGConnectingPoint num="29" id="1376" />
+<TGConnectingPoint num="30" id="1377" />
+<TGConnectingPoint num="31" id="1378" />
+<TGConnectingPoint num="32" id="1379" />
+<TGConnectingPoint num="33" id="1380" />
+<TGConnectingPoint num="34" id="1381" />
+<TGConnectingPoint num="35" id="1382" />
+<TGConnectingPoint num="36" id="1383" />
+<TGConnectingPoint num="37" id="1384" />
+<TGConnectingPoint num="38" id="1385" />
+<TGConnectingPoint num="39" id="1386" />
 <latencyCheck />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1403" >
+<COMPONENT type="5106" id="1428" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1363" />
-<TGConnectingPoint num="1" id="1364" />
-<TGConnectingPoint num="2" id="1365" />
-<TGConnectingPoint num="3" id="1366" />
-<TGConnectingPoint num="4" id="1367" />
-<TGConnectingPoint num="5" id="1368" />
-<TGConnectingPoint num="6" id="1369" />
-<TGConnectingPoint num="7" id="1370" />
-<TGConnectingPoint num="8" id="1371" />
-<TGConnectingPoint num="9" id="1372" />
-<TGConnectingPoint num="10" id="1373" />
-<TGConnectingPoint num="11" id="1374" />
-<TGConnectingPoint num="12" id="1375" />
-<TGConnectingPoint num="13" id="1376" />
-<TGConnectingPoint num="14" id="1377" />
-<TGConnectingPoint num="15" id="1378" />
-<TGConnectingPoint num="16" id="1379" />
-<TGConnectingPoint num="17" id="1380" />
-<TGConnectingPoint num="18" id="1381" />
-<TGConnectingPoint num="19" id="1382" />
-<TGConnectingPoint num="20" id="1383" />
-<TGConnectingPoint num="21" id="1384" />
-<TGConnectingPoint num="22" id="1385" />
-<TGConnectingPoint num="23" id="1386" />
-<TGConnectingPoint num="24" id="1387" />
-<TGConnectingPoint num="25" id="1388" />
-<TGConnectingPoint num="26" id="1389" />
-<TGConnectingPoint num="27" id="1390" />
-<TGConnectingPoint num="28" id="1391" />
-<TGConnectingPoint num="29" id="1392" />
-<TGConnectingPoint num="30" id="1393" />
-<TGConnectingPoint num="31" id="1394" />
-<TGConnectingPoint num="32" id="1395" />
-<TGConnectingPoint num="33" id="1396" />
-<TGConnectingPoint num="34" id="1397" />
-<TGConnectingPoint num="35" id="1398" />
-<TGConnectingPoint num="36" id="1399" />
-<TGConnectingPoint num="37" id="1400" />
-<TGConnectingPoint num="38" id="1401" />
-<TGConnectingPoint num="39" id="1402" />
+<TGConnectingPoint num="0" id="1388" />
+<TGConnectingPoint num="1" id="1389" />
+<TGConnectingPoint num="2" id="1390" />
+<TGConnectingPoint num="3" id="1391" />
+<TGConnectingPoint num="4" id="1392" />
+<TGConnectingPoint num="5" id="1393" />
+<TGConnectingPoint num="6" id="1394" />
+<TGConnectingPoint num="7" id="1395" />
+<TGConnectingPoint num="8" id="1396" />
+<TGConnectingPoint num="9" id="1397" />
+<TGConnectingPoint num="10" id="1398" />
+<TGConnectingPoint num="11" id="1399" />
+<TGConnectingPoint num="12" id="1400" />
+<TGConnectingPoint num="13" id="1401" />
+<TGConnectingPoint num="14" id="1402" />
+<TGConnectingPoint num="15" id="1403" />
+<TGConnectingPoint num="16" id="1404" />
+<TGConnectingPoint num="17" id="1405" />
+<TGConnectingPoint num="18" id="1406" />
+<TGConnectingPoint num="19" id="1407" />
+<TGConnectingPoint num="20" id="1408" />
+<TGConnectingPoint num="21" id="1409" />
+<TGConnectingPoint num="22" id="1410" />
+<TGConnectingPoint num="23" id="1411" />
+<TGConnectingPoint num="24" id="1412" />
+<TGConnectingPoint num="25" id="1413" />
+<TGConnectingPoint num="26" id="1414" />
+<TGConnectingPoint num="27" id="1415" />
+<TGConnectingPoint num="28" id="1416" />
+<TGConnectingPoint num="29" id="1417" />
+<TGConnectingPoint num="30" id="1418" />
+<TGConnectingPoint num="31" id="1419" />
+<TGConnectingPoint num="32" id="1420" />
+<TGConnectingPoint num="33" id="1421" />
+<TGConnectingPoint num="34" id="1422" />
+<TGConnectingPoint num="35" id="1423" />
+<TGConnectingPoint num="36" id="1424" />
+<TGConnectingPoint num="37" id="1425" />
+<TGConnectingPoint num="38" id="1426" />
+<TGConnectingPoint num="39" id="1427" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1444" >
+<COMPONENT type="5106" id="1469" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1404" />
-<TGConnectingPoint num="1" id="1405" />
-<TGConnectingPoint num="2" id="1406" />
-<TGConnectingPoint num="3" id="1407" />
-<TGConnectingPoint num="4" id="1408" />
-<TGConnectingPoint num="5" id="1409" />
-<TGConnectingPoint num="6" id="1410" />
-<TGConnectingPoint num="7" id="1411" />
-<TGConnectingPoint num="8" id="1412" />
-<TGConnectingPoint num="9" id="1413" />
-<TGConnectingPoint num="10" id="1414" />
-<TGConnectingPoint num="11" id="1415" />
-<TGConnectingPoint num="12" id="1416" />
-<TGConnectingPoint num="13" id="1417" />
-<TGConnectingPoint num="14" id="1418" />
-<TGConnectingPoint num="15" id="1419" />
-<TGConnectingPoint num="16" id="1420" />
-<TGConnectingPoint num="17" id="1421" />
-<TGConnectingPoint num="18" id="1422" />
-<TGConnectingPoint num="19" id="1423" />
-<TGConnectingPoint num="20" id="1424" />
-<TGConnectingPoint num="21" id="1425" />
-<TGConnectingPoint num="22" id="1426" />
-<TGConnectingPoint num="23" id="1427" />
-<TGConnectingPoint num="24" id="1428" />
-<TGConnectingPoint num="25" id="1429" />
-<TGConnectingPoint num="26" id="1430" />
-<TGConnectingPoint num="27" id="1431" />
-<TGConnectingPoint num="28" id="1432" />
-<TGConnectingPoint num="29" id="1433" />
-<TGConnectingPoint num="30" id="1434" />
-<TGConnectingPoint num="31" id="1435" />
-<TGConnectingPoint num="32" id="1436" />
-<TGConnectingPoint num="33" id="1437" />
-<TGConnectingPoint num="34" id="1438" />
-<TGConnectingPoint num="35" id="1439" />
-<TGConnectingPoint num="36" id="1440" />
-<TGConnectingPoint num="37" id="1441" />
-<TGConnectingPoint num="38" id="1442" />
-<TGConnectingPoint num="39" id="1443" />
+<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" />
+<TGConnectingPoint num="10" id="1439" />
+<TGConnectingPoint num="11" id="1440" />
+<TGConnectingPoint num="12" id="1441" />
+<TGConnectingPoint num="13" id="1442" />
+<TGConnectingPoint num="14" id="1443" />
+<TGConnectingPoint num="15" id="1444" />
+<TGConnectingPoint num="16" id="1445" />
+<TGConnectingPoint num="17" id="1446" />
+<TGConnectingPoint num="18" id="1447" />
+<TGConnectingPoint num="19" id="1448" />
+<TGConnectingPoint num="20" id="1449" />
+<TGConnectingPoint num="21" id="1450" />
+<TGConnectingPoint num="22" id="1451" />
+<TGConnectingPoint num="23" id="1452" />
+<TGConnectingPoint num="24" id="1453" />
+<TGConnectingPoint num="25" id="1454" />
+<TGConnectingPoint num="26" id="1455" />
+<TGConnectingPoint num="27" id="1456" />
+<TGConnectingPoint num="28" id="1457" />
+<TGConnectingPoint num="29" id="1458" />
+<TGConnectingPoint num="30" id="1459" />
+<TGConnectingPoint num="31" id="1460" />
+<TGConnectingPoint num="32" id="1461" />
+<TGConnectingPoint num="33" id="1462" />
+<TGConnectingPoint num="34" id="1463" />
+<TGConnectingPoint num="35" id="1464" />
+<TGConnectingPoint num="36" id="1465" />
+<TGConnectingPoint num="37" id="1466" />
+<TGConnectingPoint num="38" id="1467" />
+<TGConnectingPoint num="39" id="1468" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1561" >
+<COMPONENT type="5106" id="1586" >
 <cdparam x="23" y="372" />
 <sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="Beverage" />
-<TGConnectingPoint num="0" id="1521" />
-<TGConnectingPoint num="1" id="1522" />
-<TGConnectingPoint num="2" id="1523" />
-<TGConnectingPoint num="3" id="1524" />
-<TGConnectingPoint num="4" id="1525" />
-<TGConnectingPoint num="5" id="1526" />
-<TGConnectingPoint num="6" id="1527" />
-<TGConnectingPoint num="7" id="1528" />
-<TGConnectingPoint num="8" id="1529" />
-<TGConnectingPoint num="9" id="1530" />
-<TGConnectingPoint num="10" id="1531" />
-<TGConnectingPoint num="11" id="1532" />
-<TGConnectingPoint num="12" id="1533" />
-<TGConnectingPoint num="13" id="1534" />
-<TGConnectingPoint num="14" id="1535" />
-<TGConnectingPoint num="15" id="1536" />
-<TGConnectingPoint num="16" id="1537" />
-<TGConnectingPoint num="17" id="1538" />
-<TGConnectingPoint num="18" id="1539" />
-<TGConnectingPoint num="19" id="1540" />
-<TGConnectingPoint num="20" id="1541" />
-<TGConnectingPoint num="21" id="1542" />
-<TGConnectingPoint num="22" id="1543" />
-<TGConnectingPoint num="23" id="1544" />
-<TGConnectingPoint num="24" id="1545" />
-<TGConnectingPoint num="25" id="1546" />
-<TGConnectingPoint num="26" id="1547" />
-<TGConnectingPoint num="27" id="1548" />
-<TGConnectingPoint num="28" id="1549" />
-<TGConnectingPoint num="29" id="1550" />
-<TGConnectingPoint num="30" id="1551" />
-<TGConnectingPoint num="31" id="1552" />
-<TGConnectingPoint num="32" id="1553" />
-<TGConnectingPoint num="33" id="1554" />
-<TGConnectingPoint num="34" id="1555" />
-<TGConnectingPoint num="35" id="1556" />
-<TGConnectingPoint num="36" id="1557" />
-<TGConnectingPoint num="37" id="1558" />
-<TGConnectingPoint num="38" id="1559" />
-<TGConnectingPoint num="39" id="1560" />
+<TGConnectingPoint num="0" id="1546" />
+<TGConnectingPoint num="1" id="1547" />
+<TGConnectingPoint num="2" id="1548" />
+<TGConnectingPoint num="3" id="1549" />
+<TGConnectingPoint num="4" id="1550" />
+<TGConnectingPoint num="5" id="1551" />
+<TGConnectingPoint num="6" id="1552" />
+<TGConnectingPoint num="7" id="1553" />
+<TGConnectingPoint num="8" id="1554" />
+<TGConnectingPoint num="9" id="1555" />
+<TGConnectingPoint num="10" id="1556" />
+<TGConnectingPoint num="11" id="1557" />
+<TGConnectingPoint num="12" id="1558" />
+<TGConnectingPoint num="13" id="1559" />
+<TGConnectingPoint num="14" id="1560" />
+<TGConnectingPoint num="15" id="1561" />
+<TGConnectingPoint num="16" id="1562" />
+<TGConnectingPoint num="17" id="1563" />
+<TGConnectingPoint num="18" id="1564" />
+<TGConnectingPoint num="19" id="1565" />
+<TGConnectingPoint num="20" id="1566" />
+<TGConnectingPoint num="21" id="1567" />
+<TGConnectingPoint num="22" id="1568" />
+<TGConnectingPoint num="23" id="1569" />
+<TGConnectingPoint num="24" id="1570" />
+<TGConnectingPoint num="25" id="1571" />
+<TGConnectingPoint num="26" id="1572" />
+<TGConnectingPoint num="27" id="1573" />
+<TGConnectingPoint num="28" id="1574" />
+<TGConnectingPoint num="29" id="1575" />
+<TGConnectingPoint num="30" id="1576" />
+<TGConnectingPoint num="31" id="1577" />
+<TGConnectingPoint num="32" id="1578" />
+<TGConnectingPoint num="33" id="1579" />
+<TGConnectingPoint num="34" id="1580" />
+<TGConnectingPoint num="35" id="1581" />
+<TGConnectingPoint num="36" id="1582" />
+<TGConnectingPoint num="37" id="1583" />
+<TGConnectingPoint num="38" id="1584" />
+<TGConnectingPoint num="39" id="1585" />
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5104" id="1455" >
-<father id="1561" num="0" />
+<SUBCOMPONENT type="5104" id="1480" >
+<father id="1586" num="0" />
 <cdparam x="242" y="529" />
 <sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1445" />
-<TGConnectingPoint num="1" id="1446" />
-<TGConnectingPoint num="2" id="1447" />
-<TGConnectingPoint num="3" id="1448" />
-<TGConnectingPoint num="4" id="1449" />
-<TGConnectingPoint num="5" id="1450" />
-<TGConnectingPoint num="6" id="1451" />
-<TGConnectingPoint num="7" id="1452" />
-<TGConnectingPoint num="8" id="1453" />
-<TGConnectingPoint num="9" id="1454" />
+<TGConnectingPoint num="0" id="1470" />
+<TGConnectingPoint num="1" id="1471" />
+<TGConnectingPoint num="2" id="1472" />
+<TGConnectingPoint num="3" id="1473" />
+<TGConnectingPoint num="4" id="1474" />
+<TGConnectingPoint num="5" id="1475" />
+<TGConnectingPoint num="6" id="1476" />
+<TGConnectingPoint num="7" id="1477" />
+<TGConnectingPoint num="8" id="1478" />
+<TGConnectingPoint num="9" id="1479" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1496" >
-<father id="1561" num="1" />
+<SUBCOMPONENT type="5106" id="1521" >
+<father id="1586" num="1" />
 <cdparam x="194" y="437" />
 <sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
 <infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1456" />
-<TGConnectingPoint num="1" id="1457" />
-<TGConnectingPoint num="2" id="1458" />
-<TGConnectingPoint num="3" id="1459" />
-<TGConnectingPoint num="4" id="1460" />
-<TGConnectingPoint num="5" id="1461" />
-<TGConnectingPoint num="6" id="1462" />
-<TGConnectingPoint num="7" id="1463" />
-<TGConnectingPoint num="8" id="1464" />
-<TGConnectingPoint num="9" id="1465" />
-<TGConnectingPoint num="10" id="1466" />
-<TGConnectingPoint num="11" id="1467" />
-<TGConnectingPoint num="12" id="1468" />
-<TGConnectingPoint num="13" id="1469" />
-<TGConnectingPoint num="14" id="1470" />
-<TGConnectingPoint num="15" id="1471" />
-<TGConnectingPoint num="16" id="1472" />
-<TGConnectingPoint num="17" id="1473" />
-<TGConnectingPoint num="18" id="1474" />
-<TGConnectingPoint num="19" id="1475" />
-<TGConnectingPoint num="20" id="1476" />
-<TGConnectingPoint num="21" id="1477" />
-<TGConnectingPoint num="22" id="1478" />
-<TGConnectingPoint num="23" id="1479" />
-<TGConnectingPoint num="24" id="1480" />
-<TGConnectingPoint num="25" id="1481" />
-<TGConnectingPoint num="26" id="1482" />
-<TGConnectingPoint num="27" id="1483" />
-<TGConnectingPoint num="28" id="1484" />
-<TGConnectingPoint num="29" id="1485" />
-<TGConnectingPoint num="30" id="1486" />
-<TGConnectingPoint num="31" id="1487" />
-<TGConnectingPoint num="32" id="1488" />
-<TGConnectingPoint num="33" id="1489" />
-<TGConnectingPoint num="34" id="1490" />
-<TGConnectingPoint num="35" id="1491" />
-<TGConnectingPoint num="36" id="1492" />
-<TGConnectingPoint num="37" id="1493" />
-<TGConnectingPoint num="38" id="1494" />
-<TGConnectingPoint num="39" id="1495" />
+<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" />
 <latencyCheck />
 <extraparam>
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1498" >
-<father id="1561" num="2" />
+<SUBCOMPONENT type="5100" id="1523" >
+<father id="1586" num="2" />
 <cdparam x="254" y="401" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1497" />
+<TGConnectingPoint num="0" id="1522" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1509" >
-<father id="1561" num="3" />
+<SUBCOMPONENT type="5104" id="1534" >
+<father id="1586" num="3" />
 <cdparam x="63" y="529" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1499" />
-<TGConnectingPoint num="1" id="1500" />
-<TGConnectingPoint num="2" id="1501" />
-<TGConnectingPoint num="3" id="1502" />
-<TGConnectingPoint num="4" id="1503" />
-<TGConnectingPoint num="5" id="1504" />
-<TGConnectingPoint num="6" id="1505" />
-<TGConnectingPoint num="7" id="1506" />
-<TGConnectingPoint num="8" id="1507" />
-<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="0" id="1524" />
+<TGConnectingPoint num="1" id="1525" />
+<TGConnectingPoint num="2" id="1526" />
+<TGConnectingPoint num="3" id="1527" />
+<TGConnectingPoint num="4" id="1528" />
+<TGConnectingPoint num="5" id="1529" />
+<TGConnectingPoint num="6" id="1530" />
+<TGConnectingPoint num="7" id="1531" />
+<TGConnectingPoint num="8" id="1532" />
+<TGConnectingPoint num="9" id="1533" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1520" >
-<father id="1561" num="4" />
+<SUBCOMPONENT type="5103" id="1545" >
+<father id="1586" num="4" />
 <cdparam x="377" y="502" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1510" />
-<TGConnectingPoint num="1" id="1511" />
-<TGConnectingPoint num="2" id="1512" />
-<TGConnectingPoint num="3" id="1513" />
-<TGConnectingPoint num="4" id="1514" />
-<TGConnectingPoint num="5" id="1515" />
-<TGConnectingPoint num="6" id="1516" />
-<TGConnectingPoint num="7" id="1517" />
-<TGConnectingPoint num="8" id="1518" />
-<TGConnectingPoint num="9" id="1519" />
+<TGConnectingPoint num="0" id="1535" />
+<TGConnectingPoint num="1" id="1536" />
+<TGConnectingPoint num="2" id="1537" />
+<TGConnectingPoint num="3" id="1538" />
+<TGConnectingPoint num="4" id="1539" />
+<TGConnectingPoint num="5" id="1540" />
+<TGConnectingPoint num="6" id="1541" />
+<TGConnectingPoint num="7" id="1542" />
+<TGConnectingPoint num="8" id="1543" />
+<TGConnectingPoint num="9" id="1544" />
 <accessibility />
 </SUBCOMPONENT>
 
@@ -3062,26 +3026,26 @@
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1568" >
+<CONNECTOR type="5102" id="1593" >
 <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="1567" />
-<P1  x="485" y="219" id="1609" />
-<P2  x="485" y="275" id="1620" />
+<TGConnectingPoint num="0" id="1592" />
+<P1  x="485" y="219" id="1634" />
+<P2  x="485" y="275" id="1645" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1566" >
-<father id="1568" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1591" >
+<father id="1593" num="0" />
 <cdparam x="493" y="251" />
 <sizeparam width="173" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1562" />
-<TGConnectingPoint num="1" id="1563" />
-<TGConnectingPoint num="2" id="1564" />
-<TGConnectingPoint num="3" id="1565" />
+<TGConnectingPoint num="0" id="1587" />
+<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="2" id="1589" />
+<TGConnectingPoint num="3" id="1590" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3094,26 +3058,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1575" >
+<CONNECTOR type="5102" id="1600" >
 <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="1574" />
-<P1  x="382" y="165" id="1716" />
-<P2  x="485" y="189" id="1608" />
+<TGConnectingPoint num="0" id="1599" />
+<P1  x="382" y="165" id="1741" />
+<P2  x="485" y="189" id="1633" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1573" >
-<father id="1575" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1598" >
+<father id="1600" num="0" />
 <cdparam x="419" y="170" />
 <sizeparam width="20" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1569" />
-<TGConnectingPoint num="1" id="1570" />
-<TGConnectingPoint num="2" id="1571" />
-<TGConnectingPoint num="3" id="1572" />
+<TGConnectingPoint num="0" id="1594" />
+<TGConnectingPoint num="1" id="1595" />
+<TGConnectingPoint num="2" id="1596" />
+<TGConnectingPoint num="3" id="1597" />
 <extraparam>
 <guard value="[]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3124,26 +3088,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1582" >
+<CONNECTOR type="5102" id="1607" >
 <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="1581" />
-<P1  x="251" y="231" id="1598" />
-<P2  x="252" y="300" id="1661" />
+<TGConnectingPoint num="0" id="1606" />
+<P1  x="251" y="231" id="1623" />
+<P2  x="252" y="300" id="1686" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1580" >
-<father id="1582" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1605" >
+<father id="1607" num="0" />
 <cdparam x="175" y="246" />
 <sizeparam width="225" height="60" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1576" />
-<TGConnectingPoint num="1" id="1577" />
-<TGConnectingPoint num="2" id="1578" />
-<TGConnectingPoint num="3" id="1579" />
+<TGConnectingPoint num="0" id="1601" />
+<TGConnectingPoint num="1" id="1602" />
+<TGConnectingPoint num="2" id="1603" />
+<TGConnectingPoint num="3" id="1604" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="minUserDelay" enabled="true"/>
@@ -3156,26 +3120,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1589" >
+<CONNECTOR type="5102" id="1614" >
 <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="1588" />
-<P1  x="357" y="165" id="1715" />
-<P2  x="251" y="201" id="1597" />
+<TGConnectingPoint num="0" id="1613" />
+<P1  x="357" y="165" id="1740" />
+<P2  x="251" y="201" id="1622" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1587" >
-<father id="1589" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1612" >
+<father id="1614" num="0" />
 <cdparam x="220" y="174" />
 <sizeparam width="99" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1583" />
-<TGConnectingPoint num="1" id="1584" />
-<TGConnectingPoint num="2" id="1585" />
-<TGConnectingPoint num="3" id="1586" />
+<TGConnectingPoint num="0" id="1608" />
+<TGConnectingPoint num="1" id="1609" />
+<TGConnectingPoint num="2" id="1610" />
+<TGConnectingPoint num="3" id="1611" />
 <extraparam>
 <guard value="[nbOfCoins &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3186,26 +3150,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1596" >
+<CONNECTOR type="5102" id="1621" >
 <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="1595" />
-<P1  x="370" y="64" id="1742" />
-<P2  x="370" y="135" id="1702" />
+<TGConnectingPoint num="0" id="1620" />
+<P1  x="370" y="64" id="1767" />
+<P2  x="370" y="135" id="1727" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1594" >
-<father id="1596" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1619" >
+<father id="1621" num="0" />
 <cdparam x="376" y="105" />
 <sizeparam width="173" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1590" />
-<TGConnectingPoint num="1" id="1591" />
-<TGConnectingPoint num="2" id="1592" />
-<TGConnectingPoint num="3" id="1593" />
+<TGConnectingPoint num="0" id="1615" />
+<TGConnectingPoint num="1" id="1616" />
+<TGConnectingPoint num="2" id="1617" />
+<TGConnectingPoint num="3" id="1618" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3217,217 +3181,204 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1607" >
+<COMPONENT type="5103" id="1632" >
 <cdparam x="217" y="206" />
 <sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="1597" />
-<TGConnectingPoint num="1" id="1598" />
-<TGConnectingPoint num="2" id="1599" />
-<TGConnectingPoint num="3" id="1600" />
-<TGConnectingPoint num="4" id="1601" />
-<TGConnectingPoint num="5" id="1602" />
-<TGConnectingPoint num="6" id="1603" />
-<TGConnectingPoint num="7" id="1604" />
-<TGConnectingPoint num="8" id="1605" />
-<TGConnectingPoint num="9" id="1606" />
+<TGConnectingPoint num="0" id="1622" />
+<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="2" id="1624" />
+<TGConnectingPoint num="3" id="1625" />
+<TGConnectingPoint num="4" id="1626" />
+<TGConnectingPoint num="5" id="1627" />
+<TGConnectingPoint num="6" id="1628" />
+<TGConnectingPoint num="7" id="1629" />
+<TGConnectingPoint num="8" id="1630" />
+<TGConnectingPoint num="9" id="1631" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1618" >
+<COMPONENT type="5104" id="1643" >
 <cdparam x="447" y="194" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1608" />
-<TGConnectingPoint num="1" id="1609" />
-<TGConnectingPoint num="2" id="1610" />
-<TGConnectingPoint num="3" id="1611" />
-<TGConnectingPoint num="4" id="1612" />
-<TGConnectingPoint num="5" id="1613" />
-<TGConnectingPoint num="6" id="1614" />
-<TGConnectingPoint num="7" id="1615" />
-<TGConnectingPoint num="8" id="1616" />
-<TGConnectingPoint num="9" id="1617" />
+<TGConnectingPoint num="0" id="1633" />
+<TGConnectingPoint num="1" id="1634" />
+<TGConnectingPoint num="2" id="1635" />
+<TGConnectingPoint num="3" id="1636" />
+<TGConnectingPoint num="4" id="1637" />
+<TGConnectingPoint num="5" id="1638" />
+<TGConnectingPoint num="6" id="1639" />
+<TGConnectingPoint num="7" id="1640" />
+<TGConnectingPoint num="8" id="1641" />
+<TGConnectingPoint num="9" id="1642" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1659" >
+<COMPONENT type="5106" id="1684" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-<TGConnectingPoint num="6" id="1625" />
-<TGConnectingPoint num="7" id="1626" />
-<TGConnectingPoint num="8" id="1627" />
-<TGConnectingPoint num="9" id="1628" />
-<TGConnectingPoint num="10" id="1629" />
-<TGConnectingPoint num="11" id="1630" />
-<TGConnectingPoint num="12" id="1631" />
-<TGConnectingPoint num="13" id="1632" />
-<TGConnectingPoint num="14" id="1633" />
-<TGConnectingPoint num="15" id="1634" />
-<TGConnectingPoint num="16" id="1635" />
-<TGConnectingPoint num="17" id="1636" />
-<TGConnectingPoint num="18" id="1637" />
-<TGConnectingPoint num="19" id="1638" />
-<TGConnectingPoint num="20" id="1639" />
-<TGConnectingPoint num="21" id="1640" />
-<TGConnectingPoint num="22" id="1641" />
-<TGConnectingPoint num="23" id="1642" />
-<TGConnectingPoint num="24" id="1643" />
-<TGConnectingPoint num="25" id="1644" />
-<TGConnectingPoint num="26" id="1645" />
-<TGConnectingPoint num="27" id="1646" />
-<TGConnectingPoint num="28" id="1647" />
-<TGConnectingPoint num="29" id="1648" />
-<TGConnectingPoint num="30" id="1649" />
-<TGConnectingPoint num="31" id="1650" />
-<TGConnectingPoint num="32" id="1651" />
-<TGConnectingPoint num="33" id="1652" />
-<TGConnectingPoint num="34" id="1653" />
-<TGConnectingPoint num="35" id="1654" />
-<TGConnectingPoint num="36" id="1655" />
-<TGConnectingPoint num="37" id="1656" />
-<TGConnectingPoint num="38" id="1657" />
-<TGConnectingPoint num="39" id="1658" />
+<TGConnectingPoint num="0" id="1644" />
+<TGConnectingPoint num="1" id="1645" />
+<TGConnectingPoint num="2" id="1646" />
+<TGConnectingPoint num="3" id="1647" />
+<TGConnectingPoint num="4" id="1648" />
+<TGConnectingPoint num="5" id="1649" />
+<TGConnectingPoint num="6" id="1650" />
+<TGConnectingPoint num="7" id="1651" />
+<TGConnectingPoint num="8" id="1652" />
+<TGConnectingPoint num="9" id="1653" />
+<TGConnectingPoint num="10" id="1654" />
+<TGConnectingPoint num="11" id="1655" />
+<TGConnectingPoint num="12" id="1656" />
+<TGConnectingPoint num="13" id="1657" />
+<TGConnectingPoint num="14" id="1658" />
+<TGConnectingPoint num="15" id="1659" />
+<TGConnectingPoint num="16" id="1660" />
+<TGConnectingPoint num="17" id="1661" />
+<TGConnectingPoint num="18" id="1662" />
+<TGConnectingPoint num="19" id="1663" />
+<TGConnectingPoint num="20" id="1664" />
+<TGConnectingPoint num="21" id="1665" />
+<TGConnectingPoint num="22" id="1666" />
+<TGConnectingPoint num="23" id="1667" />
+<TGConnectingPoint num="24" id="1668" />
+<TGConnectingPoint num="25" id="1669" />
+<TGConnectingPoint num="26" id="1670" />
+<TGConnectingPoint num="27" id="1671" />
+<TGConnectingPoint num="28" id="1672" />
+<TGConnectingPoint num="29" id="1673" />
+<TGConnectingPoint num="30" id="1674" />
+<TGConnectingPoint num="31" id="1675" />
+<TGConnectingPoint num="32" id="1676" />
+<TGConnectingPoint num="33" id="1677" />
+<TGConnectingPoint num="34" id="1678" />
+<TGConnectingPoint num="35" id="1679" />
+<TGConnectingPoint num="36" id="1680" />
+<TGConnectingPoint num="37" id="1681" />
+<TGConnectingPoint num="38" id="1682" />
+<TGConnectingPoint num="39" id="1683" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1700" >
+<COMPONENT type="5106" id="1725" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1660" />
-<TGConnectingPoint num="1" id="1661" />
-<TGConnectingPoint num="2" id="1662" />
-<TGConnectingPoint num="3" id="1663" />
-<TGConnectingPoint num="4" id="1664" />
-<TGConnectingPoint num="5" id="1665" />
-<TGConnectingPoint num="6" id="1666" />
-<TGConnectingPoint num="7" id="1667" />
-<TGConnectingPoint num="8" id="1668" />
-<TGConnectingPoint num="9" id="1669" />
-<TGConnectingPoint num="10" id="1670" />
-<TGConnectingPoint num="11" id="1671" />
-<TGConnectingPoint num="12" id="1672" />
-<TGConnectingPoint num="13" id="1673" />
-<TGConnectingPoint num="14" id="1674" />
-<TGConnectingPoint num="15" id="1675" />
-<TGConnectingPoint num="16" id="1676" />
-<TGConnectingPoint num="17" id="1677" />
-<TGConnectingPoint num="18" id="1678" />
-<TGConnectingPoint num="19" id="1679" />
-<TGConnectingPoint num="20" id="1680" />
-<TGConnectingPoint num="21" id="1681" />
-<TGConnectingPoint num="22" id="1682" />
-<TGConnectingPoint num="23" id="1683" />
-<TGConnectingPoint num="24" id="1684" />
-<TGConnectingPoint num="25" id="1685" />
-<TGConnectingPoint num="26" id="1686" />
-<TGConnectingPoint num="27" id="1687" />
-<TGConnectingPoint num="28" id="1688" />
-<TGConnectingPoint num="29" id="1689" />
-<TGConnectingPoint num="30" id="1690" />
-<TGConnectingPoint num="31" id="1691" />
-<TGConnectingPoint num="32" id="1692" />
-<TGConnectingPoint num="33" id="1693" />
-<TGConnectingPoint num="34" id="1694" />
-<TGConnectingPoint num="35" id="1695" />
-<TGConnectingPoint num="36" id="1696" />
-<TGConnectingPoint num="37" id="1697" />
-<TGConnectingPoint num="38" id="1698" />
-<TGConnectingPoint num="39" id="1699" />
+<TGConnectingPoint num="0" id="1685" />
+<TGConnectingPoint num="1" id="1686" />
+<TGConnectingPoint num="2" id="1687" />
+<TGConnectingPoint num="3" id="1688" />
+<TGConnectingPoint num="4" id="1689" />
+<TGConnectingPoint num="5" id="1690" />
+<TGConnectingPoint num="6" id="1691" />
+<TGConnectingPoint num="7" id="1692" />
+<TGConnectingPoint num="8" id="1693" />
+<TGConnectingPoint num="9" id="1694" />
+<TGConnectingPoint num="10" id="1695" />
+<TGConnectingPoint num="11" id="1696" />
+<TGConnectingPoint num="12" id="1697" />
+<TGConnectingPoint num="13" id="1698" />
+<TGConnectingPoint num="14" id="1699" />
+<TGConnectingPoint num="15" id="1700" />
+<TGConnectingPoint num="16" id="1701" />
+<TGConnectingPoint num="17" id="1702" />
+<TGConnectingPoint num="18" id="1703" />
+<TGConnectingPoint num="19" id="1704" />
+<TGConnectingPoint num="20" id="1705" />
+<TGConnectingPoint num="21" id="1706" />
+<TGConnectingPoint num="22" id="1707" />
+<TGConnectingPoint num="23" id="1708" />
+<TGConnectingPoint num="24" id="1709" />
+<TGConnectingPoint num="25" id="1710" />
+<TGConnectingPoint num="26" id="1711" />
+<TGConnectingPoint num="27" id="1712" />
+<TGConnectingPoint num="28" id="1713" />
+<TGConnectingPoint num="29" id="1714" />
+<TGConnectingPoint num="30" id="1715" />
+<TGConnectingPoint num="31" id="1716" />
+<TGConnectingPoint num="32" id="1717" />
+<TGConnectingPoint num="33" id="1718" />
+<TGConnectingPoint num="34" id="1719" />
+<TGConnectingPoint num="35" id="1720" />
+<TGConnectingPoint num="36" id="1721" />
+<TGConnectingPoint num="37" id="1722" />
+<TGConnectingPoint num="38" id="1723" />
+<TGConnectingPoint num="39" id="1724" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1741" >
+<COMPONENT type="5106" id="1766" >
 <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" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1701" />
-<TGConnectingPoint num="1" id="1702" />
-<TGConnectingPoint num="2" id="1703" />
-<TGConnectingPoint num="3" id="1704" />
-<TGConnectingPoint num="4" id="1705" />
-<TGConnectingPoint num="5" id="1706" />
-<TGConnectingPoint num="6" id="1707" />
-<TGConnectingPoint num="7" id="1708" />
-<TGConnectingPoint num="8" id="1709" />
-<TGConnectingPoint num="9" id="1710" />
-<TGConnectingPoint num="10" id="1711" />
-<TGConnectingPoint num="11" id="1712" />
-<TGConnectingPoint num="12" id="1713" />
-<TGConnectingPoint num="13" id="1714" />
-<TGConnectingPoint num="14" id="1715" />
-<TGConnectingPoint num="15" id="1716" />
-<TGConnectingPoint num="16" id="1717" />
-<TGConnectingPoint num="17" id="1718" />
-<TGConnectingPoint num="18" id="1719" />
-<TGConnectingPoint num="19" id="1720" />
-<TGConnectingPoint num="20" id="1721" />
-<TGConnectingPoint num="21" id="1722" />
-<TGConnectingPoint num="22" id="1723" />
-<TGConnectingPoint num="23" id="1724" />
-<TGConnectingPoint num="24" id="1725" />
-<TGConnectingPoint num="25" id="1726" />
-<TGConnectingPoint num="26" id="1727" />
-<TGConnectingPoint num="27" id="1728" />
-<TGConnectingPoint num="28" id="1729" />
-<TGConnectingPoint num="29" id="1730" />
-<TGConnectingPoint num="30" id="1731" />
-<TGConnectingPoint num="31" id="1732" />
-<TGConnectingPoint num="32" id="1733" />
-<TGConnectingPoint num="33" id="1734" />
-<TGConnectingPoint num="34" id="1735" />
-<TGConnectingPoint num="35" id="1736" />
-<TGConnectingPoint num="36" id="1737" />
-<TGConnectingPoint num="37" id="1738" />
-<TGConnectingPoint num="38" id="1739" />
-<TGConnectingPoint num="39" id="1740" />
+<TGConnectingPoint num="0" id="1726" />
+<TGConnectingPoint num="1" id="1727" />
+<TGConnectingPoint num="2" id="1728" />
+<TGConnectingPoint num="3" id="1729" />
+<TGConnectingPoint num="4" id="1730" />
+<TGConnectingPoint num="5" id="1731" />
+<TGConnectingPoint num="6" id="1732" />
+<TGConnectingPoint num="7" id="1733" />
+<TGConnectingPoint num="8" id="1734" />
+<TGConnectingPoint num="9" id="1735" />
+<TGConnectingPoint num="10" id="1736" />
+<TGConnectingPoint num="11" id="1737" />
+<TGConnectingPoint num="12" id="1738" />
+<TGConnectingPoint num="13" id="1739" />
+<TGConnectingPoint num="14" id="1740" />
+<TGConnectingPoint num="15" id="1741" />
+<TGConnectingPoint num="16" id="1742" />
+<TGConnectingPoint num="17" id="1743" />
+<TGConnectingPoint num="18" id="1744" />
+<TGConnectingPoint num="19" id="1745" />
+<TGConnectingPoint num="20" id="1746" />
+<TGConnectingPoint num="21" id="1747" />
+<TGConnectingPoint num="22" id="1748" />
+<TGConnectingPoint num="23" id="1749" />
+<TGConnectingPoint num="24" id="1750" />
+<TGConnectingPoint num="25" id="1751" />
+<TGConnectingPoint num="26" id="1752" />
+<TGConnectingPoint num="27" id="1753" />
+<TGConnectingPoint num="28" id="1754" />
+<TGConnectingPoint num="29" id="1755" />
+<TGConnectingPoint num="30" id="1756" />
+<TGConnectingPoint num="31" id="1757" />
+<TGConnectingPoint num="32" id="1758" />
+<TGConnectingPoint num="33" id="1759" />
+<TGConnectingPoint num="34" id="1760" />
+<TGConnectingPoint num="35" id="1761" />
+<TGConnectingPoint num="36" id="1762" />
+<TGConnectingPoint num="37" id="1763" />
+<TGConnectingPoint num="38" id="1764" />
+<TGConnectingPoint num="39" id="1765" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1743" >
+<COMPONENT type="5100" id="1768" >
 <cdparam x="363" y="44" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="1742" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="5100" id="1770" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1771" />
+<TGConnectingPoint num="0" id="1767" />
 </COMPONENT>
 
 
diff --git a/src/main/java/cli/Interpreter.java b/src/main/java/cli/Interpreter.java
index 76466b35ddced0a0a4ae4ea1b67c733c4d8dce66..8ce083554fac50ab471bcd46f85096102ca7a82a 100644
--- a/src/main/java/cli/Interpreter.java
+++ b/src/main/java/cli/Interpreter.java
@@ -109,7 +109,9 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
         String line;
         currentLine = 0;
         while ((line = term.getNextCommand()) != null) {
-            executeLine(line, currentLine, false);
+            for(String subCommand: line.split(";")) {
+                executeLine(subCommand, currentLine, false);
+            }
             currentLine++;
         }
     }
@@ -143,7 +145,10 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();
             currentLine++;
-            executeLine(line, currentLine, true);
+
+            for(String subCommand: line.split(";")) {
+                executeLine(subCommand, currentLine, true);
+            }
 
         }
         scanner.close();
diff --git a/src/main/java/cli/Mouse.java b/src/main/java/cli/Mouse.java
index 82dd7961e1dd32b415fcbd8ab352b796abd22bb7..70287c522805e2411148e5cc7cdd0e5926197cf1 100644
--- a/src/main/java/cli/Mouse.java
+++ b/src/main/java/cli/Mouse.java
@@ -306,10 +306,15 @@ public class Mouse extends Command {
             return Interpreter.BAD;
         }
 
-        int x = Integer.decode(cd.substring(0, indexSpace));
-        int y = Integer.decode(cd.substring(indexSpace+1, cd.length()));
+        try {
+            int x = Integer.decode(cd.substring(0, indexSpace));
+            int y = Integer.decode(cd.substring(indexSpace + 1, cd.length()));
+            robot.mouseMove(x, y);
+        } catch (Exception e) {
+            return Interpreter.BAD;
+        }
+
 
-        robot.mouseMove(x, y);
 
         return null;
     }
@@ -321,6 +326,7 @@ public class Mouse extends Command {
             return Interpreter.BAD;
         }
 
+        try {
         int x = Integer.decode(cd.substring(0, indexSpace));
         int y = Integer.decode(cd.substring(indexSpace+1, cd.length()));
 
@@ -329,6 +335,9 @@ public class Mouse extends Command {
         robot.mouseMove((int)(pi.getLocation().getX()) + x, (int)(pi.getLocation().getY()) + y);
 
         robot.mouseMove(x, y);
+        } catch (Exception e) {
+            return Interpreter.BAD;
+        }
 
         return null;
     }