diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index fbbe3b0051a938d2b7221b221ac492902f9b68e0..c2c30d251c62371aa515fe7c270dfd202316daac 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="2" LAST_SELECTED_SUB_TAB="1">
+<TURTLEGMODELING version="3.0 beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
 <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="1400" zoom="1.0" >
@@ -4610,7 +4610,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 
 
 
-<Modeling type="AVATAR Design" nameTab="Design__20230620_182150" tabs="Design$Wallet$CoffeeMachine$CoffeeButton$TeaButton" >
+<Modeling type="AVATAR Design" nameTab="Design__20230620_182150" tabs="Block Diagram$Wallet$CoffeeMachine$CoffeeButton$TeaButton" >
 <AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
@@ -4619,13 +4619,13 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="4417" index="0" uid="f8115c18-4ade-46d7-a413-ea6b1c175502" >
+<CONNECTOR type="5002" id="2544" index="0" uid="f8115c18-4ade-46d7-a413-ea6b1c175502" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="4418" />
-<P1  x="562" y="27" id="3907" />
-<P2  x="557" y="17" id="3069" />
+<TGConnectingPoint num="0" id="2543" />
+<P1  x="562" y="27" id="2549" />
+<P2  x="557" y="17" id="2639" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
 <extraparam>
@@ -4634,13 +4634,13 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4415" index="1" uid="ab6e0480-ea3f-4e98-a249-f8c70b5e23dd" >
+<CONNECTOR type="5002" id="2546" index="1" uid="ab6e0480-ea3f-4e98-a249-f8c70b5e23dd" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="4416" />
-<P1  x="302" y="52" id="2547" />
-<P2  x="442" y="17" id="3077" />
+<TGConnectingPoint num="0" id="2545" />
+<P1  x="302" y="52" id="2674" />
+<P2  x="442" y="17" id="2647" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
 <extraparam>
@@ -4651,13 +4651,13 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="4413" index="2" uid="6d8e9b85-2eae-450d-b394-8e0f301d09a7" >
+<CONNECTOR type="5002" id="2548" index="2" uid="6d8e9b85-2eae-450d-b394-8e0f301d09a7" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="4414" />
-<P1  x="452" y="27" id="3683" />
-<P2  x="442" y="17" id="3061" />
+<TGConnectingPoint num="0" id="2547" />
+<P1  x="452" y="27" id="2590" />
+<P2  x="442" y="17" id="2631" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
 <extraparam>
@@ -4666,63 +4666,63 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <FIFOType asynchronous="false" synchronousCH="true" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="3060" index="3" uid="afb77abb-26a6-4814-983c-50506a530bee" >
+<COMPONENT type="5000" id="2671" index="3" uid="afb77abb-26a6-4814-983c-50506a530bee" >
 <cdparam x="442" y="17" />
 <sizeparam width="460" height="356" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block" value="CoffeeMachine" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3061" />
-<TGConnectingPoint num="1" id="3062" />
-<TGConnectingPoint num="2" id="3063" />
-<TGConnectingPoint num="3" id="3064" />
-<TGConnectingPoint num="4" id="3065" />
-<TGConnectingPoint num="5" id="3066" />
-<TGConnectingPoint num="6" id="3067" />
-<TGConnectingPoint num="7" id="3068" />
-<TGConnectingPoint num="8" id="3069" />
-<TGConnectingPoint num="9" id="3070" />
-<TGConnectingPoint num="10" id="3071" />
-<TGConnectingPoint num="11" id="3072" />
-<TGConnectingPoint num="12" id="3073" />
-<TGConnectingPoint num="13" id="3074" />
-<TGConnectingPoint num="14" id="3075" />
-<TGConnectingPoint num="15" id="3076" />
-<TGConnectingPoint num="16" id="3077" />
-<TGConnectingPoint num="17" id="3078" />
-<TGConnectingPoint num="18" id="3079" />
-<TGConnectingPoint num="19" id="3080" />
-<TGConnectingPoint num="20" id="3081" />
-<TGConnectingPoint num="21" id="3082" />
-<TGConnectingPoint num="22" id="3083" />
-<TGConnectingPoint num="23" id="3084" />
-<TGConnectingPoint num="24" id="3085" />
-<TGConnectingPoint num="25" id="3086" />
-<TGConnectingPoint num="26" id="3087" />
-<TGConnectingPoint num="27" id="3088" />
-<TGConnectingPoint num="28" id="3089" />
-<TGConnectingPoint num="29" id="3090" />
-<TGConnectingPoint num="30" id="3091" />
-<TGConnectingPoint num="31" id="3092" />
-<TGConnectingPoint num="32" id="3093" />
-<TGConnectingPoint num="33" id="3094" />
-<TGConnectingPoint num="34" id="3095" />
-<TGConnectingPoint num="35" id="3096" />
-<TGConnectingPoint num="36" id="3097" />
-<TGConnectingPoint num="37" id="3098" />
-<TGConnectingPoint num="38" id="3099" />
-<TGConnectingPoint num="39" id="3100" />
+<TGConnectingPoint num="0" id="2631" />
+<TGConnectingPoint num="1" id="2632" />
+<TGConnectingPoint num="2" id="2633" />
+<TGConnectingPoint num="3" id="2634" />
+<TGConnectingPoint num="4" id="2635" />
+<TGConnectingPoint num="5" id="2636" />
+<TGConnectingPoint num="6" id="2637" />
+<TGConnectingPoint num="7" id="2638" />
+<TGConnectingPoint num="8" id="2639" />
+<TGConnectingPoint num="9" id="2640" />
+<TGConnectingPoint num="10" id="2641" />
+<TGConnectingPoint num="11" id="2642" />
+<TGConnectingPoint num="12" id="2643" />
+<TGConnectingPoint num="13" id="2644" />
+<TGConnectingPoint num="14" id="2645" />
+<TGConnectingPoint num="15" id="2646" />
+<TGConnectingPoint num="16" id="2647" />
+<TGConnectingPoint num="17" id="2648" />
+<TGConnectingPoint num="18" id="2649" />
+<TGConnectingPoint num="19" id="2650" />
+<TGConnectingPoint num="20" id="2651" />
+<TGConnectingPoint num="21" id="2652" />
+<TGConnectingPoint num="22" id="2653" />
+<TGConnectingPoint num="23" id="2654" />
+<TGConnectingPoint num="24" id="2655" />
+<TGConnectingPoint num="25" id="2656" />
+<TGConnectingPoint num="26" id="2657" />
+<TGConnectingPoint num="27" id="2658" />
+<TGConnectingPoint num="28" id="2659" />
+<TGConnectingPoint num="29" id="2660" />
+<TGConnectingPoint num="30" id="2661" />
+<TGConnectingPoint num="31" id="2662" />
+<TGConnectingPoint num="32" id="2663" />
+<TGConnectingPoint num="33" id="2664" />
+<TGConnectingPoint num="34" id="2665" />
+<TGConnectingPoint num="35" id="2666" />
+<TGConnectingPoint num="36" id="2667" />
+<TGConnectingPoint num="37" id="2668" />
+<TGConnectingPoint num="38" id="2669" />
+<TGConnectingPoint num="39" id="2670" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" var="0" id="teaMinDelay" value="3" type="0" typeOther="" />
-<Attribute access="0" var="0" id="teaMaxDelay" value="8" type="0" typeOther="" />
-<Attribute access="0" var="0" id="coffeeMinDelay" value="5" type="0" typeOther="" />
-<Attribute access="0" var="0" id="coffeeMaxDelay" value="10" type="0" typeOther="" />
-<Attribute access="0" var="0" id="coinDelay" value="50" type="0" typeOther="" />
-<Attribute access="0" var="0" id="x" value="0" type="0" typeOther="" />
-<Attribute access="0" var="0" id="nbOfCoins" value="0" type="0" typeOther="" />
+<Attribute access="0" var="0" id="teaMinDelay" value="3" type="8" typeOther="" />
+<Attribute access="0" var="0" id="teaMaxDelay" value="8" type="8" typeOther="" />
+<Attribute access="0" var="0" id="coffeeMinDelay" value="5" type="8" typeOther="" />
+<Attribute access="0" var="0" id="coffeeMaxDelay" value="10" type="8" typeOther="" />
+<Attribute access="0" var="0" id="coinDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" var="0" id="x" value="0" type="8" typeOther="" />
+<Attribute access="0" var="0" id="nbOfCoins" value="0" type="8" typeOther="" />
 <Method value="beverageReady()" />
 <Signal value="in pushCoffeeButton()" attached="true" />
 <Signal value="in pushTeaButton()" attached="true" />
@@ -4730,171 +4730,171 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="3906" index="-1" uid="a0d9b5cb-30dd-46c1-b2db-b3dcbb3c5105" >
-<father id="3060" num="0" />
+<SUBCOMPONENT type="5000" id="2589" index="5" uid="a0d9b5cb-30dd-46c1-b2db-b3dcbb3c5105" >
+<father id="2671" num="0" />
 <cdparam x="562" y="27" />
 <sizeparam width="100" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="360" minY="0" maxY="256" />
 <infoparam name="Block" value="TeaButton" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3907" />
-<TGConnectingPoint num="1" id="3908" />
-<TGConnectingPoint num="2" id="3909" />
-<TGConnectingPoint num="3" id="3910" />
-<TGConnectingPoint num="4" id="3911" />
-<TGConnectingPoint num="5" id="3912" />
-<TGConnectingPoint num="6" id="3913" />
-<TGConnectingPoint num="7" id="3914" />
-<TGConnectingPoint num="8" id="3915" />
-<TGConnectingPoint num="9" id="3916" />
-<TGConnectingPoint num="10" id="3917" />
-<TGConnectingPoint num="11" id="3918" />
-<TGConnectingPoint num="12" id="3919" />
-<TGConnectingPoint num="13" id="3920" />
-<TGConnectingPoint num="14" id="3921" />
-<TGConnectingPoint num="15" id="3922" />
-<TGConnectingPoint num="16" id="3923" />
-<TGConnectingPoint num="17" id="3924" />
-<TGConnectingPoint num="18" id="3925" />
-<TGConnectingPoint num="19" id="3926" />
-<TGConnectingPoint num="20" id="3927" />
-<TGConnectingPoint num="21" id="3928" />
-<TGConnectingPoint num="22" id="3929" />
-<TGConnectingPoint num="23" id="3930" />
-<TGConnectingPoint num="24" id="3931" />
-<TGConnectingPoint num="25" id="3932" />
-<TGConnectingPoint num="26" id="3933" />
-<TGConnectingPoint num="27" id="3934" />
-<TGConnectingPoint num="28" id="3935" />
-<TGConnectingPoint num="29" id="3936" />
-<TGConnectingPoint num="30" id="3937" />
-<TGConnectingPoint num="31" id="3938" />
-<TGConnectingPoint num="32" id="3939" />
-<TGConnectingPoint num="33" id="3940" />
-<TGConnectingPoint num="34" id="3941" />
-<TGConnectingPoint num="35" id="3942" />
-<TGConnectingPoint num="36" id="3943" />
-<TGConnectingPoint num="37" id="3944" />
-<TGConnectingPoint num="38" id="3945" />
-<TGConnectingPoint num="39" id="3946" />
+<TGConnectingPoint num="0" id="2549" />
+<TGConnectingPoint num="1" id="2550" />
+<TGConnectingPoint num="2" id="2551" />
+<TGConnectingPoint num="3" id="2552" />
+<TGConnectingPoint num="4" id="2553" />
+<TGConnectingPoint num="5" id="2554" />
+<TGConnectingPoint num="6" id="2555" />
+<TGConnectingPoint num="7" id="2556" />
+<TGConnectingPoint num="8" id="2557" />
+<TGConnectingPoint num="9" id="2558" />
+<TGConnectingPoint num="10" id="2559" />
+<TGConnectingPoint num="11" id="2560" />
+<TGConnectingPoint num="12" id="2561" />
+<TGConnectingPoint num="13" id="2562" />
+<TGConnectingPoint num="14" id="2563" />
+<TGConnectingPoint num="15" id="2564" />
+<TGConnectingPoint num="16" id="2565" />
+<TGConnectingPoint num="17" id="2566" />
+<TGConnectingPoint num="18" id="2567" />
+<TGConnectingPoint num="19" id="2568" />
+<TGConnectingPoint num="20" id="2569" />
+<TGConnectingPoint num="21" id="2570" />
+<TGConnectingPoint num="22" id="2571" />
+<TGConnectingPoint num="23" id="2572" />
+<TGConnectingPoint num="24" id="2573" />
+<TGConnectingPoint num="25" id="2574" />
+<TGConnectingPoint num="26" id="2575" />
+<TGConnectingPoint num="27" id="2576" />
+<TGConnectingPoint num="28" id="2577" />
+<TGConnectingPoint num="29" id="2578" />
+<TGConnectingPoint num="30" id="2579" />
+<TGConnectingPoint num="31" id="2580" />
+<TGConnectingPoint num="32" id="2581" />
+<TGConnectingPoint num="33" id="2582" />
+<TGConnectingPoint num="34" id="2583" />
+<TGConnectingPoint num="35" id="2584" />
+<TGConnectingPoint num="36" id="2585" />
+<TGConnectingPoint num="37" id="2586" />
+<TGConnectingPoint num="38" id="2587" />
+<TGConnectingPoint num="39" id="2588" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" var="0" id="mechanicalDelay" value="10" type="0" typeOther="" />
+<Attribute access="0" var="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3682" index="-1" uid="18a9cb79-9ab0-48e3-9fcb-a2e900023915" >
-<father id="3060" num="1" />
+<SUBCOMPONENT type="5000" id="2630" index="6" uid="18a9cb79-9ab0-48e3-9fcb-a2e900023915" >
+<father id="2671" num="1" />
 <cdparam x="452" y="27" />
 <sizeparam width="100" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="360" minY="0" maxY="256" />
 <infoparam name="Block" value="CoffeeButton" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3683" />
-<TGConnectingPoint num="1" id="3684" />
-<TGConnectingPoint num="2" id="3685" />
-<TGConnectingPoint num="3" id="3686" />
-<TGConnectingPoint num="4" id="3687" />
-<TGConnectingPoint num="5" id="3688" />
-<TGConnectingPoint num="6" id="3689" />
-<TGConnectingPoint num="7" id="3690" />
-<TGConnectingPoint num="8" id="3691" />
-<TGConnectingPoint num="9" id="3692" />
-<TGConnectingPoint num="10" id="3693" />
-<TGConnectingPoint num="11" id="3694" />
-<TGConnectingPoint num="12" id="3695" />
-<TGConnectingPoint num="13" id="3696" />
-<TGConnectingPoint num="14" id="3697" />
-<TGConnectingPoint num="15" id="3698" />
-<TGConnectingPoint num="16" id="3699" />
-<TGConnectingPoint num="17" id="3700" />
-<TGConnectingPoint num="18" id="3701" />
-<TGConnectingPoint num="19" id="3702" />
-<TGConnectingPoint num="20" id="3703" />
-<TGConnectingPoint num="21" id="3704" />
-<TGConnectingPoint num="22" id="3705" />
-<TGConnectingPoint num="23" id="3706" />
-<TGConnectingPoint num="24" id="3707" />
-<TGConnectingPoint num="25" id="3708" />
-<TGConnectingPoint num="26" id="3709" />
-<TGConnectingPoint num="27" id="3710" />
-<TGConnectingPoint num="28" id="3711" />
-<TGConnectingPoint num="29" id="3712" />
-<TGConnectingPoint num="30" id="3713" />
-<TGConnectingPoint num="31" id="3714" />
-<TGConnectingPoint num="32" id="3715" />
-<TGConnectingPoint num="33" id="3716" />
-<TGConnectingPoint num="34" id="3717" />
-<TGConnectingPoint num="35" id="3718" />
-<TGConnectingPoint num="36" id="3719" />
-<TGConnectingPoint num="37" id="3720" />
-<TGConnectingPoint num="38" id="3721" />
-<TGConnectingPoint num="39" id="3722" />
+<TGConnectingPoint num="0" id="2590" />
+<TGConnectingPoint num="1" id="2591" />
+<TGConnectingPoint num="2" id="2592" />
+<TGConnectingPoint num="3" id="2593" />
+<TGConnectingPoint num="4" id="2594" />
+<TGConnectingPoint num="5" id="2595" />
+<TGConnectingPoint num="6" id="2596" />
+<TGConnectingPoint num="7" id="2597" />
+<TGConnectingPoint num="8" id="2598" />
+<TGConnectingPoint num="9" id="2599" />
+<TGConnectingPoint num="10" id="2600" />
+<TGConnectingPoint num="11" id="2601" />
+<TGConnectingPoint num="12" id="2602" />
+<TGConnectingPoint num="13" id="2603" />
+<TGConnectingPoint num="14" id="2604" />
+<TGConnectingPoint num="15" id="2605" />
+<TGConnectingPoint num="16" id="2606" />
+<TGConnectingPoint num="17" id="2607" />
+<TGConnectingPoint num="18" id="2608" />
+<TGConnectingPoint num="19" id="2609" />
+<TGConnectingPoint num="20" id="2610" />
+<TGConnectingPoint num="21" id="2611" />
+<TGConnectingPoint num="22" id="2612" />
+<TGConnectingPoint num="23" id="2613" />
+<TGConnectingPoint num="24" id="2614" />
+<TGConnectingPoint num="25" id="2615" />
+<TGConnectingPoint num="26" id="2616" />
+<TGConnectingPoint num="27" id="2617" />
+<TGConnectingPoint num="28" id="2618" />
+<TGConnectingPoint num="29" id="2619" />
+<TGConnectingPoint num="30" id="2620" />
+<TGConnectingPoint num="31" id="2621" />
+<TGConnectingPoint num="32" id="2622" />
+<TGConnectingPoint num="33" id="2623" />
+<TGConnectingPoint num="34" id="2624" />
+<TGConnectingPoint num="35" id="2625" />
+<TGConnectingPoint num="36" id="2626" />
+<TGConnectingPoint num="37" id="2627" />
+<TGConnectingPoint num="38" id="2628" />
+<TGConnectingPoint num="39" id="2629" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" var="0" id="mechanicalDelay" value="10" type="0" typeOther="" />
+<Attribute access="0" var="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5000" id="2544" index="4" uid="02a323f2-6356-46bb-9724-dc223f2df95b" >
+<COMPONENT type="5000" id="2712" index="4" uid="02a323f2-6356-46bb-9724-dc223f2df95b" >
 <cdparam x="102" y="52" />
 <sizeparam width="200" height="216" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block" value="Wallet" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2545" />
-<TGConnectingPoint num="1" id="2546" />
-<TGConnectingPoint num="2" id="2547" />
-<TGConnectingPoint num="3" id="2548" />
-<TGConnectingPoint num="4" id="2549" />
-<TGConnectingPoint num="5" id="2550" />
-<TGConnectingPoint num="6" id="2551" />
-<TGConnectingPoint num="7" id="2552" />
-<TGConnectingPoint num="8" id="2553" />
-<TGConnectingPoint num="9" id="2554" />
-<TGConnectingPoint num="10" id="2555" />
-<TGConnectingPoint num="11" id="2556" />
-<TGConnectingPoint num="12" id="2557" />
-<TGConnectingPoint num="13" id="2558" />
-<TGConnectingPoint num="14" id="2559" />
-<TGConnectingPoint num="15" id="2560" />
-<TGConnectingPoint num="16" id="2561" />
-<TGConnectingPoint num="17" id="2562" />
-<TGConnectingPoint num="18" id="2563" />
-<TGConnectingPoint num="19" id="2564" />
-<TGConnectingPoint num="20" id="2565" />
-<TGConnectingPoint num="21" id="2566" />
-<TGConnectingPoint num="22" id="2567" />
-<TGConnectingPoint num="23" id="2568" />
-<TGConnectingPoint num="24" id="2569" />
-<TGConnectingPoint num="25" id="2570" />
-<TGConnectingPoint num="26" id="2571" />
-<TGConnectingPoint num="27" id="2572" />
-<TGConnectingPoint num="28" id="2573" />
-<TGConnectingPoint num="29" id="2574" />
-<TGConnectingPoint num="30" id="2575" />
-<TGConnectingPoint num="31" id="2576" />
-<TGConnectingPoint num="32" id="2577" />
-<TGConnectingPoint num="33" id="2578" />
-<TGConnectingPoint num="34" id="2579" />
-<TGConnectingPoint num="35" id="2580" />
-<TGConnectingPoint num="36" id="2581" />
-<TGConnectingPoint num="37" id="2582" />
-<TGConnectingPoint num="38" id="2583" />
-<TGConnectingPoint num="39" id="2584" />
+<TGConnectingPoint num="0" id="2672" />
+<TGConnectingPoint num="1" id="2673" />
+<TGConnectingPoint num="2" id="2674" />
+<TGConnectingPoint num="3" id="2675" />
+<TGConnectingPoint num="4" id="2676" />
+<TGConnectingPoint num="5" id="2677" />
+<TGConnectingPoint num="6" id="2678" />
+<TGConnectingPoint num="7" id="2679" />
+<TGConnectingPoint num="8" id="2680" />
+<TGConnectingPoint num="9" id="2681" />
+<TGConnectingPoint num="10" id="2682" />
+<TGConnectingPoint num="11" id="2683" />
+<TGConnectingPoint num="12" id="2684" />
+<TGConnectingPoint num="13" id="2685" />
+<TGConnectingPoint num="14" id="2686" />
+<TGConnectingPoint num="15" id="2687" />
+<TGConnectingPoint num="16" id="2688" />
+<TGConnectingPoint num="17" id="2689" />
+<TGConnectingPoint num="18" id="2690" />
+<TGConnectingPoint num="19" id="2691" />
+<TGConnectingPoint num="20" id="2692" />
+<TGConnectingPoint num="21" id="2693" />
+<TGConnectingPoint num="22" id="2694" />
+<TGConnectingPoint num="23" id="2695" />
+<TGConnectingPoint num="24" id="2696" />
+<TGConnectingPoint num="25" id="2697" />
+<TGConnectingPoint num="26" id="2698" />
+<TGConnectingPoint num="27" id="2699" />
+<TGConnectingPoint num="28" id="2700" />
+<TGConnectingPoint num="29" id="2701" />
+<TGConnectingPoint num="30" id="2702" />
+<TGConnectingPoint num="31" id="2703" />
+<TGConnectingPoint num="32" id="2704" />
+<TGConnectingPoint num="33" id="2705" />
+<TGConnectingPoint num="34" id="2706" />
+<TGConnectingPoint num="35" id="2707" />
+<TGConnectingPoint num="36" id="2708" />
+<TGConnectingPoint num="37" id="2709" />
+<TGConnectingPoint num="38" id="2710" />
+<TGConnectingPoint num="39" id="2711" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" var="0" id="nbOfCoins" value="2" type="0" typeOther="" />
-<Attribute access="0" var="0" id="x" value="1" type="0" typeOther="" />
-<Attribute access="0" var="0" id="minUserDelay" value="50" type="0" typeOther="" />
-<Attribute access="0" var="0" id="maxUserDelay" value="70" type="0" typeOther="" />
+<Attribute access="0" var="0" id="nbOfCoins" value="2" type="8" typeOther="" />
+<Attribute access="0" var="0" id="x" value="1" type="8" typeOther="" />
+<Attribute access="0" var="0" id="minUserDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" var="0" id="maxUserDelay" value="70" type="8" typeOther="" />
 <Method value="contentOfWallet(int nbOfCoins)" />
 <Signal value="in getCoin(int nbOfCoins)" attached="true" />
 <Signal value="out putCoin(int nbOfCoins)" attached="true" />
@@ -4906,28 +4906,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="5102" id="3053" index="0" uid="3eb2d17b-7213-4a7a-b863-1b6192162e11" >
+<CONNECTOR type="5102" id="2719" index="0" uid="3eb2d17b-7213-4a7a-b863-1b6192162e11" >
 <cdparam x="502" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3054" />
-<P1  x="502" y="290" id="2703" />
-<P2  x="788" y="340" id="2768" />
+<TGConnectingPoint num="0" id="2718" />
+<P1  x="502" y="290" id="3024" />
+<P2  x="788" y="340" id="2911" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3055" index="-1" uid="347561be-a740-40e8-83ca-06703d04c04a" >
-<father id="3053" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2717" index="22" uid="347561be-a740-40e8-83ca-06703d04c04a" >
+<father id="2719" num="0" />
 <cdparam x="645" y="315" />
-<sizeparam width="100" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3056" />
-<TGConnectingPoint num="1" id="3057" />
-<TGConnectingPoint num="2" id="3058" />
-<TGConnectingPoint num="3" id="3059" />
+<TGConnectingPoint num="0" id="2713" />
+<TGConnectingPoint num="1" id="2714" />
+<TGConnectingPoint num="2" id="2715" />
+<TGConnectingPoint num="3" id="2716" />
 <extraparam>
 <guard value="nbOfCoins == 2" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -4941,28 +4941,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3046" index="1" uid="2484e23a-d569-4577-84b5-d1e02031e182" >
+<CONNECTOR type="5102" id="2726" index="1" uid="2484e23a-d569-4577-84b5-d1e02031e182" >
 <cdparam x="415" y="365" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3047" />
-<P1  x="415" y="365" id="2751" />
-<P2  x="500" y="158" id="2619" />
+<TGConnectingPoint num="0" id="2725" />
+<P1  x="415" y="365" id="2984" />
+<P2  x="500" y="158" id="3090" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3048" index="-1" uid="7ebd3054-d80a-4ff2-8256-a6555b4929aa" >
-<father id="3046" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2724" index="23" uid="7ebd3054-d80a-4ff2-8256-a6555b4929aa" >
+<father id="2726" num="0" />
 <cdparam x="457" y="261" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3049" />
-<TGConnectingPoint num="1" id="3050" />
-<TGConnectingPoint num="2" id="3051" />
-<TGConnectingPoint num="3" id="3052" />
+<TGConnectingPoint num="0" id="2720" />
+<TGConnectingPoint num="1" id="2721" />
+<TGConnectingPoint num="2" id="2722" />
+<TGConnectingPoint num="3" id="2723" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -4976,28 +4976,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3039" index="2" uid="d6f3e4a8-01c7-4995-92fe-8a9fb972fb4a" >
+<CONNECTOR type="5102" id="2733" index="2" uid="d6f3e4a8-01c7-4995-92fe-8a9fb972fb4a" >
 <cdparam x="788" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3040" />
-<P1  x="788" y="390" id="2805" />
-<P2  x="1088" y="440" id="2862" />
+<TGConnectingPoint num="0" id="2732" />
+<P1  x="788" y="390" id="2948" />
+<P2  x="1088" y="440" id="2827" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3041" index="-1" uid="e5727834-b637-481d-b16d-2c3fc794e75b" >
-<father id="3039" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2731" index="24" uid="e5727834-b637-481d-b16d-2c3fc794e75b" >
+<father id="2733" num="0" />
 <cdparam x="938" y="415" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3042" />
-<TGConnectingPoint num="1" id="3043" />
-<TGConnectingPoint num="2" id="3044" />
-<TGConnectingPoint num="3" id="3045" />
+<TGConnectingPoint num="0" id="2727" />
+<TGConnectingPoint num="1" id="2728" />
+<TGConnectingPoint num="2" id="2729" />
+<TGConnectingPoint num="3" id="2730" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5011,28 +5011,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3032" index="3" uid="632a9fa4-4a96-4855-b624-6ca050b5944b" >
+<CONNECTOR type="5102" id="2740" index="3" uid="632a9fa4-4a96-4855-b624-6ca050b5944b" >
 <cdparam x="788" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3033" />
