diff --git a/modeling/AVATAR/ev3/Bot_EV3.xml b/modeling/AVATAR/ev3/Bot_EV3.xml
index 5302b5bea4bfc8c99017ab8150920bbd7e28e820..bff0d82783a7ae38f97b77ed2dab6c813c8ed481 100644
--- a/modeling/AVATAR/ev3/Bot_EV3.xml
+++ b/modeling/AVATAR/ev3/Bot_EV3.xml
@@ -6657,8 +6657,6 @@
 <MainCode value=""/>
 <MainCode value="int checkContact(){"/>
 <MainCode value="    if ( ev3_search_sensor( LEGO_EV3_TOUCH, &amp;sn_touch, 0 )) {"/>
-<MainCode value="   printf(&quot;Press:\n&quot;);"/>
-<MainCode value="   sleep(5);"/>
 <MainCode value="   if ( _check_pressed( sn_touch )) {"/>
 <MainCode value="  return 1;"/>
 <MainCode value="   }"/>
@@ -6766,7 +6764,7 @@
 <MainCode value="  printf( &quot;*** ( EV3 ) Hello! ***\n&quot; );"/>
 <MainCode value="}"/>
 <Optimized value="false" />
-<Validated value="" />
+<Validated value="Color;Contact;Sonar;Controller;Motor2;Motor1;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="2445" >
@@ -6827,7 +6825,7 @@
 <infoparam name="connector" value="" />
 <TGConnectingPoint num="0" id="2450" />
 <P1  x="520" y="559" id="2535" />
-<P2  x="518" y="586" id="2480" />
+<P2  x="521" y="592" id="2480" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in receiveContact(int contact, int hasBeenPushed)" />
@@ -6902,7 +6900,7 @@
 </COMPONENT>
 
 <COMPONENT type="5000" id="2503" >
-<cdparam x="450" y="586" />
+<cdparam x="453" y="592" />
 <sizeparam width="137" height="172" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -7074,7 +7072,7 @@
 <TGConnectingPoint num="7" id="2561" />
 <extraparam>
 <Attribute access="0" id="MOTOR_OFF_DELAY" value="1" type="8" typeOther="" />
-<Attribute access="0" id="MOTOR_ON_DELAY" value="1" type="8" typeOther="" />
+<Attribute access="0" id="MOTOR_ON_DELAY" value="2" type="8" typeOther="" />
 <Attribute access="0" id="FACTOR_ACC" value="6" type="8" typeOther="" />
 <Attribute access="0" id="FACTOR_DEC" value="5" type="8" typeOther="" />
 <Attribute access="0" id="MOTOR_SPEED" value="500" type="8" typeOther="" />
@@ -7770,7 +7768,7 @@
 <SUBCOMPONENT type="-1" id="2774" >
 <father id="2780" num="4" />
 <cdparam x="225" y="431" />
-<sizeparam width="120" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="120" height="30" 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" />
@@ -7781,7 +7779,7 @@
 <TGConnectingPoint num="3" id="2773" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
+<afterMin value="1" enabled="true"/>
 <afterMax value="" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
@@ -8281,8 +8279,8 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="5031" >
 <father id="5027" num="1" />
-<cdparam x="294" y="695" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="97" y="638" />
+<sizeparam width="248" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -8292,7 +8290,7 @@
 <TGConnectingPoint num="2" id="5034" />
 <TGConnectingPoint num="3" id="5035" />
 <extraparam>
-<guard value="[ ]" enabled="true"/>
+<guard value="[(hasBeenPushed==1)||(contact==1) ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
 <computeMin value="" enabled="true"/>
@@ -8329,7 +8327,7 @@
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 <actions value="speed=myGlob.MOTOR_SPEED" enabled="true"/>
-<actions value="flag=1" enabled="true"/>
+<actions value="flagA=1" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8454,7 +8452,7 @@
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="3070" >
 <father id="3072" num="0" />
-<cdparam x="476" y="486" />
+<cdparam x="474" y="482" />
 <sizeparam width="200" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
@@ -8562,7 +8560,7 @@
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 <actions value="flag=0" enabled="true"/>
-<actions value="deg=200" enabled="true"/>
+<actions value="deg=180" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8606,8 +8604,8 @@
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="3105" >
 <father id="3107" num="0" />
-<cdparam x="61" y="670" />
-<sizeparam width="248" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="223" y="853" />
+<sizeparam width="248" height="15" 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" />
@@ -8617,8 +8615,8 @@
 <TGConnectingPoint num="2" id="3103" />
 <TGConnectingPoint num="3" id="3104" />
 <extraparam>
-<guard value="[(hasBeenPushed==1)||(contact==1) ]" enabled="true"/>
-<afterMin value="2" enabled="true"/>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="1" enabled="true"/>
 <afterMax value="" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>