-<P1  x="788" y="390" id="2773" />
-<P2  x="715" y="435" id="2844" />
+<TGConnectingPoint num="0" id="2739" />
+<P1  x="788" y="390" id="2916" />
+<P2  x="715" y="435" id="2899" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3034" index="-1" uid="6847d868-03a1-4948-a8c2-73edc5b55a1a" >
-<father id="3032" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2738" index="25" uid="6847d868-03a1-4948-a8c2-73edc5b55a1a" >
+<father id="2740" num="0" />
 <cdparam x="751" y="412" />
-<sizeparam width="210" height="47" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="210" height="47" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3035" />
-<TGConnectingPoint num="1" id="3036" />
-<TGConnectingPoint num="2" id="3037" />
-<TGConnectingPoint num="3" id="3038" />
+<TGConnectingPoint num="0" id="2734" />
+<TGConnectingPoint num="1" id="2735" />
+<TGConnectingPoint num="2" id="2736" />
+<TGConnectingPoint num="3" id="2737" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="minUserDelay" enabled="true"/>
@@ -5048,28 +5048,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3025" index="4" uid="4400b097-d0fd-47ec-9bed-8a265455504c" >
+<CONNECTOR type="5102" id="2747" index="4" uid="4400b097-d0fd-47ec-9bed-8a265455504c" >
 <cdparam x="1015" y="565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3026" />
-<P1  x="1015" y="565" id="2939" />
-<P2  x="500" y="171" id="2654" />
+<TGConnectingPoint num="0" id="2746" />
+<P1  x="1015" y="565" id="2816" />
+<P2  x="500" y="171" id="3125" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3027" index="-1" uid="e9294d68-90ee-4a69-a20b-ffa0e7d82a8b" >
-<father id="3025" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2745" index="26" uid="e9294d68-90ee-4a69-a20b-ffa0e7d82a8b" >
+<father id="2747" num="0" />
 <cdparam x="757" y="368" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3028" />
-<TGConnectingPoint num="1" id="3029" />
-<TGConnectingPoint num="2" id="3030" />
-<TGConnectingPoint num="3" id="3031" />
+<TGConnectingPoint num="0" id="2741" />
+<TGConnectingPoint num="1" id="2742" />
+<TGConnectingPoint num="2" id="2743" />
+<TGConnectingPoint num="3" id="2744" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5083,28 +5083,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3018" index="5" uid="6087a03b-a546-4c7b-b0a0-334da64b78a0" >
+<CONNECTOR type="5102" id="2754" index="5" uid="6087a03b-a546-4c7b-b0a0-334da64b78a0" >
 <cdparam x="1315" y="565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3019" />
-<P1  x="1315" y="565" id="2956" />
-<P2  x="500" y="171" id="2622" />
+<TGConnectingPoint num="0" id="2753" />
+<P1  x="1315" y="565" id="2805" />
+<P2  x="500" y="171" id="3093" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3020" index="-1" uid="468961f5-8534-4d24-9dce-fe2941b0cb81" >
-<father id="3018" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2752" index="27" uid="468961f5-8534-4d24-9dce-fe2941b0cb81" >
+<father id="2754" num="0" />
 <cdparam x="907" y="368" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3021" />
-<TGConnectingPoint num="1" id="3022" />
-<TGConnectingPoint num="2" id="3023" />
-<TGConnectingPoint num="3" id="3024" />
+<TGConnectingPoint num="0" id="2748" />
+<TGConnectingPoint num="1" id="2749" />
+<TGConnectingPoint num="2" id="2750" />
+<TGConnectingPoint num="3" id="2751" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5118,28 +5118,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3011" index="6" uid="229c6558-66ae-41ca-bbfb-a945c5389e2f" >
+<CONNECTOR type="5102" id="2761" index="6" uid="229c6558-66ae-41ca-bbfb-a945c5389e2f" >
 <cdparam x="715" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3012" />
-<P1  x="715" y="465" id="2845" />
-<P2  x="500" y="165" id="2632" />
+<TGConnectingPoint num="0" id="2760" />
+<P1  x="715" y="465" id="2900" />
+<P2  x="500" y="165" id="3103" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3013" index="-1" uid="13ff5ac6-9021-4943-a9c9-facc3654e2ad" >
-<father id="3011" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2759" index="28" uid="13ff5ac6-9021-4943-a9c9-facc3654e2ad" >
+<father id="2761" num="0" />
 <cdparam x="607" y="315" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3014" />
-<TGConnectingPoint num="1" id="3015" />
-<TGConnectingPoint num="2" id="3016" />
-<TGConnectingPoint num="3" id="3017" />
+<TGConnectingPoint num="0" id="2755" />
+<TGConnectingPoint num="1" id="2756" />
+<TGConnectingPoint num="2" id="2757" />
+<TGConnectingPoint num="3" id="2758" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5153,28 +5153,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3004" index="7" uid="a0627d6b-8ad3-4aa5-a810-2e1f26f9e914" >
+<CONNECTOR type="5102" id="2768" index="7" uid="a0627d6b-8ad3-4aa5-a810-2e1f26f9e914" >
 <cdparam x="482" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3005" />
-<P1  x="482" y="290" id="2711" />
-<P2  x="415" y="335" id="2750" />
+<TGConnectingPoint num="0" id="2767" />
+<P1  x="482" y="290" id="3032" />
+<P2  x="415" y="335" id="2983" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3006" index="-1" uid="3ca773d6-78a5-41f1-913f-e550580e71d8" >
-<father id="3004" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2766" index="29" uid="3ca773d6-78a5-41f1-913f-e550580e71d8" >
+<father id="2768" num="0" />
 <cdparam x="448" y="312" />
-<sizeparam width="90" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="90" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3007" />
-<TGConnectingPoint num="1" id="3008" />
-<TGConnectingPoint num="2" id="3009" />
-<TGConnectingPoint num="3" id="3010" />
+<TGConnectingPoint num="0" id="2762" />
+<TGConnectingPoint num="1" id="2763" />
+<TGConnectingPoint num="2" id="2764" />
+<TGConnectingPoint num="3" id="2765" />
 <extraparam>
 <guard value="nbOfCoins &lt; 2" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5188,28 +5188,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2997" index="8" uid="f0dc614f-c5d6-448f-b859-988b9018c886" >
+<CONNECTOR type="5102" id="2775" index="8" uid="f0dc614f-c5d6-448f-b859-988b9018c886" >
 <cdparam x="482" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2998" />
-<P1  x="482" y="290" id="2679" />
-<P2  x="500" y="165" id="2600" />
+<TGConnectingPoint num="0" id="2774" />
+<P1  x="482" y="290" id="3000" />
+<P2  x="500" y="165" id="3071" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2999" index="-1" uid="c5b06977-fd0e-4dac-b161-7ca15bed3259" >
-<father id="2997" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2773" index="30" uid="c5b06977-fd0e-4dac-b161-7ca15bed3259" >
+<father id="2775" num="0" />
 <cdparam x="491" y="227" />
-<sizeparam width="90" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="90" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3000" />
-<TGConnectingPoint num="1" id="3001" />
-<TGConnectingPoint num="2" id="3002" />
-<TGConnectingPoint num="3" id="3003" />
+<TGConnectingPoint num="0" id="2769" />
+<TGConnectingPoint num="1" id="2770" />
+<TGConnectingPoint num="2" id="2771" />
+<TGConnectingPoint num="3" id="2772" />
 <extraparam>
 <guard value="nbOfCoins &gt; 2" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5223,28 +5223,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2990" index="9" uid="5bd512a7-387f-4851-8df3-dc16ad671dcc" >
+<CONNECTOR type="5102" id="2782" index="9" uid="5bd512a7-387f-4851-8df3-dc16ad671dcc" >
 <cdparam x="1088" y="490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2991" />
-<P1  x="1088" y="490" id="2899" />
-<P2  x="1315" y="535" id="2955" />
+<TGConnectingPoint num="0" id="2781" />
+<P1  x="1088" y="490" id="2864" />
+<P2  x="1315" y="535" id="2804" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2992" index="-1" uid="4db5e2b6-4c07-4d51-893d-a7300c19a8f1" >
-<father id="2990" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2780" index="31" uid="4db5e2b6-4c07-4d51-893d-a7300c19a8f1" >
+<father id="2782" num="0" />
 <cdparam x="1201" y="512" />
-<sizeparam width="82" height="32" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="82" height="32" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2993" />
-<TGConnectingPoint num="1" id="2994" />
-<TGConnectingPoint num="2" id="2995" />
-<TGConnectingPoint num="3" id="2996" />
+<TGConnectingPoint num="0" id="2776" />
+<TGConnectingPoint num="1" id="2777" />
+<TGConnectingPoint num="2" id="2778" />
+<TGConnectingPoint num="3" id="2779" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5260,28 +5260,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2983" index="10" uid="1a951c46-71fc-4c69-883b-f49dfc9d1a7c" >
+<CONNECTOR type="5102" id="2789" index="10" uid="1a951c46-71fc-4c69-883b-f49dfc9d1a7c" >
 <cdparam x="1088" y="490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2984" />
-<P1  x="1088" y="490" id="2867" />
-<P2  x="1015" y="535" id="2938" />
+<TGConnectingPoint num="0" id="2788" />
+<P1  x="1088" y="490" id="2832" />
+<P2  x="1015" y="535" id="2815" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2985" index="-1" uid="60e13470-dbf6-482a-b162-015b0b62d907" >
-<father id="2983" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2787" index="32" uid="60e13470-dbf6-482a-b162-015b0b62d907" >
+<father id="2789" num="0" />
 <cdparam x="1051" y="512" />
-<sizeparam width="218" height="47" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="218" height="47" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2986" />
-<TGConnectingPoint num="1" id="2987" />
-<TGConnectingPoint num="2" id="2988" />
-<TGConnectingPoint num="3" id="2989" />
+<TGConnectingPoint num="0" id="2783" />
+<TGConnectingPoint num="1" id="2784" />
+<TGConnectingPoint num="2" id="2785" />
+<TGConnectingPoint num="3" id="2786" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="maxUserDelay" enabled="true"/>
@@ -5297,28 +5297,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2976" index="11" uid="1f859134-d63d-4986-a471-615f9db08564" >
+<CONNECTOR type="5102" id="2796" index="11" uid="1f859134-d63d-4986-a471-615f9db08564" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2977" />
-<P1  x="407" y="60" id="2590" />
-<P2  x="450" y="140" id="2597" />
+<TGConnectingPoint num="0" id="2795" />
+<P1  x="407" y="60" id="3140" />
+<P2  x="450" y="140" id="3068" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2978" index="-1" uid="e039dde2-56f7-48ca-929f-ee8bbb7838f9" >
-<father id="2976" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2794" index="33" uid="e039dde2-56f7-48ca-929f-ee8bbb7838f9" >
+<father id="2796" num="0" />
 <cdparam x="428" y="100" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2979" />
-<TGConnectingPoint num="1" id="2980" />
-<TGConnectingPoint num="2" id="2981" />
-<TGConnectingPoint num="3" id="2982" />
+<TGConnectingPoint num="0" id="2790" />
+<TGConnectingPoint num="1" id="2791" />
+<TGConnectingPoint num="2" id="2792" />
+<TGConnectingPoint num="3" id="2793" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5332,28 +5332,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2969" index="12" uid="dc1a701a-c4e0-4c42-b63e-b541d9c3a8d2" >
+<CONNECTOR type="5102" id="2803" index="12" uid="dc1a701a-c4e0-4c42-b63e-b541d9c3a8d2" >
 <cdparam x="450" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="2970" />
-<P1  x="450" y="190" id="2602" />
-<P2  x="482" y="240" id="2674" />
+<TGConnectingPoint num="0" id="2802" />
+<P1  x="450" y="190" id="3073" />
+<P2  x="482" y="240" id="2995" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2971" index="-1" uid="5dbc1356-ed18-4335-b82e-d747ee8490e4" >
-<father id="2969" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2801" index="34" uid="5dbc1356-ed18-4335-b82e-d747ee8490e4" >
+<father id="2803" num="0" />
 <cdparam x="466" y="215" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2972" />
-<TGConnectingPoint num="1" id="2973" />
-<TGConnectingPoint num="2" id="2974" />
-<TGConnectingPoint num="3" id="2975" />
+<TGConnectingPoint num="0" id="2797" />
+<TGConnectingPoint num="1" id="2798" />
+<TGConnectingPoint num="2" id="2799" />
+<TGConnectingPoint num="3" id="2800" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5367,47 +5367,47 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="2954" index="13" uid="b8188665-3627-4a22-94c6-92f3bd59a34f" >
+<COMPONENT type="5104" id="2814" index="13" uid="b8188665-3627-4a22-94c6-92f3bd59a34f" >
 <cdparam x="1281" y="540" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="getCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2955" />
-<TGConnectingPoint num="1" id="2956" />
-<TGConnectingPoint num="2" id="2957" />
-<TGConnectingPoint num="3" id="2958" />
-<TGConnectingPoint num="4" id="2959" />
-<TGConnectingPoint num="5" id="2960" />
-<TGConnectingPoint num="6" id="2961" />
-<TGConnectingPoint num="7" id="2962" />
-<TGConnectingPoint num="8" id="2963" />
-<TGConnectingPoint num="9" id="2964" />
+<TGConnectingPoint num="0" id="2804" />
+<TGConnectingPoint num="1" id="2805" />
+<TGConnectingPoint num="2" id="2806" />
+<TGConnectingPoint num="3" id="2807" />
+<TGConnectingPoint num="4" id="2808" />
+<TGConnectingPoint num="5" id="2809" />
+<TGConnectingPoint num="6" id="2810" />
+<TGConnectingPoint num="7" id="2811" />
+<TGConnectingPoint num="8" id="2812" />
+<TGConnectingPoint num="9" id="2813" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="2937" index="14" uid="88a2e59c-c105-4fa0-86cb-bdb8c2aa2ae5" >
+<COMPONENT type="5103" id="2825" index="14" uid="88a2e59c-c105-4fa0-86cb-bdb8c2aa2ae5" >
 <cdparam x="980" y="540" />
-<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="ejectCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2938" />
-<TGConnectingPoint num="1" id="2939" />
-<TGConnectingPoint num="2" id="2940" />
-<TGConnectingPoint num="3" id="2941" />
-<TGConnectingPoint num="4" id="2942" />
-<TGConnectingPoint num="5" id="2943" />
-<TGConnectingPoint num="6" id="2944" />
-<TGConnectingPoint num="7" id="2945" />
-<TGConnectingPoint num="8" id="2946" />
-<TGConnectingPoint num="9" id="2947" />
+<TGConnectingPoint num="0" id="2815" />
+<TGConnectingPoint num="1" id="2816" />
+<TGConnectingPoint num="2" id="2817" />
+<TGConnectingPoint num="3" id="2818" />
+<TGConnectingPoint num="4" id="2819" />
+<TGConnectingPoint num="5" id="2820" />
+<TGConnectingPoint num="6" id="2821" />
+<TGConnectingPoint num="7" id="2822" />
+<TGConnectingPoint num="8" id="2823" />
+<TGConnectingPoint num="9" id="2824" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2860" index="15" uid="42489202-9816-463b-b35d-fe6f1bcdb387" >
+<COMPONENT type="5106" id="2898" index="15" uid="42489202-9816-463b-b35d-fe6f1bcdb387" >
 <cdparam x="1000" y="440" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -5415,103 +5415,103 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="beverageSelected" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2861" />
-<TGConnectingPoint num="1" id="2862" />
-<TGConnectingPoint num="2" id="2863" />
-<TGConnectingPoint num="3" id="2864" />
-<TGConnectingPoint num="4" id="2865" />
-<TGConnectingPoint num="5" id="2866" />
-<TGConnectingPoint num="6" id="2867" />
-<TGConnectingPoint num="7" id="2868" />
-<TGConnectingPoint num="8" id="2869" />
-<TGConnectingPoint num="9" id="2870" />
-<TGConnectingPoint num="10" id="2871" />
-<TGConnectingPoint num="11" id="2872" />
-<TGConnectingPoint num="12" id="2873" />
-<TGConnectingPoint num="13" id="2874" />
-<TGConnectingPoint num="14" id="2875" />
-<TGConnectingPoint num="15" id="2876" />
-<TGConnectingPoint num="16" id="2877" />
-<TGConnectingPoint num="17" id="2878" />
-<TGConnectingPoint num="18" id="2879" />
-<TGConnectingPoint num="19" id="2880" />
-<TGConnectingPoint num="20" id="2881" />
-<TGConnectingPoint num="21" id="2882" />
-<TGConnectingPoint num="22" id="2883" />
-<TGConnectingPoint num="23" id="2884" />
-<TGConnectingPoint num="24" id="2885" />
-<TGConnectingPoint num="25" id="2886" />
-<TGConnectingPoint num="26" id="2887" />
-<TGConnectingPoint num="27" id="2888" />
-<TGConnectingPoint num="28" id="2889" />
-<TGConnectingPoint num="29" id="2890" />
-<TGConnectingPoint num="30" id="2891" />
-<TGConnectingPoint num="31" id="2892" />
-<TGConnectingPoint num="32" id="2893" />
-<TGConnectingPoint num="33" id="2894" />
-<TGConnectingPoint num="34" id="2895" />
-<TGConnectingPoint num="35" id="2896" />
-<TGConnectingPoint num="36" id="2897" />
-<TGConnectingPoint num="37" id="2898" />
-<TGConnectingPoint num="38" id="2899" />
-<TGConnectingPoint num="39" id="2900" />
-<TGConnectingPoint num="40" id="2901" />
-<TGConnectingPoint num="41" id="2902" />
-<TGConnectingPoint num="42" id="2903" />
-<TGConnectingPoint num="43" id="2904" />
-<TGConnectingPoint num="44" id="2905" />
-<TGConnectingPoint num="45" id="2906" />
-<TGConnectingPoint num="46" id="2907" />
-<TGConnectingPoint num="47" id="2908" />
-<TGConnectingPoint num="48" id="2909" />
-<TGConnectingPoint num="49" id="2910" />
-<TGConnectingPoint num="50" id="2911" />
-<TGConnectingPoint num="51" id="2912" />
-<TGConnectingPoint num="52" id="2913" />
-<TGConnectingPoint num="53" id="2914" />
-<TGConnectingPoint num="54" id="2915" />
-<TGConnectingPoint num="55" id="2916" />
-<TGConnectingPoint num="56" id="2917" />
-<TGConnectingPoint num="57" id="2918" />
-<TGConnectingPoint num="58" id="2919" />
-<TGConnectingPoint num="59" id="2920" />
-<TGConnectingPoint num="60" id="2921" />
-<TGConnectingPoint num="61" id="2922" />
-<TGConnectingPoint num="62" id="2923" />
-<TGConnectingPoint num="63" id="2924" />
-<TGConnectingPoint num="64" id="2925" />
-<TGConnectingPoint num="65" id="2926" />
-<TGConnectingPoint num="66" id="2927" />
-<TGConnectingPoint num="67" id="2928" />
-<TGConnectingPoint num="68" id="2929" />
-<TGConnectingPoint num="69" id="2930" />
-<TGConnectingPoint num="70" id="2931" />
-<TGConnectingPoint num="71" id="2932" />
+<TGConnectingPoint num="0" id="2826" />
+<TGConnectingPoint num="1" id="2827" />
+<TGConnectingPoint num="2" id="2828" />
+<TGConnectingPoint num="3" id="2829" />
+<TGConnectingPoint num="4" id="2830" />
+<TGConnectingPoint num="5" id="2831" />
+<TGConnectingPoint num="6" id="2832" />
+<TGConnectingPoint num="7" id="2833" />
+<TGConnectingPoint num="8" id="2834" />
+<TGConnectingPoint num="9" id="2835" />
+<TGConnectingPoint num="10" id="2836" />
+<TGConnectingPoint num="11" id="2837" />
+<TGConnectingPoint num="12" id="2838" />
+<TGConnectingPoint num="13" id="2839" />
+<TGConnectingPoint num="14" id="2840" />
+<TGConnectingPoint num="15" id="2841" />
+<TGConnectingPoint num="16" id="2842" />
+<TGConnectingPoint num="17" id="2843" />
+<TGConnectingPoint num="18" id="2844" />
+<TGConnectingPoint num="19" id="2845" />
+<TGConnectingPoint num="20" id="2846" />
+<TGConnectingPoint num="21" id="2847" />
+<TGConnectingPoint num="22" id="2848" />
+<TGConnectingPoint num="23" id="2849" />
+<TGConnectingPoint num="24" id="2850" />
+<TGConnectingPoint num="25" id="2851" />
+<TGConnectingPoint num="26" id="2852" />
+<TGConnectingPoint num="27" id="2853" />
+<TGConnectingPoint num="28" id="2854" />
+<TGConnectingPoint num="29" id="2855" />
+<TGConnectingPoint num="30" id="2856" />
+<TGConnectingPoint num="31" id="2857" />
+<TGConnectingPoint num="32" id="2858" />
+<TGConnectingPoint num="33" id="2859" />
+<TGConnectingPoint num="34" id="2860" />
+<TGConnectingPoint num="35" id="2861" />
+<TGConnectingPoint num="36" id="2862" />
+<TGConnectingPoint num="37" id="2863" />
+<TGConnectingPoint num="38" id="2864" />
+<TGConnectingPoint num="39" id="2865" />
+<TGConnectingPoint num="40" id="2866" />
+<TGConnectingPoint num="41" id="2867" />
+<TGConnectingPoint num="42" id="2868" />
+<TGConnectingPoint num="43" id="2869" />
+<TGConnectingPoint num="44" id="2870" />
+<TGConnectingPoint num="45" id="2871" />
+<TGConnectingPoint num="46" id="2872" />
+<TGConnectingPoint num="47" id="2873" />
+<TGConnectingPoint num="48" id="2874" />
+<TGConnectingPoint num="49" id="2875" />
+<TGConnectingPoint num="50" id="2876" />
+<TGConnectingPoint num="51" id="2877" />
+<TGConnectingPoint num="52" id="2878" />
+<TGConnectingPoint num="53" id="2879" />
+<TGConnectingPoint num="54" id="2880" />
+<TGConnectingPoint num="55" id="2881" />
+<TGConnectingPoint num="56" id="2882" />
+<TGConnectingPoint num="57" id="2883" />
+<TGConnectingPoint num="58" id="2884" />
+<TGConnectingPoint num="59" id="2885" />
+<TGConnectingPoint num="60" id="2886" />
+<TGConnectingPoint num="61" id="2887" />
+<TGConnectingPoint num="62" id="2888" />
+<TGConnectingPoint num="63" id="2889" />
+<TGConnectingPoint num="64" id="2890" />
+<TGConnectingPoint num="65" id="2891" />
+<TGConnectingPoint num="66" id="2892" />
+<TGConnectingPoint num="67" id="2893" />
+<TGConnectingPoint num="68" id="2894" />
+<TGConnectingPoint num="69" id="2895" />
+<TGConnectingPoint num="70" id="2896" />
+<TGConnectingPoint num="71" id="2897" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2843" index="16" uid="310a67c0-47c3-4611-8daf-24cc1247c8cd" >
+<COMPONENT type="5103" id="2909" index="16" uid="310a67c0-47c3-4611-8daf-24cc1247c8cd" >
 <cdparam x="680" y="440" />
-<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="ejectCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2844" />
-<TGConnectingPoint num="1" id="2845" />
-<TGConnectingPoint num="2" id="2846" />
-<TGConnectingPoint num="3" id="2847" />
-<TGConnectingPoint num="4" id="2848" />
-<TGConnectingPoint num="5" id="2849" />
-<TGConnectingPoint num="6" id="2850" />
-<TGConnectingPoint num="7" id="2851" />
-<TGConnectingPoint num="8" id="2852" />
-<TGConnectingPoint num="9" id="2853" />
+<TGConnectingPoint num="0" id="2899" />
+<TGConnectingPoint num="1" id="2900" />
+<TGConnectingPoint num="2" id="2901" />
+<TGConnectingPoint num="3" id="2902" />
+<TGConnectingPoint num="4" id="2903" />
+<TGConnectingPoint num="5" id="2904" />
+<TGConnectingPoint num="6" id="2905" />
+<TGConnectingPoint num="7" id="2906" />
+<TGConnectingPoint num="8" id="2907" />
+<TGConnectingPoint num="9" id="2908" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2766" index="17" uid="dd6314cb-515f-4f14-a27f-0e835b48d234" >
+<COMPONENT type="5106" id="2982" index="17" uid="dd6314cb-515f-4f14-a27f-0e835b48d234" >
 <cdparam x="700" y="340" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -5519,103 +5519,103 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="twoCoinsInserted" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2767" />
-<TGConnectingPoint num="1" id="2768" />
-<TGConnectingPoint num="2" id="2769" />
-<TGConnectingPoint num="3" id="2770" />
-<TGConnectingPoint num="4" id="2771" />
-<TGConnectingPoint num="5" id="2772" />
-<TGConnectingPoint num="6" id="2773" />
-<TGConnectingPoint num="7" id="2774" />
-<TGConnectingPoint num="8" id="2775" />
-<TGConnectingPoint num="9" id="2776" />
-<TGConnectingPoint num="10" id="2777" />
-<TGConnectingPoint num="11" id="2778" />
-<TGConnectingPoint num="12" id="2779" />
-<TGConnectingPoint num="13" id="2780" />
-<TGConnectingPoint num="14" id="2781" />
-<TGConnectingPoint num="15" id="2782" />
-<TGConnectingPoint num="16" id="2783" />
-<TGConnectingPoint num="17" id="2784" />
-<TGConnectingPoint num="18" id="2785" />
-<TGConnectingPoint num="19" id="2786" />
-<TGConnectingPoint num="20" id="2787" />
-<TGConnectingPoint num="21" id="2788" />
-<TGConnectingPoint num="22" id="2789" />
-<TGConnectingPoint num="23" id="2790" />
-<TGConnectingPoint num="24" id="2791" />
-<TGConnectingPoint num="25" id="2792" />
-<TGConnectingPoint num="26" id="2793" />
-<TGConnectingPoint num="27" id="2794" />
-<TGConnectingPoint num="28" id="2795" />
-<TGConnectingPoint num="29" id="2796" />
-<TGConnectingPoint num="30" id="2797" />
-<TGConnectingPoint num="31" id="2798" />
-<TGConnectingPoint num="32" id="2799" />
-<TGConnectingPoint num="33" id="2800" />
-<TGConnectingPoint num="34" id="2801" />
-<TGConnectingPoint num="35" id="2802" />
-<TGConnectingPoint num="36" id="2803" />
-<TGConnectingPoint num="37" id="2804" />
-<TGConnectingPoint num="38" id="2805" />
-<TGConnectingPoint num="39" id="2806" />
-<TGConnectingPoint num="40" id="2807" />
-<TGConnectingPoint num="41" id="2808" />
-<TGConnectingPoint num="42" id="2809" />
-<TGConnectingPoint num="43" id="2810" />
-<TGConnectingPoint num="44" id="2811" />
-<TGConnectingPoint num="45" id="2812" />
-<TGConnectingPoint num="46" id="2813" />
-<TGConnectingPoint num="47" id="2814" />
-<TGConnectingPoint num="48" id="2815" />
-<TGConnectingPoint num="49" id="2816" />
-<TGConnectingPoint num="50" id="2817" />
-<TGConnectingPoint num="51" id="2818" />
-<TGConnectingPoint num="52" id="2819" />
-<TGConnectingPoint num="53" id="2820" />
-<TGConnectingPoint num="54" id="2821" />
-<TGConnectingPoint num="55" id="2822" />
-<TGConnectingPoint num="56" id="2823" />
-<TGConnectingPoint num="57" id="2824" />
-<TGConnectingPoint num="58" id="2825" />
-<TGConnectingPoint num="59" id="2826" />
-<TGConnectingPoint num="60" id="2827" />
-<TGConnectingPoint num="61" id="2828" />
-<TGConnectingPoint num="62" id="2829" />
-<TGConnectingPoint num="63" id="2830" />
-<TGConnectingPoint num="64" id="2831" />
-<TGConnectingPoint num="65" id="2832" />
-<TGConnectingPoint num="66" id="2833" />
-<TGConnectingPoint num="67" id="2834" />
-<TGConnectingPoint num="68" id="2835" />
-<TGConnectingPoint num="69" id="2836" />
-<TGConnectingPoint num="70" id="2837" />
-<TGConnectingPoint num="71" id="2838" />
+<TGConnectingPoint num="0" id="2910" />
+<TGConnectingPoint num="1" id="2911" />
+<TGConnectingPoint num="2" id="2912" />
+<TGConnectingPoint num="3" id="2913" />
+<TGConnectingPoint num="4" id="2914" />
+<TGConnectingPoint num="5" id="2915" />
+<TGConnectingPoint num="6" id="2916" />
+<TGConnectingPoint num="7" id="2917" />
+<TGConnectingPoint num="8" id="2918" />
+<TGConnectingPoint num="9" id="2919" />
+<TGConnectingPoint num="10" id="2920" />
+<TGConnectingPoint num="11" id="2921" />
+<TGConnectingPoint num="12" id="2922" />
+<TGConnectingPoint num="13" id="2923" />
+<TGConnectingPoint num="14" id="2924" />
+<TGConnectingPoint num="15" id="2925" />
+<TGConnectingPoint num="16" id="2926" />
+<TGConnectingPoint num="17" id="2927" />
+<TGConnectingPoint num="18" id="2928" />
+<TGConnectingPoint num="19" id="2929" />
+<TGConnectingPoint num="20" id="2930" />
+<TGConnectingPoint num="21" id="2931" />
+<TGConnectingPoint num="22" id="2932" />
+<TGConnectingPoint num="23" id="2933" />
+<TGConnectingPoint num="24" id="2934" />
+<TGConnectingPoint num="25" id="2935" />
+<TGConnectingPoint num="26" id="2936" />
+<TGConnectingPoint num="27" id="2937" />
+<TGConnectingPoint num="28" id="2938" />
+<TGConnectingPoint num="29" id="2939" />
+<TGConnectingPoint num="30" id="2940" />
+<TGConnectingPoint num="31" id="2941" />
+<TGConnectingPoint num="32" id="2942" />
+<TGConnectingPoint num="33" id="2943" />
+<TGConnectingPoint num="34" id="2944" />
+<TGConnectingPoint num="35" id="2945" />
+<TGConnectingPoint num="36" id="2946" />
+<TGConnectingPoint num="37" id="2947" />
+<TGConnectingPoint num="38" id="2948" />
+<TGConnectingPoint num="39" id="2949" />
+<TGConnectingPoint num="40" id="2950" />
+<TGConnectingPoint num="41" id="2951" />
+<TGConnectingPoint num="42" id="2952" />
+<TGConnectingPoint num="43" id="2953" />
+<TGConnectingPoint num="44" id="2954" />
+<TGConnectingPoint num="45" id="2955" />
+<TGConnectingPoint num="46" id="2956" />
+<TGConnectingPoint num="47" id="2957" />
+<TGConnectingPoint num="48" id="2958" />
+<TGConnectingPoint num="49" id="2959" />
+<TGConnectingPoint num="50" id="2960" />
+<TGConnectingPoint num="51" id="2961" />
+<TGConnectingPoint num="52" id="2962" />
+<TGConnectingPoint num="53" id="2963" />
+<TGConnectingPoint num="54" id="2964" />
+<TGConnectingPoint num="55" id="2965" />
+<TGConnectingPoint num="56" id="2966" />
+<TGConnectingPoint num="57" id="2967" />
+<TGConnectingPoint num="58" id="2968" />
+<TGConnectingPoint num="59" id="2969" />
+<TGConnectingPoint num="60" id="2970" />
+<TGConnectingPoint num="61" id="2971" />
+<TGConnectingPoint num="62" id="2972" />
+<TGConnectingPoint num="63" id="2973" />
+<TGConnectingPoint num="64" id="2974" />
+<TGConnectingPoint num="65" id="2975" />
+<TGConnectingPoint num="66" id="2976" />
+<TGConnectingPoint num="67" id="2977" />
+<TGConnectingPoint num="68" id="2978" />
+<TGConnectingPoint num="69" id="2979" />
+<TGConnectingPoint num="70" id="2980" />
+<TGConnectingPoint num="71" id="2981" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2749" index="18" uid="07ae81b0-c061-408f-ace5-e6f21e3cd467" >
+<COMPONENT type="5103" id="2993" index="18" uid="07ae81b0-c061-408f-ace5-e6f21e3cd467" >
 <cdparam x="384" y="340" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="62" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="putCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2750" />
-<TGConnectingPoint num="1" id="2751" />
-<TGConnectingPoint num="2" id="2752" />
-<TGConnectingPoint num="3" id="2753" />
-<TGConnectingPoint num="4" id="2754" />
-<TGConnectingPoint num="5" id="2755" />
-<TGConnectingPoint num="6" id="2756" />
-<TGConnectingPoint num="7" id="2757" />
-<TGConnectingPoint num="8" id="2758" />
-<TGConnectingPoint num="9" id="2759" />
+<TGConnectingPoint num="0" id="2983" />
+<TGConnectingPoint num="1" id="2984" />
+<TGConnectingPoint num="2" id="2985" />
+<TGConnectingPoint num="3" id="2986" />
+<TGConnectingPoint num="4" id="2987" />
+<TGConnectingPoint num="5" id="2988" />
+<TGConnectingPoint num="6" id="2989" />
+<TGConnectingPoint num="7" id="2990" />
+<TGConnectingPoint num="8" id="2991" />
+<TGConnectingPoint num="9" id="2992" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2672" index="19" uid="3b7261c5-b9bc-4c34-9587-ac20a4bf2fca" >
+<COMPONENT type="5106" id="3066" index="19" uid="3b7261c5-b9bc-4c34-9587-ac20a4bf2fca" >
 <cdparam x="400" y="240" />
 <sizeparam width="165" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -5623,83 +5623,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="oneCoinInserted" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2673" />
-<TGConnectingPoint num="1" id="2674" />
-<TGConnectingPoint num="2" id="2675" />
-<TGConnectingPoint num="3" id="2676" />
-<TGConnectingPoint num="4" id="2677" />
-<TGConnectingPoint num="5" id="2678" />
-<TGConnectingPoint num="6" id="2679" />
-<TGConnectingPoint num="7" id="2680" />
-<TGConnectingPoint num="8" id="2681" />
-<TGConnectingPoint num="9" id="2682" />
-<TGConnectingPoint num="10" id="2683" />
-<TGConnectingPoint num="11" id="2684" />
-<TGConnectingPoint num="12" id="2685" />
-<TGConnectingPoint num="13" id="2686" />
-<TGConnectingPoint num="14" id="2687" />
-<TGConnectingPoint num="15" id="2688" />
-<TGConnectingPoint num="16" id="2689" />
-<TGConnectingPoint num="17" id="2690" />
-<TGConnectingPoint num="18" id="2691" />
-<TGConnectingPoint num="19" id="2692" />
-<TGConnectingPoint num="20" id="2693" />
-<TGConnectingPoint num="21" id="2694" />
-<TGConnectingPoint num="22" id="2695" />
-<TGConnectingPoint num="23" id="2696" />
-<TGConnectingPoint num="24" id="2697" />
-<TGConnectingPoint num="25" id="2698" />
-<TGConnectingPoint num="26" id="2699" />
-<TGConnectingPoint num="27" id="2700" />
-<TGConnectingPoint num="28" id="2701" />
-<TGConnectingPoint num="29" id="2702" />
-<TGConnectingPoint num="30" id="2703" />
-<TGConnectingPoint num="31" id="2704" />
-<TGConnectingPoint num="32" id="2705" />
-<TGConnectingPoint num="33" id="2706" />
-<TGConnectingPoint num="34" id="2707" />
-<TGConnectingPoint num="35" id="2708" />
-<TGConnectingPoint num="36" id="2709" />
-<TGConnectingPoint num="37" id="2710" />
-<TGConnectingPoint num="38" id="2711" />
-<TGConnectingPoint num="39" id="2712" />
-<TGConnectingPoint num="40" id="2713" />
-<TGConnectingPoint num="41" id="2714" />
-<TGConnectingPoint num="42" id="2715" />
-<TGConnectingPoint num="43" id="2716" />
-<TGConnectingPoint num="44" id="2717" />
-<TGConnectingPoint num="45" id="2718" />
-<TGConnectingPoint num="46" id="2719" />
-<TGConnectingPoint num="47" id="2720" />
-<TGConnectingPoint num="48" id="2721" />
-<TGConnectingPoint num="49" id="2722" />
-<TGConnectingPoint num="50" id="2723" />
-<TGConnectingPoint num="51" id="2724" />
-<TGConnectingPoint num="52" id="2725" />
-<TGConnectingPoint num="53" id="2726" />
-<TGConnectingPoint num="54" id="2727" />
-<TGConnectingPoint num="55" id="2728" />
-<TGConnectingPoint num="56" id="2729" />
-<TGConnectingPoint num="57" id="2730" />
-<TGConnectingPoint num="58" id="2731" />
-<TGConnectingPoint num="59" id="2732" />
-<TGConnectingPoint num="60" id="2733" />
-<TGConnectingPoint num="61" id="2734" />
-<TGConnectingPoint num="62" id="2735" />
-<TGConnectingPoint num="63" id="2736" />
-<TGConnectingPoint num="64" id="2737" />
-<TGConnectingPoint num="65" id="2738" />
-<TGConnectingPoint num="66" id="2739" />
-<TGConnectingPoint num="67" id="2740" />
-<TGConnectingPoint num="68" id="2741" />
-<TGConnectingPoint num="69" id="2742" />
-<TGConnectingPoint num="70" id="2743" />
-<TGConnectingPoint num="71" id="2744" />
+<TGConnectingPoint num="0" id="2994" />
+<TGConnectingPoint num="1" id="2995" />
+<TGConnectingPoint num="2" id="2996" />
+<TGConnectingPoint num="3" id="2997" />
+<TGConnectingPoint num="4" id="2998" />
+<TGConnectingPoint num="5" id="2999" />
+<TGConnectingPoint num="6" id="3000" />
+<TGConnectingPoint num="7" id="3001" />
+<TGConnectingPoint num="8" id="3002" />
+<TGConnectingPoint num="9" id="3003" />
+<TGConnectingPoint num="10" id="3004" />
+<TGConnectingPoint num="11" id="3005" />
+<TGConnectingPoint num="12" id="3006" />
+<TGConnectingPoint num="13" id="3007" />
+<TGConnectingPoint num="14" id="3008" />
+<TGConnectingPoint num="15" id="3009" />
+<TGConnectingPoint num="16" id="3010" />
+<TGConnectingPoint num="17" id="3011" />
+<TGConnectingPoint num="18" id="3012" />
+<TGConnectingPoint num="19" id="3013" />
+<TGConnectingPoint num="20" id="3014" />
+<TGConnectingPoint num="21" id="3015" />
+<TGConnectingPoint num="22" id="3016" />
+<TGConnectingPoint num="23" id="3017" />
+<TGConnectingPoint num="24" id="3018" />
+<TGConnectingPoint num="25" id="3019" />
+<TGConnectingPoint num="26" id="3020" />
+<TGConnectingPoint num="27" id="3021" />
+<TGConnectingPoint num="28" id="3022" />
+<TGConnectingPoint num="29" id="3023" />
+<TGConnectingPoint num="30" id="3024" />
+<TGConnectingPoint num="31" id="3025" />
+<TGConnectingPoint num="32" id="3026" />
+<TGConnectingPoint num="33" id="3027" />
+<TGConnectingPoint num="34" id="3028" />
+<TGConnectingPoint num="35" id="3029" />
+<TGConnectingPoint num="36" id="3030" />
+<TGConnectingPoint num="37" id="3031" />
+<TGConnectingPoint num="38" id="3032" />
+<TGConnectingPoint num="39" id="3033" />
+<TGConnectingPoint num="40" id="3034" />
+<TGConnectingPoint num="41" id="3035" />
+<TGConnectingPoint num="42" id="3036" />
+<TGConnectingPoint num="43" id="3037" />
+<TGConnectingPoint num="44" id="3038" />
+<TGConnectingPoint num="45" id="3039" />
+<TGConnectingPoint num="46" id="3040" />
+<TGConnectingPoint num="47" id="3041" />
+<TGConnectingPoint num="48" id="3042" />
+<TGConnectingPoint num="49" id="3043" />
+<TGConnectingPoint num="50" id="3044" />
+<TGConnectingPoint num="51" id="3045" />
+<TGConnectingPoint num="52" id="3046" />
+<TGConnectingPoint num="53" id="3047" />
+<TGConnectingPoint num="54" id="3048" />
+<TGConnectingPoint num="55" id="3049" />
+<TGConnectingPoint num="56" id="3050" />
+<TGConnectingPoint num="57" id="3051" />
+<TGConnectingPoint num="58" id="3052" />
+<TGConnectingPoint num="59" id="3053" />
+<TGConnectingPoint num="60" id="3054" />
+<TGConnectingPoint num="61" id="3055" />
+<TGConnectingPoint num="62" id="3056" />
+<TGConnectingPoint num="63" id="3057" />
+<TGConnectingPoint num="64" id="3058" />
+<TGConnectingPoint num="65" id="3059" />
+<TGConnectingPoint num="66" id="3060" />
+<TGConnectingPoint num="67" id="3061" />
+<TGConnectingPoint num="68" id="3062" />
+<TGConnectingPoint num="69" id="3063" />
+<TGConnectingPoint num="70" id="3064" />
+<TGConnectingPoint num="71" id="3065" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2595" index="20" uid="34858d86-1ddd-40a5-85ea-91a61bac8e3f" >
+<COMPONENT type="5106" id="3139" index="20" uid="34858d86-1ddd-40a5-85ea-91a61bac8e3f" >
 <cdparam x="400" y="140" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -5707,118 +5707,118 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Start" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2596" />
-<TGConnectingPoint num="1" id="2597" />
-<TGConnectingPoint num="2" id="2598" />
-<TGConnectingPoint num="3" id="2599" />
-<TGConnectingPoint num="4" id="2600" />
-<TGConnectingPoint num="5" id="2601" />
-<TGConnectingPoint num="6" id="2602" />
-<TGConnectingPoint num="7" id="2603" />
-<TGConnectingPoint num="8" id="2604" />
-<TGConnectingPoint num="9" id="2605" />
-<TGConnectingPoint num="10" id="2606" />
-<TGConnectingPoint num="11" id="2607" />
-<TGConnectingPoint num="12" id="2608" />
-<TGConnectingPoint num="13" id="2609" />
-<TGConnectingPoint num="14" id="2610" />
-<TGConnectingPoint num="15" id="2611" />
-<TGConnectingPoint num="16" id="2612" />
-<TGConnectingPoint num="17" id="2613" />
-<TGConnectingPoint num="18" id="2614" />
-<TGConnectingPoint num="19" id="2615" />
-<TGConnectingPoint num="20" id="2616" />
-<TGConnectingPoint num="21" id="2617" />
-<TGConnectingPoint num="22" id="2618" />
-<TGConnectingPoint num="23" id="2619" />
-<TGConnectingPoint num="24" id="2620" />
-<TGConnectingPoint num="25" id="2621" />
-<TGConnectingPoint num="26" id="2622" />
-<TGConnectingPoint num="27" id="2623" />
-<TGConnectingPoint num="28" id="2624" />
-<TGConnectingPoint num="29" id="2625" />
-<TGConnectingPoint num="30" id="2626" />
-<TGConnectingPoint num="31" id="2627" />
-<TGConnectingPoint num="32" id="2628" />
-<TGConnectingPoint num="33" id="2629" />
-<TGConnectingPoint num="34" id="2630" />
-<TGConnectingPoint num="35" id="2631" />
-<TGConnectingPoint num="36" id="2632" />
-<TGConnectingPoint num="37" id="2633" />
-<TGConnectingPoint num="38" id="2634" />
-<TGConnectingPoint num="39" id="2635" />
-<TGConnectingPoint num="40" id="2636" />
-<TGConnectingPoint num="41" id="2637" />
-<TGConnectingPoint num="42" id="2638" />
-<TGConnectingPoint num="43" id="2639" />
-<TGConnectingPoint num="44" id="2640" />
-<TGConnectingPoint num="45" id="2641" />
-<TGConnectingPoint num="46" id="2642" />
-<TGConnectingPoint num="47" id="2643" />
-<TGConnectingPoint num="48" id="2644" />
-<TGConnectingPoint num="49" id="2645" />
-<TGConnectingPoint num="50" id="2646" />
-<TGConnectingPoint num="51" id="2647" />
-<TGConnectingPoint num="52" id="2648" />
-<TGConnectingPoint num="53" id="2649" />
-<TGConnectingPoint num="54" id="2650" />
-<TGConnectingPoint num="55" id="2651" />
-<TGConnectingPoint num="56" id="2652" />
-<TGConnectingPoint num="57" id="2653" />
-<TGConnectingPoint num="58" id="2654" />
-<TGConnectingPoint num="59" id="2655" />
-<TGConnectingPoint num="60" id="2656" />
-<TGConnectingPoint num="61" id="2657" />
-<TGConnectingPoint num="62" id="2658" />
-<TGConnectingPoint num="63" id="2659" />
-<TGConnectingPoint num="64" id="2660" />
-<TGConnectingPoint num="65" id="2661" />
-<TGConnectingPoint num="66" id="2662" />
-<TGConnectingPoint num="67" id="2663" />
-<TGConnectingPoint num="68" id="2664" />
-<TGConnectingPoint num="69" id="2665" />
-<TGConnectingPoint num="70" id="2666" />
-<TGConnectingPoint num="71" id="2667" />
+<TGConnectingPoint num="0" id="3067" />
+<TGConnectingPoint num="1" id="3068" />
+<TGConnectingPoint num="2" id="3069" />
+<TGConnectingPoint num="3" id="3070" />
+<TGConnectingPoint num="4" id="3071" />
+<TGConnectingPoint num="5" id="3072" />
+<TGConnectingPoint num="6" id="3073" />
+<TGConnectingPoint num="7" id="3074" />
+<TGConnectingPoint num="8" id="3075" />
+<TGConnectingPoint num="9" id="3076" />
+<TGConnectingPoint num="10" id="3077" />
+<TGConnectingPoint num="11" id="3078" />
+<TGConnectingPoint num="12" id="3079" />
+<TGConnectingPoint num="13" id="3080" />
+<TGConnectingPoint num="14" id="3081" />
+<TGConnectingPoint num="15" id="3082" />
+<TGConnectingPoint num="16" id="3083" />
+<TGConnectingPoint num="17" id="3084" />
+<TGConnectingPoint num="18" id="3085" />
+<TGConnectingPoint num="19" id="3086" />
+<TGConnectingPoint num="20" id="3087" />
+<TGConnectingPoint num="21" id="3088" />
+<TGConnectingPoint num="22" id="3089" />
+<TGConnectingPoint num="23" id="3090" />
+<TGConnectingPoint num="24" id="3091" />
+<TGConnectingPoint num="25" id="3092" />
+<TGConnectingPoint num="26" id="3093" />
+<TGConnectingPoint num="27" id="3094" />
+<TGConnectingPoint num="28" id="3095" />
+<TGConnectingPoint num="29" id="3096" />
+<TGConnectingPoint num="30" id="3097" />
+<TGConnectingPoint num="31" id="3098" />
+<TGConnectingPoint num="32" id="3099" />
+<TGConnectingPoint num="33" id="3100" />
+<TGConnectingPoint num="34" id="3101" />
+<TGConnectingPoint num="35" id="3102" />
+<TGConnectingPoint num="36" id="3103" />
+<TGConnectingPoint num="37" id="3104" />
+<TGConnectingPoint num="38" id="3105" />
+<TGConnectingPoint num="39" id="3106" />
+<TGConnectingPoint num="40" id="3107" />
+<TGConnectingPoint num="41" id="3108" />
+<TGConnectingPoint num="42" id="3109" />
+<TGConnectingPoint num="43" id="3110" />
+<TGConnectingPoint num="44" id="3111" />
+<TGConnectingPoint num="45" id="3112" />
+<TGConnectingPoint num="46" id="3113" />
+<TGConnectingPoint num="47" id="3114" />
+<TGConnectingPoint num="48" id="3115" />
+<TGConnectingPoint num="49" id="3116" />
+<TGConnectingPoint num="50" id="3117" />
+<TGConnectingPoint num="51" id="3118" />
+<TGConnectingPoint num="52" id="3119" />
+<TGConnectingPoint num="53" id="3120" />
+<TGConnectingPoint num="54" id="3121" />
+<TGConnectingPoint num="55" id="3122" />
+<TGConnectingPoint num="56" id="3123" />
+<TGConnectingPoint num="57" id="3124" />
+<TGConnectingPoint num="58" id="3125" />
+<TGConnectingPoint num="59" id="3126" />
+<TGConnectingPoint num="60" id="3127" />
+<TGConnectingPoint num="61" id="3128" />
+<TGConnectingPoint num="62" id="3129" />
+<TGConnectingPoint num="63" id="3130" />
+<TGConnectingPoint num="64" id="3131" />
+<TGConnectingPoint num="65" id="3132" />
+<TGConnectingPoint num="66" id="3133" />
+<TGConnectingPoint num="67" id="3134" />
+<TGConnectingPoint num="68" id="3135" />
+<TGConnectingPoint num="69" id="3136" />
+<TGConnectingPoint num="70" id="3137" />
+<TGConnectingPoint num="71" id="3138" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="2589" index="21" uid="3e2339c5-f7a2-4939-b87e-c2dc90101343" >
+<COMPONENT type="5100" id="3141" index="21" uid="3e2339c5-f7a2-4939-b87e-c2dc90101343" >
 <cdparam x="400" y="40" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
 <new d="false" />
-<TGConnectingPoint num="0" id="2590" />
+<TGConnectingPoint num="0" id="3140" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="5102" id="3675" index="0" uid="47d3bb44-8205-4c23-b804-466fcd2715f5" >
+<CONNECTOR type="5102" id="3148" index="0" uid="47d3bb44-8205-4c23-b804-466fcd2715f5" >
 <cdparam x="504" y="490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3676" />
-<P1  x="504" y="490" id="3349" />
-<P2  x="500" y="171" id="3138" />
+<TGConnectingPoint num="0" id="3147" />
+<P1  x="504" y="490" id="3393" />
+<P2  x="500" y="171" id="3632" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3677" index="-1" uid="945dade2-30b6-4e17-8e0c-886fb1974df0" >
-<father id="3675" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3146" index="20" uid="945dade2-30b6-4e17-8e0c-886fb1974df0" >
+<father id="3148" num="0" />
 <cdparam x="502" y="330" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3678" />
-<TGConnectingPoint num="1" id="3679" />
-<TGConnectingPoint num="2" id="3680" />
-<TGConnectingPoint num="3" id="3681" />
+<TGConnectingPoint num="0" id="3142" />
+<TGConnectingPoint num="1" id="3143" />
+<TGConnectingPoint num="2" id="3144" />
+<TGConnectingPoint num="3" id="3145" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5832,28 +5832,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3668" index="1" uid="26b5ff39-cd6b-4b46-a283-8b00bc5188f9" >
+<CONNECTOR type="5102" id="3155" index="1" uid="26b5ff39-cd6b-4b46-a283-8b00bc5188f9" >
 <cdparam x="471" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3669" />
-<P1  x="471" y="290" id="3227" />
-<P2  x="477" y="340" id="3267" />
+<TGConnectingPoint num="0" id="3154" />
+<P1  x="471" y="290" id="3571" />
+<P2  x="477" y="340" id="3461" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3670" index="-1" uid="58d221fc-df4a-4f7f-a9bd-a83eba8097a8" >
-<father id="3668" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3153" index="21" uid="58d221fc-df4a-4f7f-a9bd-a83eba8097a8" >
+<father id="3155" num="0" />
 <cdparam x="474" y="315" />
-<sizeparam width="100" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3671" />
-<TGConnectingPoint num="1" id="3672" />
-<TGConnectingPoint num="2" id="3673" />
-<TGConnectingPoint num="3" id="3674" />
+<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="1" id="3150" />
+<TGConnectingPoint num="2" id="3151" />
+<TGConnectingPoint num="3" id="3152" />
 <extraparam>
 <guard value="nbOfCoins == 2" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5867,28 +5867,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3661" index="2" uid="ef1755c7-79ac-41e0-ade9-4fcb131d80e5" >
+<CONNECTOR type="5102" id="3162" index="2" uid="ef1755c7-79ac-41e0-ade9-4fcb131d80e5" >
 <cdparam x="715" y="365" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3662" />
-<P1  x="715" y="365" id="3517" />
-<P2  x="766" y="440" id="3532" />
+<TGConnectingPoint num="0" id="3161" />
+<P1  x="715" y="365" id="3293" />
+<P2  x="766" y="440" id="3220" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3663" index="-1" uid="dc9c5295-a240-4cd9-9d74-266c74e65b29" >
-<father id="3661" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3160" index="22" uid="dc9c5295-a240-4cd9-9d74-266c74e65b29" >
+<father id="3162" num="0" />
 <cdparam x="740" y="402" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3664" />
-<TGConnectingPoint num="1" id="3665" />
-<TGConnectingPoint num="2" id="3666" />
-<TGConnectingPoint num="3" id="3667" />
+<TGConnectingPoint num="0" id="3156" />
+<TGConnectingPoint num="1" id="3157" />
+<TGConnectingPoint num="2" id="3158" />
+<TGConnectingPoint num="3" id="3159" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5902,28 +5902,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3654" index="3" uid="a8d2bcd7-a60a-449f-983b-3628f1202bf7" >
+<CONNECTOR type="5102" id="3169" index="3" uid="a8d2bcd7-a60a-449f-983b-3628f1202bf7" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3655" />
-<P1  x="407" y="60" id="3106" />
-<P2  x="450" y="140" id="3113" />
+<TGConnectingPoint num="0" id="3168" />
+<P1  x="407" y="60" id="3679" />
+<P2  x="450" y="140" id="3607" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3656" index="-1" uid="ac538fab-8f44-4228-802a-fc5b6a877dcd" >
-<father id="3654" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3167" index="23" uid="ac538fab-8f44-4228-802a-fc5b6a877dcd" >
+<father id="3169" num="0" />
 <cdparam x="428" y="100" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3657" />
-<TGConnectingPoint num="1" id="3658" />
-<TGConnectingPoint num="2" id="3659" />
-<TGConnectingPoint num="3" id="3660" />
+<TGConnectingPoint num="0" id="3163" />
+<TGConnectingPoint num="1" id="3164" />
+<TGConnectingPoint num="2" id="3165" />
+<TGConnectingPoint num="3" id="3166" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5937,28 +5937,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3647" index="4" uid="b4b997b5-49d5-459e-87ef-2d156c5ae1b8" >
+<CONNECTOR type="5102" id="3176" index="4" uid="b4b997b5-49d5-459e-87ef-2d156c5ae1b8" >
 <cdparam x="715" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3648" />
-<P1  x="715" y="465" id="3423" />
-<P2  x="788" y="540" id="3438" />
+<TGConnectingPoint num="0" id="3175" />
+<P1  x="715" y="465" id="3377" />
+<P2  x="788" y="540" id="3304" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3649" index="-1" uid="c4b759cf-90d2-4c19-a8dd-89f770f260ae" >
-<father id="3647" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3174" index="24" uid="c4b759cf-90d2-4c19-a8dd-89f770f260ae" >
+<father id="3176" num="0" />
 <cdparam x="751" y="502" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3650" />
-<TGConnectingPoint num="1" id="3651" />
-<TGConnectingPoint num="2" id="3652" />
-<TGConnectingPoint num="3" id="3653" />
+<TGConnectingPoint num="0" id="3170" />
+<TGConnectingPoint num="1" id="3171" />
+<TGConnectingPoint num="2" id="3172" />
+<TGConnectingPoint num="3" id="3173" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -5972,28 +5972,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3640" index="5" uid="8cc6e628-d552-400c-8616-1061f61f1231" >
+<CONNECTOR type="5102" id="3183" index="5" uid="8cc6e628-d552-400c-8616-1061f61f1231" >
 <cdparam x="450" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3641" />
-<P1  x="450" y="190" id="3118" />
-<P2  x="471" y="240" id="3190" />
+<TGConnectingPoint num="0" id="3182" />
+<P1  x="450" y="190" id="3612" />
+<P2  x="471" y="240" id="3534" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3642" index="-1" uid="79cf3c2c-677a-4e8b-be68-2363ff2d259d" >
-<father id="3640" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3181" index="25" uid="79cf3c2c-677a-4e8b-be68-2363ff2d259d" >
+<father id="3183" num="0" />
 <cdparam x="460" y="215" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3643" />
-<TGConnectingPoint num="1" id="3644" />
-<TGConnectingPoint num="2" id="3645" />
-<TGConnectingPoint num="3" id="3646" />
+<TGConnectingPoint num="0" id="3177" />
+<TGConnectingPoint num="1" id="3178" />
+<TGConnectingPoint num="2" id="3179" />
+<TGConnectingPoint num="3" id="3180" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6007,28 +6007,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3633" index="6" uid="66cd667f-3a19-4e11-9d58-f8aa4edbc400" >
+<CONNECTOR type="5102" id="3190" index="6" uid="66cd667f-3a19-4e11-9d58-f8aa4edbc400" >
 <cdparam x="471" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3634" />
-<P1  x="471" y="290" id="3195" />
-<P2  x="715" y="335" id="3516" />
+<TGConnectingPoint num="0" id="3189" />
+<P1  x="471" y="290" id="3539" />
+<P2  x="715" y="335" id="3292" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3635" index="-1" uid="6295213a-1869-4408-a918-a133b4e492e4" >
-<father id="3633" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3188" index="26" uid="6295213a-1869-4408-a918-a133b4e492e4" >
+<father id="3190" num="0" />
 <cdparam x="593" y="312" />
-<sizeparam width="162" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="162" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3636" />
-<TGConnectingPoint num="1" id="3637" />
-<TGConnectingPoint num="2" id="3638" />
-<TGConnectingPoint num="3" id="3639" />
+<TGConnectingPoint num="0" id="3184" />
+<TGConnectingPoint num="1" id="3185" />
+<TGConnectingPoint num="2" id="3186" />
+<TGConnectingPoint num="3" id="3187" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="coinDelay" enabled="true"/>
@@ -6042,28 +6042,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3626" index="7" uid="bce81312-9032-45a7-ad44-9b66f4036936" >
+<CONNECTOR type="5102" id="3197" index="7" uid="bce81312-9032-45a7-ad44-9b66f4036936" >
 <cdparam x="477" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3627" />
-<P1  x="477" y="390" id="3304" />
-<P2  x="715" y="435" id="3422" />
+<TGConnectingPoint num="0" id="3196" />
+<P1  x="477" y="390" id="3498" />
+<P2  x="715" y="435" id="3376" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3628" index="-1" uid="cf5dc0f1-5b1d-45ca-8307-c48153600ee0" >
-<father id="3626" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3195" index="27" uid="cf5dc0f1-5b1d-45ca-8307-c48153600ee0" >
+<father id="3197" num="0" />
 <cdparam x="596" y="412" />
-<sizeparam width="200" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="200" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3629" />
-<TGConnectingPoint num="1" id="3630" />
-<TGConnectingPoint num="2" id="3631" />
-<TGConnectingPoint num="3" id="3632" />
+<TGConnectingPoint num="0" id="3191" />
+<TGConnectingPoint num="1" id="3192" />
+<TGConnectingPoint num="2" id="3193" />
+<TGConnectingPoint num="3" id="3194" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="teaMaxDelay" enabled="true"/>
@@ -6077,28 +6077,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3619" index="8" uid="35e108cc-fc06-4cbd-b73c-6f2ed7ac0cf3" >
+<CONNECTOR type="5102" id="3204" index="8" uid="35e108cc-fc06-4cbd-b73c-6f2ed7ac0cf3" >
 <cdparam x="788" y="590" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3620" />
-<P1  x="788" y="590" id="3443" />
-<P2  x="500" y="165" id="3148" />
+<TGConnectingPoint num="0" id="3203" />
+<P1  x="788" y="590" id="3309" />
+<P2  x="500" y="165" id="3642" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3621" index="-1" uid="7ee2ca5f-8050-467d-9710-b1b393ca5025" >
-<father id="3619" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3202" index="28" uid="7ee2ca5f-8050-467d-9710-b1b393ca5025" >
+<father id="3204" num="0" />
 <cdparam x="644" y="377" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3622" />
-<TGConnectingPoint num="1" id="3623" />
-<TGConnectingPoint num="2" id="3624" />
-<TGConnectingPoint num="3" id="3625" />
+<TGConnectingPoint num="0" id="3198" />
+<TGConnectingPoint num="1" id="3199" />
+<TGConnectingPoint num="2" id="3200" />
+<TGConnectingPoint num="3" id="3201" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6112,28 +6112,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3612" index="9" uid="b9375723-7aed-4f41-99f0-ba85ad2b713e" >
+<CONNECTOR type="5102" id="3211" index="9" uid="b9375723-7aed-4f41-99f0-ba85ad2b713e" >
 <cdparam x="766" y="490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3613" />
-<P1  x="766" y="490" id="3537" />
-<P2  x="500" y="165" id="3116" />
+<TGConnectingPoint num="0" id="3210" />
+<P1  x="766" y="490" id="3225" />
+<P2  x="500" y="165" id="3610" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3614" index="-1" uid="355878be-5649-411e-a586-58af8d1d9a0b" >
-<father id="3612" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3209" index="29" uid="355878be-5649-411e-a586-58af8d1d9a0b" >
+<father id="3211" num="0" />
 <cdparam x="633" y="327" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3615" />
-<TGConnectingPoint num="1" id="3616" />
-<TGConnectingPoint num="2" id="3617" />
-<TGConnectingPoint num="3" id="3618" />
+<TGConnectingPoint num="0" id="3205" />
+<TGConnectingPoint num="1" id="3206" />
+<TGConnectingPoint num="2" id="3207" />
+<TGConnectingPoint num="3" id="3208" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6147,28 +6147,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3605" index="10" uid="f91b96a0-c280-4c00-95b3-bcdbbc1a7f85" >
+<CONNECTOR type="5102" id="3218" index="10" uid="f91b96a0-c280-4c00-95b3-bcdbbc1a7f85" >
 <cdparam x="477" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3606" />
-<P1  x="477" y="390" id="3272" />
-<P2  x="504" y="440" id="3344" />
+<TGConnectingPoint num="0" id="3217" />
+<P1  x="477" y="390" id="3466" />
+<P2  x="504" y="440" id="3388" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3607" index="-1" uid="a23eddec-c916-4293-8f38-ae4d47bcd803" >
-<father id="3605" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3216" index="30" uid="a23eddec-c916-4293-8f38-ae4d47bcd803" >
+<father id="3218" num="0" />
 <cdparam x="490" y="415" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3608" />
-<TGConnectingPoint num="1" id="3609" />
-<TGConnectingPoint num="2" id="3610" />
-<TGConnectingPoint num="3" id="3611" />
+<TGConnectingPoint num="0" id="3212" />
+<TGConnectingPoint num="1" id="3213" />
+<TGConnectingPoint num="2" id="3214" />
+<TGConnectingPoint num="3" id="3215" />
 <extraparam>
 <guard value="x &gt; 0" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6182,7 +6182,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3530" index="11" uid="4966518e-b7e1-4ec1-969f-7b0c6ff5a8dc" >
+<COMPONENT type="5106" id="3291" index="11" uid="4966518e-b7e1-4ec1-969f-7b0c6ff5a8dc" >
 <cdparam x="700" y="440" />
 <sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6190,103 +6190,103 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="CoinEjection" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3531" />
-<TGConnectingPoint num="1" id="3532" />
-<TGConnectingPoint num="2" id="3533" />
-<TGConnectingPoint num="3" id="3534" />
-<TGConnectingPoint num="4" id="3535" />
-<TGConnectingPoint num="5" id="3536" />
-<TGConnectingPoint num="6" id="3537" />
-<TGConnectingPoint num="7" id="3538" />
-<TGConnectingPoint num="8" id="3539" />
-<TGConnectingPoint num="9" id="3540" />
-<TGConnectingPoint num="10" id="3541" />
-<TGConnectingPoint num="11" id="3542" />
-<TGConnectingPoint num="12" id="3543" />
-<TGConnectingPoint num="13" id="3544" />
-<TGConnectingPoint num="14" id="3545" />
-<TGConnectingPoint num="15" id="3546" />
-<TGConnectingPoint num="16" id="3547" />
-<TGConnectingPoint num="17" id="3548" />
-<TGConnectingPoint num="18" id="3549" />
-<TGConnectingPoint num="19" id="3550" />
-<TGConnectingPoint num="20" id="3551" />
-<TGConnectingPoint num="21" id="3552" />
-<TGConnectingPoint num="22" id="3553" />
-<TGConnectingPoint num="23" id="3554" />
-<TGConnectingPoint num="24" id="3555" />
-<TGConnectingPoint num="25" id="3556" />
-<TGConnectingPoint num="26" id="3557" />
-<TGConnectingPoint num="27" id="3558" />
-<TGConnectingPoint num="28" id="3559" />
-<TGConnectingPoint num="29" id="3560" />
-<TGConnectingPoint num="30" id="3561" />
-<TGConnectingPoint num="31" id="3562" />
-<TGConnectingPoint num="32" id="3563" />
-<TGConnectingPoint num="33" id="3564" />
-<TGConnectingPoint num="34" id="3565" />
-<TGConnectingPoint num="35" id="3566" />
-<TGConnectingPoint num="36" id="3567" />
-<TGConnectingPoint num="37" id="3568" />
-<TGConnectingPoint num="38" id="3569" />
-<TGConnectingPoint num="39" id="3570" />
-<TGConnectingPoint num="40" id="3571" />
-<TGConnectingPoint num="41" id="3572" />
-<TGConnectingPoint num="42" id="3573" />
-<TGConnectingPoint num="43" id="3574" />
-<TGConnectingPoint num="44" id="3575" />
-<TGConnectingPoint num="45" id="3576" />
-<TGConnectingPoint num="46" id="3577" />
-<TGConnectingPoint num="47" id="3578" />
-<TGConnectingPoint num="48" id="3579" />
-<TGConnectingPoint num="49" id="3580" />
-<TGConnectingPoint num="50" id="3581" />
-<TGConnectingPoint num="51" id="3582" />
-<TGConnectingPoint num="52" id="3583" />
-<TGConnectingPoint num="53" id="3584" />
-<TGConnectingPoint num="54" id="3585" />
-<TGConnectingPoint num="55" id="3586" />
-<TGConnectingPoint num="56" id="3587" />
-<TGConnectingPoint num="57" id="3588" />
-<TGConnectingPoint num="58" id="3589" />
-<TGConnectingPoint num="59" id="3590" />
-<TGConnectingPoint num="60" id="3591" />
-<TGConnectingPoint num="61" id="3592" />
-<TGConnectingPoint num="62" id="3593" />
-<TGConnectingPoint num="63" id="3594" />
-<TGConnectingPoint num="64" id="3595" />
-<TGConnectingPoint num="65" id="3596" />
-<TGConnectingPoint num="66" id="3597" />
-<TGConnectingPoint num="67" id="3598" />
-<TGConnectingPoint num="68" id="3599" />
-<TGConnectingPoint num="69" id="3600" />
-<TGConnectingPoint num="70" id="3601" />
-<TGConnectingPoint num="71" id="3602" />
+<TGConnectingPoint num="0" id="3219" />
+<TGConnectingPoint num="1" id="3220" />
+<TGConnectingPoint num="2" id="3221" />
+<TGConnectingPoint num="3" id="3222" />
+<TGConnectingPoint num="4" id="3223" />
+<TGConnectingPoint num="5" id="3224" />
+<TGConnectingPoint num="6" id="3225" />
+<TGConnectingPoint num="7" id="3226" />
+<TGConnectingPoint num="8" id="3227" />
+<TGConnectingPoint num="9" id="3228" />
+<TGConnectingPoint num="10" id="3229" />
+<TGConnectingPoint num="11" id="3230" />
+<TGConnectingPoint num="12" id="3231" />
+<TGConnectingPoint num="13" id="3232" />
+<TGConnectingPoint num="14" id="3233" />
+<TGConnectingPoint num="15" id="3234" />
+<TGConnectingPoint num="16" id="3235" />
+<TGConnectingPoint num="17" id="3236" />
+<TGConnectingPoint num="18" id="3237" />
+<TGConnectingPoint num="19" id="3238" />
+<TGConnectingPoint num="20" id="3239" />
+<TGConnectingPoint num="21" id="3240" />
+<TGConnectingPoint num="22" id="3241" />
+<TGConnectingPoint num="23" id="3242" />
+<TGConnectingPoint num="24" id="3243" />
+<TGConnectingPoint num="25" id="3244" />
+<TGConnectingPoint num="26" id="3245" />
+<TGConnectingPoint num="27" id="3246" />
+<TGConnectingPoint num="28" id="3247" />
+<TGConnectingPoint num="29" id="3248" />
+<TGConnectingPoint num="30" id="3249" />
+<TGConnectingPoint num="31" id="3250" />
+<TGConnectingPoint num="32" id="3251" />
+<TGConnectingPoint num="33" id="3252" />
+<TGConnectingPoint num="34" id="3253" />
+<TGConnectingPoint num="35" id="3254" />
+<TGConnectingPoint num="36" id="3255" />
+<TGConnectingPoint num="37" id="3256" />
+<TGConnectingPoint num="38" id="3257" />
+<TGConnectingPoint num="39" id="3258" />
+<TGConnectingPoint num="40" id="3259" />
+<TGConnectingPoint num="41" id="3260" />
+<TGConnectingPoint num="42" id="3261" />
+<TGConnectingPoint num="43" id="3262" />
+<TGConnectingPoint num="44" id="3263" />
+<TGConnectingPoint num="45" id="3264" />
+<TGConnectingPoint num="46" id="3265" />
+<TGConnectingPoint num="47" id="3266" />
+<TGConnectingPoint num="48" id="3267" />
+<TGConnectingPoint num="49" id="3268" />
+<TGConnectingPoint num="50" id="3269" />
+<TGConnectingPoint num="51" id="3270" />
+<TGConnectingPoint num="52" id="3271" />
+<TGConnectingPoint num="53" id="3272" />
+<TGConnectingPoint num="54" id="3273" />
+<TGConnectingPoint num="55" id="3274" />
+<TGConnectingPoint num="56" id="3275" />
+<TGConnectingPoint num="57" id="3276" />
+<TGConnectingPoint num="58" id="3277" />
+<TGConnectingPoint num="59" id="3278" />
+<TGConnectingPoint num="60" id="3279" />
+<TGConnectingPoint num="61" id="3280" />
+<TGConnectingPoint num="62" id="3281" />
+<TGConnectingPoint num="63" id="3282" />
+<TGConnectingPoint num="64" id="3283" />
+<TGConnectingPoint num="65" id="3284" />
+<TGConnectingPoint num="66" id="3285" />
+<TGConnectingPoint num="67" id="3286" />
+<TGConnectingPoint num="68" id="3287" />
+<TGConnectingPoint num="69" id="3288" />
+<TGConnectingPoint num="70" id="3289" />
+<TGConnectingPoint num="71" id="3290" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3515" index="12" uid="bb871f64-f5fd-4df1-a853-43159523856d" >
+<COMPONENT type="5103" id="3302" index="12" uid="bb871f64-f5fd-4df1-a853-43159523856d" >
 <cdparam x="680" y="340" />
-<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="ejectCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3516" />
-<TGConnectingPoint num="1" id="3517" />
-<TGConnectingPoint num="2" id="3518" />
-<TGConnectingPoint num="3" id="3519" />
-<TGConnectingPoint num="4" id="3520" />
-<TGConnectingPoint num="5" id="3521" />
-<TGConnectingPoint num="6" id="3522" />
-<TGConnectingPoint num="7" id="3523" />
-<TGConnectingPoint num="8" id="3524" />
-<TGConnectingPoint num="9" id="3525" />
+<TGConnectingPoint num="0" id="3292" />
+<TGConnectingPoint num="1" id="3293" />
+<TGConnectingPoint num="2" id="3294" />
+<TGConnectingPoint num="3" id="3295" />
+<TGConnectingPoint num="4" id="3296" />
+<TGConnectingPoint num="5" id="3297" />
+<TGConnectingPoint num="6" id="3298" />
+<TGConnectingPoint num="7" id="3299" />
+<TGConnectingPoint num="8" id="3300" />
+<TGConnectingPoint num="9" id="3301" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3436" index="13" uid="d36be56e-1eb5-4c1e-8ed8-fa8d0ba2b416" >
+<COMPONENT type="5106" id="3375" index="13" uid="d36be56e-1eb5-4c1e-8ed8-fa8d0ba2b416" >
 <cdparam x="700" y="540" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6294,103 +6294,103 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="BeverageEjection" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3437" />
-<TGConnectingPoint num="1" id="3438" />
-<TGConnectingPoint num="2" id="3439" />
-<TGConnectingPoint num="3" id="3440" />
-<TGConnectingPoint num="4" id="3441" />
-<TGConnectingPoint num="5" id="3442" />
-<TGConnectingPoint num="6" id="3443" />
-<TGConnectingPoint num="7" id="3444" />
-<TGConnectingPoint num="8" id="3445" />
-<TGConnectingPoint num="9" id="3446" />
-<TGConnectingPoint num="10" id="3447" />
-<TGConnectingPoint num="11" id="3448" />
-<TGConnectingPoint num="12" id="3449" />
-<TGConnectingPoint num="13" id="3450" />
-<TGConnectingPoint num="14" id="3451" />
-<TGConnectingPoint num="15" id="3452" />
-<TGConnectingPoint num="16" id="3453" />
-<TGConnectingPoint num="17" id="3454" />
-<TGConnectingPoint num="18" id="3455" />
-<TGConnectingPoint num="19" id="3456" />
-<TGConnectingPoint num="20" id="3457" />
-<TGConnectingPoint num="21" id="3458" />
-<TGConnectingPoint num="22" id="3459" />
-<TGConnectingPoint num="23" id="3460" />
-<TGConnectingPoint num="24" id="3461" />
-<TGConnectingPoint num="25" id="3462" />
-<TGConnectingPoint num="26" id="3463" />
-<TGConnectingPoint num="27" id="3464" />
-<TGConnectingPoint num="28" id="3465" />
-<TGConnectingPoint num="29" id="3466" />
-<TGConnectingPoint num="30" id="3467" />
-<TGConnectingPoint num="31" id="3468" />
-<TGConnectingPoint num="32" id="3469" />
-<TGConnectingPoint num="33" id="3470" />
-<TGConnectingPoint num="34" id="3471" />
-<TGConnectingPoint num="35" id="3472" />
-<TGConnectingPoint num="36" id="3473" />
-<TGConnectingPoint num="37" id="3474" />
-<TGConnectingPoint num="38" id="3475" />
-<TGConnectingPoint num="39" id="3476" />
-<TGConnectingPoint num="40" id="3477" />
-<TGConnectingPoint num="41" id="3478" />
-<TGConnectingPoint num="42" id="3479" />
-<TGConnectingPoint num="43" id="3480" />
-<TGConnectingPoint num="44" id="3481" />
-<TGConnectingPoint num="45" id="3482" />
-<TGConnectingPoint num="46" id="3483" />
-<TGConnectingPoint num="47" id="3484" />
-<TGConnectingPoint num="48" id="3485" />
-<TGConnectingPoint num="49" id="3486" />
-<TGConnectingPoint num="50" id="3487" />
-<TGConnectingPoint num="51" id="3488" />
-<TGConnectingPoint num="52" id="3489" />
-<TGConnectingPoint num="53" id="3490" />
-<TGConnectingPoint num="54" id="3491" />
-<TGConnectingPoint num="55" id="3492" />
-<TGConnectingPoint num="56" id="3493" />
-<TGConnectingPoint num="57" id="3494" />
-<TGConnectingPoint num="58" id="3495" />
-<TGConnectingPoint num="59" id="3496" />
-<TGConnectingPoint num="60" id="3497" />
-<TGConnectingPoint num="61" id="3498" />
-<TGConnectingPoint num="62" id="3499" />
-<TGConnectingPoint num="63" id="3500" />
-<TGConnectingPoint num="64" id="3501" />
-<TGConnectingPoint num="65" id="3502" />
-<TGConnectingPoint num="66" id="3503" />
-<TGConnectingPoint num="67" id="3504" />
-<TGConnectingPoint num="68" id="3505" />
-<TGConnectingPoint num="69" id="3506" />
-<TGConnectingPoint num="70" id="3507" />
-<TGConnectingPoint num="71" id="3508" />
+<TGConnectingPoint num="0" id="3303" />
+<TGConnectingPoint num="1" id="3304" />
+<TGConnectingPoint num="2" id="3305" />
+<TGConnectingPoint num="3" id="3306" />
+<TGConnectingPoint num="4" id="3307" />
+<TGConnectingPoint num="5" id="3308" />
+<TGConnectingPoint num="6" id="3309" />
+<TGConnectingPoint num="7" id="3310" />
+<TGConnectingPoint num="8" id="3311" />
+<TGConnectingPoint num="9" id="3312" />
+<TGConnectingPoint num="10" id="3313" />
+<TGConnectingPoint num="11" id="3314" />
+<TGConnectingPoint num="12" id="3315" />
+<TGConnectingPoint num="13" id="3316" />
+<TGConnectingPoint num="14" id="3317" />
+<TGConnectingPoint num="15" id="3318" />
+<TGConnectingPoint num="16" id="3319" />
+<TGConnectingPoint num="17" id="3320" />
+<TGConnectingPoint num="18" id="3321" />
+<TGConnectingPoint num="19" id="3322" />
+<TGConnectingPoint num="20" id="3323" />
+<TGConnectingPoint num="21" id="3324" />
+<TGConnectingPoint num="22" id="3325" />
+<TGConnectingPoint num="23" id="3326" />
+<TGConnectingPoint num="24" id="3327" />
+<TGConnectingPoint num="25" id="3328" />
+<TGConnectingPoint num="26" id="3329" />
+<TGConnectingPoint num="27" id="3330" />
+<TGConnectingPoint num="28" id="3331" />
+<TGConnectingPoint num="29" id="3332" />
+<TGConnectingPoint num="30" id="3333" />
+<TGConnectingPoint num="31" id="3334" />
+<TGConnectingPoint num="32" id="3335" />
+<TGConnectingPoint num="33" id="3336" />
+<TGConnectingPoint num="34" id="3337" />
+<TGConnectingPoint num="35" id="3338" />
+<TGConnectingPoint num="36" id="3339" />
+<TGConnectingPoint num="37" id="3340" />
+<TGConnectingPoint num="38" id="3341" />
+<TGConnectingPoint num="39" id="3342" />
+<TGConnectingPoint num="40" id="3343" />
+<TGConnectingPoint num="41" id="3344" />
+<TGConnectingPoint num="42" id="3345" />
+<TGConnectingPoint num="43" id="3346" />
+<TGConnectingPoint num="44" id="3347" />
+<TGConnectingPoint num="45" id="3348" />
+<TGConnectingPoint num="46" id="3349" />
+<TGConnectingPoint num="47" id="3350" />
+<TGConnectingPoint num="48" id="3351" />
+<TGConnectingPoint num="49" id="3352" />
+<TGConnectingPoint num="50" id="3353" />
+<TGConnectingPoint num="51" id="3354" />
+<TGConnectingPoint num="52" id="3355" />
+<TGConnectingPoint num="53" id="3356" />
+<TGConnectingPoint num="54" id="3357" />
+<TGConnectingPoint num="55" id="3358" />
+<TGConnectingPoint num="56" id="3359" />
+<TGConnectingPoint num="57" id="3360" />
+<TGConnectingPoint num="58" id="3361" />
+<TGConnectingPoint num="59" id="3362" />
+<TGConnectingPoint num="60" id="3363" />
+<TGConnectingPoint num="61" id="3364" />
+<TGConnectingPoint num="62" id="3365" />
+<TGConnectingPoint num="63" id="3366" />
+<TGConnectingPoint num="64" id="3367" />
+<TGConnectingPoint num="65" id="3368" />
+<TGConnectingPoint num="66" id="3369" />
+<TGConnectingPoint num="67" id="3370" />
+<TGConnectingPoint num="68" id="3371" />
+<TGConnectingPoint num="69" id="3372" />
+<TGConnectingPoint num="70" id="3373" />
+<TGConnectingPoint num="71" id="3374" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3421" index="14" uid="cdd181ef-209f-4bd4-9cad-613608a12642" >
+<COMPONENT type="5103" id="3386" index="14" uid="cdd181ef-209f-4bd4-9cad-613608a12642" >
 <cdparam x="680" y="440" />
-<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="ejectCoin()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3422" />
-<TGConnectingPoint num="1" id="3423" />
-<TGConnectingPoint num="2" id="3424" />
-<TGConnectingPoint num="3" id="3425" />
-<TGConnectingPoint num="4" id="3426" />
-<TGConnectingPoint num="5" id="3427" />
-<TGConnectingPoint num="6" id="3428" />
-<TGConnectingPoint num="7" id="3429" />
-<TGConnectingPoint num="8" id="3430" />
-<TGConnectingPoint num="9" id="3431" />
+<TGConnectingPoint num="0" id="3376" />
+<TGConnectingPoint num="1" id="3377" />
+<TGConnectingPoint num="2" id="3378" />
+<TGConnectingPoint num="3" id="3379" />
+<TGConnectingPoint num="4" id="3380" />
+<TGConnectingPoint num="5" id="3381" />
+<TGConnectingPoint num="6" id="3382" />
+<TGConnectingPoint num="7" id="3383" />
+<TGConnectingPoint num="8" id="3384" />
+<TGConnectingPoint num="9" id="3385" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3342" index="15" uid="382cfd88-4672-41d5-a510-32cb75b036dc" >
+<COMPONENT type="5106" id="3459" index="15" uid="382cfd88-4672-41d5-a510-32cb75b036dc" >
 <cdparam x="400" y="440" />
 <sizeparam width="209" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6398,83 +6398,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="BeveragePreparation" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3343" />
-<TGConnectingPoint num="1" id="3344" />
-<TGConnectingPoint num="2" id="3345" />
-<TGConnectingPoint num="3" id="3346" />
-<TGConnectingPoint num="4" id="3347" />
-<TGConnectingPoint num="5" id="3348" />
-<TGConnectingPoint num="6" id="3349" />
-<TGConnectingPoint num="7" id="3350" />
-<TGConnectingPoint num="8" id="3351" />
-<TGConnectingPoint num="9" id="3352" />
-<TGConnectingPoint num="10" id="3353" />
-<TGConnectingPoint num="11" id="3354" />
-<TGConnectingPoint num="12" id="3355" />
-<TGConnectingPoint num="13" id="3356" />
-<TGConnectingPoint num="14" id="3357" />
-<TGConnectingPoint num="15" id="3358" />
-<TGConnectingPoint num="16" id="3359" />
-<TGConnectingPoint num="17" id="3360" />
-<TGConnectingPoint num="18" id="3361" />
-<TGConnectingPoint num="19" id="3362" />
-<TGConnectingPoint num="20" id="3363" />
-<TGConnectingPoint num="21" id="3364" />
-<TGConnectingPoint num="22" id="3365" />
-<TGConnectingPoint num="23" id="3366" />
-<TGConnectingPoint num="24" id="3367" />
-<TGConnectingPoint num="25" id="3368" />
-<TGConnectingPoint num="26" id="3369" />
-<TGConnectingPoint num="27" id="3370" />
-<TGConnectingPoint num="28" id="3371" />
-<TGConnectingPoint num="29" id="3372" />
-<TGConnectingPoint num="30" id="3373" />
-<TGConnectingPoint num="31" id="3374" />
-<TGConnectingPoint num="32" id="3375" />
-<TGConnectingPoint num="33" id="3376" />
-<TGConnectingPoint num="34" id="3377" />
-<TGConnectingPoint num="35" id="3378" />
-<TGConnectingPoint num="36" id="3379" />
-<TGConnectingPoint num="37" id="3380" />
-<TGConnectingPoint num="38" id="3381" />
-<TGConnectingPoint num="39" id="3382" />
-<TGConnectingPoint num="40" id="3383" />
-<TGConnectingPoint num="41" id="3384" />
-<TGConnectingPoint num="42" id="3385" />
-<TGConnectingPoint num="43" id="3386" />
-<TGConnectingPoint num="44" id="3387" />
-<TGConnectingPoint num="45" id="3388" />
-<TGConnectingPoint num="46" id="3389" />
-<TGConnectingPoint num="47" id="3390" />
-<TGConnectingPoint num="48" id="3391" />
-<TGConnectingPoint num="49" id="3392" />
-<TGConnectingPoint num="50" id="3393" />
-<TGConnectingPoint num="51" id="3394" />
-<TGConnectingPoint num="52" id="3395" />
-<TGConnectingPoint num="53" id="3396" />
-<TGConnectingPoint num="54" id="3397" />
-<TGConnectingPoint num="55" id="3398" />
-<TGConnectingPoint num="56" id="3399" />
-<TGConnectingPoint num="57" id="3400" />
-<TGConnectingPoint num="58" id="3401" />
-<TGConnectingPoint num="59" id="3402" />
-<TGConnectingPoint num="60" id="3403" />
-<TGConnectingPoint num="61" id="3404" />
-<TGConnectingPoint num="62" id="3405" />
-<TGConnectingPoint num="63" id="3406" />
-<TGConnectingPoint num="64" id="3407" />
-<TGConnectingPoint num="65" id="3408" />
-<TGConnectingPoint num="66" id="3409" />
-<TGConnectingPoint num="67" id="3410" />
-<TGConnectingPoint num="68" id="3411" />
-<TGConnectingPoint num="69" id="3412" />
-<TGConnectingPoint num="70" id="3413" />
-<TGConnectingPoint num="71" id="3414" />
+<TGConnectingPoint num="0" id="3387" />
+<TGConnectingPoint num="1" id="3388" />
+<TGConnectingPoint num="2" id="3389" />
+<TGConnectingPoint num="3" id="3390" />
+<TGConnectingPoint num="4" id="3391" />
+<TGConnectingPoint num="5" id="3392" />
+<TGConnectingPoint num="6" id="3393" />
+<TGConnectingPoint num="7" id="3394" />
+<TGConnectingPoint num="8" id="3395" />
+<TGConnectingPoint num="9" id="3396" />
+<TGConnectingPoint num="10" id="3397" />
+<TGConnectingPoint num="11" id="3398" />
+<TGConnectingPoint num="12" id="3399" />
+<TGConnectingPoint num="13" id="3400" />
+<TGConnectingPoint num="14" id="3401" />
+<TGConnectingPoint num="15" id="3402" />
+<TGConnectingPoint num="16" id="3403" />
+<TGConnectingPoint num="17" id="3404" />
+<TGConnectingPoint num="18" id="3405" />
+<TGConnectingPoint num="19" id="3406" />
+<TGConnectingPoint num="20" id="3407" />
+<TGConnectingPoint num="21" id="3408" />
+<TGConnectingPoint num="22" id="3409" />
+<TGConnectingPoint num="23" id="3410" />
+<TGConnectingPoint num="24" id="3411" />
+<TGConnectingPoint num="25" id="3412" />
+<TGConnectingPoint num="26" id="3413" />
+<TGConnectingPoint num="27" id="3414" />
+<TGConnectingPoint num="28" id="3415" />
+<TGConnectingPoint num="29" id="3416" />
+<TGConnectingPoint num="30" id="3417" />
+<TGConnectingPoint num="31" id="3418" />
+<TGConnectingPoint num="32" id="3419" />
+<TGConnectingPoint num="33" id="3420" />
+<TGConnectingPoint num="34" id="3421" />
+<TGConnectingPoint num="35" id="3422" />
+<TGConnectingPoint num="36" id="3423" />
+<TGConnectingPoint num="37" id="3424" />
+<TGConnectingPoint num="38" id="3425" />
+<TGConnectingPoint num="39" id="3426" />
+<TGConnectingPoint num="40" id="3427" />
+<TGConnectingPoint num="41" id="3428" />
+<TGConnectingPoint num="42" id="3429" />
+<TGConnectingPoint num="43" id="3430" />
+<TGConnectingPoint num="44" id="3431" />
+<TGConnectingPoint num="45" id="3432" />
+<TGConnectingPoint num="46" id="3433" />
+<TGConnectingPoint num="47" id="3434" />
+<TGConnectingPoint num="48" id="3435" />
+<TGConnectingPoint num="49" id="3436" />
+<TGConnectingPoint num="50" id="3437" />
+<TGConnectingPoint num="51" id="3438" />
+<TGConnectingPoint num="52" id="3439" />
+<TGConnectingPoint num="53" id="3440" />
+<TGConnectingPoint num="54" id="3441" />
+<TGConnectingPoint num="55" id="3442" />
+<TGConnectingPoint num="56" id="3443" />
+<TGConnectingPoint num="57" id="3444" />
+<TGConnectingPoint num="58" id="3445" />
+<TGConnectingPoint num="59" id="3446" />
+<TGConnectingPoint num="60" id="3447" />
+<TGConnectingPoint num="61" id="3448" />
+<TGConnectingPoint num="62" id="3449" />
+<TGConnectingPoint num="63" id="3450" />
+<TGConnectingPoint num="64" id="3451" />
+<TGConnectingPoint num="65" id="3452" />
+<TGConnectingPoint num="66" id="3453" />
+<TGConnectingPoint num="67" id="3454" />
+<TGConnectingPoint num="68" id="3455" />
+<TGConnectingPoint num="69" id="3456" />
+<TGConnectingPoint num="70" id="3457" />
+<TGConnectingPoint num="71" id="3458" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3265" index="16" uid="0edbe78c-1bc3-4ade-947b-aa590b9d1ca8" >
+<COMPONENT type="5106" id="3532" index="16" uid="0edbe78c-1bc3-4ade-947b-aa590b9d1ca8" >
 <cdparam x="400" y="340" />
 <sizeparam width="154" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6482,83 +6482,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="SelectBeverage" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3266" />
-<TGConnectingPoint num="1" id="3267" />
-<TGConnectingPoint num="2" id="3268" />
-<TGConnectingPoint num="3" id="3269" />
-<TGConnectingPoint num="4" id="3270" />
-<TGConnectingPoint num="5" id="3271" />
-<TGConnectingPoint num="6" id="3272" />
-<TGConnectingPoint num="7" id="3273" />
-<TGConnectingPoint num="8" id="3274" />
-<TGConnectingPoint num="9" id="3275" />
-<TGConnectingPoint num="10" id="3276" />
-<TGConnectingPoint num="11" id="3277" />
-<TGConnectingPoint num="12" id="3278" />
-<TGConnectingPoint num="13" id="3279" />
-<TGConnectingPoint num="14" id="3280" />
-<TGConnectingPoint num="15" id="3281" />
-<TGConnectingPoint num="16" id="3282" />
-<TGConnectingPoint num="17" id="3283" />
-<TGConnectingPoint num="18" id="3284" />
-<TGConnectingPoint num="19" id="3285" />
-<TGConnectingPoint num="20" id="3286" />
-<TGConnectingPoint num="21" id="3287" />
-<TGConnectingPoint num="22" id="3288" />
-<TGConnectingPoint num="23" id="3289" />
-<TGConnectingPoint num="24" id="3290" />
-<TGConnectingPoint num="25" id="3291" />
-<TGConnectingPoint num="26" id="3292" />
-<TGConnectingPoint num="27" id="3293" />
-<TGConnectingPoint num="28" id="3294" />
-<TGConnectingPoint num="29" id="3295" />
-<TGConnectingPoint num="30" id="3296" />
-<TGConnectingPoint num="31" id="3297" />
-<TGConnectingPoint num="32" id="3298" />
-<TGConnectingPoint num="33" id="3299" />
-<TGConnectingPoint num="34" id="3300" />
-<TGConnectingPoint num="35" id="3301" />
-<TGConnectingPoint num="36" id="3302" />
-<TGConnectingPoint num="37" id="3303" />
-<TGConnectingPoint num="38" id="3304" />
-<TGConnectingPoint num="39" id="3305" />
-<TGConnectingPoint num="40" id="3306" />
-<TGConnectingPoint num="41" id="3307" />
-<TGConnectingPoint num="42" id="3308" />
-<TGConnectingPoint num="43" id="3309" />
-<TGConnectingPoint num="44" id="3310" />
-<TGConnectingPoint num="45" id="3311" />
-<TGConnectingPoint num="46" id="3312" />
-<TGConnectingPoint num="47" id="3313" />
-<TGConnectingPoint num="48" id="3314" />
-<TGConnectingPoint num="49" id="3315" />
-<TGConnectingPoint num="50" id="3316" />
-<TGConnectingPoint num="51" id="3317" />
-<TGConnectingPoint num="52" id="3318" />
-<TGConnectingPoint num="53" id="3319" />
-<TGConnectingPoint num="54" id="3320" />
-<TGConnectingPoint num="55" id="3321" />
-<TGConnectingPoint num="56" id="3322" />
-<TGConnectingPoint num="57" id="3323" />
-<TGConnectingPoint num="58" id="3324" />
-<TGConnectingPoint num="59" id="3325" />
-<TGConnectingPoint num="60" id="3326" />
-<TGConnectingPoint num="61" id="3327" />
-<TGConnectingPoint num="62" id="3328" />
-<TGConnectingPoint num="63" id="3329" />
-<TGConnectingPoint num="64" id="3330" />
-<TGConnectingPoint num="65" id="3331" />
-<TGConnectingPoint num="66" id="3332" />
-<TGConnectingPoint num="67" id="3333" />
-<TGConnectingPoint num="68" id="3334" />
-<TGConnectingPoint num="69" id="3335" />
-<TGConnectingPoint num="70" id="3336" />
-<TGConnectingPoint num="71" id="3337" />
+<TGConnectingPoint num="0" id="3460" />
+<TGConnectingPoint num="1" id="3461" />
+<TGConnectingPoint num="2" id="3462" />
+<TGConnectingPoint num="3" id="3463" />
+<TGConnectingPoint num="4" id="3464" />
+<TGConnectingPoint num="5" id="3465" />
+<TGConnectingPoint num="6" id="3466" />
+<TGConnectingPoint num="7" id="3467" />
+<TGConnectingPoint num="8" id="3468" />
+<TGConnectingPoint num="9" id="3469" />
+<TGConnectingPoint num="10" id="3470" />
+<TGConnectingPoint num="11" id="3471" />
+<TGConnectingPoint num="12" id="3472" />
+<TGConnectingPoint num="13" id="3473" />
+<TGConnectingPoint num="14" id="3474" />
+<TGConnectingPoint num="15" id="3475" />
+<TGConnectingPoint num="16" id="3476" />
+<TGConnectingPoint num="17" id="3477" />
+<TGConnectingPoint num="18" id="3478" />
+<TGConnectingPoint num="19" id="3479" />
+<TGConnectingPoint num="20" id="3480" />
+<TGConnectingPoint num="21" id="3481" />
+<TGConnectingPoint num="22" id="3482" />
+<TGConnectingPoint num="23" id="3483" />
+<TGConnectingPoint num="24" id="3484" />
+<TGConnectingPoint num="25" id="3485" />
+<TGConnectingPoint num="26" id="3486" />
+<TGConnectingPoint num="27" id="3487" />
+<TGConnectingPoint num="28" id="3488" />
+<TGConnectingPoint num="29" id="3489" />
+<TGConnectingPoint num="30" id="3490" />
+<TGConnectingPoint num="31" id="3491" />
+<TGConnectingPoint num="32" id="3492" />
+<TGConnectingPoint num="33" id="3493" />
+<TGConnectingPoint num="34" id="3494" />
+<TGConnectingPoint num="35" id="3495" />
+<TGConnectingPoint num="36" id="3496" />
+<TGConnectingPoint num="37" id="3497" />
+<TGConnectingPoint num="38" id="3498" />
+<TGConnectingPoint num="39" id="3499" />
+<TGConnectingPoint num="40" id="3500" />
+<TGConnectingPoint num="41" id="3501" />
+<TGConnectingPoint num="42" id="3502" />
+<TGConnectingPoint num="43" id="3503" />
+<TGConnectingPoint num="44" id="3504" />
+<TGConnectingPoint num="45" id="3505" />
+<TGConnectingPoint num="46" id="3506" />
+<TGConnectingPoint num="47" id="3507" />
+<TGConnectingPoint num="48" id="3508" />
+<TGConnectingPoint num="49" id="3509" />
+<TGConnectingPoint num="50" id="3510" />
+<TGConnectingPoint num="51" id="3511" />
+<TGConnectingPoint num="52" id="3512" />
+<TGConnectingPoint num="53" id="3513" />
+<TGConnectingPoint num="54" id="3514" />
+<TGConnectingPoint num="55" id="3515" />
+<TGConnectingPoint num="56" id="3516" />
+<TGConnectingPoint num="57" id="3517" />
+<TGConnectingPoint num="58" id="3518" />
+<TGConnectingPoint num="59" id="3519" />
+<TGConnectingPoint num="60" id="3520" />
+<TGConnectingPoint num="61" id="3521" />
+<TGConnectingPoint num="62" id="3522" />
+<TGConnectingPoint num="63" id="3523" />
+<TGConnectingPoint num="64" id="3524" />
+<TGConnectingPoint num="65" id="3525" />
+<TGConnectingPoint num="66" id="3526" />
+<TGConnectingPoint num="67" id="3527" />
+<TGConnectingPoint num="68" id="3528" />
+<TGConnectingPoint num="69" id="3529" />
+<TGConnectingPoint num="70" id="3530" />
+<TGConnectingPoint num="71" id="3531" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3188" index="17" uid="4d7fb933-e20b-4c18-a3bc-915f9c594ea3" >
+<COMPONENT type="5106" id="3605" index="17" uid="4d7fb933-e20b-4c18-a3bc-915f9c594ea3" >
 <cdparam x="400" y="240" />
 <sizeparam width="143" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6566,83 +6566,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="CoinInsertion" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3189" />
-<TGConnectingPoint num="1" id="3190" />
-<TGConnectingPoint num="2" id="3191" />
-<TGConnectingPoint num="3" id="3192" />
-<TGConnectingPoint num="4" id="3193" />
-<TGConnectingPoint num="5" id="3194" />
-<TGConnectingPoint num="6" id="3195" />
-<TGConnectingPoint num="7" id="3196" />
-<TGConnectingPoint num="8" id="3197" />
-<TGConnectingPoint num="9" id="3198" />
-<TGConnectingPoint num="10" id="3199" />
-<TGConnectingPoint num="11" id="3200" />
-<TGConnectingPoint num="12" id="3201" />
-<TGConnectingPoint num="13" id="3202" />
-<TGConnectingPoint num="14" id="3203" />
-<TGConnectingPoint num="15" id="3204" />
-<TGConnectingPoint num="16" id="3205" />
-<TGConnectingPoint num="17" id="3206" />
-<TGConnectingPoint num="18" id="3207" />
-<TGConnectingPoint num="19" id="3208" />
-<TGConnectingPoint num="20" id="3209" />
-<TGConnectingPoint num="21" id="3210" />
-<TGConnectingPoint num="22" id="3211" />
-<TGConnectingPoint num="23" id="3212" />
-<TGConnectingPoint num="24" id="3213" />
-<TGConnectingPoint num="25" id="3214" />
-<TGConnectingPoint num="26" id="3215" />
-<TGConnectingPoint num="27" id="3216" />
-<TGConnectingPoint num="28" id="3217" />
-<TGConnectingPoint num="29" id="3218" />
-<TGConnectingPoint num="30" id="3219" />
-<TGConnectingPoint num="31" id="3220" />
-<TGConnectingPoint num="32" id="3221" />
-<TGConnectingPoint num="33" id="3222" />
-<TGConnectingPoint num="34" id="3223" />
-<TGConnectingPoint num="35" id="3224" />
-<TGConnectingPoint num="36" id="3225" />
-<TGConnectingPoint num="37" id="3226" />
-<TGConnectingPoint num="38" id="3227" />
-<TGConnectingPoint num="39" id="3228" />
-<TGConnectingPoint num="40" id="3229" />
-<TGConnectingPoint num="41" id="3230" />
-<TGConnectingPoint num="42" id="3231" />
-<TGConnectingPoint num="43" id="3232" />
-<TGConnectingPoint num="44" id="3233" />
-<TGConnectingPoint num="45" id="3234" />
-<TGConnectingPoint num="46" id="3235" />
-<TGConnectingPoint num="47" id="3236" />
-<TGConnectingPoint num="48" id="3237" />
-<TGConnectingPoint num="49" id="3238" />
-<TGConnectingPoint num="50" id="3239" />
-<TGConnectingPoint num="51" id="3240" />
-<TGConnectingPoint num="52" id="3241" />
-<TGConnectingPoint num="53" id="3242" />
-<TGConnectingPoint num="54" id="3243" />
-<TGConnectingPoint num="55" id="3244" />
-<TGConnectingPoint num="56" id="3245" />
-<TGConnectingPoint num="57" id="3246" />
-<TGConnectingPoint num="58" id="3247" />
-<TGConnectingPoint num="59" id="3248" />
-<TGConnectingPoint num="60" id="3249" />
-<TGConnectingPoint num="61" id="3250" />
-<TGConnectingPoint num="62" id="3251" />
-<TGConnectingPoint num="63" id="3252" />
-<TGConnectingPoint num="64" id="3253" />
-<TGConnectingPoint num="65" id="3254" />
-<TGConnectingPoint num="66" id="3255" />
-<TGConnectingPoint num="67" id="3256" />
-<TGConnectingPoint num="68" id="3257" />
-<TGConnectingPoint num="69" id="3258" />
-<TGConnectingPoint num="70" id="3259" />
-<TGConnectingPoint num="71" id="3260" />
+<TGConnectingPoint num="0" id="3533" />
+<TGConnectingPoint num="1" id="3534" />
+<TGConnectingPoint num="2" id="3535" />
+<TGConnectingPoint num="3" id="3536" />
+<TGConnectingPoint num="4" id="3537" />
+<TGConnectingPoint num="5" id="3538" />
+<TGConnectingPoint num="6" id="3539" />
+<TGConnectingPoint num="7" id="3540" />
+<TGConnectingPoint num="8" id="3541" />
+<TGConnectingPoint num="9" id="3542" />
+<TGConnectingPoint num="10" id="3543" />
+<TGConnectingPoint num="11" id="3544" />
+<TGConnectingPoint num="12" id="3545" />
+<TGConnectingPoint num="13" id="3546" />
+<TGConnectingPoint num="14" id="3547" />
+<TGConnectingPoint num="15" id="3548" />
+<TGConnectingPoint num="16" id="3549" />
+<TGConnectingPoint num="17" id="3550" />
+<TGConnectingPoint num="18" id="3551" />
+<TGConnectingPoint num="19" id="3552" />
+<TGConnectingPoint num="20" id="3553" />
+<TGConnectingPoint num="21" id="3554" />
+<TGConnectingPoint num="22" id="3555" />
+<TGConnectingPoint num="23" id="3556" />
+<TGConnectingPoint num="24" id="3557" />
+<TGConnectingPoint num="25" id="3558" />
+<TGConnectingPoint num="26" id="3559" />
+<TGConnectingPoint num="27" id="3560" />
+<TGConnectingPoint num="28" id="3561" />
+<TGConnectingPoint num="29" id="3562" />
+<TGConnectingPoint num="30" id="3563" />
+<TGConnectingPoint num="31" id="3564" />
+<TGConnectingPoint num="32" id="3565" />
+<TGConnectingPoint num="33" id="3566" />
+<TGConnectingPoint num="34" id="3567" />
+<TGConnectingPoint num="35" id="3568" />
+<TGConnectingPoint num="36" id="3569" />
+<TGConnectingPoint num="37" id="3570" />
+<TGConnectingPoint num="38" id="3571" />
+<TGConnectingPoint num="39" id="3572" />
+<TGConnectingPoint num="40" id="3573" />
+<TGConnectingPoint num="41" id="3574" />
+<TGConnectingPoint num="42" id="3575" />
+<TGConnectingPoint num="43" id="3576" />
+<TGConnectingPoint num="44" id="3577" />
+<TGConnectingPoint num="45" id="3578" />
+<TGConnectingPoint num="46" id="3579" />
+<TGConnectingPoint num="47" id="3580" />
+<TGConnectingPoint num="48" id="3581" />
+<TGConnectingPoint num="49" id="3582" />
+<TGConnectingPoint num="50" id="3583" />
+<TGConnectingPoint num="51" id="3584" />
+<TGConnectingPoint num="52" id="3585" />
+<TGConnectingPoint num="53" id="3586" />
+<TGConnectingPoint num="54" id="3587" />
+<TGConnectingPoint num="55" id="3588" />
+<TGConnectingPoint num="56" id="3589" />
+<TGConnectingPoint num="57" id="3590" />
+<TGConnectingPoint num="58" id="3591" />
+<TGConnectingPoint num="59" id="3592" />
+<TGConnectingPoint num="60" id="3593" />
+<TGConnectingPoint num="61" id="3594" />
+<TGConnectingPoint num="62" id="3595" />
+<TGConnectingPoint num="63" id="3596" />
+<TGConnectingPoint num="64" id="3597" />
+<TGConnectingPoint num="65" id="3598" />
+<TGConnectingPoint num="66" id="3599" />
+<TGConnectingPoint num="67" id="3600" />
+<TGConnectingPoint num="68" id="3601" />
+<TGConnectingPoint num="69" id="3602" />
+<TGConnectingPoint num="70" id="3603" />
+<TGConnectingPoint num="71" id="3604" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3111" index="18" uid="852c1e77-d3a1-443c-b195-95a932447a62" >
+<COMPONENT type="5106" id="3678" index="18" uid="852c1e77-d3a1-443c-b195-95a932447a62" >
 <cdparam x="400" y="140" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6650,118 +6650,118 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Start" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3112" />
-<TGConnectingPoint num="1" id="3113" />
-<TGConnectingPoint num="2" id="3114" />
-<TGConnectingPoint num="3" id="3115" />
-<TGConnectingPoint num="4" id="3116" />
-<TGConnectingPoint num="5" id="3117" />
-<TGConnectingPoint num="6" id="3118" />
-<TGConnectingPoint num="7" id="3119" />
-<TGConnectingPoint num="8" id="3120" />
-<TGConnectingPoint num="9" id="3121" />
-<TGConnectingPoint num="10" id="3122" />
-<TGConnectingPoint num="11" id="3123" />
-<TGConnectingPoint num="12" id="3124" />
-<TGConnectingPoint num="13" id="3125" />
-<TGConnectingPoint num="14" id="3126" />
-<TGConnectingPoint num="15" id="3127" />
-<TGConnectingPoint num="16" id="3128" />
-<TGConnectingPoint num="17" id="3129" />
-<TGConnectingPoint num="18" id="3130" />
-<TGConnectingPoint num="19" id="3131" />
-<TGConnectingPoint num="20" id="3132" />
-<TGConnectingPoint num="21" id="3133" />
-<TGConnectingPoint num="22" id="3134" />
-<TGConnectingPoint num="23" id="3135" />
-<TGConnectingPoint num="24" id="3136" />
-<TGConnectingPoint num="25" id="3137" />
-<TGConnectingPoint num="26" id="3138" />
-<TGConnectingPoint num="27" id="3139" />
-<TGConnectingPoint num="28" id="3140" />
-<TGConnectingPoint num="29" id="3141" />
-<TGConnectingPoint num="30" id="3142" />
-<TGConnectingPoint num="31" id="3143" />
-<TGConnectingPoint num="32" id="3144" />
-<TGConnectingPoint num="33" id="3145" />
-<TGConnectingPoint num="34" id="3146" />
-<TGConnectingPoint num="35" id="3147" />
-<TGConnectingPoint num="36" id="3148" />
-<TGConnectingPoint num="37" id="3149" />
-<TGConnectingPoint num="38" id="3150" />
-<TGConnectingPoint num="39" id="3151" />
-<TGConnectingPoint num="40" id="3152" />
-<TGConnectingPoint num="41" id="3153" />
-<TGConnectingPoint num="42" id="3154" />
-<TGConnectingPoint num="43" id="3155" />
-<TGConnectingPoint num="44" id="3156" />
-<TGConnectingPoint num="45" id="3157" />
-<TGConnectingPoint num="46" id="3158" />
-<TGConnectingPoint num="47" id="3159" />
-<TGConnectingPoint num="48" id="3160" />
-<TGConnectingPoint num="49" id="3161" />
-<TGConnectingPoint num="50" id="3162" />
-<TGConnectingPoint num="51" id="3163" />
-<TGConnectingPoint num="52" id="3164" />
-<TGConnectingPoint num="53" id="3165" />
-<TGConnectingPoint num="54" id="3166" />
-<TGConnectingPoint num="55" id="3167" />
-<TGConnectingPoint num="56" id="3168" />
-<TGConnectingPoint num="57" id="3169" />
-<TGConnectingPoint num="58" id="3170" />
-<TGConnectingPoint num="59" id="3171" />
-<TGConnectingPoint num="60" id="3172" />
-<TGConnectingPoint num="61" id="3173" />
-<TGConnectingPoint num="62" id="3174" />
-<TGConnectingPoint num="63" id="3175" />
-<TGConnectingPoint num="64" id="3176" />
-<TGConnectingPoint num="65" id="3177" />
-<TGConnectingPoint num="66" id="3178" />
-<TGConnectingPoint num="67" id="3179" />
-<TGConnectingPoint num="68" id="3180" />
-<TGConnectingPoint num="69" id="3181" />
-<TGConnectingPoint num="70" id="3182" />
-<TGConnectingPoint num="71" id="3183" />
+<TGConnectingPoint num="0" id="3606" />
+<TGConnectingPoint num="1" id="3607" />
+<TGConnectingPoint num="2" id="3608" />
+<TGConnectingPoint num="3" id="3609" />
+<TGConnectingPoint num="4" id="3610" />
+<TGConnectingPoint num="5" id="3611" />
+<TGConnectingPoint num="6" id="3612" />
+<TGConnectingPoint num="7" id="3613" />
+<TGConnectingPoint num="8" id="3614" />
+<TGConnectingPoint num="9" id="3615" />
+<TGConnectingPoint num="10" id="3616" />
+<TGConnectingPoint num="11" id="3617" />
+<TGConnectingPoint num="12" id="3618" />
+<TGConnectingPoint num="13" id="3619" />
+<TGConnectingPoint num="14" id="3620" />
+<TGConnectingPoint num="15" id="3621" />
+<TGConnectingPoint num="16" id="3622" />
+<TGConnectingPoint num="17" id="3623" />
+<TGConnectingPoint num="18" id="3624" />
+<TGConnectingPoint num="19" id="3625" />
+<TGConnectingPoint num="20" id="3626" />
+<TGConnectingPoint num="21" id="3627" />
+<TGConnectingPoint num="22" id="3628" />
+<TGConnectingPoint num="23" id="3629" />
+<TGConnectingPoint num="24" id="3630" />
+<TGConnectingPoint num="25" id="3631" />
+<TGConnectingPoint num="26" id="3632" />
+<TGConnectingPoint num="27" id="3633" />
+<TGConnectingPoint num="28" id="3634" />
+<TGConnectingPoint num="29" id="3635" />
+<TGConnectingPoint num="30" id="3636" />
+<TGConnectingPoint num="31" id="3637" />
+<TGConnectingPoint num="32" id="3638" />
+<TGConnectingPoint num="33" id="3639" />
+<TGConnectingPoint num="34" id="3640" />
+<TGConnectingPoint num="35" id="3641" />
+<TGConnectingPoint num="36" id="3642" />
+<TGConnectingPoint num="37" id="3643" />
+<TGConnectingPoint num="38" id="3644" />
+<TGConnectingPoint num="39" id="3645" />
+<TGConnectingPoint num="40" id="3646" />
+<TGConnectingPoint num="41" id="3647" />
+<TGConnectingPoint num="42" id="3648" />
+<TGConnectingPoint num="43" id="3649" />
+<TGConnectingPoint num="44" id="3650" />
+<TGConnectingPoint num="45" id="3651" />
+<TGConnectingPoint num="46" id="3652" />
+<TGConnectingPoint num="47" id="3653" />
+<TGConnectingPoint num="48" id="3654" />
+<TGConnectingPoint num="49" id="3655" />
+<TGConnectingPoint num="50" id="3656" />
+<TGConnectingPoint num="51" id="3657" />
+<TGConnectingPoint num="52" id="3658" />
+<TGConnectingPoint num="53" id="3659" />
+<TGConnectingPoint num="54" id="3660" />
+<TGConnectingPoint num="55" id="3661" />
+<TGConnectingPoint num="56" id="3662" />
+<TGConnectingPoint num="57" id="3663" />
+<TGConnectingPoint num="58" id="3664" />
+<TGConnectingPoint num="59" id="3665" />
+<TGConnectingPoint num="60" id="3666" />
+<TGConnectingPoint num="61" id="3667" />
+<TGConnectingPoint num="62" id="3668" />
+<TGConnectingPoint num="63" id="3669" />
+<TGConnectingPoint num="64" id="3670" />
+<TGConnectingPoint num="65" id="3671" />
+<TGConnectingPoint num="66" id="3672" />
+<TGConnectingPoint num="67" id="3673" />
+<TGConnectingPoint num="68" id="3674" />
+<TGConnectingPoint num="69" id="3675" />
+<TGConnectingPoint num="70" id="3676" />
+<TGConnectingPoint num="71" id="3677" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="3105" index="19" uid="9b9f3896-edba-47e5-a153-9d26bc6d973a" >
+<COMPONENT type="5100" id="3680" index="19" uid="9b9f3896-edba-47e5-a153-9d26bc6d973a" >
 <cdparam x="400" y="40" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3106" />
+<TGConnectingPoint num="0" id="3679" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="5102" id="3899" index="0" uid="1e575005-a3df-4e85-9f78-c5ea926786c1" >
+<CONNECTOR type="5102" id="3687" index="0" uid="1e575005-a3df-4e85-9f78-c5ea926786c1" >
 <cdparam x="466" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3900" />
-<P1  x="466" y="290" id="3817" />
-<P2  x="500" y="165" id="3738" />
+<TGConnectingPoint num="0" id="3686" />
+<P1  x="466" y="290" id="3708" />
+<P2  x="500" y="165" id="3779" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3901" index="-1" uid="8843aa1a-dc95-47ff-a629-92865bf7c951" >
-<father id="3899" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3685" index="6" uid="8843aa1a-dc95-47ff-a629-92865bf7c951" >
+<father id="3687" num="0" />
 <cdparam x="483" y="227" />
-<sizeparam width="137" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="137" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3902" />
-<TGConnectingPoint num="1" id="3903" />
-<TGConnectingPoint num="2" id="3904" />
-<TGConnectingPoint num="3" id="3905" />
+<TGConnectingPoint num="0" id="3681" />
+<TGConnectingPoint num="1" id="3682" />
+<TGConnectingPoint num="2" id="3683" />
+<TGConnectingPoint num="3" id="3684" />
 <extraparam>
 <guard value="mechanicalDelay &gt;= 0" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6775,28 +6775,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3892" index="1" uid="b1369839-43c1-4456-84c2-9a997793ae12" >
+<CONNECTOR type="5102" id="3694" index="1" uid="b1369839-43c1-4456-84c2-9a997793ae12" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3893" />
-<P1  x="407" y="60" id="3728" />
-<P2  x="450" y="140" id="3735" />
+<TGConnectingPoint num="0" id="3693" />
+<P1  x="407" y="60" id="3848" />
+<P2  x="450" y="140" id="3776" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3894" index="-1" uid="1ff5bc5e-935e-4f22-98ac-0a337349cfa7" >
-<father id="3892" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3692" index="7" uid="1ff5bc5e-935e-4f22-98ac-0a337349cfa7" >
+<father id="3694" num="0" />
 <cdparam x="428" y="100" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3895" />
-<TGConnectingPoint num="1" id="3896" />
-<TGConnectingPoint num="2" id="3897" />
-<TGConnectingPoint num="3" id="3898" />
+<TGConnectingPoint num="0" id="3688" />
+<TGConnectingPoint num="1" id="3689" />
+<TGConnectingPoint num="2" id="3690" />
+<TGConnectingPoint num="3" id="3691" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6810,28 +6810,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3885" index="2" uid="b589a5ca-b16b-430c-8f22-7ce671fb73cb" >
+<CONNECTOR type="5102" id="3701" index="2" uid="b589a5ca-b16b-430c-8f22-7ce671fb73cb" >
 <cdparam x="450" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3886" />
-<P1  x="450" y="190" id="3740" />
-<P2  x="466" y="240" id="3812" />
+<TGConnectingPoint num="0" id="3700" />
+<P1  x="450" y="190" id="3781" />
+<P2  x="466" y="240" id="3703" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3887" index="-1" uid="ea6eb85a-1642-4483-8610-2f7d721ab251" >
-<father id="3885" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3699" index="8" uid="ea6eb85a-1642-4483-8610-2f7d721ab251" >
+<father id="3701" num="0" />
 <cdparam x="458" y="215" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3888" />
-<TGConnectingPoint num="1" id="3889" />
-<TGConnectingPoint num="2" id="3890" />
-<TGConnectingPoint num="3" id="3891" />
+<TGConnectingPoint num="0" id="3695" />
+<TGConnectingPoint num="1" id="3696" />
+<TGConnectingPoint num="2" id="3697" />
+<TGConnectingPoint num="3" id="3698" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -6845,7 +6845,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3810" index="3" uid="954ef69a-6166-4ff3-bc5f-155367b7f92d" >
+<COMPONENT type="5106" id="3774" index="3" uid="954ef69a-6166-4ff3-bc5f-155367b7f92d" >
 <cdparam x="400" y="240" />
 <sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6853,83 +6853,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="ButtonPushed" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3811" />
-<TGConnectingPoint num="1" id="3812" />
-<TGConnectingPoint num="2" id="3813" />
-<TGConnectingPoint num="3" id="3814" />
-<TGConnectingPoint num="4" id="3815" />
-<TGConnectingPoint num="5" id="3816" />
-<TGConnectingPoint num="6" id="3817" />
-<TGConnectingPoint num="7" id="3818" />
-<TGConnectingPoint num="8" id="3819" />
-<TGConnectingPoint num="9" id="3820" />
-<TGConnectingPoint num="10" id="3821" />
-<TGConnectingPoint num="11" id="3822" />
-<TGConnectingPoint num="12" id="3823" />
-<TGConnectingPoint num="13" id="3824" />
-<TGConnectingPoint num="14" id="3825" />
-<TGConnectingPoint num="15" id="3826" />
-<TGConnectingPoint num="16" id="3827" />
-<TGConnectingPoint num="17" id="3828" />
-<TGConnectingPoint num="18" id="3829" />
-<TGConnectingPoint num="19" id="3830" />
-<TGConnectingPoint num="20" id="3831" />
-<TGConnectingPoint num="21" id="3832" />
-<TGConnectingPoint num="22" id="3833" />
-<TGConnectingPoint num="23" id="3834" />
-<TGConnectingPoint num="24" id="3835" />
-<TGConnectingPoint num="25" id="3836" />
-<TGConnectingPoint num="26" id="3837" />
-<TGConnectingPoint num="27" id="3838" />
-<TGConnectingPoint num="28" id="3839" />
-<TGConnectingPoint num="29" id="3840" />
-<TGConnectingPoint num="30" id="3841" />
-<TGConnectingPoint num="31" id="3842" />
-<TGConnectingPoint num="32" id="3843" />
-<TGConnectingPoint num="33" id="3844" />
-<TGConnectingPoint num="34" id="3845" />
-<TGConnectingPoint num="35" id="3846" />
-<TGConnectingPoint num="36" id="3847" />
-<TGConnectingPoint num="37" id="3848" />
-<TGConnectingPoint num="38" id="3849" />
-<TGConnectingPoint num="39" id="3850" />
-<TGConnectingPoint num="40" id="3851" />
-<TGConnectingPoint num="41" id="3852" />
-<TGConnectingPoint num="42" id="3853" />
-<TGConnectingPoint num="43" id="3854" />
-<TGConnectingPoint num="44" id="3855" />
-<TGConnectingPoint num="45" id="3856" />
-<TGConnectingPoint num="46" id="3857" />
-<TGConnectingPoint num="47" id="3858" />
-<TGConnectingPoint num="48" id="3859" />
-<TGConnectingPoint num="49" id="3860" />
-<TGConnectingPoint num="50" id="3861" />
-<TGConnectingPoint num="51" id="3862" />
-<TGConnectingPoint num="52" id="3863" />
-<TGConnectingPoint num="53" id="3864" />
-<TGConnectingPoint num="54" id="3865" />
-<TGConnectingPoint num="55" id="3866" />
-<TGConnectingPoint num="56" id="3867" />
-<TGConnectingPoint num="57" id="3868" />
-<TGConnectingPoint num="58" id="3869" />
-<TGConnectingPoint num="59" id="3870" />
-<TGConnectingPoint num="60" id="3871" />
-<TGConnectingPoint num="61" id="3872" />
-<TGConnectingPoint num="62" id="3873" />
-<TGConnectingPoint num="63" id="3874" />
-<TGConnectingPoint num="64" id="3875" />
-<TGConnectingPoint num="65" id="3876" />
-<TGConnectingPoint num="66" id="3877" />
-<TGConnectingPoint num="67" id="3878" />
-<TGConnectingPoint num="68" id="3879" />
-<TGConnectingPoint num="69" id="3880" />
-<TGConnectingPoint num="70" id="3881" />
-<TGConnectingPoint num="71" id="3882" />
+<TGConnectingPoint num="0" id="3702" />
+<TGConnectingPoint num="1" id="3703" />
+<TGConnectingPoint num="2" id="3704" />
+<TGConnectingPoint num="3" id="3705" />
+<TGConnectingPoint num="4" id="3706" />
+<TGConnectingPoint num="5" id="3707" />
+<TGConnectingPoint num="6" id="3708" />
+<TGConnectingPoint num="7" id="3709" />
+<TGConnectingPoint num="8" id="3710" />
+<TGConnectingPoint num="9" id="3711" />
+<TGConnectingPoint num="10" id="3712" />
+<TGConnectingPoint num="11" id="3713" />
+<TGConnectingPoint num="12" id="3714" />
+<TGConnectingPoint num="13" id="3715" />
+<TGConnectingPoint num="14" id="3716" />
+<TGConnectingPoint num="15" id="3717" />
+<TGConnectingPoint num="16" id="3718" />
+<TGConnectingPoint num="17" id="3719" />
+<TGConnectingPoint num="18" id="3720" />
+<TGConnectingPoint num="19" id="3721" />
+<TGConnectingPoint num="20" id="3722" />
+<TGConnectingPoint num="21" id="3723" />
+<TGConnectingPoint num="22" id="3724" />
+<TGConnectingPoint num="23" id="3725" />
+<TGConnectingPoint num="24" id="3726" />
+<TGConnectingPoint num="25" id="3727" />
+<TGConnectingPoint num="26" id="3728" />
+<TGConnectingPoint num="27" id="3729" />
+<TGConnectingPoint num="28" id="3730" />
+<TGConnectingPoint num="29" id="3731" />
+<TGConnectingPoint num="30" id="3732" />
+<TGConnectingPoint num="31" id="3733" />
+<TGConnectingPoint num="32" id="3734" />
+<TGConnectingPoint num="33" id="3735" />
+<TGConnectingPoint num="34" id="3736" />
+<TGConnectingPoint num="35" id="3737" />
+<TGConnectingPoint num="36" id="3738" />
+<TGConnectingPoint num="37" id="3739" />
+<TGConnectingPoint num="38" id="3740" />
+<TGConnectingPoint num="39" id="3741" />
+<TGConnectingPoint num="40" id="3742" />
+<TGConnectingPoint num="41" id="3743" />
+<TGConnectingPoint num="42" id="3744" />
+<TGConnectingPoint num="43" id="3745" />
+<TGConnectingPoint num="44" id="3746" />
+<TGConnectingPoint num="45" id="3747" />
+<TGConnectingPoint num="46" id="3748" />
+<TGConnectingPoint num="47" id="3749" />
+<TGConnectingPoint num="48" id="3750" />
+<TGConnectingPoint num="49" id="3751" />
+<TGConnectingPoint num="50" id="3752" />
+<TGConnectingPoint num="51" id="3753" />
+<TGConnectingPoint num="52" id="3754" />
+<TGConnectingPoint num="53" id="3755" />
+<TGConnectingPoint num="54" id="3756" />
+<TGConnectingPoint num="55" id="3757" />
+<TGConnectingPoint num="56" id="3758" />
+<TGConnectingPoint num="57" id="3759" />
+<TGConnectingPoint num="58" id="3760" />
+<TGConnectingPoint num="59" id="3761" />
+<TGConnectingPoint num="60" id="3762" />
+<TGConnectingPoint num="61" id="3763" />
+<TGConnectingPoint num="62" id="3764" />
+<TGConnectingPoint num="63" id="3765" />
+<TGConnectingPoint num="64" id="3766" />
+<TGConnectingPoint num="65" id="3767" />
+<TGConnectingPoint num="66" id="3768" />
+<TGConnectingPoint num="67" id="3769" />
+<TGConnectingPoint num="68" id="3770" />
+<TGConnectingPoint num="69" id="3771" />
+<TGConnectingPoint num="70" id="3772" />
+<TGConnectingPoint num="71" id="3773" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3733" index="4" uid="919df820-796c-4c33-bab0-834a0a213297" >
+<COMPONENT type="5106" id="3847" index="4" uid="919df820-796c-4c33-bab0-834a0a213297" >
 <cdparam x="400" y="140" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6937,118 +6937,118 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Start" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3734" />
-<TGConnectingPoint num="1" id="3735" />
-<TGConnectingPoint num="2" id="3736" />
-<TGConnectingPoint num="3" id="3737" />
-<TGConnectingPoint num="4" id="3738" />
-<TGConnectingPoint num="5" id="3739" />
-<TGConnectingPoint num="6" id="3740" />
-<TGConnectingPoint num="7" id="3741" />
-<TGConnectingPoint num="8" id="3742" />
-<TGConnectingPoint num="9" id="3743" />
-<TGConnectingPoint num="10" id="3744" />
-<TGConnectingPoint num="11" id="3745" />
-<TGConnectingPoint num="12" id="3746" />
-<TGConnectingPoint num="13" id="3747" />
-<TGConnectingPoint num="14" id="3748" />
-<TGConnectingPoint num="15" id="3749" />
-<TGConnectingPoint num="16" id="3750" />
-<TGConnectingPoint num="17" id="3751" />
-<TGConnectingPoint num="18" id="3752" />
-<TGConnectingPoint num="19" id="3753" />
-<TGConnectingPoint num="20" id="3754" />
-<TGConnectingPoint num="21" id="3755" />
-<TGConnectingPoint num="22" id="3756" />
-<TGConnectingPoint num="23" id="3757" />
-<TGConnectingPoint num="24" id="3758" />
-<TGConnectingPoint num="25" id="3759" />
-<TGConnectingPoint num="26" id="3760" />
-<TGConnectingPoint num="27" id="3761" />
-<TGConnectingPoint num="28" id="3762" />
-<TGConnectingPoint num="29" id="3763" />
-<TGConnectingPoint num="30" id="3764" />
-<TGConnectingPoint num="31" id="3765" />
-<TGConnectingPoint num="32" id="3766" />
-<TGConnectingPoint num="33" id="3767" />
-<TGConnectingPoint num="34" id="3768" />
-<TGConnectingPoint num="35" id="3769" />
-<TGConnectingPoint num="36" id="3770" />
-<TGConnectingPoint num="37" id="3771" />
-<TGConnectingPoint num="38" id="3772" />
-<TGConnectingPoint num="39" id="3773" />
-<TGConnectingPoint num="40" id="3774" />
-<TGConnectingPoint num="41" id="3775" />
-<TGConnectingPoint num="42" id="3776" />
-<TGConnectingPoint num="43" id="3777" />
-<TGConnectingPoint num="44" id="3778" />
-<TGConnectingPoint num="45" id="3779" />
-<TGConnectingPoint num="46" id="3780" />
-<TGConnectingPoint num="47" id="3781" />
-<TGConnectingPoint num="48" id="3782" />
-<TGConnectingPoint num="49" id="3783" />
-<TGConnectingPoint num="50" id="3784" />
-<TGConnectingPoint num="51" id="3785" />
-<TGConnectingPoint num="52" id="3786" />
-<TGConnectingPoint num="53" id="3787" />
-<TGConnectingPoint num="54" id="3788" />
-<TGConnectingPoint num="55" id="3789" />
-<TGConnectingPoint num="56" id="3790" />
-<TGConnectingPoint num="57" id="3791" />
-<TGConnectingPoint num="58" id="3792" />
-<TGConnectingPoint num="59" id="3793" />
-<TGConnectingPoint num="60" id="3794" />
-<TGConnectingPoint num="61" id="3795" />
-<TGConnectingPoint num="62" id="3796" />
-<TGConnectingPoint num="63" id="3797" />
-<TGConnectingPoint num="64" id="3798" />
-<TGConnectingPoint num="65" id="3799" />
-<TGConnectingPoint num="66" id="3800" />
-<TGConnectingPoint num="67" id="3801" />
-<TGConnectingPoint num="68" id="3802" />
-<TGConnectingPoint num="69" id="3803" />
-<TGConnectingPoint num="70" id="3804" />
-<TGConnectingPoint num="71" id="3805" />
+<TGConnectingPoint num="0" id="3775" />
+<TGConnectingPoint num="1" id="3776" />
+<TGConnectingPoint num="2" id="3777" />
+<TGConnectingPoint num="3" id="3778" />
+<TGConnectingPoint num="4" id="3779" />
+<TGConnectingPoint num="5" id="3780" />
+<TGConnectingPoint num="6" id="3781" />
+<TGConnectingPoint num="7" id="3782" />
+<TGConnectingPoint num="8" id="3783" />
+<TGConnectingPoint num="9" id="3784" />
+<TGConnectingPoint num="10" id="3785" />
+<TGConnectingPoint num="11" id="3786" />
+<TGConnectingPoint num="12" id="3787" />
+<TGConnectingPoint num="13" id="3788" />
+<TGConnectingPoint num="14" id="3789" />
+<TGConnectingPoint num="15" id="3790" />
+<TGConnectingPoint num="16" id="3791" />
+<TGConnectingPoint num="17" id="3792" />
+<TGConnectingPoint num="18" id="3793" />
+<TGConnectingPoint num="19" id="3794" />
+<TGConnectingPoint num="20" id="3795" />
+<TGConnectingPoint num="21" id="3796" />
+<TGConnectingPoint num="22" id="3797" />
+<TGConnectingPoint num="23" id="3798" />
+<TGConnectingPoint num="24" id="3799" />
+<TGConnectingPoint num="25" id="3800" />
+<TGConnectingPoint num="26" id="3801" />
+<TGConnectingPoint num="27" id="3802" />
+<TGConnectingPoint num="28" id="3803" />
+<TGConnectingPoint num="29" id="3804" />
+<TGConnectingPoint num="30" id="3805" />
+<TGConnectingPoint num="31" id="3806" />
+<TGConnectingPoint num="32" id="3807" />
+<TGConnectingPoint num="33" id="3808" />
+<TGConnectingPoint num="34" id="3809" />
+<TGConnectingPoint num="35" id="3810" />
+<TGConnectingPoint num="36" id="3811" />
+<TGConnectingPoint num="37" id="3812" />
+<TGConnectingPoint num="38" id="3813" />
+<TGConnectingPoint num="39" id="3814" />
+<TGConnectingPoint num="40" id="3815" />
+<TGConnectingPoint num="41" id="3816" />
+<TGConnectingPoint num="42" id="3817" />
+<TGConnectingPoint num="43" id="3818" />
+<TGConnectingPoint num="44" id="3819" />
+<TGConnectingPoint num="45" id="3820" />
+<TGConnectingPoint num="46" id="3821" />
+<TGConnectingPoint num="47" id="3822" />
+<TGConnectingPoint num="48" id="3823" />
+<TGConnectingPoint num="49" id="3824" />
+<TGConnectingPoint num="50" id="3825" />
+<TGConnectingPoint num="51" id="3826" />
+<TGConnectingPoint num="52" id="3827" />
+<TGConnectingPoint num="53" id="3828" />
+<TGConnectingPoint num="54" id="3829" />
+<TGConnectingPoint num="55" id="3830" />
+<TGConnectingPoint num="56" id="3831" />
+<TGConnectingPoint num="57" id="3832" />
+<TGConnectingPoint num="58" id="3833" />
+<TGConnectingPoint num="59" id="3834" />
+<TGConnectingPoint num="60" id="3835" />
+<TGConnectingPoint num="61" id="3836" />
+<TGConnectingPoint num="62" id="3837" />
+<TGConnectingPoint num="63" id="3838" />
+<TGConnectingPoint num="64" id="3839" />
+<TGConnectingPoint num="65" id="3840" />
+<TGConnectingPoint num="66" id="3841" />
+<TGConnectingPoint num="67" id="3842" />
+<TGConnectingPoint num="68" id="3843" />
+<TGConnectingPoint num="69" id="3844" />
+<TGConnectingPoint num="70" id="3845" />
+<TGConnectingPoint num="71" id="3846" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="3727" index="5" uid="6abe616a-a7dd-4f1c-8e9e-ef7f6ac0a232" >
+<COMPONENT type="5100" id="3849" index="5" uid="6abe616a-a7dd-4f1c-8e9e-ef7f6ac0a232" >
 <cdparam x="400" y="40" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3728" />
+<TGConnectingPoint num="0" id="3848" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="5102" id="4406" index="0" uid="c649bd3c-ced7-4b80-a00e-77533c3dbf8c" >
+<CONNECTOR type="5102" id="3856" index="0" uid="c649bd3c-ced7-4b80-a00e-77533c3dbf8c" >
 <cdparam x="466" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4407" />
-<P1  x="466" y="390" id="4150" />
-<P2  x="500" y="265" id="4071" />
+<TGConnectingPoint num="0" id="3855" />
+<P1  x="466" y="390" id="4101" />
+<P2  x="500" y="265" id="4172" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4408" index="-1" uid="2a0026ef-5983-49b6-adbf-772f25198cba" >
-<father id="4406" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3854" index="15" uid="2a0026ef-5983-49b6-adbf-772f25198cba" >
+<father id="3856" num="0" />
 <cdparam x="483" y="327" />
-<sizeparam width="936" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="936" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4409" />
-<TGConnectingPoint num="1" id="4410" />
-<TGConnectingPoint num="2" id="4411" />
-<TGConnectingPoint num="3" id="4412" />
+<TGConnectingPoint num="0" id="3850" />
+<TGConnectingPoint num="1" id="3851" />
+<TGConnectingPoint num="2" id="3852" />
+<TGConnectingPoint num="3" id="3853" />
 <extraparam>
 <guard value="(CoffeeMachine.x == 0)&amp;&amp;((CoffeeMachine.COFFEE_MACHINE_STATE_MACHINE_CURRENT_TIME-CoffeeMachine.x_time) &gt;= CoffeeMachine.Wallet.maxUserDelay)" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7062,28 +7062,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4399" index="1" uid="1d5bd9df-094b-4a25-a179-f61b880b438b" >
+<CONNECTOR type="5102" id="3863" index="1" uid="1d5bd9df-094b-4a25-a179-f61b880b438b" >
 <cdparam x="466" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4400" />
-<P1  x="466" y="390" id="4118" />
-<P2  x="450" y="440" id="4190" />
+<TGConnectingPoint num="0" id="3862" />
+<P1  x="466" y="390" id="4069" />
+<P2  x="450" y="440" id="3991" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4401" index="-1" uid="88d18db8-d914-4969-8eb5-e483ff1dd1cc" >
-<father id="4399" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3861" index="16" uid="88d18db8-d914-4969-8eb5-e483ff1dd1cc" >
+<father id="3863" num="0" />
 <cdparam x="458" y="415" />
-<sizeparam width="136" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="136" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4402" />
-<TGConnectingPoint num="1" id="4403" />
-<TGConnectingPoint num="2" id="4404" />
-<TGConnectingPoint num="3" id="4405" />
+<TGConnectingPoint num="0" id="3857" />
+<TGConnectingPoint num="1" id="3858" />
+<TGConnectingPoint num="2" id="3859" />
+<TGConnectingPoint num="3" id="3860" />
 <extraparam>
 <guard value="CoffeeMachine.x == 1" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7097,28 +7097,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4392" index="2" uid="ff3b8183-abfe-4179-8da8-9864d683aa03" >
+<CONNECTOR type="5102" id="3870" index="2" uid="ff3b8183-abfe-4179-8da8-9864d683aa03" >
 <cdparam x="415" y="665" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4393" />
-<P1  x="415" y="665" id="4344" />
-<P2  x="500" y="265" id="4039" />
+<TGConnectingPoint num="0" id="3869" />
+<P1  x="415" y="665" id="3907" />
+<P2  x="500" y="265" id="4140" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4394" index="-1" uid="3805f962-2a2f-4e38-babe-ba93b1372abb" >
-<father id="4392" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3868" index="17" uid="3805f962-2a2f-4e38-babe-ba93b1372abb" >
+<father id="3870" num="0" />
 <cdparam x="457" y="465" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4395" />
-<TGConnectingPoint num="1" id="4396" />
-<TGConnectingPoint num="2" id="4397" />
-<TGConnectingPoint num="3" id="4398" />
+<TGConnectingPoint num="0" id="3864" />
+<TGConnectingPoint num="1" id="3865" />
+<TGConnectingPoint num="2" id="3866" />
+<TGConnectingPoint num="3" id="3867" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7132,28 +7132,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4385" index="3" uid="62709a46-d0b2-404d-bc1a-ad297039b3a4" >
+<CONNECTOR type="5102" id="3877" index="3" uid="62709a46-d0b2-404d-bc1a-ad297039b3a4" >
 <cdparam x="450" y="490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4386" />
-<P1  x="450" y="490" id="4195" />
-<P2  x="466" y="540" id="4267" />
+<TGConnectingPoint num="0" id="3876" />
+<P1  x="450" y="490" id="3996" />
+<P2  x="466" y="540" id="3918" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4387" index="-1" uid="d1b9c626-af4a-4053-a6c1-f555374e776c" >
-<father id="4385" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3875" index="18" uid="d1b9c626-af4a-4053-a6c1-f555374e776c" >
+<father id="3877" num="0" />
 <cdparam x="458" y="515" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4388" />
-<TGConnectingPoint num="1" id="4389" />
-<TGConnectingPoint num="2" id="4390" />
-<TGConnectingPoint num="3" id="4391" />
+<TGConnectingPoint num="0" id="3871" />
+<TGConnectingPoint num="1" id="3872" />
+<TGConnectingPoint num="2" id="3873" />
+<TGConnectingPoint num="3" id="3874" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7167,28 +7167,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4378" index="4" uid="c98d531e-43c5-47cb-b168-8e34c1d4ff62" >
+<CONNECTOR type="5102" id="3884" index="4" uid="c98d531e-43c5-47cb-b168-8e34c1d4ff62" >
 <cdparam x="450" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4379" />
-<P1  x="450" y="190" id="3964" />
-<P2  x="450" y="240" id="4036" />
+<TGConnectingPoint num="0" id="3883" />
+<P1  x="450" y="190" id="4215" />
+<P2  x="450" y="240" id="4137" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4380" index="-1" uid="08307e0f-211c-47a9-af88-1c7a68c45dd3" >
-<father id="4378" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3882" index="19" uid="08307e0f-211c-47a9-af88-1c7a68c45dd3" >
+<father id="3884" num="0" />
 <cdparam x="450" y="215" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4381" />
-<TGConnectingPoint num="1" id="4382" />
-<TGConnectingPoint num="2" id="4383" />
-<TGConnectingPoint num="3" id="4384" />
+<TGConnectingPoint num="0" id="3878" />
+<TGConnectingPoint num="1" id="3879" />
+<TGConnectingPoint num="2" id="3880" />
+<TGConnectingPoint num="3" id="3881" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7202,28 +7202,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4371" index="5" uid="a4f5e31c-34ac-4c67-9381-ac9345a39d03" >
+<CONNECTOR type="5102" id="3891" index="5" uid="a4f5e31c-34ac-4c67-9381-ac9345a39d03" >
 <cdparam x="466" y="590" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4372" />
-<P1  x="466" y="590" id="4272" />
-<P2  x="415" y="635" id="4343" />
+<TGConnectingPoint num="0" id="3890" />
+<P1  x="466" y="590" id="3923" />
+<P2  x="415" y="635" id="3906" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4373" index="-1" uid="702e926d-b7fa-44c7-bc0e-b4bd9242abce" >
-<father id="4371" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3889" index="20" uid="702e926d-b7fa-44c7-bc0e-b4bd9242abce" >
+<father id="3891" num="0" />
 <cdparam x="440" y="612" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4374" />
-<TGConnectingPoint num="1" id="4375" />
-<TGConnectingPoint num="2" id="4376" />
-<TGConnectingPoint num="3" id="4377" />
+<TGConnectingPoint num="0" id="3885" />
+<TGConnectingPoint num="1" id="3886" />
+<TGConnectingPoint num="2" id="3887" />
+<TGConnectingPoint num="3" id="3888" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7237,28 +7237,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4364" index="6" uid="0331603f-c99d-4b9e-a8f0-bfbfdf8c83f3" >
+<CONNECTOR type="5102" id="3898" index="6" uid="0331603f-c99d-4b9e-a8f0-bfbfdf8c83f3" >
 <cdparam x="450" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4365" />
-<P1  x="450" y="290" id="4041" />
-<P2  x="466" y="340" id="4113" />
+<TGConnectingPoint num="0" id="3897" />
+<P1  x="450" y="290" id="4142" />
+<P2  x="466" y="340" id="4064" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4366" index="-1" uid="df67b36e-3fab-4067-817e-3cfdabde2be0" >
-<father id="4364" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3896" index="21" uid="df67b36e-3fab-4067-817e-3cfdabde2be0" >
+<father id="3898" num="0" />
 <cdparam x="458" y="315" />
-<sizeparam width="188" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="188" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4367" />
-<TGConnectingPoint num="1" id="4368" />
-<TGConnectingPoint num="2" id="4369" />
-<TGConnectingPoint num="3" id="4370" />
+<TGConnectingPoint num="0" id="3892" />
+<TGConnectingPoint num="1" id="3893" />
+<TGConnectingPoint num="2" id="3894" />
+<TGConnectingPoint num="3" id="3895" />
 <extraparam>
 <guard value="CoffeeMachine.nbOfCoins == 2" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7272,28 +7272,28 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4357" index="7" uid="79964194-bfe2-4a81-82d9-e71127814ecc" >
+<CONNECTOR type="5102" id="3905" index="7" uid="79964194-bfe2-4a81-82d9-e71127814ecc" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4358" />
-<P1  x="407" y="60" id="3952" />
-<P2  x="450" y="140" id="3959" />
+<TGConnectingPoint num="0" id="3904" />
+<P1  x="407" y="60" id="4282" />
+<P2  x="450" y="140" id="4210" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4359" index="-1" uid="2ca46cb0-3239-4ddc-9172-c76227b8aa4b" >
-<father id="4357" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3903" index="22" uid="2ca46cb0-3239-4ddc-9172-c76227b8aa4b" >
+<father id="3905" num="0" />
 <cdparam x="428" y="100" />
-<sizeparam width="50" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="50" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4360" />
-<TGConnectingPoint num="1" id="4361" />
-<TGConnectingPoint num="2" id="4362" />
-<TGConnectingPoint num="3" id="4363" />
+<TGConnectingPoint num="0" id="3899" />
+<TGConnectingPoint num="1" id="3900" />
+<TGConnectingPoint num="2" id="3901" />
+<TGConnectingPoint num="3" id="3902" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -7307,27 +7307,27 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="4342" index="8" uid="2ad976fe-106d-4840-8940-c5fc3959b9b2" >
+<COMPONENT type="5103" id="3916" index="8" uid="2ad976fe-106d-4840-8940-c5fc3959b9b2" >
 <cdparam x="392" y="640" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="push()" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4343" />
-<TGConnectingPoint num="1" id="4344" />
-<TGConnectingPoint num="2" id="4345" />
-<TGConnectingPoint num="3" id="4346" />
-<TGConnectingPoint num="4" id="4347" />
-<TGConnectingPoint num="5" id="4348" />
-<TGConnectingPoint num="6" id="4349" />
-<TGConnectingPoint num="7" id="4350" />
-<TGConnectingPoint num="8" id="4351" />
-<TGConnectingPoint num="9" id="4352" />
+<TGConnectingPoint num="0" id="3906" />
+<TGConnectingPoint num="1" id="3907" />
+<TGConnectingPoint num="2" id="3908" />
+<TGConnectingPoint num="3" id="3909" />
+<TGConnectingPoint num="4" id="3910" />
+<TGConnectingPoint num="5" id="3911" />
+<TGConnectingPoint num="6" id="3912" />
+<TGConnectingPoint num="7" id="3913" />
+<TGConnectingPoint num="8" id="3914" />
+<TGConnectingPoint num="9" id="3915" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="4265" index="9" uid="13b666a5-fc85-4983-9124-3fe3f49cefbf" >
+<COMPONENT type="5106" id="3989" index="9" uid="13b666a5-fc85-4983-9124-3fe3f49cefbf" >
 <cdparam x="400" y="540" />
 <sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7335,83 +7335,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="WaitRetrieve" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4266" />
-<TGConnectingPoint num="1" id="4267" />
-<TGConnectingPoint num="2" id="4268" />
-<TGConnectingPoint num="3" id="4269" />
-<TGConnectingPoint num="4" id="4270" />
-<TGConnectingPoint num="5" id="4271" />
-<TGConnectingPoint num="6" id="4272" />
-<TGConnectingPoint num="7" id="4273" />
-<TGConnectingPoint num="8" id="4274" />
-<TGConnectingPoint num="9" id="4275" />
-<TGConnectingPoint num="10" id="4276" />
-<TGConnectingPoint num="11" id="4277" />
-<TGConnectingPoint num="12" id="4278" />
-<TGConnectingPoint num="13" id="4279" />
-<TGConnectingPoint num="14" id="4280" />
-<TGConnectingPoint num="15" id="4281" />
-<TGConnectingPoint num="16" id="4282" />
-<TGConnectingPoint num="17" id="4283" />
-<TGConnectingPoint num="18" id="4284" />
-<TGConnectingPoint num="19" id="4285" />
-<TGConnectingPoint num="20" id="4286" />
-<TGConnectingPoint num="21" id="4287" />
-<TGConnectingPoint num="22" id="4288" />
-<TGConnectingPoint num="23" id="4289" />
-<TGConnectingPoint num="24" id="4290" />
-<TGConnectingPoint num="25" id="4291" />
-<TGConnectingPoint num="26" id="4292" />
-<TGConnectingPoint num="27" id="4293" />
-<TGConnectingPoint num="28" id="4294" />
-<TGConnectingPoint num="29" id="4295" />
-<TGConnectingPoint num="30" id="4296" />
-<TGConnectingPoint num="31" id="4297" />
-<TGConnectingPoint num="32" id="4298" />
-<TGConnectingPoint num="33" id="4299" />
-<TGConnectingPoint num="34" id="4300" />
-<TGConnectingPoint num="35" id="4301" />
-<TGConnectingPoint num="36" id="4302" />
-<TGConnectingPoint num="37" id="4303" />
-<TGConnectingPoint num="38" id="4304" />
-<TGConnectingPoint num="39" id="4305" />
-<TGConnectingPoint num="40" id="4306" />
-<TGConnectingPoint num="41" id="4307" />
-<TGConnectingPoint num="42" id="4308" />
-<TGConnectingPoint num="43" id="4309" />
-<TGConnectingPoint num="44" id="4310" />
-<TGConnectingPoint num="45" id="4311" />
-<TGConnectingPoint num="46" id="4312" />
-<TGConnectingPoint num="47" id="4313" />
-<TGConnectingPoint num="48" id="4314" />
-<TGConnectingPoint num="49" id="4315" />
-<TGConnectingPoint num="50" id="4316" />
-<TGConnectingPoint num="51" id="4317" />
-<TGConnectingPoint num="52" id="4318" />
-<TGConnectingPoint num="53" id="4319" />
-<TGConnectingPoint num="54" id="4320" />
-<TGConnectingPoint num="55" id="4321" />
-<TGConnectingPoint num="56" id="4322" />
-<TGConnectingPoint num="57" id="4323" />
-<TGConnectingPoint num="58" id="4324" />
-<TGConnectingPoint num="59" id="4325" />
-<TGConnectingPoint num="60" id="4326" />
-<TGConnectingPoint num="61" id="4327" />
-<TGConnectingPoint num="62" id="4328" />
-<TGConnectingPoint num="63" id="4329" />
-<TGConnectingPoint num="64" id="4330" />
-<TGConnectingPoint num="65" id="4331" />
-<TGConnectingPoint num="66" id="4332" />
-<TGConnectingPoint num="67" id="4333" />
-<TGConnectingPoint num="68" id="4334" />
-<TGConnectingPoint num="69" id="4335" />
-<TGConnectingPoint num="70" id="4336" />
-<TGConnectingPoint num="71" id="4337" />
+<TGConnectingPoint num="0" id="3917" />
+<TGConnectingPoint num="1" id="3918" />
+<TGConnectingPoint num="2" id="3919" />
+<TGConnectingPoint num="3" id="3920" />
+<TGConnectingPoint num="4" id="3921" />
+<TGConnectingPoint num="5" id="3922" />
+<TGConnectingPoint num="6" id="3923" />
+<TGConnectingPoint num="7" id="3924" />
+<TGConnectingPoint num="8" id="3925" />
+<TGConnectingPoint num="9" id="3926" />
+<TGConnectingPoint num="10" id="3927" />
+<TGConnectingPoint num="11" id="3928" />
+<TGConnectingPoint num="12" id="3929" />
+<TGConnectingPoint num="13" id="3930" />
+<TGConnectingPoint num="14" id="3931" />
+<TGConnectingPoint num="15" id="3932" />
+<TGConnectingPoint num="16" id="3933" />
+<TGConnectingPoint num="17" id="3934" />
+<TGConnectingPoint num="18" id="3935" />
+<TGConnectingPoint num="19" id="3936" />
+<TGConnectingPoint num="20" id="3937" />
+<TGConnectingPoint num="21" id="3938" />
+<TGConnectingPoint num="22" id="3939" />
+<TGConnectingPoint num="23" id="3940" />
+<TGConnectingPoint num="24" id="3941" />
+<TGConnectingPoint num="25" id="3942" />
+<TGConnectingPoint num="26" id="3943" />
+<TGConnectingPoint num="27" id="3944" />
+<TGConnectingPoint num="28" id="3945" />
+<TGConnectingPoint num="29" id="3946" />
+<TGConnectingPoint num="30" id="3947" />
+<TGConnectingPoint num="31" id="3948" />
+<TGConnectingPoint num="32" id="3949" />
+<TGConnectingPoint num="33" id="3950" />
+<TGConnectingPoint num="34" id="3951" />
+<TGConnectingPoint num="35" id="3952" />
+<TGConnectingPoint num="36" id="3953" />
+<TGConnectingPoint num="37" id="3954" />
+<TGConnectingPoint num="38" id="3955" />
+<TGConnectingPoint num="39" id="3956" />
+<TGConnectingPoint num="40" id="3957" />
+<TGConnectingPoint num="41" id="3958" />
+<TGConnectingPoint num="42" id="3959" />
+<TGConnectingPoint num="43" id="3960" />
+<TGConnectingPoint num="44" id="3961" />
+<TGConnectingPoint num="45" id="3962" />
+<TGConnectingPoint num="46" id="3963" />
+<TGConnectingPoint num="47" id="3964" />
+<TGConnectingPoint num="48" id="3965" />
+<TGConnectingPoint num="49" id="3966" />
+<TGConnectingPoint num="50" id="3967" />
+<TGConnectingPoint num="51" id="3968" />
+<TGConnectingPoint num="52" id="3969" />
+<TGConnectingPoint num="53" id="3970" />
+<TGConnectingPoint num="54" id="3971" />
+<TGConnectingPoint num="55" id="3972" />
+<TGConnectingPoint num="56" id="3973" />
+<TGConnectingPoint num="57" id="3974" />
+<TGConnectingPoint num="58" id="3975" />
+<TGConnectingPoint num="59" id="3976" />
+<TGConnectingPoint num="60" id="3977" />
+<TGConnectingPoint num="61" id="3978" />
+<TGConnectingPoint num="62" id="3979" />
+<TGConnectingPoint num="63" id="3980" />
+<TGConnectingPoint num="64" id="3981" />
+<TGConnectingPoint num="65" id="3982" />
+<TGConnectingPoint num="66" id="3983" />
+<TGConnectingPoint num="67" id="3984" />
+<TGConnectingPoint num="68" id="3985" />
+<TGConnectingPoint num="69" id="3986" />
+<TGConnectingPoint num="70" id="3987" />
+<TGConnectingPoint num="71" id="3988" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4188" index="10" uid="b932f410-d697-4824-b3bf-2c4d7d362fdb" >
+<COMPONENT type="5106" id="4062" index="10" uid="b932f410-d697-4824-b3bf-2c4d7d362fdb" >
 <cdparam x="400" y="440" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7419,83 +7419,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Brewing" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4189" />
-<TGConnectingPoint num="1" id="4190" />
-<TGConnectingPoint num="2" id="4191" />
-<TGConnectingPoint num="3" id="4192" />
-<TGConnectingPoint num="4" id="4193" />
-<TGConnectingPoint num="5" id="4194" />
-<TGConnectingPoint num="6" id="4195" />
-<TGConnectingPoint num="7" id="4196" />
-<TGConnectingPoint num="8" id="4197" />
-<TGConnectingPoint num="9" id="4198" />
-<TGConnectingPoint num="10" id="4199" />
-<TGConnectingPoint num="11" id="4200" />
-<TGConnectingPoint num="12" id="4201" />
-<TGConnectingPoint num="13" id="4202" />
-<TGConnectingPoint num="14" id="4203" />
-<TGConnectingPoint num="15" id="4204" />
-<TGConnectingPoint num="16" id="4205" />
-<TGConnectingPoint num="17" id="4206" />
-<TGConnectingPoint num="18" id="4207" />
-<TGConnectingPoint num="19" id="4208" />
-<TGConnectingPoint num="20" id="4209" />
-<TGConnectingPoint num="21" id="4210" />
-<TGConnectingPoint num="22" id="4211" />
-<TGConnectingPoint num="23" id="4212" />
-<TGConnectingPoint num="24" id="4213" />
-<TGConnectingPoint num="25" id="4214" />
-<TGConnectingPoint num="26" id="4215" />
-<TGConnectingPoint num="27" id="4216" />
-<TGConnectingPoint num="28" id="4217" />
-<TGConnectingPoint num="29" id="4218" />
-<TGConnectingPoint num="30" id="4219" />
-<TGConnectingPoint num="31" id="4220" />
-<TGConnectingPoint num="32" id="4221" />
-<TGConnectingPoint num="33" id="4222" />
-<TGConnectingPoint num="34" id="4223" />
-<TGConnectingPoint num="35" id="4224" />
-<TGConnectingPoint num="36" id="4225" />
-<TGConnectingPoint num="37" id="4226" />
-<TGConnectingPoint num="38" id="4227" />
-<TGConnectingPoint num="39" id="4228" />
-<TGConnectingPoint num="40" id="4229" />
-<TGConnectingPoint num="41" id="4230" />
-<TGConnectingPoint num="42" id="4231" />
-<TGConnectingPoint num="43" id="4232" />
-<TGConnectingPoint num="44" id="4233" />
-<TGConnectingPoint num="45" id="4234" />
-<TGConnectingPoint num="46" id="4235" />
-<TGConnectingPoint num="47" id="4236" />
-<TGConnectingPoint num="48" id="4237" />
-<TGConnectingPoint num="49" id="4238" />
-<TGConnectingPoint num="50" id="4239" />
-<TGConnectingPoint num="51" id="4240" />
-<TGConnectingPoint num="52" id="4241" />
-<TGConnectingPoint num="53" id="4242" />
-<TGConnectingPoint num="54" id="4243" />
-<TGConnectingPoint num="55" id="4244" />
-<TGConnectingPoint num="56" id="4245" />
-<TGConnectingPoint num="57" id="4246" />
-<TGConnectingPoint num="58" id="4247" />
-<TGConnectingPoint num="59" id="4248" />
-<TGConnectingPoint num="60" id="4249" />
-<TGConnectingPoint num="61" id="4250" />
-<TGConnectingPoint num="62" id="4251" />
-<TGConnectingPoint num="63" id="4252" />
-<TGConnectingPoint num="64" id="4253" />
-<TGConnectingPoint num="65" id="4254" />
-<TGConnectingPoint num="66" id="4255" />
-<TGConnectingPoint num="67" id="4256" />
-<TGConnectingPoint num="68" id="4257" />
-<TGConnectingPoint num="69" id="4258" />
-<TGConnectingPoint num="70" id="4259" />
-<TGConnectingPoint num="71" id="4260" />
+<TGConnectingPoint num="0" id="3990" />
+<TGConnectingPoint num="1" id="3991" />
+<TGConnectingPoint num="2" id="3992" />
+<TGConnectingPoint num="3" id="3993" />
+<TGConnectingPoint num="4" id="3994" />
+<TGConnectingPoint num="5" id="3995" />
+<TGConnectingPoint num="6" id="3996" />
+<TGConnectingPoint num="7" id="3997" />
+<TGConnectingPoint num="8" id="3998" />
+<TGConnectingPoint num="9" id="3999" />
+<TGConnectingPoint num="10" id="4000" />
+<TGConnectingPoint num="11" id="4001" />
+<TGConnectingPoint num="12" id="4002" />
+<TGConnectingPoint num="13" id="4003" />
+<TGConnectingPoint num="14" id="4004" />
+<TGConnectingPoint num="15" id="4005" />
+<TGConnectingPoint num="16" id="4006" />
+<TGConnectingPoint num="17" id="4007" />
+<TGConnectingPoint num="18" id="4008" />
+<TGConnectingPoint num="19" id="4009" />
+<TGConnectingPoint num="20" id="4010" />
+<TGConnectingPoint num="21" id="4011" />
+<TGConnectingPoint num="22" id="4012" />
+<TGConnectingPoint num="23" id="4013" />
+<TGConnectingPoint num="24" id="4014" />
+<TGConnectingPoint num="25" id="4015" />
+<TGConnectingPoint num="26" id="4016" />
+<TGConnectingPoint num="27" id="4017" />
+<TGConnectingPoint num="28" id="4018" />
+<TGConnectingPoint num="29" id="4019" />
+<TGConnectingPoint num="30" id="4020" />
+<TGConnectingPoint num="31" id="4021" />
+<TGConnectingPoint num="32" id="4022" />
+<TGConnectingPoint num="33" id="4023" />
+<TGConnectingPoint num="34" id="4024" />
+<TGConnectingPoint num="35" id="4025" />
+<TGConnectingPoint num="36" id="4026" />
+<TGConnectingPoint num="37" id="4027" />
+<TGConnectingPoint num="38" id="4028" />
+<TGConnectingPoint num="39" id="4029" />
+<TGConnectingPoint num="40" id="4030" />
+<TGConnectingPoint num="41" id="4031" />
+<TGConnectingPoint num="42" id="4032" />
+<TGConnectingPoint num="43" id="4033" />
+<TGConnectingPoint num="44" id="4034" />
+<TGConnectingPoint num="45" id="4035" />
+<TGConnectingPoint num="46" id="4036" />
+<TGConnectingPoint num="47" id="4037" />
+<TGConnectingPoint num="48" id="4038" />
+<TGConnectingPoint num="49" id="4039" />
+<TGConnectingPoint num="50" id="4040" />
+<TGConnectingPoint num="51" id="4041" />
+<TGConnectingPoint num="52" id="4042" />
+<TGConnectingPoint num="53" id="4043" />
+<TGConnectingPoint num="54" id="4044" />
+<TGConnectingPoint num="55" id="4045" />
+<TGConnectingPoint num="56" id="4046" />
+<TGConnectingPoint num="57" id="4047" />
+<TGConnectingPoint num="58" id="4048" />
+<TGConnectingPoint num="59" id="4049" />
+<TGConnectingPoint num="60" id="4050" />
+<TGConnectingPoint num="61" id="4051" />
+<TGConnectingPoint num="62" id="4052" />
+<TGConnectingPoint num="63" id="4053" />
+<TGConnectingPoint num="64" id="4054" />
+<TGConnectingPoint num="65" id="4055" />
+<TGConnectingPoint num="66" id="4056" />
+<TGConnectingPoint num="67" id="4057" />
+<TGConnectingPoint num="68" id="4058" />
+<TGConnectingPoint num="69" id="4059" />
+<TGConnectingPoint num="70" id="4060" />
+<TGConnectingPoint num="71" id="4061" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4111" index="11" uid="a4099374-218f-4522-8d54-e053ed15dd7d" >
+<COMPONENT type="5106" id="4135" index="11" uid="a4099374-218f-4522-8d54-e053ed15dd7d" >
 <cdparam x="400" y="340" />
 <sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7503,83 +7503,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="AwaitingCoin" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4112" />
-<TGConnectingPoint num="1" id="4113" />
-<TGConnectingPoint num="2" id="4114" />
-<TGConnectingPoint num="3" id="4115" />
-<TGConnectingPoint num="4" id="4116" />
-<TGConnectingPoint num="5" id="4117" />
-<TGConnectingPoint num="6" id="4118" />
-<TGConnectingPoint num="7" id="4119" />
-<TGConnectingPoint num="8" id="4120" />
-<TGConnectingPoint num="9" id="4121" />
-<TGConnectingPoint num="10" id="4122" />
-<TGConnectingPoint num="11" id="4123" />
-<TGConnectingPoint num="12" id="4124" />
-<TGConnectingPoint num="13" id="4125" />
-<TGConnectingPoint num="14" id="4126" />
-<TGConnectingPoint num="15" id="4127" />
-<TGConnectingPoint num="16" id="4128" />
-<TGConnectingPoint num="17" id="4129" />
-<TGConnectingPoint num="18" id="4130" />
-<TGConnectingPoint num="19" id="4131" />
-<TGConnectingPoint num="20" id="4132" />
-<TGConnectingPoint num="21" id="4133" />
-<TGConnectingPoint num="22" id="4134" />
-<TGConnectingPoint num="23" id="4135" />
-<TGConnectingPoint num="24" id="4136" />
-<TGConnectingPoint num="25" id="4137" />
-<TGConnectingPoint num="26" id="4138" />
-<TGConnectingPoint num="27" id="4139" />
-<TGConnectingPoint num="28" id="4140" />
-<TGConnectingPoint num="29" id="4141" />
-<TGConnectingPoint num="30" id="4142" />
-<TGConnectingPoint num="31" id="4143" />
-<TGConnectingPoint num="32" id="4144" />
-<TGConnectingPoint num="33" id="4145" />
-<TGConnectingPoint num="34" id="4146" />
-<TGConnectingPoint num="35" id="4147" />
-<TGConnectingPoint num="36" id="4148" />
-<TGConnectingPoint num="37" id="4149" />
-<TGConnectingPoint num="38" id="4150" />
-<TGConnectingPoint num="39" id="4151" />
-<TGConnectingPoint num="40" id="4152" />
-<TGConnectingPoint num="41" id="4153" />
-<TGConnectingPoint num="42" id="4154" />
-<TGConnectingPoint num="43" id="4155" />
-<TGConnectingPoint num="44" id="4156" />
-<TGConnectingPoint num="45" id="4157" />
-<TGConnectingPoint num="46" id="4158" />
-<TGConnectingPoint num="47" id="4159" />
-<TGConnectingPoint num="48" id="4160" />
-<TGConnectingPoint num="49" id="4161" />
-<TGConnectingPoint num="50" id="4162" />
-<TGConnectingPoint num="51" id="4163" />
-<TGConnectingPoint num="52" id="4164" />
-<TGConnectingPoint num="53" id="4165" />
-<TGConnectingPoint num="54" id="4166" />
-<TGConnectingPoint num="55" id="4167" />
-<TGConnectingPoint num="56" id="4168" />
-<TGConnectingPoint num="57" id="4169" />
-<TGConnectingPoint num="58" id="4170" />
-<TGConnectingPoint num="59" id="4171" />
-<TGConnectingPoint num="60" id="4172" />
-<TGConnectingPoint num="61" id="4173" />
-<TGConnectingPoint num="62" id="4174" />
-<TGConnectingPoint num="63" id="4175" />
-<TGConnectingPoint num="64" id="4176" />
-<TGConnectingPoint num="65" id="4177" />
-<TGConnectingPoint num="66" id="4178" />
-<TGConnectingPoint num="67" id="4179" />
-<TGConnectingPoint num="68" id="4180" />
-<TGConnectingPoint num="69" id="4181" />
-<TGConnectingPoint num="70" id="4182" />
-<TGConnectingPoint num="71" id="4183" />
+<TGConnectingPoint num="0" id="4063" />
+<TGConnectingPoint num="1" id="4064" />
+<TGConnectingPoint num="2" id="4065" />
+<TGConnectingPoint num="3" id="4066" />
+<TGConnectingPoint num="4" id="4067" />
+<TGConnectingPoint num="5" id="4068" />
+<TGConnectingPoint num="6" id="4069" />
+<TGConnectingPoint num="7" id="4070" />
+<TGConnectingPoint num="8" id="4071" />
+<TGConnectingPoint num="9" id="4072" />
+<TGConnectingPoint num="10" id="4073" />
+<TGConnectingPoint num="11" id="4074" />
+<TGConnectingPoint num="12" id="4075" />
+<TGConnectingPoint num="13" id="4076" />
+<TGConnectingPoint num="14" id="4077" />
+<TGConnectingPoint num="15" id="4078" />
+<TGConnectingPoint num="16" id="4079" />
+<TGConnectingPoint num="17" id="4080" />
+<TGConnectingPoint num="18" id="4081" />
+<TGConnectingPoint num="19" id="4082" />
+<TGConnectingPoint num="20" id="4083" />
+<TGConnectingPoint num="21" id="4084" />
+<TGConnectingPoint num="22" id="4085" />
+<TGConnectingPoint num="23" id="4086" />
+<TGConnectingPoint num="24" id="4087" />
+<TGConnectingPoint num="25" id="4088" />
+<TGConnectingPoint num="26" id="4089" />
+<TGConnectingPoint num="27" id="4090" />
+<TGConnectingPoint num="28" id="4091" />
+<TGConnectingPoint num="29" id="4092" />
+<TGConnectingPoint num="30" id="4093" />
+<TGConnectingPoint num="31" id="4094" />
+<TGConnectingPoint num="32" id="4095" />
+<TGConnectingPoint num="33" id="4096" />
+<TGConnectingPoint num="34" id="4097" />
+<TGConnectingPoint num="35" id="4098" />
+<TGConnectingPoint num="36" id="4099" />
+<TGConnectingPoint num="37" id="4100" />
+<TGConnectingPoint num="38" id="4101" />
+<TGConnectingPoint num="39" id="4102" />
+<TGConnectingPoint num="40" id="4103" />
+<TGConnectingPoint num="41" id="4104" />
+<TGConnectingPoint num="42" id="4105" />
+<TGConnectingPoint num="43" id="4106" />
+<TGConnectingPoint num="44" id="4107" />
+<TGConnectingPoint num="45" id="4108" />
+<TGConnectingPoint num="46" id="4109" />
+<TGConnectingPoint num="47" id="4110" />
+<TGConnectingPoint num="48" id="4111" />
+<TGConnectingPoint num="49" id="4112" />
+<TGConnectingPoint num="50" id="4113" />
+<TGConnectingPoint num="51" id="4114" />
+<TGConnectingPoint num="52" id="4115" />
+<TGConnectingPoint num="53" id="4116" />
+<TGConnectingPoint num="54" id="4117" />
+<TGConnectingPoint num="55" id="4118" />
+<TGConnectingPoint num="56" id="4119" />
+<TGConnectingPoint num="57" id="4120" />
+<TGConnectingPoint num="58" id="4121" />
+<TGConnectingPoint num="59" id="4122" />
+<TGConnectingPoint num="60" id="4123" />
+<TGConnectingPoint num="61" id="4124" />
+<TGConnectingPoint num="62" id="4125" />
+<TGConnectingPoint num="63" id="4126" />
+<TGConnectingPoint num="64" id="4127" />
+<TGConnectingPoint num="65" id="4128" />
+<TGConnectingPoint num="66" id="4129" />
+<TGConnectingPoint num="67" id="4130" />
+<TGConnectingPoint num="68" id="4131" />
+<TGConnectingPoint num="69" id="4132" />
+<TGConnectingPoint num="70" id="4133" />
+<TGConnectingPoint num="71" id="4134" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4034" index="12" uid="4fdec169-c44f-4166-8fd6-4db3c0c319a9" >
+<COMPONENT type="5106" id="4208" index="12" uid="4fdec169-c44f-4166-8fd6-4db3c0c319a9" >
 <cdparam x="400" y="240" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7587,83 +7587,83 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Idle" />
 <new d="false" />
-<TGConnectingPoint num="0" id="4035" />
-<TGConnectingPoint num="1" id="4036" />
-<TGConnectingPoint num="2" id="4037" />
-<TGConnectingPoint num="3" id="4038" />
-<TGConnectingPoint num="4" id="4039" />
-<TGConnectingPoint num="5" id="4040" />
-<TGConnectingPoint num="6" id="4041" />
-<TGConnectingPoint num="7" id="4042" />
-<TGConnectingPoint num="8" id="4043" />
-<TGConnectingPoint num="9" id="4044" />
-<TGConnectingPoint num="10" id="4045" />
-<TGConnectingPoint num="11" id="4046" />
-<TGConnectingPoint num="12" id="4047" />
-<TGConnectingPoint num="13" id="4048" />
-<TGConnectingPoint num="14" id="4049" />
-<TGConnectingPoint num="15" id="4050" />
-<TGConnectingPoint num="16" id="4051" />
-<TGConnectingPoint num="17" id="4052" />
-<TGConnectingPoint num="18" id="4053" />
-<TGConnectingPoint num="19" id="4054" />
-<TGConnectingPoint num="20" id="4055" />
-<TGConnectingPoint num="21" id="4056" />
-<TGConnectingPoint num="22" id="4057" />
-<TGConnectingPoint num="23" id="4058" />
-<TGConnectingPoint num="24" id="4059" />
-<TGConnectingPoint num="25" id="4060" />
-<TGConnectingPoint num="26" id="4061" />
-<TGConnectingPoint num="27" id="4062" />
-<TGConnectingPoint num="28" id="4063" />
-<TGConnectingPoint num="29" id="4064" />
-<TGConnectingPoint num="30" id="4065" />
-<TGConnectingPoint num="31" id="4066" />
-<TGConnectingPoint num="32" id="4067" />
-<TGConnectingPoint num="33" id="4068" />
-<TGConnectingPoint num="34" id="4069" />
-<TGConnectingPoint num="35" id="4070" />
-<TGConnectingPoint num="36" id="4071" />
-<TGConnectingPoint num="37" id="4072" />
-<TGConnectingPoint num="38" id="4073" />
-<TGConnectingPoint num="39" id="4074" />
-<TGConnectingPoint num="40" id="4075" />
-<TGConnectingPoint num="41" id="4076" />
-<TGConnectingPoint num="42" id="4077" />
-<TGConnectingPoint num="43" id="4078" />
-<TGConnectingPoint num="44" id="4079" />
-<TGConnectingPoint num="45" id="4080" />
-<TGConnectingPoint num="46" id="4081" />
-<TGConnectingPoint num="47" id="4082" />
-<TGConnectingPoint num="48" id="4083" />
-<TGConnectingPoint num="49" id="4084" />
-<TGConnectingPoint num="50" id="4085" />
-<TGConnectingPoint num="51" id="4086" />
-<TGConnectingPoint num="52" id="4087" />
-<TGConnectingPoint num="53" id="4088" />
-<TGConnectingPoint num="54" id="4089" />
-<TGConnectingPoint num="55" id="4090" />
-<TGConnectingPoint num="56" id="4091" />
-<TGConnectingPoint num="57" id="4092" />
-<TGConnectingPoint num="58" id="4093" />
-<TGConnectingPoint num="59" id="4094" />
-<TGConnectingPoint num="60" id="4095" />
-<TGConnectingPoint num="61" id="4096" />
-<TGConnectingPoint num="62" id="4097" />
-<TGConnectingPoint num="63" id="4098" />
-<TGConnectingPoint num="64" id="4099" />
-<TGConnectingPoint num="65" id="4100" />
-<TGConnectingPoint num="66" id="4101" />
-<TGConnectingPoint num="67" id="4102" />
-<TGConnectingPoint num="68" id="4103" />
-<TGConnectingPoint num="69" id="4104" />
-<TGConnectingPoint num="70" id="4105" />
-<TGConnectingPoint num="71" id="4106" />
+<TGConnectingPoint num="0" id="4136" />
+<TGConnectingPoint num="1" id="4137" />
+<TGConnectingPoint num="2" id="4138" />
+<TGConnectingPoint num="3" id="4139" />
+<TGConnectingPoint num="4" id="4140" />
+<TGConnectingPoint num="5" id="4141" />
+<TGConnectingPoint num="6" id="4142" />
+<TGConnectingPoint num="7" id="4143" />
+<TGConnectingPoint num="8" id="4144" />
+<TGConnectingPoint num="9" id="4145" />
+<TGConnectingPoint num="10" id="4146" />
+<TGConnectingPoint num="11" id="4147" />
+<TGConnectingPoint num="12" id="4148" />
+<TGConnectingPoint num="13" id="4149" />
+<TGConnectingPoint num="14" id="4150" />
+<TGConnectingPoint num="15" id="4151" />
+<TGConnectingPoint num="16" id="4152" />
+<TGConnectingPoint num="17" id="4153" />
+<TGConnectingPoint num="18" id="4154" />
+<TGConnectingPoint num="19" id="4155" />
+<TGConnectingPoint num="20" id="4156" />
+<TGConnectingPoint num="21" id="4157" />
+<TGConnectingPoint num="22" id="4158" />
+<TGConnectingPoint num="23" id="4159" />
+<TGConnectingPoint num="24" id="4160" />
+<TGConnectingPoint num="25" id="4161" />
+<TGConnectingPoint num="26" id="4162" />
+<TGConnectingPoint num="27" id="4163" />
+<TGConnectingPoint num="28" id="4164" />
+<TGConnectingPoint num="29" id="4165" />
+<TGConnectingPoint num="30" id="4166" />
+<TGConnectingPoint num="31" id="4167" />
+<TGConnectingPoint num="32" id="4168" />
+<TGConnectingPoint num="33" id="4169" />
+<TGConnectingPoint num="34" id="4170" />
+<TGConnectingPoint num="35" id="4171" />
+<TGConnectingPoint num="36" id="4172" />
+<TGConnectingPoint num="37" id="4173" />
+<TGConnectingPoint num="38" id="4174" />
+<TGConnectingPoint num="39" id="4175" />
+<TGConnectingPoint num="40" id="4176" />
+<TGConnectingPoint num="41" id="4177" />
+<TGConnectingPoint num="42" id="4178" />
+<TGConnectingPoint num="43" id="4179" />
+<TGConnectingPoint num="44" id="4180" />
+<TGConnectingPoint num="45" id="4181" />
+<TGConnectingPoint num="46" id="4182" />
+<TGConnectingPoint num="47" id="4183" />
+<TGConnectingPoint num="48" id="4184" />
+<TGConnectingPoint num="49" id="4185" />
+<TGConnectingPoint num="50" id="4186" />
+<TGConnectingPoint num="51" id="4187" />
+<TGConnectingPoint num="52" id="4188" />
+<TGConnectingPoint num="53" id="4189" />
+<TGConnectingPoint num="54" id="4190" />
+<TGConnectingPoint num="55" id="4191" />
+<TGConnectingPoint num="56" id="4192" />
+<TGConnectingPoint num="57" id="4193" />
+<TGConnectingPoint num="58" id="4194" />
+<TGConnectingPoint num="59" id="4195" />
+<TGConnectingPoint num="60" id="4196" />
+<TGConnectingPoint num="61" id="4197" />
+<TGConnectingPoint num="62" id="4198" />
+<TGConnectingPoint num="63" id="4199" />
+<TGConnectingPoint num="64" id="4200" />
+<TGConnectingPoint num="65" id="4201" />
+<TGConnectingPoint num="66" id="4202" />
+<TGConnectingPoint num="67" id="4203" />
+<TGConnectingPoint num="68" id="4204" />
+<TGConnectingPoint num="69" id="4205" />
+<TGConnectingPoint num="70" id="4206" />
+<TGConnectingPoint num="71" id="4207" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3957" index="13" uid="05757890-f09a-405a-98b7-c31a1b2609b9" >
+<COMPONENT type="5106" id="4281" index="13" uid="05757890-f09a-405a-98b7-c31a1b2609b9" >
 <cdparam x="400" y="140" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7671,90 +7671,90 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="state" value="Start" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3958" />
-<TGConnectingPoint num="1" id="3959" />
-<TGConnectingPoint num="2" id="3960" />
-<TGConnectingPoint num="3" id="3961" />
-<TGConnectingPoint num="4" id="3962" />
-<TGConnectingPoint num="5" id="3963" />
-<TGConnectingPoint num="6" id="3964" />
-<TGConnectingPoint num="7" id="3965" />
-<TGConnectingPoint num="8" id="3966" />
-<TGConnectingPoint num="9" id="3967" />
-<TGConnectingPoint num="10" id="3968" />
-<TGConnectingPoint num="11" id="3969" />
-<TGConnectingPoint num="12" id="3970" />
-<TGConnectingPoint num="13" id="3971" />
-<TGConnectingPoint num="14" id="3972" />
-<TGConnectingPoint num="15" id="3973" />
-<TGConnectingPoint num="16" id="3974" />
-<TGConnectingPoint num="17" id="3975" />
-<TGConnectingPoint num="18" id="3976" />
-<TGConnectingPoint num="19" id="3977" />
-<TGConnectingPoint num="20" id="3978" />
-<TGConnectingPoint num="21" id="3979" />
-<TGConnectingPoint num="22" id="3980" />
-<TGConnectingPoint num="23" id="3981" />
-<TGConnectingPoint num="24" id="3982" />
-<TGConnectingPoint num="25" id="3983" />
-<TGConnectingPoint num="26" id="3984" />
-<TGConnectingPoint num="27" id="3985" />
-<TGConnectingPoint num="28" id="3986" />
-<TGConnectingPoint num="29" id="3987" />
-<TGConnectingPoint num="30" id="3988" />
-<TGConnectingPoint num="31" id="3989" />
-<TGConnectingPoint num="32" id="3990" />
-<TGConnectingPoint num="33" id="3991" />
-<TGConnectingPoint num="34" id="3992" />
-<TGConnectingPoint num="35" id="3993" />
-<TGConnectingPoint num="36" id="3994" />
-<TGConnectingPoint num="37" id="3995" />
-<TGConnectingPoint num="38" id="3996" />
-<TGConnectingPoint num="39" id="3997" />
-<TGConnectingPoint num="40" id="3998" />
-<TGConnectingPoint num="41" id="3999" />
-<TGConnectingPoint num="42" id="4000" />
-<TGConnectingPoint num="43" id="4001" />
-<TGConnectingPoint num="44" id="4002" />
-<TGConnectingPoint num="45" id="4003" />
-<TGConnectingPoint num="46" id="4004" />
-<TGConnectingPoint num="47" id="4005" />
-<TGConnectingPoint num="48" id="4006" />
-<TGConnectingPoint num="49" id="4007" />
-<TGConnectingPoint num="50" id="4008" />
-<TGConnectingPoint num="51" id="4009" />
-<TGConnectingPoint num="52" id="4010" />
-<TGConnectingPoint num="53" id="4011" />
-<TGConnectingPoint num="54" id="4012" />
-<TGConnectingPoint num="55" id="4013" />
-<TGConnectingPoint num="56" id="4014" />
-<TGConnectingPoint num="57" id="4015" />
-<TGConnectingPoint num="58" id="4016" />
-<TGConnectingPoint num="59" id="4017" />
-<TGConnectingPoint num="60" id="4018" />
-<TGConnectingPoint num="61" id="4019" />
-<TGConnectingPoint num="62" id="4020" />
-<TGConnectingPoint num="63" id="4021" />
-<TGConnectingPoint num="64" id="4022" />
-<TGConnectingPoint num="65" id="4023" />
-<TGConnectingPoint num="66" id="4024" />
-<TGConnectingPoint num="67" id="4025" />
-<TGConnectingPoint num="68" id="4026" />
-<TGConnectingPoint num="69" id="4027" />
-<TGConnectingPoint num="70" id="4028" />
-<TGConnectingPoint num="71" id="4029" />
+<TGConnectingPoint num="0" id="4209" />
+<TGConnectingPoint num="1" id="4210" />
+<TGConnectingPoint num="2" id="4211" />
+<TGConnectingPoint num="3" id="4212" />
+<TGConnectingPoint num="4" id="4213" />
+<TGConnectingPoint num="5" id="4214" />
+<TGConnectingPoint num="6" id="4215" />
+<TGConnectingPoint num="7" id="4216" />
+<TGConnectingPoint num="8" id="4217" />
+<TGConnectingPoint num="9" id="4218" />
+<TGConnectingPoint num="10" id="4219" />
+<TGConnectingPoint num="11" id="4220" />
+<TGConnectingPoint num="12" id="4221" />
+<TGConnectingPoint num="13" id="4222" />
+<TGConnectingPoint num="14" id="4223" />
+<TGConnectingPoint num="15" id="4224" />
+<TGConnectingPoint num="16" id="4225" />
+<TGConnectingPoint num="17" id="4226" />
+<TGConnectingPoint num="18" id="4227" />
+<TGConnectingPoint num="19" id="4228" />
+<TGConnectingPoint num="20" id="4229" />
+<TGConnectingPoint num="21" id="4230" />
+<TGConnectingPoint num="22" id="4231" />
+<TGConnectingPoint num="23" id="4232" />
+<TGConnectingPoint num="24" id="4233" />
+<TGConnectingPoint num="25" id="4234" />
+<TGConnectingPoint num="26" id="4235" />
+<TGConnectingPoint num="27" id="4236" />
+<TGConnectingPoint num="28" id="4237" />
+<TGConnectingPoint num="29" id="4238" />
+<TGConnectingPoint num="30" id="4239" />
+<TGConnectingPoint num="31" id="4240" />
+<TGConnectingPoint num="32" id="4241" />
+<TGConnectingPoint num="33" id="4242" />
+<TGConnectingPoint num="34" id="4243" />
+<TGConnectingPoint num="35" id="4244" />
+<TGConnectingPoint num="36" id="4245" />
+<TGConnectingPoint num="37" id="4246" />
+<TGConnectingPoint num="38" id="4247" />
+<TGConnectingPoint num="39" id="4248" />
+<TGConnectingPoint num="40" id="4249" />
+<TGConnectingPoint num="41" id="4250" />
+<TGConnectingPoint num="42" id="4251" />
+<TGConnectingPoint num="43" id="4252" />
+<TGConnectingPoint num="44" id="4253" />
+<TGConnectingPoint num="45" id="4254" />
+<TGConnectingPoint num="46" id="4255" />
+<TGConnectingPoint num="47" id="4256" />
+<TGConnectingPoint num="48" id="4257" />
+<TGConnectingPoint num="49" id="4258" />
+<TGConnectingPoint num="50" id="4259" />
+<TGConnectingPoint num="51" id="4260" />
+<TGConnectingPoint num="52" id="4261" />
+<TGConnectingPoint num="53" id="4262" />
+<TGConnectingPoint num="54" id="4263" />
+<TGConnectingPoint num="55" id="4264" />
+<TGConnectingPoint num="56" id="4265" />
+<TGConnectingPoint num="57" id="4266" />
+<TGConnectingPoint num="58" id="4267" />
+<TGConnectingPoint num="59" id="4268" />
+<TGConnectingPoint num="60" id="4269" />
+<TGConnectingPoint num="61" id="4270" />
+<TGConnectingPoint num="62" id="4271" />
+<TGConnectingPoint num="63" id="4272" />
+<TGConnectingPoint num="64" id="4273" />
+<TGConnectingPoint num="65" id="4274" />
+<TGConnectingPoint num="66" id="4275" />
+<TGConnectingPoint num="67" id="4276" />
+<TGConnectingPoint num="68" id="4277" />
+<TGConnectingPoint num="69" id="4278" />
+<TGConnectingPoint num="70" id="4279" />
+<TGConnectingPoint num="71" id="4280" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="3951" index="14" uid="734eacd0-6019-4edc-93dc-6618eb12595b" >
+<COMPONENT type="5100" id="4283" index="14" uid="734eacd0-6019-4edc-93dc-6618eb12595b" >
 <cdparam x="400" y="40" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
 <new d="false" />
-<TGConnectingPoint num="0" id="3952" />
+<TGConnectingPoint num="0" id="4282" />
 </COMPONENT>
 
 
diff --git a/src/main/java/avatartranslator/incrementalverification/IncrementalVerificationManager.java b/src/main/java/avatartranslator/incrementalverification/IncrementalVerificationManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..92763e8b6a43d83230344a17430b5546ea066102
--- /dev/null
+++ b/src/main/java/avatartranslator/incrementalverification/IncrementalVerificationManager.java
@@ -0,0 +1,92 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package avatartranslator.incrementalverification;
+
+
+import avatartranslator.AvatarDependencyGraph;
+import avatartranslator.AvatarSpecification;
+import graph.*;
+
+import java.util.ArrayList;
+
+/**
+   * Class IncrementalVerificationManager
+   * Creation: 22/06/2023
+   * @version 1.0 22/06/2023
+   * @author Ludovic Apvrille
+ */
+public class IncrementalVerificationManager {
+
+    // Initial spec
+    public AvatarSpecification initialSpec;
+    AvatarDependencyGraph dgi;
+
+
+    // New spec
+    public AvatarSpecification newSpec;
+    public AvatarDependencyGraph dgm;
+
+    public AUTState vpI, vpM; // same Vp, in the two graphs
+
+
+    public AvatarDependencyGraph dgr; //dgr is a reduced graphs on which model-
+    //checking decides if vp is reachable through an
+    //old path
+    public ArrayList<AUTState> Pr; // List of states which reachability must be studied on dgr
+
+    public AvatarDependencyGraph dgp; //dgp is a reduced graphs on which model-
+    // checking decides if vp is reachable through a
+    // new path.
+
+
+
+
+
+
+    public IncrementalVerificationManager() {
+
+    }
+
+
+
+
+
+
+
+}
diff --git a/src/main/java/graph/AUTGraph.java b/src/main/java/graph/AUTGraph.java
index 0c1c072ecb49836bd1020002b239e7ca8bdcc723..890ca5ea53f42e9267efdcaa6c2d4fb4c8bff11f 100755
--- a/src/main/java/graph/AUTGraph.java
+++ b/src/main/java/graph/AUTGraph.java
@@ -459,6 +459,18 @@ public class AUTGraph implements myutil.Graph {
         return null;
     }
 
+    public ArrayList<AUTState> getAllStateWithReference(Object _ref) {
+        ArrayList<AUTState> states = new ArrayList<>();
+        for(AUTState st: states) {
+            if (st.referenceObject == _ref) {
+                states.add(st);
+            }
+        }
+        return states;
+    }
+
+
+
     public AUTState getState(int _id) {
         return states.get(_id);
     }
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index 4799da5fb1b53796a33f9bd1f8302bb40f1b4327..b312455a3d233dbbd7cbcc09a13dce8e005bb754 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -128,7 +128,7 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator
     }
 
     public void setModelName(String _modelName) {
-        modelName = _modelName;
+        modelName = _modelName.replace("\\", "\\\\");
     }
 
     public void saveFile(String path, String filename) throws FileException {
@@ -388,10 +388,12 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator
         declaration += CR;
 
         // Declaration of Model Name
-        declaration += "//Declaration of Model Name" + CR;
+        declaration += "// Declaration of Model Name" + CR;
         declaration += "std::string msg=" + "\"" + modelName + "\"" + SCCR;
         declaration += "addModelName(" + "\"" + modelName + "\"" + ")" + SCCR;
 
+
+
         // Declaration of Buses
         declaration += "//Declaration of Buses" + CR;
 
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 405d0fb81c89b5e71a1848ae83a62564ef72a6f6..c04b87ed5c4ed2434a78f16c5980c78330b9a2dd 100644
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1496,7 +1496,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
 			LinkedHashMap<String, ArrayList<String>> deviceTaskMap = new LinkedHashMap<String, ArrayList<String>>();
 			for (String name: tmlComponentsToValidate){
 				TMLTask task = tmap.getTMLModeling().getTMLTaskByName(name);
-				if (task==null){
+				if (task == null){
 					continue;
 				}
 				HwNode node = tmap.getHwNodeOf(task);
@@ -1517,9 +1517,14 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
 				simtraces.add("time=0 block="+ node.getName()+" type=state_entering state=start");
 				simIndex++;
 			}*/
+
+            //TraceManager.addDev("Processing traces");
+
 			for (TMLTask task : tmap.getTMLModeling().getTasks()){
 				if (!simtraces.contains("time=0 block="+ task.getName()+" type=state_entering state=startState") && tmlComponentsToValidate.contains(task.getName())){
-					simtraces.add("time=0 block="+ task.getName()+" type=state_entering state=startState");
+					String trace = "time=0 block="+ task.getName()+" type=state_entering state=startState";
+                    simtraces.add(trace);
+                    //TraceManager.addDev("Trace added: " + trace);
 					simIndex++;
 				}
 			}
@@ -1556,6 +1561,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
 			}
 			bw.close();
 			pos.close();
+            TraceManager.addDev("Sim trace written");
 			tmlSimPanel.setVisible(true);
 	
 		}