From 87be84dee7ab6ab224b722a14e6b491e9c49d30b Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Wed, 8 Feb 2017 18:18:37 +0100
Subject: [PATCH] :updates

---
 MPSoC/Makefile.soclib                         |    2 +-
 MPSoC/Makefile.src                            |    2 +-
 MPSoC/generated_src/main.c                    |  713 +-
 MPSoC/generated_src/main.h                    |   17 +-
 MPSoC/generated_topcell/config                |   30 +-
 MPSoC/generated_topcell/deployinfo.h          |   12 +-
 MPSoC/generated_topcell/deployinfo_map.h      |  112 -
 MPSoC/generated_topcell/nbproc                |    2 +-
 MPSoC/generated_topcell/procinfo.mk           |    2 +-
 bin/config.xml                                |    4 +-
 .../MicroWaveOven_SimpleAsynchronous.xml      | 3972 +++++-----
 ...veOven_SimpleSynchronousDeploy2CPU2RAM.xml |   42 +-
 modeling/DASIP2016/DASIP2016_2RAM.xml         | 6936 ++++++++---------
 .../toSoclib/TasksAndMainGenerator.java       |   26 +-
 ttool.exe                                     |    2 +-
 15 files changed, 5555 insertions(+), 6319 deletions(-)

diff --git a/MPSoC/Makefile.soclib b/MPSoC/Makefile.soclib
index 23e77faf34..62f5641005 100644
--- a/MPSoC/Makefile.soclib
+++ b/MPSoC/Makefile.soclib
@@ -1 +1 @@
-objs = main.o TestBench.o SpeedSensor.o RadarSensor.o GPSSensor.o CarPositionSimulator.o EmergencySimulator.o Communication.o DSRSC_Management.o NeighbourhoodTableManagement.o CorrectnessChecking.o PTC.o DrivingPowerReductionStrategy.o BCU.o DangerAvoidanceStrategy.o BrakeManagement.o CSCU.o ObjectListManagement.o PlausibilityCheck.o VehiculeDynamicsManagement.o 
\ No newline at end of file
+objs = main.o B2.o B0.o B1.o 
\ No newline at end of file
diff --git a/MPSoC/Makefile.src b/MPSoC/Makefile.src
index f005e67c8d..049a27a745 100755
--- a/MPSoC/Makefile.src
+++ b/MPSoC/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/TestBench.c generated_src/SpeedSensor.c generated_src/RadarSensor.c generated_src/GPSSensor.c generated_src/CarPositionSimulator.c generated_src/EmergencySimulator.c generated_src/Communication.c generated_src/DSRSC_Management.c generated_src/NeighbourhoodTableManagement.c generated_src/CorrectnessChecking.c generated_src/PTC.c generated_src/DrivingPowerReductionStrategy.c generated_src/BCU.c generated_src/DangerAvoidanceStrategy.c generated_src/BrakeManagement.c generated_src/CSCU.c generated_src/ObjectListManagement.c generated_src/PlausibilityCheck.c generated_src/VehiculeDynamicsManagement.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/B2.c generated_src/B0.c generated_src/B1.c 
\ No newline at end of file
diff --git a/MPSoC/generated_src/main.c b/MPSoC/generated_src/main.c
index 6687e0e189..0531f51beb 100644
--- a/MPSoC/generated_src/main.c
+++ b/MPSoC/generated_src/main.c
@@ -17,32 +17,16 @@
 #include "mwmr.h" 
  
 
-#define NB_PROC 5
+#define NB_PROC 2
 #define WIDTH 4
 #define DEPTH 16
 
 void __user_init() {
 }
 
-#include "TestBench.h"
-#include "SpeedSensor.h"
-#include "RadarSensor.h"
-#include "GPSSensor.h"
-#include "CarPositionSimulator.h"
-#include "EmergencySimulator.h"
-#include "Communication.h"
-#include "DSRSC_Management.h"
-#include "NeighbourhoodTableManagement.h"
-#include "CorrectnessChecking.h"
-#include "PTC.h"
-#include "DrivingPowerReductionStrategy.h"
-#include "BCU.h"
-#include "DangerAvoidanceStrategy.h"
-#include "BrakeManagement.h"
-#include "CSCU.h"
-#include "ObjectListManagement.h"
-#include "PlausibilityCheck.h"
-#include "VehiculeDynamicsManagement.h"
+#include "B2.h"
+#include "B0.h"
+#include "B1.h"
 
 /* Main mutex */
 pthread_barrier_t barrier ;
@@ -51,129 +35,16 @@ pthread_mutex_t __mainMutex;
 
 #define CHANNEL0 __attribute__((section("section_channel0")))
 #define LOCK0 __attribute__((section("section_lock0")))
-#define CHANNEL1 __attribute__((section("section_channel1")))
-#define LOCK1 __attribute__((section("section_lock1")))
-#define CHANNEL2 __attribute__((section("section_channel2")))
-#define LOCK2 __attribute__((section("section_lock2")))
-#define CHANNEL3 __attribute__((section("section_channel3")))
-#define LOCK3 __attribute__((section("section_lock3")))
-#define CHANNEL4 __attribute__((section("section_channel4")))
-#define LOCK4 __attribute__((section("section_lock4")))
-#define CHANNEL5 __attribute__((section("section_channel5")))
-#define LOCK5 __attribute__((section("section_lock5")))
-#define CHANNEL6 __attribute__((section("section_channel6")))
-#define LOCK6 __attribute__((section("section_lock6")))
-#define CHANNEL7 __attribute__((section("section_channel7")))
-#define LOCK7 __attribute__((section("section_lock7")))
-#define CHANNEL8 __attribute__((section("section_channel8")))
-#define LOCK8 __attribute__((section("section_lock8")))
-#define CHANNEL9 __attribute__((section("section_channel9")))
-#define LOCK9 __attribute__((section("section_lock9")))
-#define CHANNEL10 __attribute__((section("section_channel10")))
-#define LOCK10 __attribute__((section("section_lock10")))
-#define CHANNEL11 __attribute__((section("section_channel11")))
-#define LOCK11 __attribute__((section("section_lock11")))
-#define CHANNEL12 __attribute__((section("section_channel12")))
-#define LOCK12 __attribute__((section("section_lock12")))
-#define CHANNEL13 __attribute__((section("section_channel13")))
-#define LOCK13 __attribute__((section("section_lock13")))
-#define CHANNEL14 __attribute__((section("section_channel14")))
-#define LOCK14 __attribute__((section("section_lock14")))
 #define base(arg) arg
 
 typedef struct mwmr_s mwmr_t;
 
 /* Synchronous channels */
-syncchannel __DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-uint32_t const DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_lock LOCK0;
-struct mwmr_status_s DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status CHANNEL0;
-uint8_t DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_data[32] CHANNEL0;
-struct mwmr_s DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency CHANNEL0;
-
-syncchannel __NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-uint32_t const NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_lock LOCK0;
-struct mwmr_status_s NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status CHANNEL0;
-uint8_t NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_data[32] CHANNEL0;
-struct mwmr_s NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList CHANNEL0;
-
-syncchannel __DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-uint32_t const DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_lock LOCK0;
-struct mwmr_status_s DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status CHANNEL0;
-uint8_t DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_data[32] CHANNEL0;
-struct mwmr_s DangerAvoidanceStrategy_brakePower__BrakeManagement_brake CHANNEL0;
-
-syncchannel __DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-uint32_t const DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_lock LOCK0;
-struct mwmr_status_s DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status CHANNEL0;
-uint8_t DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_data[32] CHANNEL0;
-struct mwmr_s DangerAvoidanceStrategy_brake__PlausibilityCheck_brake CHANNEL0;
-
-syncchannel __PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-uint32_t const PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_lock LOCK0;
-struct mwmr_status_s PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status CHANNEL0;
-uint8_t PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_data[32] CHANNEL0;
-struct mwmr_s PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed CHANNEL0;
-
-syncchannel __SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-uint32_t const SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_lock LOCK0;
-struct mwmr_status_s SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status CHANNEL0;
-uint8_t SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_data[32] CHANNEL0;
-struct mwmr_s SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed CHANNEL0;
-
-syncchannel __PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-uint32_t const PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_lock LOCK0;
-struct mwmr_status_s PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status CHANNEL0;
-uint8_t PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_data[32] CHANNEL0;
-struct mwmr_s PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle CHANNEL0;
-
-syncchannel __RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-uint32_t const RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_lock LOCK0;
-struct mwmr_status_s RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status CHANNEL0;
-uint8_t RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_data[32] CHANNEL0;
-struct mwmr_s RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead CHANNEL0;
-
-syncchannel __CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-uint32_t const CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_lock LOCK0;
-struct mwmr_status_s CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status CHANNEL0;
-uint8_t CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_data[32] CHANNEL0;
-struct mwmr_s CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify CHANNEL0;
-
-syncchannel __DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-uint32_t const DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_lock LOCK0;
-struct mwmr_status_s DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status CHANNEL0;
-uint8_t DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_data[32] CHANNEL0;
-struct mwmr_s DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage CHANNEL0;
-
-syncchannel __DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-uint32_t const DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_lock LOCK0;
-struct mwmr_status_s DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status CHANNEL0;
-uint8_t DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_data[32] CHANNEL0;
-struct mwmr_s DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode CHANNEL0;
-
-syncchannel __CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-uint32_t const CarPositionSimulator_carPosition__DSRSC_Management_carPosition_lock LOCK0;
-struct mwmr_status_s CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status CHANNEL0;
-uint8_t CarPositionSimulator_carPosition__DSRSC_Management_carPosition_data[32] CHANNEL0;
-struct mwmr_s CarPositionSimulator_carPosition__DSRSC_Management_carPosition CHANNEL0;
-
-syncchannel __EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-uint32_t const EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_lock LOCK0;
-struct mwmr_status_s EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status CHANNEL0;
-uint8_t EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_data[32] CHANNEL0;
-struct mwmr_s EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected CHANNEL0;
-
-syncchannel __GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-uint32_t const GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_lock LOCK0;
-struct mwmr_status_s GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status CHANNEL0;
-uint8_t GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_data[32] CHANNEL0;
-struct mwmr_s GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition CHANNEL0;
-
-/* Asynchronous channels */
-asyncchannel __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-uint32_t const DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_lock LOCK0;
-struct mwmr_status_s DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status CHANNEL0;
-uint8_t DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_data[32] CHANNEL0;
-struct mwmr_s DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder CHANNEL0;
+syncchannel __B_sendReq__B2_receiveReq;
+uint32_t const B_sendReq__B2_receiveReq_lock LOCK0;
+struct mwmr_status_s B_sendReq__B2_receiveReq_status CHANNEL0;
+uint8_t B_sendReq__B2_receiveReq_data[32] CHANNEL0;
+struct mwmr_s B_sendReq__B2_receiveReq CHANNEL0;
 
 
 int main(int argc, char *argv[]) {
@@ -186,320 +57,38 @@ int main(int argc, char *argv[]) {
   pthread_mutex_init(&__mainMutex, NULL);
   
   /* Synchronous channels */
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status.rptr = 0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status.wptr = 0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status.usage = 0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status.lock = 0;
-  
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.width = 1;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.depth = 1;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.gdepth = 1;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.buffer = DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_data;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status = &DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status;
-  
-  __DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.inname ="broadcastEmergencyBrakingMessage";
-  __DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.outname ="forwardEmergency";
-  __DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.mwmr_fifo = &DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status =&DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency_status;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status->lock=0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status->rptr=0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status->usage=0;
-  DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency.status->wptr =0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status.rptr = 0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status.wptr = 0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status.usage = 0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status.lock = 0;
-  
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.width = 1;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.depth = 1;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.gdepth = 1;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.buffer = NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_data;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status = &NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status;
-  
-  __NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.inname ="getNodeList";
-  __NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.outname ="sendTable";
-  __NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.mwmr_fifo = &NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status =&NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList_status;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status->lock=0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status->rptr=0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status->usage=0;
-  NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList.status->wptr =0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status.rptr = 0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status.wptr = 0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status.usage = 0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status.lock = 0;
-  
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.width = 1;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.depth = 1;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.gdepth = 1;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.buffer = DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_data;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status = &DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status;
-  
-  __DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.inname ="brake";
-  __DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.outname ="brakePower";
-  __DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.mwmr_fifo = &DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status =&DangerAvoidanceStrategy_brakePower__BrakeManagement_brake_status;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status->lock=0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status->rptr=0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status->usage=0;
-  DangerAvoidanceStrategy_brakePower__BrakeManagement_brake.status->wptr =0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status.rptr = 0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status.wptr = 0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status.usage = 0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status.lock = 0;
-  
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.width = 1;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.depth = 1;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.gdepth = 1;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.buffer = DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_data;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status = &DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status;
-  
-  __DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.inname ="brake";
-  __DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.outname ="brake";
-  __DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.mwmr_fifo = &DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status =&DangerAvoidanceStrategy_brake__PlausibilityCheck_brake_status;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status->lock=0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status->rptr=0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status->usage=0;
-  DangerAvoidanceStrategy_brake__PlausibilityCheck_brake.status->wptr =0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status.rptr = 0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status.wptr = 0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status.usage = 0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status.lock = 0;
-  
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.width = 1;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.depth = 1;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.gdepth = 1;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.buffer = PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_data;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status = &PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status;
-  
-  __PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.inname ="getInfoOnSpeed";
-  __PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.outname ="getInfoOnSpeed";
-  __PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.mwmr_fifo = &PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status =&PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed_status;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status->lock=0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status->rptr=0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status->usage=0;
-  PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed.status->wptr =0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status.rptr = 0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status.wptr = 0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status.usage = 0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status.lock = 0;
-  
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.width = 1;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.depth = 1;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.gdepth = 1;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.buffer = SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_data;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status = &SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status;
-  
-  __SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.inname ="updateOnSpeed";
-  __SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.outname ="updateOnSpeed";
-  __SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.mwmr_fifo = &SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status =&SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed_status;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status->lock=0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status->rptr=0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status->usage=0;
-  SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed.status->wptr =0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status.rptr = 0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status.wptr = 0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status.usage = 0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status.lock = 0;
-  
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.width = 1;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.depth = 1;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.gdepth = 1;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.buffer = PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_data;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status = &PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status;
-  
-  __PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.inname ="getInfoOnObstacle";
-  __PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.outname ="getInfoOnObstacle";
-  __PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.mwmr_fifo = &PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status =&PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle_status;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status->lock=0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status->rptr=0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status->usage=0;
-  PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle.status->wptr =0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status.rptr = 0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status.wptr = 0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status.usage = 0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status.lock = 0;
-  
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.width = 1;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.depth = 1;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.gdepth = 1;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.buffer = RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_data;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status = &RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status;
-  
-  __RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.inname ="isObstacleAhead";
-  __RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.outname ="obstacleAhead";
-  __RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.mwmr_fifo = &RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status =&RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead_status;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status->lock=0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status->rptr=0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status->usage=0;
-  RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead.status->wptr =0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status.rptr = 0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status.wptr = 0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status.usage = 0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status.lock = 0;
-  
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.width = 1;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.depth = 1;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.gdepth = 1;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.buffer = CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_data;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status = &CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status;
-  
-  __CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.inname ="getEmergencyMessageToVerify";
-  __CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.outname ="toPlausibityCheckMessage";
-  __CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.mwmr_fifo = &CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status =&CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify_status;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status->lock=0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status->rptr=0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status->usage=0;
-  CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify.status->wptr =0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status.rptr = 0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status.wptr = 0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status.usage = 0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status.lock = 0;
-  
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.width = 1;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.depth = 1;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.gdepth = 1;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.buffer = DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_data;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status = &DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status;
-  
-  __DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.inname ="getEmergencyBrakingMessage";
-  __DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.outname ="forwardEmergencyBrakingMessage";
-  __DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.mwmr_fifo = &DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status =&DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage_status;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status->lock=0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status->rptr=0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status->usage=0;
-  DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage.status->wptr =0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status.rptr = 0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status.wptr = 0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status.usage = 0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status.lock = 0;
-  
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.width = 1;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.depth = 1;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.gdepth = 1;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.buffer = DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_data;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status = &DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status;
-  
-  __DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.inname ="addANode";
-  __DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.outname ="setCarPosition";
-  __DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.mwmr_fifo = &DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status =&DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode_status;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status->lock=0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status->rptr=0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status->usage=0;
-  DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode.status->wptr =0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status.rptr = 0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status.wptr = 0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status.usage = 0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status.lock = 0;
-  
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.width = 1;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.depth = 1;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.gdepth = 1;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.buffer = CarPositionSimulator_carPosition__DSRSC_Management_carPosition_data;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status = &CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status;
-  
-  __CarPositionSimulator_carPosition__DSRSC_Management_carPosition.inname ="carPosition";
-  __CarPositionSimulator_carPosition__DSRSC_Management_carPosition.outname ="carPosition";
-  __CarPositionSimulator_carPosition__DSRSC_Management_carPosition.mwmr_fifo = &CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status =&CarPositionSimulator_carPosition__DSRSC_Management_carPosition_status;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status->lock=0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status->rptr=0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status->usage=0;
-  CarPositionSimulator_carPosition__DSRSC_Management_carPosition.status->wptr =0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status.rptr = 0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status.wptr = 0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status.usage = 0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status.lock = 0;
-  
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.width = 1;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.depth = 1;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.gdepth = 1;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.buffer = EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_data;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status = &EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status;
-  
-  __EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.inname ="obstacleDetected";
-  __EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.outname ="obstacleDetected";
-  __EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.mwmr_fifo = &EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status =&EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected_status;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status->lock=0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status->rptr=0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status->usage=0;
-  EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected.status->wptr =0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status.rptr = 0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status.wptr = 0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status.usage = 0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status.lock = 0;
-  
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.width = 1;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.depth = 1;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.gdepth = 1;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.buffer = GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_data;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status = &GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status;
-  
-  __GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.inname ="setPosition";
-  __GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.outname ="setPosition";
-  __GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.mwmr_fifo = &GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status =&GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition_status;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status->lock=0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status->rptr=0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status->usage=0;
-  GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition.status->wptr =0;
-  /* Asynchronous channels */
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status.rptr = 0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status.wptr = 0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status.usage = 0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status.lock = 0;
-  
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.width = 1;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.depth = 11;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.gdepth = DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.depth;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.buffer = DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_data;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status = &DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status;
-  __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.inname ="getReducePowerOrder";
-  __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.outname ="reducePower";
-  __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.isBlocking = 0;
-  __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.maxNbOfMessages = 1;
-  __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.mwmr_fifo = &DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status =&DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder_status;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status->lock=0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status->rptr=0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status->usage=0;
-  DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder.status->wptr=0;
+  B_sendReq__B2_receiveReq_status.rptr = 0;
+  B_sendReq__B2_receiveReq_status.wptr = 0;
+  B_sendReq__B2_receiveReq_status.usage = 0;
+  B_sendReq__B2_receiveReq_status.lock = 0;
+  
+  B_sendReq__B2_receiveReq.width = 1;
+  B_sendReq__B2_receiveReq.depth = 1;
+  B_sendReq__B2_receiveReq.gdepth = 1;
+  B_sendReq__B2_receiveReq.buffer = B_sendReq__B2_receiveReq_data;
+  B_sendReq__B2_receiveReq.status = &B_sendReq__B2_receiveReq_status;
+  
+  __B_sendReq__B2_receiveReq.inname ="receiveReq";
+  __B_sendReq__B2_receiveReq.outname ="sendReq";
+  __B_sendReq__B2_receiveReq.mwmr_fifo = &B_sendReq__B2_receiveReq;
+  B_sendReq__B2_receiveReq.status =&B_sendReq__B2_receiveReq_status;
+  B_sendReq__B2_receiveReq.status->lock=0;
+  B_sendReq__B2_receiveReq.status->rptr=0;
+  B_sendReq__B2_receiveReq.status->usage=0;
+  B_sendReq__B2_receiveReq.status->wptr =0;
   
   /* Threads of tasks */
-  pthread_t thread__TestBench;
-  pthread_t thread__SpeedSensor;
-  pthread_t thread__RadarSensor;
-  pthread_t thread__GPSSensor;
-  pthread_t thread__CarPositionSimulator;
-  pthread_t thread__EmergencySimulator;
-  pthread_t thread__Communication;
-  pthread_t thread__DSRSC_Management;
-  pthread_t thread__NeighbourhoodTableManagement;
-  pthread_t thread__CorrectnessChecking;
-  pthread_t thread__PTC;
-  pthread_t thread__DrivingPowerReductionStrategy;
-  pthread_t thread__BCU;
-  pthread_t thread__DangerAvoidanceStrategy;
-  pthread_t thread__BrakeManagement;
-  pthread_t thread__CSCU;
-  pthread_t thread__ObjectListManagement;
-  pthread_t thread__PlausibilityCheck;
-  pthread_t thread__VehiculeDynamicsManagement;
+  pthread_t thread__B2;
+  pthread_t thread__B0;
+  pthread_t thread__B1;
   /* Activating tracing  */
   if (argc>1){
     activeTracingInFile(argv[1]);
   } else {
     activeTracingInConsole();
   }
+  /* Activating debug messages */
+  activeDebug();
   /* Activating randomness */
   initRandom();
   /* Initializing the main mutex */
@@ -509,244 +98,48 @@ if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
   __user_init();
   
   
-  struct mwmr_s *channels_array_TestBench;
-  ptr =malloc(sizeof(pthread_t));
-  thread__TestBench= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__TestBench, attr_t, mainFunc__TestBench, (void *)channels_array_TestBench);
-  
-  struct mwmr_s *channels_array_SpeedSensor[1];
-  channels_array_SpeedSensor[0]=&SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__SpeedSensor= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__SpeedSensor, attr_t, mainFunc__SpeedSensor, (void *)channels_array_SpeedSensor);
-  
-  struct mwmr_s *channels_array_RadarSensor[1];
-  channels_array_RadarSensor[0]=&RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__RadarSensor= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__RadarSensor, attr_t, mainFunc__RadarSensor, (void *)channels_array_RadarSensor);
-  
-  struct mwmr_s *channels_array_GPSSensor[1];
-  channels_array_GPSSensor[0]=&GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__GPSSensor= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__GPSSensor, attr_t, mainFunc__GPSSensor, (void *)channels_array_GPSSensor);
-  
-  struct mwmr_s *channels_array_CarPositionSimulator[1];
-  channels_array_CarPositionSimulator[0]=&CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__CarPositionSimulator= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__CarPositionSimulator, attr_t, mainFunc__CarPositionSimulator, (void *)channels_array_CarPositionSimulator);
-  
-  struct mwmr_s *channels_array_EmergencySimulator[1];
-  channels_array_EmergencySimulator[0]=&EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
+  debugMsg("Starting tasks");
+  struct mwmr_s *channels_array_B2[1];
+  channels_array_B2[0]=&B_sendReq__B2_receiveReq;
   
   ptr =malloc(sizeof(pthread_t));
-  thread__EmergencySimulator= (pthread_t)ptr;
+  thread__B2= (pthread_t)ptr;
   attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 4);  
-  
-  
-  pthread_create(&thread__EmergencySimulator, attr_t, mainFunc__EmergencySimulator, (void *)channels_array_EmergencySimulator);
-  
-  struct mwmr_s *channels_array_Communication;
-  ptr =malloc(sizeof(pthread_t));
-  thread__Communication= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
-  
-  pthread_create(&thread__Communication, attr_t, mainFunc__Communication, (void *)channels_array_Communication);
-  
-  struct mwmr_s *channels_array_DSRSC_Management[5];
-  channels_array_DSRSC_Management[0]=&DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-  channels_array_DSRSC_Management[1]=&DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-  channels_array_DSRSC_Management[2]=&DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-  channels_array_DSRSC_Management[3]=&CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-  channels_array_DSRSC_Management[4]=&EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__DSRSC_Management= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
+  pthread_attr_affinity(attr_t, 0);  
   
-  pthread_create(&thread__DSRSC_Management, attr_t, mainFunc__DSRSC_Management, (void *)channels_array_DSRSC_Management);
   
-  struct mwmr_s *channels_array_NeighbourhoodTableManagement[3];
-  channels_array_NeighbourhoodTableManagement[0]=&NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-  channels_array_NeighbourhoodTableManagement[1]=&DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-  channels_array_NeighbourhoodTableManagement[2]=&GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
+  debugMsg("Starting tasks");
+  pthread_create(&thread__B2, attr_t, mainFunc__B2, (void *)channels_array_B2);
   
+  struct mwmr_s *channels_array_B0;
   ptr =malloc(sizeof(pthread_t));
-  thread__NeighbourhoodTableManagement= (pthread_t)ptr;
+  thread__B0= (pthread_t)ptr;
   attr_t = malloc(sizeof(pthread_attr_t));
   pthread_attr_affinity(attr_t, 1);  
   
   
-  pthread_create(&thread__NeighbourhoodTableManagement, attr_t, mainFunc__NeighbourhoodTableManagement, (void *)channels_array_NeighbourhoodTableManagement);
-  
-  struct mwmr_s *channels_array_CorrectnessChecking[2];
-  channels_array_CorrectnessChecking[0]=&CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-  channels_array_CorrectnessChecking[1]=&DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
+  debugMsg("Starting tasks");
+  pthread_create(&thread__B0, attr_t, mainFunc__B0, (void *)channels_array_B0);
   
+  struct mwmr_s *channels_array_B1;
   ptr =malloc(sizeof(pthread_t));
-  thread__CorrectnessChecking= (pthread_t)ptr;
+  thread__B1= (pthread_t)ptr;
   attr_t = malloc(sizeof(pthread_attr_t));
   pthread_attr_affinity(attr_t, 1);  
   
   
-  pthread_create(&thread__CorrectnessChecking, attr_t, mainFunc__CorrectnessChecking, (void *)channels_array_CorrectnessChecking);
-  
-  struct mwmr_s *channels_array_PTC;
-  ptr =malloc(sizeof(pthread_t));
-  thread__PTC= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 2);  
-  
-  
-  pthread_create(&thread__PTC, attr_t, mainFunc__PTC, (void *)channels_array_PTC);
-  
-  struct mwmr_s *channels_array_DrivingPowerReductionStrategy[1];
-  channels_array_DrivingPowerReductionStrategy[0]=&DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__DrivingPowerReductionStrategy= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 2);  
-  
-  
-  pthread_create(&thread__DrivingPowerReductionStrategy, attr_t, mainFunc__DrivingPowerReductionStrategy, (void *)channels_array_DrivingPowerReductionStrategy);
-  
-  struct mwmr_s *channels_array_BCU;
-  ptr =malloc(sizeof(pthread_t));
-  thread__BCU= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 3);  
-  
-  
-  pthread_create(&thread__BCU, attr_t, mainFunc__BCU, (void *)channels_array_BCU);
-  
-  struct mwmr_s *channels_array_DangerAvoidanceStrategy[4];
-  channels_array_DangerAvoidanceStrategy[0]=&DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-  channels_array_DangerAvoidanceStrategy[1]=&DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-  channels_array_DangerAvoidanceStrategy[2]=&DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-  channels_array_DangerAvoidanceStrategy[3]=&DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__DangerAvoidanceStrategy= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 3);  
-  
-  
-  pthread_create(&thread__DangerAvoidanceStrategy, attr_t, mainFunc__DangerAvoidanceStrategy, (void *)channels_array_DangerAvoidanceStrategy);
-  
-  struct mwmr_s *channels_array_BrakeManagement[1];
-  channels_array_BrakeManagement[0]=&DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__BrakeManagement= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 3);  
-  
-  
-  pthread_create(&thread__BrakeManagement, attr_t, mainFunc__BrakeManagement, (void *)channels_array_BrakeManagement);
-  
-  struct mwmr_s *channels_array_CSCU;
-  ptr =malloc(sizeof(pthread_t));
-  thread__CSCU= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__CSCU, attr_t, mainFunc__CSCU, (void *)channels_array_CSCU);
-  
-  struct mwmr_s *channels_array_ObjectListManagement[2];
-  channels_array_ObjectListManagement[0]=&PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-  channels_array_ObjectListManagement[1]=&RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__ObjectListManagement= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__ObjectListManagement, attr_t, mainFunc__ObjectListManagement, (void *)channels_array_ObjectListManagement);
-  
-  struct mwmr_s *channels_array_PlausibilityCheck[5];
-  channels_array_PlausibilityCheck[0]=&NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-  channels_array_PlausibilityCheck[1]=&DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-  channels_array_PlausibilityCheck[2]=&PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-  channels_array_PlausibilityCheck[3]=&PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-  channels_array_PlausibilityCheck[4]=&CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__PlausibilityCheck= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__PlausibilityCheck, attr_t, mainFunc__PlausibilityCheck, (void *)channels_array_PlausibilityCheck);
-  
-  struct mwmr_s *channels_array_VehiculeDynamicsManagement[2];
-  channels_array_VehiculeDynamicsManagement[0]=&PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-  channels_array_VehiculeDynamicsManagement[1]=&SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__VehiculeDynamicsManagement= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__VehiculeDynamicsManagement, attr_t, mainFunc__VehiculeDynamicsManagement, (void *)channels_array_VehiculeDynamicsManagement);
+  debugMsg("Starting tasks");
+  pthread_create(&thread__B1, attr_t, mainFunc__B1, (void *)channels_array_B1);
   
   
   
-  pthread_join(thread__TestBench, NULL);
-  pthread_join(thread__SpeedSensor, NULL);
-  pthread_join(thread__RadarSensor, NULL);
-  pthread_join(thread__GPSSensor, NULL);
-  pthread_join(thread__CarPositionSimulator, NULL);
-  pthread_join(thread__EmergencySimulator, NULL);
-  pthread_join(thread__Communication, NULL);
-  pthread_join(thread__DSRSC_Management, NULL);
-  pthread_join(thread__NeighbourhoodTableManagement, NULL);
-  pthread_join(thread__CorrectnessChecking, NULL);
-  pthread_join(thread__PTC, NULL);
-  pthread_join(thread__DrivingPowerReductionStrategy, NULL);
-  pthread_join(thread__BCU, NULL);
-  pthread_join(thread__DangerAvoidanceStrategy, NULL);
-  pthread_join(thread__BrakeManagement, NULL);
-  pthread_join(thread__CSCU, NULL);
-  pthread_join(thread__ObjectListManagement, NULL);
-  pthread_join(thread__PlausibilityCheck, NULL);
-  pthread_join(thread__VehiculeDynamicsManagement, NULL);
+  debugMsg("Joining tasks");
+  pthread_join(thread__B2, NULL);
+  pthread_join(thread__B0, NULL);
+  pthread_join(thread__B1, NULL);
   
   
+  debugMsg("Application terminated");
   return 0;
   
 }
diff --git a/MPSoC/generated_src/main.h b/MPSoC/generated_src/main.h
index c306805348..3cbbabc876 100644
--- a/MPSoC/generated_src/main.h
+++ b/MPSoC/generated_src/main.h
@@ -3,20 +3,5 @@
 extern pthread_mutex_t __mainMutex;
 
 /* Synchronous channels */
-extern syncchannel __DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-extern syncchannel __NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-extern syncchannel __DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-extern syncchannel __DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-extern syncchannel __PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-extern syncchannel __SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-extern syncchannel __PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-extern syncchannel __RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-extern syncchannel __CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-extern syncchannel __DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-extern syncchannel __DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-extern syncchannel __CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-extern syncchannel __EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-extern syncchannel __GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-/* Asynchronous channels */
-extern asyncchannel __DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
+extern syncchannel __B_sendReq__B2_receiveReq;
 #endif
diff --git a/MPSoC/generated_topcell/config b/MPSoC/generated_topcell/config
index b2cee6e052..38129acb49 100644
--- a/MPSoC/generated_topcell/config
+++ b/MPSoC/generated_topcell/config
@@ -9,43 +9,29 @@
   CONFIG_LICENSE_APP_LGPL
 
 # Libs
-#DG enleve 8.9. remis
   CONFIG_PTHREAD
   CONFIG_PTHREAD_MAIN
   CONFIG_PTHREAD_TIME
 
-#DG 20.06.
-#CONFIG_SRL_SOCLIB
-#CONFIG_SRL
-
-#ajoute DG
-#DG enleve 8.9.
-CONFIG_PTHREAD_ATTRIBUTES
-#ajoute DG
+  CONFIG_PTHREAD_ATTRIBUTES
 
   CONFIG_PTHREAD_STACK_SIZE 32768
   CONFIG_LIBC_STREAM_STD
-#  CONFIG_MUTEK_TIMER undefined
+
   CONFIG_LIBAVATAR
   CONFIG_HEXO_INTTYPES_DEPRECATED undefined
   CONFIG_LIBM
   CONFIG_LIBC_STREAM
   CONFIG_VFS
-#ajoute DG
- CONFIG_MWMR
- CONFIG_MWMR_SOCLIB
-#DG 20.06.
-#CONFIG_MWMR_USE_RAMLOCKS
-#fin ajoute DG
+  CONFIG_MWMR
+  CONFIG_MWMR_SOCLIB
   CONFIG_MUTEK_SCHEDULER_STATIC
 
 %include $(SRC_DIR)/examples/common/build_options.conf
 %include $(SRC_DIR)/examples/common/platforms.conf
 
-  # inter-processor interrupts
+# inter-processor interrupts
   CONFIG_HEXO_IPI
-#  CONFIG_ARCH_SMP undefined
-CONFIG_ARCH_SMP
-# number of processors derived from SysML design
-# CONFIG_CPU_MAXCOUNT 5
-CONFIG_CPU_MAXCOUNT 5
+
+  CONFIG_ARCH_SMP
+CONFIG_CPU_MAXCOUNT 2
diff --git a/MPSoC/generated_topcell/deployinfo.h b/MPSoC/generated_topcell/deployinfo.h
index 32f543a9cc..67a351b314 100644
--- a/MPSoC/generated_topcell/deployinfo.h
+++ b/MPSoC/generated_topcell/deployinfo.h
@@ -1,13 +1,7 @@
 
 #define CACHED_RAM0_NAME cram0
 #define CACHED_RAM0_ADDR 0x10000000
-#define CACHED_RAM0_SIZE 0x1000000
+#define CACHED_RAM0_SIZE 0x800
 #define DEPLOY_RAM0_NAME uram0
-#define DEPLOY_RAM0_ADDR 0x11200000
-#define DEPLOY_RAM0_SIZE 0x1000000
-#define CACHED_RAM1_NAME cram1
-#define CACHED_RAM1_ADDR 0x20000000
-#define CACHED_RAM1_SIZE 0x1000000
-#define DEPLOY_RAM1_NAME uram1
-#define DEPLOY_RAM1_ADDR 0x21200000
-#define DEPLOY_RAM1_SIZE 0x1000000
+#define DEPLOY_RAM0_ADDR 0x10200800
+#define DEPLOY_RAM0_SIZE 0x800
diff --git a/MPSoC/generated_topcell/deployinfo_map.h b/MPSoC/generated_topcell/deployinfo_map.h
index f24dcb1528..642e838fdf 100644
--- a/MPSoC/generated_topcell/deployinfo_map.h
+++ b/MPSoC/generated_topcell/deployinfo_map.h
@@ -5,118 +5,6 @@
 *(section_channel0)\
 } > uram0\
 
- .channel1 : { \
-*(section_channel1)\
-} > uram0\
-
- .channel2 : { \
-*(section_channel2)\
-} > uram0\
-
- .channel3 : { \
-*(section_channel3)\
-} > uram0\
-
- .channel4 : { \
-*(section_channel4)\
-} > uram0\
-
- .lock0 : { \
-*(section_lock0)\
-} > uram0\
-
- .lock1 : { \
-*(section_lock1)\
-} > uram0\
-
- .lock2 : { \
-*(section_lock2)\
-} > uram0\
-
- .lock3 : { \
-*(section_lock3)\
-} > uram0\
-
- .lock4 : { \
-*(section_lock4)\
-} > uram0\
-
- .channel5 : { \
-*(section_channel5)\
-} > uram1\
-
- .channel6 : { \
-*(section_channel6)\
-} > uram1\
-
- .channel7 : { \
-*(section_channel7)\
-} > uram1\
-
- .channel8 : { \
-*(section_channel8)\
-} > uram1\
-
- .channel9 : { \
-*(section_channel9)\
-} > uram1\
-
- .channel10 : { \
-*(section_channel10)\
-} > uram1\
-
- .channel11 : { \
-*(section_channel11)\
-} > uram1\
-
- .channel12 : { \
-*(section_channel12)\
-} > uram1\
-
- .channel13 : { \
-*(section_channel13)\
-} > uram1\
-
- .channel14 : { \
-*(section_channel14)\
-} > uram1\
-
  .lock0 : { \
 *(section_lock0)\
 } > uram0\
-
- .lock1 : { \
-*(section_lock1)\
-} > uram0\
-
- .lock2 : { \
-*(section_lock2)\
-} > uram0\
-
- .lock3 : { \
-*(section_lock3)\
-} > uram0\
-
- .lock4 : { \
-*(section_lock4)\
-} > uram0\
-
- .lock5 : { \
-*(section_lock5)\
-} > uram0\
-
- .lock6 : { \
-*(section_lock6)\
-} > uram0\
-
- .lock7 : { \
-*(section_lock7)\
-} > uram0\
-
- .lock8 : { \
-*(section_lock8)\
-} > uram0\
-
- .lock9 : { \
-*(section_lock9)\
-} > uram0\
diff --git a/MPSoC/generated_topcell/nbproc b/MPSoC/generated_topcell/nbproc
index 62cef37efa..93fa26b5ca 100644
--- a/MPSoC/generated_topcell/nbproc
+++ b/MPSoC/generated_topcell/nbproc
@@ -1 +1 @@
-CONFIG_CPU_MAXCOUNT 5
+CONFIG_CPU_MAXCOUNT 2
diff --git a/MPSoC/generated_topcell/procinfo.mk b/MPSoC/generated_topcell/procinfo.mk
index 2b524e64c6..3d8ace1df2 100644
--- a/MPSoC/generated_topcell/procinfo.mk
+++ b/MPSoC/generated_topcell/procinfo.mk
@@ -1 +1 @@
-SOCLIB_CPU_COUNT = 5
+SOCLIB_CPU_COUNT = 2
diff --git a/bin/config.xml b/bin/config.xml
index 1bd425c576..bbae106e0e 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -63,11 +63,11 @@
 <ExternalCommand2Host data="localhost"/>
 <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/>
 
-<LastOpenFile data="/Users/localapvrille/TToolgit/TTool/modeling/Letitia/latency.xml"/>
+<LastOpenFile data="/users/enseig/genius/modeling-dg/miniAsynchronousDeploy2DD.xml"/>
 
 
 
-<LastWindowAttributes x="281" y="52" width="1470" height="1000" max="false" />
+<LastWindowAttributes x="412" y="25" width="1098" height="1000" max="false" />
 
 
 <ProVerifHash data=""/>
diff --git a/modeling/AVATAR/MicroWaveOven_SimpleAsynchronous.xml b/modeling/AVATAR/MicroWaveOven_SimpleAsynchronous.xml
index 505b4b6a8f..b59fff53a4 100644
--- a/modeling/AVATAR/MicroWaveOven_SimpleAsynchronous.xml
+++ b/modeling/AVATAR/MicroWaveOven_SimpleAsynchronous.xml
@@ -110,79 +110,80 @@
 <CryptoBlock value="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="133" >
+<SUBCOMPONENT type="5000" id="33" >
 <father id="158" num="0" />
-<cdparam x="102" y="427" />
-<sizeparam width="116" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="579" y="387" />
+<sizeparam width="138" height="81" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="642" minY="0" maxY="339" />
-<infoparam name="Block0" value="Bell" />
-<TGConnectingPoint num="0" id="109" />
-<TGConnectingPoint num="1" id="110" />
-<TGConnectingPoint num="2" id="111" />
-<TGConnectingPoint num="3" id="112" />
-<TGConnectingPoint num="4" id="113" />
-<TGConnectingPoint num="5" id="114" />
-<TGConnectingPoint num="6" id="115" />
-<TGConnectingPoint num="7" id="116" />
-<TGConnectingPoint num="8" id="117" />
-<TGConnectingPoint num="9" id="118" />
-<TGConnectingPoint num="10" id="119" />
-<TGConnectingPoint num="11" id="120" />
-<TGConnectingPoint num="12" id="121" />
-<TGConnectingPoint num="13" id="122" />
-<TGConnectingPoint num="14" id="123" />
-<TGConnectingPoint num="15" id="124" />
-<TGConnectingPoint num="16" id="125" />
-<TGConnectingPoint num="17" id="126" />
-<TGConnectingPoint num="18" id="127" />
-<TGConnectingPoint num="19" id="128" />
-<TGConnectingPoint num="20" id="129" />
-<TGConnectingPoint num="21" id="130" />
-<TGConnectingPoint num="22" id="131" />
-<TGConnectingPoint num="23" id="132" />
+<cdrectangleparam minX="0" maxX="620" minY="0" maxY="319" />
+<infoparam name="Block0" value="Door" />
+<TGConnectingPoint num="0" id="9" />
+<TGConnectingPoint num="1" id="10" />
+<TGConnectingPoint num="2" id="11" />
+<TGConnectingPoint num="3" id="12" />
+<TGConnectingPoint num="4" id="13" />
+<TGConnectingPoint num="5" id="14" />
+<TGConnectingPoint num="6" id="15" />
+<TGConnectingPoint num="7" id="16" />
+<TGConnectingPoint num="8" id="17" />
+<TGConnectingPoint num="9" id="18" />
+<TGConnectingPoint num="10" id="19" />
+<TGConnectingPoint num="11" id="20" />
+<TGConnectingPoint num="12" id="21" />
+<TGConnectingPoint num="13" id="22" />
+<TGConnectingPoint num="14" id="23" />
+<TGConnectingPoint num="15" id="24" />
+<TGConnectingPoint num="16" id="25" />
+<TGConnectingPoint num="17" id="26" />
+<TGConnectingPoint num="18" id="27" />
+<TGConnectingPoint num="19" id="28" />
+<TGConnectingPoint num="20" id="29" />
+<TGConnectingPoint num="21" id="30" />
+<TGConnectingPoint num="22" id="31" />
+<TGConnectingPoint num="23" id="32" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in ring()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
+<Signal value="in okDoor()" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="108" >
+<SUBCOMPONENT type="5000" id="58" >
 <father id="158" num="1" />
-<cdparam x="82" y="203" />
-<sizeparam width="164" height="104" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="555" y="194" />
+<sizeparam width="162" height="103" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="594" minY="0" maxY="296" />
-<infoparam name="Block0" value="ControlPanel" />
-<TGConnectingPoint num="0" id="84" />
-<TGConnectingPoint num="1" id="85" />
-<TGConnectingPoint num="2" id="86" />
-<TGConnectingPoint num="3" id="87" />
-<TGConnectingPoint num="4" id="88" />
-<TGConnectingPoint num="5" id="89" />
-<TGConnectingPoint num="6" id="90" />
-<TGConnectingPoint num="7" id="91" />
-<TGConnectingPoint num="8" id="92" />
-<TGConnectingPoint num="9" id="93" />
-<TGConnectingPoint num="10" id="94" />
-<TGConnectingPoint num="11" id="95" />
-<TGConnectingPoint num="12" id="96" />
-<TGConnectingPoint num="13" id="97" />
-<TGConnectingPoint num="14" id="98" />
-<TGConnectingPoint num="15" id="99" />
-<TGConnectingPoint num="16" id="100" />
-<TGConnectingPoint num="17" id="101" />
-<TGConnectingPoint num="18" id="102" />
-<TGConnectingPoint num="19" id="103" />
-<TGConnectingPoint num="20" id="104" />
-<TGConnectingPoint num="21" id="105" />
-<TGConnectingPoint num="22" id="106" />
-<TGConnectingPoint num="23" id="107" />
+<cdrectangleparam minX="0" maxX="596" minY="0" maxY="297" />
+<infoparam name="Block0" value="Magnetron" />
+<TGConnectingPoint num="0" id="34" />
+<TGConnectingPoint num="1" id="35" />
+<TGConnectingPoint num="2" id="36" />
+<TGConnectingPoint num="3" id="37" />
+<TGConnectingPoint num="4" id="38" />
+<TGConnectingPoint num="5" id="39" />
+<TGConnectingPoint num="6" id="40" />
+<TGConnectingPoint num="7" id="41" />
+<TGConnectingPoint num="8" id="42" />
+<TGConnectingPoint num="9" id="43" />
+<TGConnectingPoint num="10" id="44" />
+<TGConnectingPoint num="11" id="45" />
+<TGConnectingPoint num="12" id="46" />
+<TGConnectingPoint num="13" id="47" />
+<TGConnectingPoint num="14" id="48" />
+<TGConnectingPoint num="15" id="49" />
+<TGConnectingPoint num="16" id="50" />
+<TGConnectingPoint num="17" id="51" />
+<TGConnectingPoint num="18" id="52" />
+<TGConnectingPoint num="19" id="53" />
+<TGConnectingPoint num="20" id="54" />
+<TGConnectingPoint num="21" id="55" />
+<TGConnectingPoint num="22" id="56" />
+<TGConnectingPoint num="23" id="57" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="5" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="83" >
@@ -220,91 +221,90 @@
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out okDoor()" />
+<Signal value="in start(int duration)" attached="false" />
+<Signal value="in closed()" attached="false" />
+<Signal value="in open()" attached="false" />
+<Signal value="out ringBell()" attached="false" />
+<Signal value="out startMagnetron()" attached="false" />
+<Signal value="out stopMagnetron()" attached="false" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out okDoor()" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="58" >
+<SUBCOMPONENT type="5000" id="108" >
 <father id="158" num="3" />
-<cdparam x="555" y="194" />
-<sizeparam width="162" height="103" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="82" y="203" />
+<sizeparam width="164" height="104" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="596" minY="0" maxY="297" />
-<infoparam name="Block0" value="Magnetron" />
-<TGConnectingPoint num="0" id="34" />
-<TGConnectingPoint num="1" id="35" />
-<TGConnectingPoint num="2" id="36" />
-<TGConnectingPoint num="3" id="37" />
-<TGConnectingPoint num="4" id="38" />
-<TGConnectingPoint num="5" id="39" />
-<TGConnectingPoint num="6" id="40" />
-<TGConnectingPoint num="7" id="41" />
-<TGConnectingPoint num="8" id="42" />
-<TGConnectingPoint num="9" id="43" />
-<TGConnectingPoint num="10" id="44" />
-<TGConnectingPoint num="11" id="45" />
-<TGConnectingPoint num="12" id="46" />
-<TGConnectingPoint num="13" id="47" />
-<TGConnectingPoint num="14" id="48" />
-<TGConnectingPoint num="15" id="49" />
-<TGConnectingPoint num="16" id="50" />
-<TGConnectingPoint num="17" id="51" />
-<TGConnectingPoint num="18" id="52" />
-<TGConnectingPoint num="19" id="53" />
-<TGConnectingPoint num="20" id="54" />
-<TGConnectingPoint num="21" id="55" />
-<TGConnectingPoint num="22" id="56" />
-<TGConnectingPoint num="23" id="57" />
+<cdrectangleparam minX="0" maxX="594" minY="0" maxY="296" />
+<infoparam name="Block0" value="ControlPanel" />
+<TGConnectingPoint num="0" id="84" />
+<TGConnectingPoint num="1" id="85" />
+<TGConnectingPoint num="2" id="86" />
+<TGConnectingPoint num="3" id="87" />
+<TGConnectingPoint num="4" id="88" />
+<TGConnectingPoint num="5" id="89" />
+<TGConnectingPoint num="6" id="90" />
+<TGConnectingPoint num="7" id="91" />
+<TGConnectingPoint num="8" id="92" />
+<TGConnectingPoint num="9" id="93" />
+<TGConnectingPoint num="10" id="94" />
+<TGConnectingPoint num="11" id="95" />
+<TGConnectingPoint num="12" id="96" />
+<TGConnectingPoint num="13" id="97" />
+<TGConnectingPoint num="14" id="98" />
+<TGConnectingPoint num="15" id="99" />
+<TGConnectingPoint num="16" id="100" />
+<TGConnectingPoint num="17" id="101" />
+<TGConnectingPoint num="18" id="102" />
+<TGConnectingPoint num="19" id="103" />
+<TGConnectingPoint num="20" id="104" />
+<TGConnectingPoint num="21" id="105" />
+<TGConnectingPoint num="22" id="106" />
+<TGConnectingPoint num="23" id="107" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Attribute access="0" id="duration" value="5" type="8" typeOther="" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="33" >
+<SUBCOMPONENT type="5000" id="133" >
 <father id="158" num="4" />
-<cdparam x="579" y="387" />
-<sizeparam width="138" height="81" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="102" y="427" />
+<sizeparam width="116" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="620" minY="0" maxY="319" />
-<infoparam name="Block0" value="Door" />
-<TGConnectingPoint num="0" id="9" />
-<TGConnectingPoint num="1" id="10" />
-<TGConnectingPoint num="2" id="11" />
-<TGConnectingPoint num="3" id="12" />
-<TGConnectingPoint num="4" id="13" />
-<TGConnectingPoint num="5" id="14" />
-<TGConnectingPoint num="6" id="15" />
-<TGConnectingPoint num="7" id="16" />
-<TGConnectingPoint num="8" id="17" />
-<TGConnectingPoint num="9" id="18" />
-<TGConnectingPoint num="10" id="19" />
-<TGConnectingPoint num="11" id="20" />
-<TGConnectingPoint num="12" id="21" />
-<TGConnectingPoint num="13" id="22" />
-<TGConnectingPoint num="14" id="23" />
-<TGConnectingPoint num="15" id="24" />
-<TGConnectingPoint num="16" id="25" />
-<TGConnectingPoint num="17" id="26" />
-<TGConnectingPoint num="18" id="27" />
-<TGConnectingPoint num="19" id="28" />
-<TGConnectingPoint num="20" id="29" />
-<TGConnectingPoint num="21" id="30" />
-<TGConnectingPoint num="22" id="31" />
-<TGConnectingPoint num="23" id="32" />
+<cdrectangleparam minX="0" maxX="642" minY="0" maxY="339" />
+<infoparam name="Block0" value="Bell" />
+<TGConnectingPoint num="0" id="109" />
+<TGConnectingPoint num="1" id="110" />
+<TGConnectingPoint num="2" id="111" />
+<TGConnectingPoint num="3" id="112" />
+<TGConnectingPoint num="4" id="113" />
+<TGConnectingPoint num="5" id="114" />
+<TGConnectingPoint num="6" id="115" />
+<TGConnectingPoint num="7" id="116" />
+<TGConnectingPoint num="8" id="117" />
+<TGConnectingPoint num="9" id="118" />
+<TGConnectingPoint num="10" id="119" />
+<TGConnectingPoint num="11" id="120" />
+<TGConnectingPoint num="12" id="121" />
+<TGConnectingPoint num="13" id="122" />
+<TGConnectingPoint num="14" id="123" />
+<TGConnectingPoint num="15" id="124" />
+<TGConnectingPoint num="16" id="125" />
+<TGConnectingPoint num="17" id="126" />
+<TGConnectingPoint num="18" id="127" />
+<TGConnectingPoint num="19" id="128" />
+<TGConnectingPoint num="20" id="129" />
+<TGConnectingPoint num="21" id="130" />
+<TGConnectingPoint num="22" id="131" />
+<TGConnectingPoint num="23" id="132" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
-<Signal value="in okDoor()" />
+<Signal value="in ring()" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -402,26 +402,56 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1109" >
-<cdparam x="404" y="381" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="221" >
+<cdparam x="419" y="209" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1108" />
-<P1  x="404" y="381" id="1224" />
-<P2  x="388" y="401" id="1160" />
+<TGConnectingPoint num="0" id="217" />
+<TGConnectingPoint num="1" id="218" />
+<TGConnectingPoint num="2" id="219" />
+<TGConnectingPoint num="3" id="220" />
+<P1  x="419" y="209" id="237" />
+<P2  x="369" y="123" id="250" />
+<Point x="412" y="243" />
+<Point x="332" y="243" />
+<Point x="332" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1107" >
-<father id="1109" num="0" />
-<cdparam x="404" y="421" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="209" >
+<father id="221" num="0" />
+<cdparam x="412" y="243" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="210" >
+<father id="221" num="1" />
+<cdparam x="332" y="243" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="211" >
+<father id="221" num="2" />
+<cdparam x="332" y="123" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="216" >
+<father id="221" num="3" />
+<cdparam x="419" y="249" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1103" />
-<TGConnectingPoint num="1" id="1104" />
-<TGConnectingPoint num="2" id="1105" />
-<TGConnectingPoint num="3" id="1106" />
+<TGConnectingPoint num="0" id="212" />
+<TGConnectingPoint num="1" id="213" />
+<TGConnectingPoint num="2" id="214" />
+<TGConnectingPoint num="3" id="215" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -431,25 +461,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1116" >
-<cdparam x="417" y="235" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="228" >
+<cdparam x="420" y="151" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1115" />
-<P1  x="403" y="230" id="1172" />
-<P2  x="404" y="243" id="1183" />
+<TGConnectingPoint num="0" id="227" />
+<P1  x="419" y="148" id="253" />
+<P2  x="419" y="179" id="236" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1114" >
-<father id="1116" num="0" />
-<cdparam x="417" y="275" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="226" >
+<father id="228" num="0" />
+<cdparam x="420" y="191" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1110" />
-<TGConnectingPoint num="1" id="1111" />
-<TGConnectingPoint num="2" id="1112" />
-<TGConnectingPoint num="3" id="1113" />
+<TGConnectingPoint num="0" id="222" />
+<TGConnectingPoint num="1" id="223" />
+<TGConnectingPoint num="2" id="224" />
+<TGConnectingPoint num="3" id="225" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -459,121 +489,202 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1123" >
-<cdparam x="407" y="283" />
+<CONNECTOR type="5102" id="235" >
+<cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1122" />
-<P1  x="404" y="273" id="1188" />
-<P2  x="404" y="351" id="1223" />
+<TGConnectingPoint num="0" id="234" />
+<P1  x="407" y="70" id="288" />
+<P2  x="419" y="98" id="248" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1121" >
-<father id="1123" num="0" />
-<cdparam x="407" y="311" />
-<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="233" >
+<father id="235" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1117" />
-<TGConnectingPoint num="1" id="1118" />
-<TGConnectingPoint num="2" id="1119" />
-<TGConnectingPoint num="3" id="1120" />
+<TGConnectingPoint num="0" id="229" />
+<TGConnectingPoint num="1" id="230" />
+<TGConnectingPoint num="2" id="231" />
+<TGConnectingPoint num="3" id="232" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="2" />
-<afterMax value="4" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1138" >
-<cdparam x="407" y="277" />
+<COMPONENT type="5104" id="246" >
+<cdparam x="395" y="184" />
+<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="ring()" />
+<TGConnectingPoint num="0" id="236" />
+<TGConnectingPoint num="1" id="237" />
+<TGConnectingPoint num="2" id="238" />
+<TGConnectingPoint num="3" id="239" />
+<TGConnectingPoint num="4" id="240" />
+<TGConnectingPoint num="5" id="241" />
+<TGConnectingPoint num="6" id="242" />
+<TGConnectingPoint num="7" id="243" />
+<TGConnectingPoint num="8" id="244" />
+<TGConnectingPoint num="9" id="245" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="287" >
+<cdparam x="369" y="98" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="Active" />
+<TGConnectingPoint num="0" id="247" />
+<TGConnectingPoint num="1" id="248" />
+<TGConnectingPoint num="2" id="249" />
+<TGConnectingPoint num="3" id="250" />
+<TGConnectingPoint num="4" id="251" />
+<TGConnectingPoint num="5" id="252" />
+<TGConnectingPoint num="6" id="253" />
+<TGConnectingPoint num="7" id="254" />
+<TGConnectingPoint num="8" id="255" />
+<TGConnectingPoint num="9" id="256" />
+<TGConnectingPoint num="10" id="257" />
+<TGConnectingPoint num="11" id="258" />
+<TGConnectingPoint num="12" id="259" />
+<TGConnectingPoint num="13" id="260" />
+<TGConnectingPoint num="14" id="261" />
+<TGConnectingPoint num="15" id="262" />
+<TGConnectingPoint num="16" id="263" />
+<TGConnectingPoint num="17" id="264" />
+<TGConnectingPoint num="18" id="265" />
+<TGConnectingPoint num="19" id="266" />
+<TGConnectingPoint num="20" id="267" />
+<TGConnectingPoint num="21" id="268" />
+<TGConnectingPoint num="22" id="269" />
+<TGConnectingPoint num="23" id="270" />
+<TGConnectingPoint num="24" id="271" />
+<TGConnectingPoint num="25" id="272" />
+<TGConnectingPoint num="26" id="273" />
+<TGConnectingPoint num="27" id="274" />
+<TGConnectingPoint num="28" id="275" />
+<TGConnectingPoint num="29" id="276" />
+<TGConnectingPoint num="30" id="277" />
+<TGConnectingPoint num="31" id="278" />
+<TGConnectingPoint num="32" id="279" />
+<TGConnectingPoint num="33" id="280" />
+<TGConnectingPoint num="34" id="281" />
+<TGConnectingPoint num="35" id="282" />
+<TGConnectingPoint num="36" id="283" />
+<TGConnectingPoint num="37" id="284" />
+<TGConnectingPoint num="38" id="285" />
+<TGConnectingPoint num="39" id="286" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="289" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="288" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="302" >
+<cdparam x="504" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1133" />
-<TGConnectingPoint num="1" id="1134" />
-<TGConnectingPoint num="2" id="1135" />
-<TGConnectingPoint num="3" id="1136" />
-<TGConnectingPoint num="4" id="1137" />
-<P1  x="388" y="431" id="1161" />
-<P2  x="357" y="115" id="1248" />
-<Point x="345" y="523" />
-<Point x="262" y="526" />
-<Point x="315" y="264" />
-<Point x="334" y="115" />
+<TGConnectingPoint num="0" id="298" />
+<TGConnectingPoint num="1" id="299" />
+<TGConnectingPoint num="2" id="300" />
+<TGConnectingPoint num="3" id="301" />
+<P1  x="504" y="232" id="361" />
+<P2  x="454" y="123" id="322" />
+<Point x="504" y="254" />
+<Point x="426" y="254" />
+<Point x="426" y="123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1124" >
-<father id="1138" num="0" />
-<cdparam x="345" y="523" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1125" >
-<father id="1138" num="1" />
-<cdparam x="262" y="526" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="290" >
+<father id="302" num="0" />
+<cdparam x="504" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1126" >
-<father id="1138" num="2" />
-<cdparam x="315" y="264" />
+<SUBCOMPONENT type="-1" id="291" >
+<father id="302" num="1" />
+<cdparam x="426" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1127" >
-<father id="1138" num="3" />
-<cdparam x="334" y="115" />
+<SUBCOMPONENT type="-1" id="292" >
+<father id="302" num="2" />
+<cdparam x="426" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1132" >
-<father id="1138" num="4" />
-<cdparam x="312" y="477" />
-<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="297" >
+<father id="302" num="3" />
+<cdparam x="504" y="272" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1128" />
-<TGConnectingPoint num="1" id="1129" />
-<TGConnectingPoint num="2" id="1130" />
-<TGConnectingPoint num="3" id="1131" />
+<TGConnectingPoint num="0" id="293" />
+<TGConnectingPoint num="1" id="294" />
+<TGConnectingPoint num="2" id="295" />
+<TGConnectingPoint num="3" id="296" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="2" />
-<afterMax value="4" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1145" >
-<cdparam x="403" y="337" />
+<CONNECTOR type="5102" id="311" >
+<cdparam x="504" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1144" />
-<P1  x="404" y="185" id="1235" />
-<P2  x="403" y="200" id="1171" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1143" >
-<father id="1145" num="0" />
-<cdparam x="410" y="352" />
+<TGConnectingPoint num="0" id="309" />
+<TGConnectingPoint num="1" id="310" />
+<P1  x="504" y="148" id="325" />
+<P2  x="504" y="202" id="360" />
+<Point x="504" y="175" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="303" >
+<father id="311" num="0" />
+<cdparam x="504" y="175" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="308" >
+<father id="311" num="1" />
+<cdparam x="504" y="188" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1139" />
-<TGConnectingPoint num="1" id="1140" />
-<TGConnectingPoint num="2" id="1141" />
-<TGConnectingPoint num="3" id="1142" />
+<TGConnectingPoint num="0" id="304" />
+<TGConnectingPoint num="1" id="305" />
+<TGConnectingPoint num="2" id="306" />
+<TGConnectingPoint num="3" id="307" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -583,25 +694,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1152" >
-<cdparam x="407" y="150" />
+<CONNECTOR type="5102" id="318" >
+<cdparam x="385" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1151" />
-<P1  x="407" y="131" id="1251" />
-<P2  x="404" y="155" id="1234" />
+<TGConnectingPoint num="0" id="317" />
+<P1  x="481" y="74" id="371" />
+<P2  x="504" y="98" id="320" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1150" >
-<father id="1152" num="0" />
-<cdparam x="407" y="190" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="316" >
+<father id="318" num="0" />
+<cdparam x="385" y="115" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1146" />
-<TGConnectingPoint num="1" id="1147" />
-<TGConnectingPoint num="2" id="1148" />
-<TGConnectingPoint num="3" id="1149" />
+<TGConnectingPoint num="0" id="312" />
+<TGConnectingPoint num="1" id="313" />
+<TGConnectingPoint num="2" id="314" />
+<TGConnectingPoint num="3" id="315" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -611,25 +722,106 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1159" >
-<cdparam x="407" y="70" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="359" >
+<cdparam x="454" y="98" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="Active" />
+<TGConnectingPoint num="0" id="319" />
+<TGConnectingPoint num="1" id="320" />
+<TGConnectingPoint num="2" id="321" />
+<TGConnectingPoint num="3" id="322" />
+<TGConnectingPoint num="4" id="323" />
+<TGConnectingPoint num="5" id="324" />
+<TGConnectingPoint num="6" id="325" />
+<TGConnectingPoint num="7" id="326" />
+<TGConnectingPoint num="8" id="327" />
+<TGConnectingPoint num="9" id="328" />
+<TGConnectingPoint num="10" id="329" />
+<TGConnectingPoint num="11" id="330" />
+<TGConnectingPoint num="12" id="331" />
+<TGConnectingPoint num="13" id="332" />
+<TGConnectingPoint num="14" id="333" />
+<TGConnectingPoint num="15" id="334" />
+<TGConnectingPoint num="16" id="335" />
+<TGConnectingPoint num="17" id="336" />
+<TGConnectingPoint num="18" id="337" />
+<TGConnectingPoint num="19" id="338" />
+<TGConnectingPoint num="20" id="339" />
+<TGConnectingPoint num="21" id="340" />
+<TGConnectingPoint num="22" id="341" />
+<TGConnectingPoint num="23" id="342" />
+<TGConnectingPoint num="24" id="343" />
+<TGConnectingPoint num="25" id="344" />
+<TGConnectingPoint num="26" id="345" />
+<TGConnectingPoint num="27" id="346" />
+<TGConnectingPoint num="28" id="347" />
+<TGConnectingPoint num="29" id="348" />
+<TGConnectingPoint num="30" id="349" />
+<TGConnectingPoint num="31" id="350" />
+<TGConnectingPoint num="32" id="351" />
+<TGConnectingPoint num="33" id="352" />
+<TGConnectingPoint num="34" id="353" />
+<TGConnectingPoint num="35" id="354" />
+<TGConnectingPoint num="36" id="355" />
+<TGConnectingPoint num="37" id="356" />
+<TGConnectingPoint num="38" id="357" />
+<TGConnectingPoint num="39" id="358" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="370" >
+<cdparam x="440" y="207" />
+<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="startButton(duration)" />
+<TGConnectingPoint num="0" id="360" />
+<TGConnectingPoint num="1" id="361" />
+<TGConnectingPoint num="2" id="362" />
+<TGConnectingPoint num="3" id="363" />
+<TGConnectingPoint num="4" id="364" />
+<TGConnectingPoint num="5" id="365" />
+<TGConnectingPoint num="6" id="366" />
+<TGConnectingPoint num="7" id="367" />
+<TGConnectingPoint num="8" id="368" />
+<TGConnectingPoint num="9" id="369" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="372" >
+<cdparam x="474" y="54" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="371" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="379" >
+<cdparam x="670" y="320" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="1158" />
-<P1  x="407" y="70" id="1286" />
-<P2  x="407" y="100" id="1246" />
+<TGConnectingPoint num="0" id="378" />
+<P1  x="669" y="330" id="768" />
+<P2  x="669" y="336" id="565" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1157" >
-<father id="1159" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="377" >
+<father id="379" num="0" />
+<cdparam x="670" y="360" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
-<TGConnectingPoint num="2" id="1155" />
-<TGConnectingPoint num="3" id="1156" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -639,240 +831,109 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1170" >
-<cdparam x="354" y="406" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="386" >
+<cdparam x="660" y="188" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="385" />
+<P1  x="660" y="188" id="823" />
+<P2  x="656" y="196" id="576" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="384" >
+<father id="386" num="0" />
+<cdparam x="660" y="228" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="okDoor()" />
-<TGConnectingPoint num="0" id="1160" />
-<TGConnectingPoint num="1" id="1161" />
-<TGConnectingPoint num="2" id="1162" />
-<TGConnectingPoint num="3" id="1163" />
-<TGConnectingPoint num="4" id="1164" />
-<TGConnectingPoint num="5" id="1165" />
-<TGConnectingPoint num="6" id="1166" />
-<TGConnectingPoint num="7" id="1167" />
-<TGConnectingPoint num="8" id="1168" />
-<TGConnectingPoint num="9" id="1169" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="380" />
+<TGConnectingPoint num="1" id="381" />
+<TGConnectingPoint num="2" id="382" />
+<TGConnectingPoint num="3" id="383" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1181" >
-<cdparam x="369" y="205" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="393" >
+<cdparam x="670" y="539" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="392" />
+<P1  x="671" y="539" id="555" />
+<P2  x="671" y="551" id="789" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="391" >
+<father id="393" num="0" />
+<cdparam x="670" y="579" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="okDoor()" />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
-<TGConnectingPoint num="2" id="1173" />
-<TGConnectingPoint num="3" id="1174" />
-<TGConnectingPoint num="4" id="1175" />
-<TGConnectingPoint num="5" id="1176" />
-<TGConnectingPoint num="6" id="1177" />
-<TGConnectingPoint num="7" id="1178" />
-<TGConnectingPoint num="8" id="1179" />
-<TGConnectingPoint num="9" id="1180" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="387" />
+<TGConnectingPoint num="1" id="388" />
+<TGConnectingPoint num="2" id="389" />
+<TGConnectingPoint num="3" id="390" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1222" >
-<cdparam x="354" y="243" />
-<sizeparam width="100" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="400" >
+<cdparam x="671" y="503" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="399" />
+<P1  x="671" y="503" id="812" />
+<P2  x="671" y="509" id="554" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="398" >
+<father id="400" num="0" />
+<cdparam x="707" y="530" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="DoorIsOpened" />
-<TGConnectingPoint num="0" id="1182" />
-<TGConnectingPoint num="1" id="1183" />
-<TGConnectingPoint num="2" id="1184" />
-<TGConnectingPoint num="3" id="1185" />
-<TGConnectingPoint num="4" id="1186" />
-<TGConnectingPoint num="5" id="1187" />
-<TGConnectingPoint num="6" id="1188" />
-<TGConnectingPoint num="7" id="1189" />
-<TGConnectingPoint num="8" id="1190" />
-<TGConnectingPoint num="9" id="1191" />
-<TGConnectingPoint num="10" id="1192" />
-<TGConnectingPoint num="11" id="1193" />
-<TGConnectingPoint num="12" id="1194" />
-<TGConnectingPoint num="13" id="1195" />
-<TGConnectingPoint num="14" id="1196" />
-<TGConnectingPoint num="15" id="1197" />
-<TGConnectingPoint num="16" id="1198" />
-<TGConnectingPoint num="17" id="1199" />
-<TGConnectingPoint num="18" id="1200" />
-<TGConnectingPoint num="19" id="1201" />
-<TGConnectingPoint num="20" id="1202" />
-<TGConnectingPoint num="21" id="1203" />
-<TGConnectingPoint num="22" id="1204" />
-<TGConnectingPoint num="23" id="1205" />
-<TGConnectingPoint num="24" id="1206" />
-<TGConnectingPoint num="25" id="1207" />
-<TGConnectingPoint num="26" id="1208" />
-<TGConnectingPoint num="27" id="1209" />
-<TGConnectingPoint num="28" id="1210" />
-<TGConnectingPoint num="29" id="1211" />
-<TGConnectingPoint num="30" id="1212" />
-<TGConnectingPoint num="31" id="1213" />
-<TGConnectingPoint num="32" id="1214" />
-<TGConnectingPoint num="33" id="1215" />
-<TGConnectingPoint num="34" id="1216" />
-<TGConnectingPoint num="35" id="1217" />
-<TGConnectingPoint num="36" id="1218" />
-<TGConnectingPoint num="37" id="1219" />
-<TGConnectingPoint num="38" id="1220" />
-<TGConnectingPoint num="39" id="1221" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1233" >
-<cdparam x="377" y="356" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="1223" />
-<TGConnectingPoint num="1" id="1224" />
-<TGConnectingPoint num="2" id="1225" />
-<TGConnectingPoint num="3" id="1226" />
-<TGConnectingPoint num="4" id="1227" />
-<TGConnectingPoint num="5" id="1228" />
-<TGConnectingPoint num="6" id="1229" />
-<TGConnectingPoint num="7" id="1230" />
-<TGConnectingPoint num="8" id="1231" />
-<TGConnectingPoint num="9" id="1232" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1244" >
-<cdparam x="381" y="160" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="1234" />
-<TGConnectingPoint num="1" id="1235" />
-<TGConnectingPoint num="2" id="1236" />
-<TGConnectingPoint num="3" id="1237" />
-<TGConnectingPoint num="4" id="1238" />
-<TGConnectingPoint num="5" id="1239" />
-<TGConnectingPoint num="6" id="1240" />
-<TGConnectingPoint num="7" id="1241" />
-<TGConnectingPoint num="8" id="1242" />
-<TGConnectingPoint num="9" id="1243" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1285" >
-<cdparam x="357" y="100" />
-<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="1245" />
-<TGConnectingPoint num="1" id="1246" />
-<TGConnectingPoint num="2" id="1247" />
-<TGConnectingPoint num="3" id="1248" />
-<TGConnectingPoint num="4" id="1249" />
-<TGConnectingPoint num="5" id="1250" />
-<TGConnectingPoint num="6" id="1251" />
-<TGConnectingPoint num="7" id="1252" />
-<TGConnectingPoint num="8" id="1253" />
-<TGConnectingPoint num="9" id="1254" />
-<TGConnectingPoint num="10" id="1255" />
-<TGConnectingPoint num="11" id="1256" />
-<TGConnectingPoint num="12" id="1257" />
-<TGConnectingPoint num="13" id="1258" />
-<TGConnectingPoint num="14" id="1259" />
-<TGConnectingPoint num="15" id="1260" />
-<TGConnectingPoint num="16" id="1261" />
-<TGConnectingPoint num="17" id="1262" />
-<TGConnectingPoint num="18" id="1263" />
-<TGConnectingPoint num="19" id="1264" />
-<TGConnectingPoint num="20" id="1265" />
-<TGConnectingPoint num="21" id="1266" />
-<TGConnectingPoint num="22" id="1267" />
-<TGConnectingPoint num="23" id="1268" />
-<TGConnectingPoint num="24" id="1269" />
-<TGConnectingPoint num="25" id="1270" />
-<TGConnectingPoint num="26" id="1271" />
-<TGConnectingPoint num="27" id="1272" />
-<TGConnectingPoint num="28" id="1273" />
-<TGConnectingPoint num="29" id="1274" />
-<TGConnectingPoint num="30" id="1275" />
-<TGConnectingPoint num="31" id="1276" />
-<TGConnectingPoint num="32" id="1277" />
-<TGConnectingPoint num="33" id="1278" />
-<TGConnectingPoint num="34" id="1279" />
-<TGConnectingPoint num="35" id="1280" />
-<TGConnectingPoint num="36" id="1281" />
-<TGConnectingPoint num="37" id="1282" />
-<TGConnectingPoint num="38" id="1283" />
-<TGConnectingPoint num="39" id="1284" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="394" />
+<TGConnectingPoint num="1" id="395" />
+<TGConnectingPoint num="2" id="396" />
+<TGConnectingPoint num="3" id="397" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1287" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1286" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
+</SUBCOMPONENT>
 
-<AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="968" >
-<cdparam x="407" y="380" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="407" >
+<cdparam x="661" y="61" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="964" />
-<TGConnectingPoint num="1" id="965" />
-<TGConnectingPoint num="2" id="966" />
-<TGConnectingPoint num="3" id="967" />
-<P1  x="407" y="310" id="1009" />
-<P2  x="365" y="113" id="1065" />
-<Point x="407" y="327" />
-<Point x="323" y="327" />
-<Point x="323" y="113" />
+<TGConnectingPoint num="0" id="406" />
+<P1  x="659" y="56" id="703" />
+<P2  x="660" y="64" id="587" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="956" >
-<father id="968" num="0" />
-<cdparam x="407" y="327" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="957" >
-<father id="968" num="1" />
-<cdparam x="323" y="327" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="958" >
-<father id="968" num="2" />
-<cdparam x="323" y="113" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="963" >
-<father id="968" num="3" />
-<cdparam x="407" y="420" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="405" >
+<father id="407" num="0" />
+<cdparam x="661" y="101" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="959" />
-<TGConnectingPoint num="1" id="960" />
-<TGConnectingPoint num="2" id="961" />
-<TGConnectingPoint num="3" id="962" />
+<TGConnectingPoint num="0" id="401" />
+<TGConnectingPoint num="1" id="402" />
+<TGConnectingPoint num="2" id="403" />
+<TGConnectingPoint num="3" id="404" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -882,25 +943,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="975" >
-<cdparam x="411" y="243" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="414" >
+<cdparam x="661" y="175" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="974" />
-<P1  x="408" y="242" id="1025" />
-<P2  x="407" y="280" id="1008" />
+<TGConnectingPoint num="0" id="413" />
+<P1  x="656" y="226" id="577" />
+<P2  x="471" y="158" id="740" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="973" >
-<father id="975" num="0" />
-<cdparam x="411" y="283" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="412" >
+<father id="414" num="0" />
+<cdparam x="695" y="203" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="969" />
-<TGConnectingPoint num="1" id="970" />
-<TGConnectingPoint num="2" id="971" />
-<TGConnectingPoint num="3" id="972" />
+<TGConnectingPoint num="0" id="408" />
+<TGConnectingPoint num="1" id="409" />
+<TGConnectingPoint num="2" id="410" />
+<TGConnectingPoint num="3" id="411" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -910,25 +971,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="982" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="421" >
+<cdparam x="450" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="981" />
-<P1  x="407" y="70" id="1060" />
-<P2  x="407" y="96" id="1063" />
+<TGConnectingPoint num="0" id="420" />
+<P1  x="427" y="215" id="755" />
+<P2  x="453" y="264" id="607" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="980" >
-<father id="982" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="419" >
+<father id="421" num="0" />
+<cdparam x="450" y="295" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="976" />
-<TGConnectingPoint num="1" id="977" />
-<TGConnectingPoint num="2" id="978" />
-<TGConnectingPoint num="3" id="979" />
+<TGConnectingPoint num="0" id="415" />
+<TGConnectingPoint num="1" id="416" />
+<TGConnectingPoint num="2" id="417" />
+<TGConnectingPoint num="3" id="418" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -938,25 +999,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="989" >
-<cdparam x="449" y="131" />
-<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="988" />
-<P1  x="449" y="131" id="1069" />
-<P2  x="495" y="154" id="997" />
+<CONNECTOR type="5102" id="428" >
+<cdparam x="769" y="593" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="427" />
+<P1  x="671" y="443" id="880" />
+<P2  x="671" y="473" id="811" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="987" >
-<father id="989" num="0" />
-<cdparam x="449" y="171" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="426" >
+<father id="428" num="0" />
+<cdparam x="769" y="633" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="983" />
-<TGConnectingPoint num="1" id="984" />
-<TGConnectingPoint num="2" id="985" />
-<TGConnectingPoint num="3" id="986" />
+<TGConnectingPoint num="0" id="422" />
+<TGConnectingPoint num="1" id="423" />
+<TGConnectingPoint num="2" id="424" />
+<TGConnectingPoint num="3" id="425" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -966,25 +1027,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="996" >
-<cdparam x="495" y="184" />
-<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="995" />
-<P1  x="495" y="184" id="998" />
-<P2  x="444" y="202" id="1021" />
+<CONNECTOR type="5102" id="441" >
+<cdparam x="656" y="608" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="2" id="439" />
+<TGConnectingPoint num="3" id="440" />
+<P1  x="671" y="581" id="790" />
+<P2  x="478" y="432" id="663" />
+<Point x="671" y="595" />
+<Point x="548" y="595" />
+<Point x="548" y="432" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="994" >
-<father id="996" num="0" />
-<cdparam x="495" y="224" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="429" >
+<father id="441" num="0" />
+<cdparam x="671" y="595" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="430" >
+<father id="441" num="1" />
+<cdparam x="548" y="595" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="431" >
+<father id="441" num="2" />
+<cdparam x="548" y="432" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="436" >
+<father id="441" num="3" />
+<cdparam x="656" y="648" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="990" />
-<TGConnectingPoint num="1" id="991" />
-<TGConnectingPoint num="2" id="992" />
-<TGConnectingPoint num="3" id="993" />
+<TGConnectingPoint num="0" id="432" />
+<TGConnectingPoint num="1" id="433" />
+<TGConnectingPoint num="2" id="434" />
+<TGConnectingPoint num="3" id="435" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -994,174 +1085,112 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1007" >
-<cdparam x="464" y="159" />
-<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="448" >
+<cdparam x="770" y="523" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="447" />
+<P1  x="669" y="366" id="566" />
+<P2  x="671" y="393" id="875" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="446" >
+<father id="448" num="0" />
+<cdparam x="770" y="563" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="startM()" />
-<TGConnectingPoint num="0" id="997" />
-<TGConnectingPoint num="1" id="998" />
-<TGConnectingPoint num="2" id="999" />
-<TGConnectingPoint num="3" id="1000" />
-<TGConnectingPoint num="4" id="1001" />
-<TGConnectingPoint num="5" id="1002" />
-<TGConnectingPoint num="6" id="1003" />
-<TGConnectingPoint num="7" id="1004" />
-<TGConnectingPoint num="8" id="1005" />
-<TGConnectingPoint num="9" id="1006" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="442" />
+<TGConnectingPoint num="1" id="443" />
+<TGConnectingPoint num="2" id="444" />
+<TGConnectingPoint num="3" id="445" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5104" id="1018" >
-<cdparam x="377" y="285" />
-<sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="461" >
+<cdparam x="425" y="562" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="457" />
+<TGConnectingPoint num="1" id="458" />
+<TGConnectingPoint num="2" id="459" />
+<TGConnectingPoint num="3" id="460" />
+<P1  x="403" y="445" id="664" />
+<P2  x="378" y="432" id="662" />
+<Point x="403" y="480" />
+<Point x="319" y="480" />
+<Point x="319" y="432" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="449" >
+<father id="461" num="0" />
+<cdparam x="403" y="480" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="stopM()" />
-<TGConnectingPoint num="0" id="1008" />
-<TGConnectingPoint num="1" id="1009" />
-<TGConnectingPoint num="2" id="1010" />
-<TGConnectingPoint num="3" id="1011" />
-<TGConnectingPoint num="4" id="1012" />
-<TGConnectingPoint num="5" id="1013" />
-<TGConnectingPoint num="6" id="1014" />
-<TGConnectingPoint num="7" id="1015" />
-<TGConnectingPoint num="8" id="1016" />
-<TGConnectingPoint num="9" id="1017" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1059" >
-<cdparam x="373" y="202" />
-<sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="450" >
+<father id="461" num="1" />
+<cdparam x="319" y="480" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state1" value="Running" />
-<TGConnectingPoint num="0" id="1019" />
-<TGConnectingPoint num="1" id="1020" />
-<TGConnectingPoint num="2" id="1021" />
-<TGConnectingPoint num="3" id="1022" />
-<TGConnectingPoint num="4" id="1023" />
-<TGConnectingPoint num="5" id="1024" />
-<TGConnectingPoint num="6" id="1025" />
-<TGConnectingPoint num="7" id="1026" />
-<TGConnectingPoint num="8" id="1027" />
-<TGConnectingPoint num="9" id="1028" />
-<TGConnectingPoint num="10" id="1029" />
-<TGConnectingPoint num="11" id="1030" />
-<TGConnectingPoint num="12" id="1031" />
-<TGConnectingPoint num="13" id="1032" />
-<TGConnectingPoint num="14" id="1033" />
-<TGConnectingPoint num="15" id="1034" />
-<TGConnectingPoint num="16" id="1035" />
-<TGConnectingPoint num="17" id="1036" />
-<TGConnectingPoint num="18" id="1037" />
-<TGConnectingPoint num="19" id="1038" />
-<TGConnectingPoint num="20" id="1039" />
-<TGConnectingPoint num="21" id="1040" />
-<TGConnectingPoint num="22" id="1041" />
-<TGConnectingPoint num="23" id="1042" />
-<TGConnectingPoint num="24" id="1043" />
-<TGConnectingPoint num="25" id="1044" />
-<TGConnectingPoint num="26" id="1045" />
-<TGConnectingPoint num="27" id="1046" />
-<TGConnectingPoint num="28" id="1047" />
-<TGConnectingPoint num="29" id="1048" />
-<TGConnectingPoint num="30" id="1049" />
-<TGConnectingPoint num="31" id="1050" />
-<TGConnectingPoint num="32" id="1051" />
-<TGConnectingPoint num="33" id="1052" />
-<TGConnectingPoint num="34" id="1053" />
-<TGConnectingPoint num="35" id="1054" />
-<TGConnectingPoint num="36" id="1055" />
-<TGConnectingPoint num="37" id="1056" />
-<TGConnectingPoint num="38" id="1057" />
-<TGConnectingPoint num="39" id="1058" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="451" >
+<father id="461" num="2" />
+<cdparam x="319" y="432" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="456" >
+<father id="461" num="3" />
+<cdparam x="166" y="446" />
+<sizeparam width="205" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="452" />
+<TGConnectingPoint num="1" id="453" />
+<TGConnectingPoint num="2" id="454" />
+<TGConnectingPoint num="3" id="455" />
 <extraparam>
+<guard value="[ remainingTime&gt;0 ]" />
+<afterMin value="1" />
+<afterMax value="1" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="remainingTime= remainingTime -1" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5100" id="1061" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1060" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1102" >
-<cdparam x="365" y="96" />
-<sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitForStart" />
-<TGConnectingPoint num="0" id="1062" />
-<TGConnectingPoint num="1" id="1063" />
-<TGConnectingPoint num="2" id="1064" />
-<TGConnectingPoint num="3" id="1065" />
-<TGConnectingPoint num="4" id="1066" />
-<TGConnectingPoint num="5" id="1067" />
-<TGConnectingPoint num="6" id="1068" />
-<TGConnectingPoint num="7" id="1069" />
-<TGConnectingPoint num="8" id="1070" />
-<TGConnectingPoint num="9" id="1071" />
-<TGConnectingPoint num="10" id="1072" />
-<TGConnectingPoint num="11" id="1073" />
-<TGConnectingPoint num="12" id="1074" />
-<TGConnectingPoint num="13" id="1075" />
-<TGConnectingPoint num="14" id="1076" />
-<TGConnectingPoint num="15" id="1077" />
-<TGConnectingPoint num="16" id="1078" />
-<TGConnectingPoint num="17" id="1079" />
-<TGConnectingPoint num="18" id="1080" />
-<TGConnectingPoint num="19" id="1081" />
-<TGConnectingPoint num="20" id="1082" />
-<TGConnectingPoint num="21" id="1083" />
-<TGConnectingPoint num="22" id="1084" />
-<TGConnectingPoint num="23" id="1085" />
-<TGConnectingPoint num="24" id="1086" />
-<TGConnectingPoint num="25" id="1087" />
-<TGConnectingPoint num="26" id="1088" />
-<TGConnectingPoint num="27" id="1089" />
-<TGConnectingPoint num="28" id="1090" />
-<TGConnectingPoint num="29" id="1091" />
-<TGConnectingPoint num="30" id="1092" />
-<TGConnectingPoint num="31" id="1093" />
-<TGConnectingPoint num="32" id="1094" />
-<TGConnectingPoint num="33" id="1095" />
-<TGConnectingPoint num="34" id="1096" />
-<TGConnectingPoint num="35" id="1097" />
-<TGConnectingPoint num="36" id="1098" />
-<TGConnectingPoint num="37" id="1099" />
-<TGConnectingPoint num="38" id="1100" />
-<TGConnectingPoint num="39" id="1101" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="379" >
-<cdparam x="670" y="320" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="378" />
-<P1  x="669" y="330" id="768" />
-<P2  x="669" y="336" id="565" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="377" >
-<father id="379" num="0" />
-<cdparam x="670" y="360" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="468" >
+<cdparam x="499" y="496" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="467" />
+<P1  x="478" y="420" id="654" />
+<P2  x="670" y="257" id="639" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="466" >
+<father id="468" num="0" />
+<cdparam x="530" y="362" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="373" />
-<TGConnectingPoint num="1" id="374" />
-<TGConnectingPoint num="2" id="375" />
-<TGConnectingPoint num="3" id="376" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1171,27 +1200,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="386" >
-<cdparam x="660" y="188" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="475" >
+<cdparam x="450" y="562" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="385" />
-<P1  x="660" y="188" id="823" />
-<P2  x="656" y="196" id="576" />
+<TGConnectingPoint num="0" id="474" />
+<P1  x="428" y="445" id="656" />
+<P2  x="428" y="507" id="778" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="384" >
-<father id="386" num="0" />
-<cdparam x="660" y="228" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="473" >
+<father id="475" num="0" />
+<cdparam x="410" y="472" />
+<sizeparam width="139" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="380" />
-<TGConnectingPoint num="1" id="381" />
-<TGConnectingPoint num="2" id="382" />
-<TGConnectingPoint num="3" id="383" />
+<TGConnectingPoint num="0" id="469" />
+<TGConnectingPoint num="1" id="470" />
+<TGConnectingPoint num="2" id="471" />
+<TGConnectingPoint num="3" id="472" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ remainingTime==0 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1199,53 +1228,94 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="393" >
-<cdparam x="670" y="539" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="482" >
+<cdparam x="450" y="487" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="392" />
-<P1  x="671" y="539" id="555" />
-<P2  x="671" y="551" id="789" />
+<TGConnectingPoint num="0" id="481" />
+<P1  x="428" y="336" id="801" />
+<P2  x="415" y="395" id="667" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="391" >
-<father id="393" num="0" />
-<cdparam x="670" y="579" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="480" >
+<father id="482" num="0" />
+<cdparam x="274" y="356" />
+<sizeparam width="144" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="387" />
-<TGConnectingPoint num="1" id="388" />
-<TGConnectingPoint num="2" id="389" />
-<TGConnectingPoint num="3" id="390" />
+<TGConnectingPoint num="0" id="476" />
+<TGConnectingPoint num="1" id="477" />
+<TGConnectingPoint num="2" id="478" />
+<TGConnectingPoint num="3" id="479" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="remainingTime=duration" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="400" >
-<cdparam x="671" y="503" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="497" >
+<cdparam x="419" y="547" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="399" />
-<P1  x="671" y="503" id="812" />
-<P2  x="671" y="509" id="554" />
+<TGConnectingPoint num="0" id="492" />
+<TGConnectingPoint num="1" id="493" />
+<TGConnectingPoint num="2" id="494" />
+<TGConnectingPoint num="3" id="495" />
+<TGConnectingPoint num="4" id="496" />
+<P1  x="428" y="579" id="692" />
+<P2  x="389" y="119" id="713" />
+<Point x="428" y="603" />
+<Point x="220" y="603" />
+<Point x="220" y="83" />
+<Point x="389" y="83" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="398" >
-<father id="400" num="0" />
-<cdparam x="707" y="530" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="483" >
+<father id="497" num="0" />
+<cdparam x="428" y="603" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="484" >
+<father id="497" num="1" />
+<cdparam x="220" y="603" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="485" >
+<father id="497" num="2" />
+<cdparam x="220" y="83" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="486" >
+<father id="497" num="3" />
+<cdparam x="389" y="83" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="491" >
+<father id="497" num="4" />
+<cdparam x="419" y="587" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="394" />
-<TGConnectingPoint num="1" id="395" />
-<TGConnectingPoint num="2" id="396" />
-<TGConnectingPoint num="3" id="397" />
+<TGConnectingPoint num="0" id="487" />
+<TGConnectingPoint num="1" id="488" />
+<TGConnectingPoint num="2" id="489" />
+<TGConnectingPoint num="3" id="490" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1255,25 +1325,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="407" >
-<cdparam x="661" y="61" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="504" >
+<cdparam x="419" y="633" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="406" />
-<P1  x="659" y="56" id="703" />
-<P2  x="660" y="64" id="587" />
+<TGConnectingPoint num="0" id="503" />
+<P1  x="428" y="537" id="779" />
+<P2  x="428" y="549" id="691" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="405" >
-<father id="407" num="0" />
-<cdparam x="661" y="101" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="502" >
+<father id="504" num="0" />
+<cdparam x="419" y="673" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="401" />
-<TGConnectingPoint num="1" id="402" />
-<TGConnectingPoint num="2" id="403" />
-<TGConnectingPoint num="3" id="404" />
+<TGConnectingPoint num="0" id="498" />
+<TGConnectingPoint num="1" id="499" />
+<TGConnectingPoint num="2" id="500" />
+<TGConnectingPoint num="3" id="501" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1283,25 +1353,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="414" >
-<cdparam x="661" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="511" >
+<cdparam x="471" y="183" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="413" />
-<P1  x="656" y="226" id="577" />
-<P2  x="471" y="158" id="740" />
+<TGConnectingPoint num="0" id="510" />
+<P1  x="471" y="141" id="717" />
+<P2  x="659" y="26" id="702" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="412" >
-<father id="414" num="0" />
-<cdparam x="695" y="203" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="509" >
+<father id="511" num="0" />
+<cdparam x="471" y="223" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="408" />
-<TGConnectingPoint num="1" id="409" />
-<TGConnectingPoint num="2" id="410" />
-<TGConnectingPoint num="3" id="411" />
+<TGConnectingPoint num="0" id="505" />
+<TGConnectingPoint num="1" id="506" />
+<TGConnectingPoint num="2" id="507" />
+<TGConnectingPoint num="3" id="508" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1311,25 +1381,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="421" >
-<cdparam x="450" y="255" />
+<CONNECTOR type="5102" id="518" >
+<cdparam x="463" y="186" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="420" />
-<P1  x="427" y="215" id="755" />
-<P2  x="453" y="264" id="607" />
+<TGConnectingPoint num="0" id="517" />
+<P1  x="450" y="164" id="728" />
+<P2  x="427" y="185" id="754" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="419" >
-<father id="421" num="0" />
-<cdparam x="450" y="295" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="516" >
+<father id="518" num="0" />
+<cdparam x="400" y="221" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="415" />
-<TGConnectingPoint num="1" id="416" />
-<TGConnectingPoint num="2" id="417" />
-<TGConnectingPoint num="3" id="418" />
+<TGConnectingPoint num="0" id="512" />
+<TGConnectingPoint num="1" id="513" />
+<TGConnectingPoint num="2" id="514" />
+<TGConnectingPoint num="3" id="515" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1339,25 +1409,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="428" >
-<cdparam x="769" y="593" />
+<CONNECTOR type="5102" id="525" >
+<cdparam x="438" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="427" />
-<P1  x="671" y="443" id="880" />
-<P2  x="671" y="473" id="811" />
+<TGConnectingPoint num="0" id="524" />
+<P1  x="430" y="100" id="765" />
+<P2  x="430" y="119" id="714" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="426" >
-<father id="428" num="0" />
-<cdparam x="769" y="633" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="523" >
+<father id="525" num="0" />
+<cdparam x="442" y="129" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="422" />
-<TGConnectingPoint num="1" id="423" />
-<TGConnectingPoint num="2" id="424" />
-<TGConnectingPoint num="3" id="425" />
+<TGConnectingPoint num="0" id="519" />
+<TGConnectingPoint num="1" id="520" />
+<TGConnectingPoint num="2" id="521" />
+<TGConnectingPoint num="3" id="522" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1367,55 +1437,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="441" >
-<cdparam x="656" y="608" />
+<CONNECTOR type="5102" id="532" >
+<cdparam x="449" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="437" />
-<TGConnectingPoint num="1" id="438" />
-<TGConnectingPoint num="2" id="439" />
-<TGConnectingPoint num="3" id="440" />
-<P1  x="671" y="581" id="790" />
-<P2  x="478" y="432" id="663" />
-<Point x="671" y="595" />
-<Point x="548" y="595" />
-<Point x="548" y="432" />
+<TGConnectingPoint num="0" id="531" />
+<P1  x="428" y="295" id="604" />
+<P2  x="428" y="306" id="800" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="429" >
-<father id="441" num="0" />
-<cdparam x="671" y="595" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="430" >
-<father id="441" num="1" />
-<cdparam x="548" y="595" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="431" >
-<father id="441" num="2" />
-<cdparam x="548" y="432" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="436" >
-<father id="441" num="3" />
-<cdparam x="656" y="648" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="530" >
+<father id="532" num="0" />
+<cdparam x="449" y="428" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="432" />
-<TGConnectingPoint num="1" id="433" />
-<TGConnectingPoint num="2" id="434" />
-<TGConnectingPoint num="3" id="435" />
+<TGConnectingPoint num="0" id="526" />
+<TGConnectingPoint num="1" id="527" />
+<TGConnectingPoint num="2" id="528" />
+<TGConnectingPoint num="3" id="529" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1425,25 +1465,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="448" >
-<cdparam x="770" y="523" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="539" >
+<cdparam x="765" y="127" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="447" />
-<P1  x="669" y="366" id="566" />
-<P2  x="671" y="393" id="875" />
+<TGConnectingPoint num="0" id="538" />
+<P1  x="660" y="94" id="588" />
+<P2  x="661" y="106" id="834" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="446" >
-<father id="448" num="0" />
-<cdparam x="770" y="563" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="537" >
+<father id="539" num="0" />
+<cdparam x="765" y="167" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
+<TGConnectingPoint num="0" id="533" />
+<TGConnectingPoint num="1" id="534" />
+<TGConnectingPoint num="2" id="535" />
+<TGConnectingPoint num="3" id="536" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1453,84 +1493,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="461" >
-<cdparam x="425" y="562" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="457" />
-<TGConnectingPoint num="1" id="458" />
-<TGConnectingPoint num="2" id="459" />
-<TGConnectingPoint num="3" id="460" />
-<P1  x="403" y="445" id="664" />
-<P2  x="378" y="432" id="662" />
-<Point x="403" y="480" />
-<Point x="319" y="480" />
-<Point x="319" y="432" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="449" >
-<father id="461" num="0" />
-<cdparam x="403" y="480" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="450" >
-<father id="461" num="1" />
-<cdparam x="319" y="480" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="451" >
-<father id="461" num="2" />
-<cdparam x="319" y="432" />
+<CONNECTOR type="5102" id="546" >
+<cdparam x="719" y="141" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="456" >
-<father id="461" num="3" />
-<cdparam x="166" y="446" />
-<sizeparam width="205" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="452" />
-<TGConnectingPoint num="1" id="453" />
-<TGConnectingPoint num="2" id="454" />
-<TGConnectingPoint num="3" id="455" />
-<extraparam>
-<guard value="[ remainingTime&gt;0 ]" />
-<afterMin value="1" />
-<afterMax value="1" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="remainingTime= remainingTime -1" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="468" >
-<cdparam x="499" y="496" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="467" />
-<P1  x="478" y="420" id="654" />
-<P2  x="670" y="257" id="639" />
+<TGConnectingPoint num="0" id="545" />
+<P1  x="661" y="141" id="839" />
+<P2  x="660" y="158" id="822" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="466" >
-<father id="468" num="0" />
-<cdparam x="530" y="362" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="544" >
+<father id="546" num="0" />
+<cdparam x="719" y="181" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="462" />
-<TGConnectingPoint num="1" id="463" />
-<TGConnectingPoint num="2" id="464" />
-<TGConnectingPoint num="3" id="465" />
+<TGConnectingPoint num="0" id="540" />
+<TGConnectingPoint num="1" id="541" />
+<TGConnectingPoint num="2" id="542" />
+<TGConnectingPoint num="3" id="543" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1540,27 +1521,27 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="475" >
-<cdparam x="450" y="562" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="553" >
+<cdparam x="794" y="287" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="474" />
-<P1  x="428" y="445" id="656" />
-<P2  x="428" y="507" id="778" />
+<TGConnectingPoint num="0" id="552" />
+<P1  x="670" y="287" id="640" />
+<P2  x="669" y="300" id="767" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="473" >
-<father id="475" num="0" />
-<cdparam x="410" y="472" />
-<sizeparam width="139" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="551" >
+<father id="553" num="0" />
+<cdparam x="794" y="327" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="469" />
-<TGConnectingPoint num="1" id="470" />
-<TGConnectingPoint num="2" id="471" />
-<TGConnectingPoint num="3" id="472" />
+<TGConnectingPoint num="0" id="547" />
+<TGConnectingPoint num="1" id="548" />
+<TGConnectingPoint num="2" id="549" />
+<TGConnectingPoint num="3" id="550" />
 <extraparam>
-<guard value="[ remainingTime==0 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1568,330 +1549,9 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="482" >
-<cdparam x="450" y="487" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="481" />
-<P1  x="428" y="336" id="801" />
-<P2  x="415" y="395" id="667" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="480" >
-<father id="482" num="0" />
-<cdparam x="274" y="356" />
-<sizeparam width="144" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="remainingTime=duration" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="497" >
-<cdparam x="419" y="547" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="492" />
-<TGConnectingPoint num="1" id="493" />
-<TGConnectingPoint num="2" id="494" />
-<TGConnectingPoint num="3" id="495" />
-<TGConnectingPoint num="4" id="496" />
-<P1  x="428" y="579" id="692" />
-<P2  x="389" y="119" id="713" />
-<Point x="428" y="603" />
-<Point x="220" y="603" />
-<Point x="220" y="83" />
-<Point x="389" y="83" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="483" >
-<father id="497" num="0" />
-<cdparam x="428" y="603" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="484" >
-<father id="497" num="1" />
-<cdparam x="220" y="603" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="485" >
-<father id="497" num="2" />
-<cdparam x="220" y="83" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="486" >
-<father id="497" num="3" />
-<cdparam x="389" y="83" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="491" >
-<father id="497" num="4" />
-<cdparam x="419" y="587" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="487" />
-<TGConnectingPoint num="1" id="488" />
-<TGConnectingPoint num="2" id="489" />
-<TGConnectingPoint num="3" id="490" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="504" >
-<cdparam x="419" y="633" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="503" />
-<P1  x="428" y="537" id="779" />
-<P2  x="428" y="549" id="691" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="502" >
-<father id="504" num="0" />
-<cdparam x="419" y="673" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="498" />
-<TGConnectingPoint num="1" id="499" />
-<TGConnectingPoint num="2" id="500" />
-<TGConnectingPoint num="3" id="501" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="511" >
-<cdparam x="471" y="183" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="510" />
-<P1  x="471" y="141" id="717" />
-<P2  x="659" y="26" id="702" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="509" >
-<father id="511" num="0" />
-<cdparam x="471" y="223" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="505" />
-<TGConnectingPoint num="1" id="506" />
-<TGConnectingPoint num="2" id="507" />
-<TGConnectingPoint num="3" id="508" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="518" >
-<cdparam x="463" y="186" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="517" />
-<P1  x="450" y="164" id="728" />
-<P2  x="427" y="185" id="754" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="516" >
-<father id="518" num="0" />
-<cdparam x="400" y="221" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="512" />
-<TGConnectingPoint num="1" id="513" />
-<TGConnectingPoint num="2" id="514" />
-<TGConnectingPoint num="3" id="515" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="525" >
-<cdparam x="438" y="140" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="524" />
-<P1  x="430" y="100" id="765" />
-<P2  x="430" y="119" id="714" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="523" >
-<father id="525" num="0" />
-<cdparam x="442" y="129" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="519" />
-<TGConnectingPoint num="1" id="520" />
-<TGConnectingPoint num="2" id="521" />
-<TGConnectingPoint num="3" id="522" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="532" >
-<cdparam x="449" y="388" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="531" />
-<P1  x="428" y="295" id="604" />
-<P2  x="428" y="306" id="800" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="530" >
-<father id="532" num="0" />
-<cdparam x="449" y="428" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="526" />
-<TGConnectingPoint num="1" id="527" />
-<TGConnectingPoint num="2" id="528" />
-<TGConnectingPoint num="3" id="529" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="539" >
-<cdparam x="765" y="127" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="538" />
-<P1  x="660" y="94" id="588" />
-<P2  x="661" y="106" id="834" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="537" >
-<father id="539" num="0" />
-<cdparam x="765" y="167" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="533" />
-<TGConnectingPoint num="1" id="534" />
-<TGConnectingPoint num="2" id="535" />
-<TGConnectingPoint num="3" id="536" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="546" >
-<cdparam x="719" y="141" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="545" />
-<P1  x="661" y="141" id="839" />
-<P2  x="660" y="158" id="822" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="544" >
-<father id="546" num="0" />
-<cdparam x="719" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="540" />
-<TGConnectingPoint num="1" id="541" />
-<TGConnectingPoint num="2" id="542" />
-<TGConnectingPoint num="3" id="543" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="553" >
-<cdparam x="794" y="287" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="552" />
-<P1  x="670" y="287" id="640" />
-<P2  x="669" y="300" id="767" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="551" >
-<father id="553" num="0" />
-<cdparam x="794" y="327" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="547" />
-<TGConnectingPoint num="1" id="548" />
-<TGConnectingPoint num="2" id="549" />
-<TGConnectingPoint num="3" id="550" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5103" id="564" >
-<cdparam x="641" y="514" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="564" >
+<cdparam x="641" y="514" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="okDoor()" />
@@ -2079,374 +1739,693 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="701" >
-<cdparam x="398" y="554" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="ringBell()" />
-<TGConnectingPoint num="0" id="691" />
-<TGConnectingPoint num="1" id="692" />
-<TGConnectingPoint num="2" id="693" />
-<TGConnectingPoint num="3" id="694" />
-<TGConnectingPoint num="4" id="695" />
-<TGConnectingPoint num="5" id="696" />
-<TGConnectingPoint num="6" id="697" />
-<TGConnectingPoint num="7" id="698" />
-<TGConnectingPoint num="8" id="699" />
-<TGConnectingPoint num="9" id="700" />
-<accessibility />
-</COMPONENT>
-
-<COMPONENT type="5104" id="712" >
-<cdparam x="632" y="31" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="701" >
+<cdparam x="398" y="554" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="ringBell()" />
+<TGConnectingPoint num="0" id="691" />
+<TGConnectingPoint num="1" id="692" />
+<TGConnectingPoint num="2" id="693" />
+<TGConnectingPoint num="3" id="694" />
+<TGConnectingPoint num="4" id="695" />
+<TGConnectingPoint num="5" id="696" />
+<TGConnectingPoint num="6" id="697" />
+<TGConnectingPoint num="7" id="698" />
+<TGConnectingPoint num="8" id="699" />
+<TGConnectingPoint num="9" id="700" />
+<accessibility />
+</COMPONENT>
+
+<COMPONENT type="5104" id="712" >
+<cdparam x="632" y="31" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="open()" />
+<TGConnectingPoint num="0" id="702" />
+<TGConnectingPoint num="1" id="703" />
+<TGConnectingPoint num="2" id="704" />
+<TGConnectingPoint num="3" id="705" />
+<TGConnectingPoint num="4" id="706" />
+<TGConnectingPoint num="5" id="707" />
+<TGConnectingPoint num="6" id="708" />
+<TGConnectingPoint num="7" id="709" />
+<TGConnectingPoint num="8" id="710" />
+<TGConnectingPoint num="9" id="711" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="753" >
+<cdparam x="389" y="119" />
+<sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state1" value="Idle" />
+<TGConnectingPoint num="0" id="713" />
+<TGConnectingPoint num="1" id="714" />
+<TGConnectingPoint num="2" id="715" />
+<TGConnectingPoint num="3" id="716" />
+<TGConnectingPoint num="4" id="717" />
+<TGConnectingPoint num="5" id="718" />
+<TGConnectingPoint num="6" id="719" />
+<TGConnectingPoint num="7" id="720" />
+<TGConnectingPoint num="8" id="721" />
+<TGConnectingPoint num="9" id="722" />
+<TGConnectingPoint num="10" id="723" />
+<TGConnectingPoint num="11" id="724" />
+<TGConnectingPoint num="12" id="725" />
+<TGConnectingPoint num="13" id="726" />
+<TGConnectingPoint num="14" id="727" />
+<TGConnectingPoint num="15" id="728" />
+<TGConnectingPoint num="16" id="729" />
+<TGConnectingPoint num="17" id="730" />
+<TGConnectingPoint num="18" id="731" />
+<TGConnectingPoint num="19" id="732" />
+<TGConnectingPoint num="20" id="733" />
+<TGConnectingPoint num="21" id="734" />
+<TGConnectingPoint num="22" id="735" />
+<TGConnectingPoint num="23" id="736" />
+<TGConnectingPoint num="24" id="737" />
+<TGConnectingPoint num="25" id="738" />
+<TGConnectingPoint num="26" id="739" />
+<TGConnectingPoint num="27" id="740" />
+<TGConnectingPoint num="28" id="741" />
+<TGConnectingPoint num="29" id="742" />
+<TGConnectingPoint num="30" id="743" />
+<TGConnectingPoint num="31" id="744" />
+<TGConnectingPoint num="32" id="745" />
+<TGConnectingPoint num="33" id="746" />
+<TGConnectingPoint num="34" id="747" />
+<TGConnectingPoint num="35" id="748" />
+<TGConnectingPoint num="36" id="749" />
+<TGConnectingPoint num="37" id="750" />
+<TGConnectingPoint num="38" id="751" />
+<TGConnectingPoint num="39" id="752" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="764" >
+<cdparam x="377" y="190" />
+<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="start(duration)" />
+<TGConnectingPoint num="0" id="754" />
+<TGConnectingPoint num="1" id="755" />
+<TGConnectingPoint num="2" id="756" />
+<TGConnectingPoint num="3" id="757" />
+<TGConnectingPoint num="4" id="758" />
+<TGConnectingPoint num="5" id="759" />
+<TGConnectingPoint num="6" id="760" />
+<TGConnectingPoint num="7" id="761" />
+<TGConnectingPoint num="8" id="762" />
+<TGConnectingPoint num="9" id="763" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="766" >
+<cdparam x="423" y="80" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="765" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="777" >
+<cdparam x="617" y="305" />
+<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="stopMagnetron()" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
+<TGConnectingPoint num="4" id="771" />
+<TGConnectingPoint num="5" id="772" />
+<TGConnectingPoint num="6" id="773" />
+<TGConnectingPoint num="7" id="774" />
+<TGConnectingPoint num="8" id="775" />
+<TGConnectingPoint num="9" id="776" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="788" >
+<cdparam x="376" y="512" />
+<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="stopMagnetron()" />
+<TGConnectingPoint num="0" id="778" />
+<TGConnectingPoint num="1" id="779" />
+<TGConnectingPoint num="2" id="780" />
+<TGConnectingPoint num="3" id="781" />
+<TGConnectingPoint num="4" id="782" />
+<TGConnectingPoint num="5" id="783" />
+<TGConnectingPoint num="6" id="784" />
+<TGConnectingPoint num="7" id="785" />
+<TGConnectingPoint num="8" id="786" />
+<TGConnectingPoint num="9" id="787" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="799" >
+<cdparam x="619" y="556" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="startMagnetron()" />
+<TGConnectingPoint num="0" id="789" />
+<TGConnectingPoint num="1" id="790" />
+<TGConnectingPoint num="2" id="791" />
+<TGConnectingPoint num="3" id="792" />
+<TGConnectingPoint num="4" id="793" />
+<TGConnectingPoint num="5" id="794" />
+<TGConnectingPoint num="6" id="795" />
+<TGConnectingPoint num="7" id="796" />
+<TGConnectingPoint num="8" id="797" />
+<TGConnectingPoint num="9" id="798" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="810" >
+<cdparam x="376" y="311" />
+<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="startMagnetron()" />
+<TGConnectingPoint num="0" id="800" />
+<TGConnectingPoint num="1" id="801" />
+<TGConnectingPoint num="2" id="802" />
+<TGConnectingPoint num="3" id="803" />
+<TGConnectingPoint num="4" id="804" />
+<TGConnectingPoint num="5" id="805" />
+<TGConnectingPoint num="6" id="806" />
+<TGConnectingPoint num="7" id="807" />
+<TGConnectingPoint num="8" id="808" />
+<TGConnectingPoint num="9" id="809" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="821" >
+<cdparam x="640" y="478" />
+<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="closed()" />
+<TGConnectingPoint num="0" id="811" />
+<TGConnectingPoint num="1" id="812" />
+<TGConnectingPoint num="2" id="813" />
+<TGConnectingPoint num="3" id="814" />
+<TGConnectingPoint num="4" id="815" />
+<TGConnectingPoint num="5" id="816" />
+<TGConnectingPoint num="6" id="817" />
+<TGConnectingPoint num="7" id="818" />
+<TGConnectingPoint num="8" id="819" />
+<TGConnectingPoint num="9" id="820" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="832" >
+<cdparam x="629" y="163" />
+<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="closed()" />
+<TGConnectingPoint num="0" id="822" />
+<TGConnectingPoint num="1" id="823" />
+<TGConnectingPoint num="2" id="824" />
+<TGConnectingPoint num="3" id="825" />
+<TGConnectingPoint num="4" id="826" />
+<TGConnectingPoint num="5" id="827" />
+<TGConnectingPoint num="6" id="828" />
+<TGConnectingPoint num="7" id="829" />
+<TGConnectingPoint num="8" id="830" />
+<TGConnectingPoint num="9" id="831" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="873" >
+<cdparam x="603" y="106" />
+<sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="DoorOpened" />
+<TGConnectingPoint num="0" id="833" />
+<TGConnectingPoint num="1" id="834" />
+<TGConnectingPoint num="2" id="835" />
+<TGConnectingPoint num="3" id="836" />
+<TGConnectingPoint num="4" id="837" />
+<TGConnectingPoint num="5" id="838" />
+<TGConnectingPoint num="6" id="839" />
+<TGConnectingPoint num="7" id="840" />
+<TGConnectingPoint num="8" id="841" />
+<TGConnectingPoint num="9" id="842" />
+<TGConnectingPoint num="10" id="843" />
+<TGConnectingPoint num="11" id="844" />
+<TGConnectingPoint num="12" id="845" />
+<TGConnectingPoint num="13" id="846" />
+<TGConnectingPoint num="14" id="847" />
+<TGConnectingPoint num="15" id="848" />
+<TGConnectingPoint num="16" id="849" />
+<TGConnectingPoint num="17" id="850" />
+<TGConnectingPoint num="18" id="851" />
+<TGConnectingPoint num="19" id="852" />
+<TGConnectingPoint num="20" id="853" />
+<TGConnectingPoint num="21" id="854" />
+<TGConnectingPoint num="22" id="855" />
+<TGConnectingPoint num="23" id="856" />
+<TGConnectingPoint num="24" id="857" />
+<TGConnectingPoint num="25" id="858" />
+<TGConnectingPoint num="26" id="859" />
+<TGConnectingPoint num="27" id="860" />
+<TGConnectingPoint num="28" id="861" />
+<TGConnectingPoint num="29" id="862" />
+<TGConnectingPoint num="30" id="863" />
+<TGConnectingPoint num="31" id="864" />
+<TGConnectingPoint num="32" id="865" />
+<TGConnectingPoint num="33" id="866" />
+<TGConnectingPoint num="34" id="867" />
+<TGConnectingPoint num="35" id="868" />
+<TGConnectingPoint num="36" id="869" />
+<TGConnectingPoint num="37" id="870" />
+<TGConnectingPoint num="38" id="871" />
+<TGConnectingPoint num="39" id="872" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="914" >
+<cdparam x="571" y="393" />
+<sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="open()" />
-<TGConnectingPoint num="0" id="702" />
-<TGConnectingPoint num="1" id="703" />
-<TGConnectingPoint num="2" id="704" />
-<TGConnectingPoint num="3" id="705" />
-<TGConnectingPoint num="4" id="706" />
-<TGConnectingPoint num="5" id="707" />
-<TGConnectingPoint num="6" id="708" />
-<TGConnectingPoint num="7" id="709" />
-<TGConnectingPoint num="8" id="710" />
-<TGConnectingPoint num="9" id="711" />
+<infoparam name="state0" value="DoorOpenedWhileHeating" />
+<TGConnectingPoint num="0" id="874" />
+<TGConnectingPoint num="1" id="875" />
+<TGConnectingPoint num="2" id="876" />
+<TGConnectingPoint num="3" id="877" />
+<TGConnectingPoint num="4" id="878" />
+<TGConnectingPoint num="5" id="879" />
+<TGConnectingPoint num="6" id="880" />
+<TGConnectingPoint num="7" id="881" />
+<TGConnectingPoint num="8" id="882" />
+<TGConnectingPoint num="9" id="883" />
+<TGConnectingPoint num="10" id="884" />
+<TGConnectingPoint num="11" id="885" />
+<TGConnectingPoint num="12" id="886" />
+<TGConnectingPoint num="13" id="887" />
+<TGConnectingPoint num="14" id="888" />
+<TGConnectingPoint num="15" id="889" />
+<TGConnectingPoint num="16" id="890" />
+<TGConnectingPoint num="17" id="891" />
+<TGConnectingPoint num="18" id="892" />
+<TGConnectingPoint num="19" id="893" />
+<TGConnectingPoint num="20" id="894" />
+<TGConnectingPoint num="21" id="895" />
+<TGConnectingPoint num="22" id="896" />
+<TGConnectingPoint num="23" id="897" />
+<TGConnectingPoint num="24" id="898" />
+<TGConnectingPoint num="25" id="899" />
+<TGConnectingPoint num="26" id="900" />
+<TGConnectingPoint num="27" id="901" />
+<TGConnectingPoint num="28" id="902" />
+<TGConnectingPoint num="29" id="903" />
+<TGConnectingPoint num="30" id="904" />
+<TGConnectingPoint num="31" id="905" />
+<TGConnectingPoint num="32" id="906" />
+<TGConnectingPoint num="33" id="907" />
+<TGConnectingPoint num="34" id="908" />
+<TGConnectingPoint num="35" id="909" />
+<TGConnectingPoint num="36" id="910" />
+<TGConnectingPoint num="37" id="911" />
+<TGConnectingPoint num="38" id="912" />
+<TGConnectingPoint num="39" id="913" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="753" >
-<cdparam x="389" y="119" />
-<sizeparam width="82" height="45" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="955" >
+<cdparam x="251" y="240" />
+<sizeparam width="543" height="394" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state1" value="Idle" />
-<TGConnectingPoint num="0" id="713" />
-<TGConnectingPoint num="1" id="714" />
-<TGConnectingPoint num="2" id="715" />
-<TGConnectingPoint num="3" id="716" />
-<TGConnectingPoint num="4" id="717" />
-<TGConnectingPoint num="5" id="718" />
-<TGConnectingPoint num="6" id="719" />
-<TGConnectingPoint num="7" id="720" />
-<TGConnectingPoint num="8" id="721" />
-<TGConnectingPoint num="9" id="722" />
-<TGConnectingPoint num="10" id="723" />
-<TGConnectingPoint num="11" id="724" />
-<TGConnectingPoint num="12" id="725" />
-<TGConnectingPoint num="13" id="726" />
-<TGConnectingPoint num="14" id="727" />
-<TGConnectingPoint num="15" id="728" />
-<TGConnectingPoint num="16" id="729" />
-<TGConnectingPoint num="17" id="730" />
-<TGConnectingPoint num="18" id="731" />
-<TGConnectingPoint num="19" id="732" />
-<TGConnectingPoint num="20" id="733" />
-<TGConnectingPoint num="21" id="734" />
-<TGConnectingPoint num="22" id="735" />
-<TGConnectingPoint num="23" id="736" />
-<TGConnectingPoint num="24" id="737" />
-<TGConnectingPoint num="25" id="738" />
-<TGConnectingPoint num="26" id="739" />
-<TGConnectingPoint num="27" id="740" />
-<TGConnectingPoint num="28" id="741" />
-<TGConnectingPoint num="29" id="742" />
-<TGConnectingPoint num="30" id="743" />
-<TGConnectingPoint num="31" id="744" />
-<TGConnectingPoint num="32" id="745" />
-<TGConnectingPoint num="33" id="746" />
-<TGConnectingPoint num="34" id="747" />
-<TGConnectingPoint num="35" id="748" />
-<TGConnectingPoint num="36" id="749" />
-<TGConnectingPoint num="37" id="750" />
-<TGConnectingPoint num="38" id="751" />
-<TGConnectingPoint num="39" id="752" />
+<infoparam name="state0" value="Heating" />
+<TGConnectingPoint num="0" id="915" />
+<TGConnectingPoint num="1" id="916" />
+<TGConnectingPoint num="2" id="917" />
+<TGConnectingPoint num="3" id="918" />
+<TGConnectingPoint num="4" id="919" />
+<TGConnectingPoint num="5" id="920" />
+<TGConnectingPoint num="6" id="921" />
+<TGConnectingPoint num="7" id="922" />
+<TGConnectingPoint num="8" id="923" />
+<TGConnectingPoint num="9" id="924" />
+<TGConnectingPoint num="10" id="925" />
+<TGConnectingPoint num="11" id="926" />
+<TGConnectingPoint num="12" id="927" />
+<TGConnectingPoint num="13" id="928" />
+<TGConnectingPoint num="14" id="929" />
+<TGConnectingPoint num="15" id="930" />
+<TGConnectingPoint num="16" id="931" />
+<TGConnectingPoint num="17" id="932" />
+<TGConnectingPoint num="18" id="933" />
+<TGConnectingPoint num="19" id="934" />
+<TGConnectingPoint num="20" id="935" />
+<TGConnectingPoint num="21" id="936" />
+<TGConnectingPoint num="22" id="937" />
+<TGConnectingPoint num="23" id="938" />
+<TGConnectingPoint num="24" id="939" />
+<TGConnectingPoint num="25" id="940" />
+<TGConnectingPoint num="26" id="941" />
+<TGConnectingPoint num="27" id="942" />
+<TGConnectingPoint num="28" id="943" />
+<TGConnectingPoint num="29" id="944" />
+<TGConnectingPoint num="30" id="945" />
+<TGConnectingPoint num="31" id="946" />
+<TGConnectingPoint num="32" id="947" />
+<TGConnectingPoint num="33" id="948" />
+<TGConnectingPoint num="34" id="949" />
+<TGConnectingPoint num="35" id="950" />
+<TGConnectingPoint num="36" id="951" />
+<TGConnectingPoint num="37" id="952" />
+<TGConnectingPoint num="38" id="953" />
+<TGConnectingPoint num="39" id="954" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="764" >
-<cdparam x="377" y="190" />
-<sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="start(duration)" />
-<TGConnectingPoint num="0" id="754" />
-<TGConnectingPoint num="1" id="755" />
-<TGConnectingPoint num="2" id="756" />
-<TGConnectingPoint num="3" id="757" />
-<TGConnectingPoint num="4" id="758" />
-<TGConnectingPoint num="5" id="759" />
-<TGConnectingPoint num="6" id="760" />
-<TGConnectingPoint num="7" id="761" />
-<TGConnectingPoint num="8" id="762" />
-<TGConnectingPoint num="9" id="763" />
-</COMPONENT>
 
-<COMPONENT type="5100" id="766" >
-<cdparam x="423" y="80" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Magnetron" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="968" >
+<cdparam x="407" y="380" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="964" />
+<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="2" id="966" />
+<TGConnectingPoint num="3" id="967" />
+<P1  x="407" y="310" id="1009" />
+<P2  x="365" y="113" id="1065" />
+<Point x="407" y="327" />
+<Point x="323" y="327" />
+<Point x="323" y="113" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="956" >
+<father id="968" num="0" />
+<cdparam x="407" y="327" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="765" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="777" >
-<cdparam x="617" y="305" />
-<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="957" >
+<father id="968" num="1" />
+<cdparam x="323" y="327" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="767" />
-<TGConnectingPoint num="1" id="768" />
-<TGConnectingPoint num="2" id="769" />
-<TGConnectingPoint num="3" id="770" />
-<TGConnectingPoint num="4" id="771" />
-<TGConnectingPoint num="5" id="772" />
-<TGConnectingPoint num="6" id="773" />
-<TGConnectingPoint num="7" id="774" />
-<TGConnectingPoint num="8" id="775" />
-<TGConnectingPoint num="9" id="776" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="788" >
-<cdparam x="376" y="512" />
-<sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="958" >
+<father id="968" num="2" />
+<cdparam x="323" y="113" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="stopMagnetron()" />
-<TGConnectingPoint num="0" id="778" />
-<TGConnectingPoint num="1" id="779" />
-<TGConnectingPoint num="2" id="780" />
-<TGConnectingPoint num="3" id="781" />
-<TGConnectingPoint num="4" id="782" />
-<TGConnectingPoint num="5" id="783" />
-<TGConnectingPoint num="6" id="784" />
-<TGConnectingPoint num="7" id="785" />
-<TGConnectingPoint num="8" id="786" />
-<TGConnectingPoint num="9" id="787" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="799" >
-<cdparam x="619" y="556" />
-<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="963" >
+<father id="968" num="3" />
+<cdparam x="407" y="420" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="789" />
-<TGConnectingPoint num="1" id="790" />
-<TGConnectingPoint num="2" id="791" />
-<TGConnectingPoint num="3" id="792" />
-<TGConnectingPoint num="4" id="793" />
-<TGConnectingPoint num="5" id="794" />
-<TGConnectingPoint num="6" id="795" />
-<TGConnectingPoint num="7" id="796" />
-<TGConnectingPoint num="8" id="797" />
-<TGConnectingPoint num="9" id="798" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="959" />
+<TGConnectingPoint num="1" id="960" />
+<TGConnectingPoint num="2" id="961" />
+<TGConnectingPoint num="3" id="962" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5103" id="810" >
-<cdparam x="376" y="311" />
-<sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="975" >
+<cdparam x="411" y="243" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="974" />
+<P1  x="408" y="242" id="1025" />
+<P2  x="407" y="280" id="1008" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="973" >
+<father id="975" num="0" />
+<cdparam x="411" y="283" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="startMagnetron()" />
-<TGConnectingPoint num="0" id="800" />
-<TGConnectingPoint num="1" id="801" />
-<TGConnectingPoint num="2" id="802" />
-<TGConnectingPoint num="3" id="803" />
-<TGConnectingPoint num="4" id="804" />
-<TGConnectingPoint num="5" id="805" />
-<TGConnectingPoint num="6" id="806" />
-<TGConnectingPoint num="7" id="807" />
-<TGConnectingPoint num="8" id="808" />
-<TGConnectingPoint num="9" id="809" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="969" />
+<TGConnectingPoint num="1" id="970" />
+<TGConnectingPoint num="2" id="971" />
+<TGConnectingPoint num="3" id="972" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5104" id="821" >
-<cdparam x="640" y="478" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="982" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="981" />
+<P1  x="407" y="70" id="1060" />
+<P2  x="407" y="96" id="1063" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="980" >
+<father id="982" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="811" />
-<TGConnectingPoint num="1" id="812" />
-<TGConnectingPoint num="2" id="813" />
-<TGConnectingPoint num="3" id="814" />
-<TGConnectingPoint num="4" id="815" />
-<TGConnectingPoint num="5" id="816" />
-<TGConnectingPoint num="6" id="817" />
-<TGConnectingPoint num="7" id="818" />
-<TGConnectingPoint num="8" id="819" />
-<TGConnectingPoint num="9" id="820" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="976" />
+<TGConnectingPoint num="1" id="977" />
+<TGConnectingPoint num="2" id="978" />
+<TGConnectingPoint num="3" id="979" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5104" id="832" >
-<cdparam x="629" y="163" />
-<sizeparam width="63" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="989" >
+<cdparam x="449" y="131" />
+<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="988" />
+<P1  x="449" y="131" id="1069" />
+<P2  x="495" y="154" id="997" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="987" >
+<father id="989" num="0" />
+<cdparam x="449" y="171" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="closed()" />
-<TGConnectingPoint num="0" id="822" />
-<TGConnectingPoint num="1" id="823" />
-<TGConnectingPoint num="2" id="824" />
-<TGConnectingPoint num="3" id="825" />
-<TGConnectingPoint num="4" id="826" />
-<TGConnectingPoint num="5" id="827" />
-<TGConnectingPoint num="6" id="828" />
-<TGConnectingPoint num="7" id="829" />
-<TGConnectingPoint num="8" id="830" />
-<TGConnectingPoint num="9" id="831" />
-</COMPONENT>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="983" />
+<TGConnectingPoint num="1" id="984" />
+<TGConnectingPoint num="2" id="985" />
+<TGConnectingPoint num="3" id="986" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="873" >
-<cdparam x="603" y="106" />
-<sizeparam width="116" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="996" >
+<cdparam x="495" y="184" />
+<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="995" />
+<P1  x="495" y="184" id="998" />
+<P2  x="444" y="202" id="1021" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="994" >
+<father id="996" num="0" />
+<cdparam x="495" y="224" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="DoorOpened" />
-<TGConnectingPoint num="0" id="833" />
-<TGConnectingPoint num="1" id="834" />
-<TGConnectingPoint num="2" id="835" />
-<TGConnectingPoint num="3" id="836" />
-<TGConnectingPoint num="4" id="837" />
-<TGConnectingPoint num="5" id="838" />
-<TGConnectingPoint num="6" id="839" />
-<TGConnectingPoint num="7" id="840" />
-<TGConnectingPoint num="8" id="841" />
-<TGConnectingPoint num="9" id="842" />
-<TGConnectingPoint num="10" id="843" />
-<TGConnectingPoint num="11" id="844" />
-<TGConnectingPoint num="12" id="845" />
-<TGConnectingPoint num="13" id="846" />
-<TGConnectingPoint num="14" id="847" />
-<TGConnectingPoint num="15" id="848" />
-<TGConnectingPoint num="16" id="849" />
-<TGConnectingPoint num="17" id="850" />
-<TGConnectingPoint num="18" id="851" />
-<TGConnectingPoint num="19" id="852" />
-<TGConnectingPoint num="20" id="853" />
-<TGConnectingPoint num="21" id="854" />
-<TGConnectingPoint num="22" id="855" />
-<TGConnectingPoint num="23" id="856" />
-<TGConnectingPoint num="24" id="857" />
-<TGConnectingPoint num="25" id="858" />
-<TGConnectingPoint num="26" id="859" />
-<TGConnectingPoint num="27" id="860" />
-<TGConnectingPoint num="28" id="861" />
-<TGConnectingPoint num="29" id="862" />
-<TGConnectingPoint num="30" id="863" />
-<TGConnectingPoint num="31" id="864" />
-<TGConnectingPoint num="32" id="865" />
-<TGConnectingPoint num="33" id="866" />
-<TGConnectingPoint num="34" id="867" />
-<TGConnectingPoint num="35" id="868" />
-<TGConnectingPoint num="36" id="869" />
-<TGConnectingPoint num="37" id="870" />
-<TGConnectingPoint num="38" id="871" />
-<TGConnectingPoint num="39" id="872" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="990" />
+<TGConnectingPoint num="1" id="991" />
+<TGConnectingPoint num="2" id="992" />
+<TGConnectingPoint num="3" id="993" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5104" id="1007" >
+<cdparam x="464" y="159" />
+<sizeparam width="62" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="startM()" />
+<TGConnectingPoint num="0" id="997" />
+<TGConnectingPoint num="1" id="998" />
+<TGConnectingPoint num="2" id="999" />
+<TGConnectingPoint num="3" id="1000" />
+<TGConnectingPoint num="4" id="1001" />
+<TGConnectingPoint num="5" id="1002" />
+<TGConnectingPoint num="6" id="1003" />
+<TGConnectingPoint num="7" id="1004" />
+<TGConnectingPoint num="8" id="1005" />
+<TGConnectingPoint num="9" id="1006" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1018" >
+<cdparam x="377" y="285" />
+<sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="stopM()" />
+<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="1" id="1009" />
+<TGConnectingPoint num="2" id="1010" />
+<TGConnectingPoint num="3" id="1011" />
+<TGConnectingPoint num="4" id="1012" />
+<TGConnectingPoint num="5" id="1013" />
+<TGConnectingPoint num="6" id="1014" />
+<TGConnectingPoint num="7" id="1015" />
+<TGConnectingPoint num="8" id="1016" />
+<TGConnectingPoint num="9" id="1017" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="914" >
-<cdparam x="571" y="393" />
-<sizeparam width="200" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1059" >
+<cdparam x="373" y="202" />
+<sizeparam width="71" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="DoorOpenedWhileHeating" />
-<TGConnectingPoint num="0" id="874" />
-<TGConnectingPoint num="1" id="875" />
-<TGConnectingPoint num="2" id="876" />
-<TGConnectingPoint num="3" id="877" />
-<TGConnectingPoint num="4" id="878" />
-<TGConnectingPoint num="5" id="879" />
-<TGConnectingPoint num="6" id="880" />
-<TGConnectingPoint num="7" id="881" />
-<TGConnectingPoint num="8" id="882" />
-<TGConnectingPoint num="9" id="883" />
-<TGConnectingPoint num="10" id="884" />
-<TGConnectingPoint num="11" id="885" />
-<TGConnectingPoint num="12" id="886" />
-<TGConnectingPoint num="13" id="887" />
-<TGConnectingPoint num="14" id="888" />
-<TGConnectingPoint num="15" id="889" />
-<TGConnectingPoint num="16" id="890" />
-<TGConnectingPoint num="17" id="891" />
-<TGConnectingPoint num="18" id="892" />
-<TGConnectingPoint num="19" id="893" />
-<TGConnectingPoint num="20" id="894" />
-<TGConnectingPoint num="21" id="895" />
-<TGConnectingPoint num="22" id="896" />
-<TGConnectingPoint num="23" id="897" />
-<TGConnectingPoint num="24" id="898" />
-<TGConnectingPoint num="25" id="899" />
-<TGConnectingPoint num="26" id="900" />
-<TGConnectingPoint num="27" id="901" />
-<TGConnectingPoint num="28" id="902" />
-<TGConnectingPoint num="29" id="903" />
-<TGConnectingPoint num="30" id="904" />
-<TGConnectingPoint num="31" id="905" />
-<TGConnectingPoint num="32" id="906" />
-<TGConnectingPoint num="33" id="907" />
-<TGConnectingPoint num="34" id="908" />
-<TGConnectingPoint num="35" id="909" />
-<TGConnectingPoint num="36" id="910" />
-<TGConnectingPoint num="37" id="911" />
-<TGConnectingPoint num="38" id="912" />
-<TGConnectingPoint num="39" id="913" />
+<infoparam name="state1" value="Running" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
+<TGConnectingPoint num="2" id="1021" />
+<TGConnectingPoint num="3" id="1022" />
+<TGConnectingPoint num="4" id="1023" />
+<TGConnectingPoint num="5" id="1024" />
+<TGConnectingPoint num="6" id="1025" />
+<TGConnectingPoint num="7" id="1026" />
+<TGConnectingPoint num="8" id="1027" />
+<TGConnectingPoint num="9" id="1028" />
+<TGConnectingPoint num="10" id="1029" />
+<TGConnectingPoint num="11" id="1030" />
+<TGConnectingPoint num="12" id="1031" />
+<TGConnectingPoint num="13" id="1032" />
+<TGConnectingPoint num="14" id="1033" />
+<TGConnectingPoint num="15" id="1034" />
+<TGConnectingPoint num="16" id="1035" />
+<TGConnectingPoint num="17" id="1036" />
+<TGConnectingPoint num="18" id="1037" />
+<TGConnectingPoint num="19" id="1038" />
+<TGConnectingPoint num="20" id="1039" />
+<TGConnectingPoint num="21" id="1040" />
+<TGConnectingPoint num="22" id="1041" />
+<TGConnectingPoint num="23" id="1042" />
+<TGConnectingPoint num="24" id="1043" />
+<TGConnectingPoint num="25" id="1044" />
+<TGConnectingPoint num="26" id="1045" />
+<TGConnectingPoint num="27" id="1046" />
+<TGConnectingPoint num="28" id="1047" />
+<TGConnectingPoint num="29" id="1048" />
+<TGConnectingPoint num="30" id="1049" />
+<TGConnectingPoint num="31" id="1050" />
+<TGConnectingPoint num="32" id="1051" />
+<TGConnectingPoint num="33" id="1052" />
+<TGConnectingPoint num="34" id="1053" />
+<TGConnectingPoint num="35" id="1054" />
+<TGConnectingPoint num="36" id="1055" />
+<TGConnectingPoint num="37" id="1056" />
+<TGConnectingPoint num="38" id="1057" />
+<TGConnectingPoint num="39" id="1058" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="955" >
-<cdparam x="251" y="240" />
-<sizeparam width="543" height="394" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="1061" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="Heating" />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
-<TGConnectingPoint num="3" id="918" />
-<TGConnectingPoint num="4" id="919" />
-<TGConnectingPoint num="5" id="920" />
-<TGConnectingPoint num="6" id="921" />
-<TGConnectingPoint num="7" id="922" />
-<TGConnectingPoint num="8" id="923" />
-<TGConnectingPoint num="9" id="924" />
-<TGConnectingPoint num="10" id="925" />
-<TGConnectingPoint num="11" id="926" />
-<TGConnectingPoint num="12" id="927" />
-<TGConnectingPoint num="13" id="928" />
-<TGConnectingPoint num="14" id="929" />
-<TGConnectingPoint num="15" id="930" />
-<TGConnectingPoint num="16" id="931" />
-<TGConnectingPoint num="17" id="932" />
-<TGConnectingPoint num="18" id="933" />
-<TGConnectingPoint num="19" id="934" />
-<TGConnectingPoint num="20" id="935" />
-<TGConnectingPoint num="21" id="936" />
-<TGConnectingPoint num="22" id="937" />
-<TGConnectingPoint num="23" id="938" />
-<TGConnectingPoint num="24" id="939" />
-<TGConnectingPoint num="25" id="940" />
-<TGConnectingPoint num="26" id="941" />
-<TGConnectingPoint num="27" id="942" />
-<TGConnectingPoint num="28" id="943" />
-<TGConnectingPoint num="29" id="944" />
-<TGConnectingPoint num="30" id="945" />
-<TGConnectingPoint num="31" id="946" />
-<TGConnectingPoint num="32" id="947" />
-<TGConnectingPoint num="33" id="948" />
-<TGConnectingPoint num="34" id="949" />
-<TGConnectingPoint num="35" id="950" />
-<TGConnectingPoint num="36" id="951" />
-<TGConnectingPoint num="37" id="952" />
-<TGConnectingPoint num="38" id="953" />
-<TGConnectingPoint num="39" id="954" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1060" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1102" >
+<cdparam x="365" y="96" />
+<sizeparam width="84" height="35" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitForStart" />
+<TGConnectingPoint num="0" id="1062" />
+<TGConnectingPoint num="1" id="1063" />
+<TGConnectingPoint num="2" id="1064" />
+<TGConnectingPoint num="3" id="1065" />
+<TGConnectingPoint num="4" id="1066" />
+<TGConnectingPoint num="5" id="1067" />
+<TGConnectingPoint num="6" id="1068" />
+<TGConnectingPoint num="7" id="1069" />
+<TGConnectingPoint num="8" id="1070" />
+<TGConnectingPoint num="9" id="1071" />
+<TGConnectingPoint num="10" id="1072" />
+<TGConnectingPoint num="11" id="1073" />
+<TGConnectingPoint num="12" id="1074" />
+<TGConnectingPoint num="13" id="1075" />
+<TGConnectingPoint num="14" id="1076" />
+<TGConnectingPoint num="15" id="1077" />
+<TGConnectingPoint num="16" id="1078" />
+<TGConnectingPoint num="17" id="1079" />
+<TGConnectingPoint num="18" id="1080" />
+<TGConnectingPoint num="19" id="1081" />
+<TGConnectingPoint num="20" id="1082" />
+<TGConnectingPoint num="21" id="1083" />
+<TGConnectingPoint num="22" id="1084" />
+<TGConnectingPoint num="23" id="1085" />
+<TGConnectingPoint num="24" id="1086" />
+<TGConnectingPoint num="25" id="1087" />
+<TGConnectingPoint num="26" id="1088" />
+<TGConnectingPoint num="27" id="1089" />
+<TGConnectingPoint num="28" id="1090" />
+<TGConnectingPoint num="29" id="1091" />
+<TGConnectingPoint num="30" id="1092" />
+<TGConnectingPoint num="31" id="1093" />
+<TGConnectingPoint num="32" id="1094" />
+<TGConnectingPoint num="33" id="1095" />
+<TGConnectingPoint num="34" id="1096" />
+<TGConnectingPoint num="35" id="1097" />
+<TGConnectingPoint num="36" id="1098" />
+<TGConnectingPoint num="37" id="1099" />
+<TGConnectingPoint num="38" id="1100" />
+<TGConnectingPoint num="39" id="1101" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -2454,56 +2433,26 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ControlPanel" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="302" >
-<cdparam x="504" y="232" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<AVATARStateMachineDiagramPanel name="Door" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1109" >
+<cdparam x="404" y="381" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="298" />
-<TGConnectingPoint num="1" id="299" />
-<TGConnectingPoint num="2" id="300" />
-<TGConnectingPoint num="3" id="301" />
-<P1  x="504" y="232" id="361" />
-<P2  x="454" y="123" id="322" />
-<Point x="504" y="254" />
-<Point x="426" y="254" />
-<Point x="426" y="123" />
+<TGConnectingPoint num="0" id="1108" />
+<P1  x="404" y="381" id="1224" />
+<P2  x="388" y="401" id="1160" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="290" >
-<father id="302" num="0" />
-<cdparam x="504" y="254" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="291" >
-<father id="302" num="1" />
-<cdparam x="426" y="254" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="292" >
-<father id="302" num="2" />
-<cdparam x="426" y="123" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="297" >
-<father id="302" num="3" />
-<cdparam x="504" y="272" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1107" >
+<father id="1109" num="0" />
+<cdparam x="404" y="421" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="293" />
-<TGConnectingPoint num="1" id="294" />
-<TGConnectingPoint num="2" id="295" />
-<TGConnectingPoint num="3" id="296" />
+<TGConnectingPoint num="0" id="1103" />
+<TGConnectingPoint num="1" id="1104" />
+<TGConnectingPoint num="2" id="1105" />
+<TGConnectingPoint num="3" id="1106" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2513,35 +2462,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="311" >
-<cdparam x="504" y="148" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="1116" >
+<cdparam x="417" y="235" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="309" />
-<TGConnectingPoint num="1" id="310" />
-<P1  x="504" y="148" id="325" />
-<P2  x="504" y="202" id="360" />
-<Point x="504" y="175" />
+<TGConnectingPoint num="0" id="1115" />
+<P1  x="403" y="230" id="1172" />
+<P2  x="404" y="243" id="1183" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="303" >
-<father id="311" num="0" />
-<cdparam x="504" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="308" >
-<father id="311" num="1" />
-<cdparam x="504" y="188" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1114" >
+<father id="1116" num="0" />
+<cdparam x="417" y="275" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="304" />
-<TGConnectingPoint num="1" id="305" />
-<TGConnectingPoint num="2" id="306" />
-<TGConnectingPoint num="3" id="307" />
+<TGConnectingPoint num="0" id="1110" />
+<TGConnectingPoint num="1" id="1111" />
+<TGConnectingPoint num="2" id="1112" />
+<TGConnectingPoint num="3" id="1113" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2551,164 +2490,121 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="318" >
-<cdparam x="385" y="75" />
+<CONNECTOR type="5102" id="1123" >
+<cdparam x="407" y="283" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="317" />
-<P1  x="481" y="74" id="371" />
-<P2  x="504" y="98" id="320" />
+<TGConnectingPoint num="0" id="1122" />
+<P1  x="404" y="273" id="1188" />
+<P2  x="404" y="351" id="1223" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="316" >
-<father id="318" num="0" />
-<cdparam x="385" y="115" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1121" >
+<father id="1123" num="0" />
+<cdparam x="407" y="311" />
+<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="312" />
-<TGConnectingPoint num="1" id="313" />
-<TGConnectingPoint num="2" id="314" />
-<TGConnectingPoint num="3" id="315" />
+<TGConnectingPoint num="0" id="1117" />
+<TGConnectingPoint num="1" id="1118" />
+<TGConnectingPoint num="2" id="1119" />
+<TGConnectingPoint num="3" id="1120" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
+<afterMin value="2" />
+<afterMax value="4" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="359" >
-<cdparam x="454" y="98" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="319" />
-<TGConnectingPoint num="1" id="320" />
-<TGConnectingPoint num="2" id="321" />
-<TGConnectingPoint num="3" id="322" />
-<TGConnectingPoint num="4" id="323" />
-<TGConnectingPoint num="5" id="324" />
-<TGConnectingPoint num="6" id="325" />
-<TGConnectingPoint num="7" id="326" />
-<TGConnectingPoint num="8" id="327" />
-<TGConnectingPoint num="9" id="328" />
-<TGConnectingPoint num="10" id="329" />
-<TGConnectingPoint num="11" id="330" />
-<TGConnectingPoint num="12" id="331" />
-<TGConnectingPoint num="13" id="332" />
-<TGConnectingPoint num="14" id="333" />
-<TGConnectingPoint num="15" id="334" />
-<TGConnectingPoint num="16" id="335" />
-<TGConnectingPoint num="17" id="336" />
-<TGConnectingPoint num="18" id="337" />
-<TGConnectingPoint num="19" id="338" />
-<TGConnectingPoint num="20" id="339" />
-<TGConnectingPoint num="21" id="340" />
-<TGConnectingPoint num="22" id="341" />
-<TGConnectingPoint num="23" id="342" />
-<TGConnectingPoint num="24" id="343" />
-<TGConnectingPoint num="25" id="344" />
-<TGConnectingPoint num="26" id="345" />
-<TGConnectingPoint num="27" id="346" />
-<TGConnectingPoint num="28" id="347" />
-<TGConnectingPoint num="29" id="348" />
-<TGConnectingPoint num="30" id="349" />
-<TGConnectingPoint num="31" id="350" />
-<TGConnectingPoint num="32" id="351" />
-<TGConnectingPoint num="33" id="352" />
-<TGConnectingPoint num="34" id="353" />
-<TGConnectingPoint num="35" id="354" />
-<TGConnectingPoint num="36" id="355" />
-<TGConnectingPoint num="37" id="356" />
-<TGConnectingPoint num="38" id="357" />
-<TGConnectingPoint num="39" id="358" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="370" >
-<cdparam x="440" y="207" />
-<sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="startButton(duration)" />
-<TGConnectingPoint num="0" id="360" />
-<TGConnectingPoint num="1" id="361" />
-<TGConnectingPoint num="2" id="362" />
-<TGConnectingPoint num="3" id="363" />
-<TGConnectingPoint num="4" id="364" />
-<TGConnectingPoint num="5" id="365" />
-<TGConnectingPoint num="6" id="366" />
-<TGConnectingPoint num="7" id="367" />
-<TGConnectingPoint num="8" id="368" />
-<TGConnectingPoint num="9" id="369" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="372" >
-<cdparam x="474" y="54" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="371" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Bell" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="221" >
-<cdparam x="419" y="209" />
+<CONNECTOR type="5102" id="1138" >
+<cdparam x="407" y="277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="217" />
-<TGConnectingPoint num="1" id="218" />
-<TGConnectingPoint num="2" id="219" />
-<TGConnectingPoint num="3" id="220" />
-<P1  x="419" y="209" id="237" />
-<P2  x="369" y="123" id="250" />
-<Point x="412" y="243" />
-<Point x="332" y="243" />
-<Point x="332" y="123" />
+<TGConnectingPoint num="0" id="1133" />
+<TGConnectingPoint num="1" id="1134" />
+<TGConnectingPoint num="2" id="1135" />
+<TGConnectingPoint num="3" id="1136" />
+<TGConnectingPoint num="4" id="1137" />
+<P1  x="388" y="431" id="1161" />
+<P2  x="357" y="115" id="1248" />
+<Point x="345" y="523" />
+<Point x="262" y="526" />
+<Point x="315" y="264" />
+<Point x="334" y="115" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="209" >
-<father id="221" num="0" />
-<cdparam x="412" y="243" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1124" >
+<father id="1138" num="0" />
+<cdparam x="345" y="523" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="210" >
-<father id="221" num="1" />
-<cdparam x="332" y="243" />
+<SUBCOMPONENT type="-1" id="1125" >
+<father id="1138" num="1" />
+<cdparam x="262" y="526" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="211" >
-<father id="221" num="2" />
-<cdparam x="332" y="123" />
+<SUBCOMPONENT type="-1" id="1126" >
+<father id="1138" num="2" />
+<cdparam x="315" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="216" >
-<father id="221" num="3" />
-<cdparam x="419" y="249" />
+<SUBCOMPONENT type="-1" id="1127" >
+<father id="1138" num="3" />
+<cdparam x="334" y="115" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1132" >
+<father id="1138" num="4" />
+<cdparam x="312" y="477" />
+<sizeparam width="59" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1128" />
+<TGConnectingPoint num="1" id="1129" />
+<TGConnectingPoint num="2" id="1130" />
+<TGConnectingPoint num="3" id="1131" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="2" />
+<afterMax value="4" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1145" >
+<cdparam x="403" y="337" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from  to " value="null" />
+<TGConnectingPoint num="0" id="1144" />
+<P1  x="404" y="185" id="1235" />
+<P2  x="403" y="200" id="1171" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1143" >
+<father id="1145" num="0" />
+<cdparam x="410" y="352" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="212" />
-<TGConnectingPoint num="1" id="213" />
-<TGConnectingPoint num="2" id="214" />
-<TGConnectingPoint num="3" id="215" />
+<TGConnectingPoint num="0" id="1139" />
+<TGConnectingPoint num="1" id="1140" />
+<TGConnectingPoint num="2" id="1141" />
+<TGConnectingPoint num="3" id="1142" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2718,25 +2614,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="228" >
-<cdparam x="420" y="151" />
+<CONNECTOR type="5102" id="1152" >
+<cdparam x="407" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="227" />
-<P1  x="419" y="148" id="253" />
-<P2  x="419" y="179" id="236" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="226" >
-<father id="228" num="0" />
-<cdparam x="420" y="191" />
+<TGConnectingPoint num="0" id="1151" />
+<P1  x="407" y="131" id="1251" />
+<P2  x="404" y="155" id="1234" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1150" >
+<father id="1152" num="0" />
+<cdparam x="407" y="190" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="222" />
-<TGConnectingPoint num="1" id="223" />
-<TGConnectingPoint num="2" id="224" />
-<TGConnectingPoint num="3" id="225" />
+<TGConnectingPoint num="0" id="1146" />
+<TGConnectingPoint num="1" id="1147" />
+<TGConnectingPoint num="2" id="1148" />
+<TGConnectingPoint num="3" id="1149" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2746,25 +2642,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="235" >
+<CONNECTOR type="5102" id="1159" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from  to " value="null" />
-<TGConnectingPoint num="0" id="234" />
-<P1  x="407" y="70" id="288" />
-<P2  x="419" y="98" id="248" />
+<TGConnectingPoint num="0" id="1158" />
+<P1  x="407" y="70" id="1286" />
+<P2  x="407" y="100" id="1246" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="233" >
-<father id="235" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1157" >
+<father id="1159" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="229" />
-<TGConnectingPoint num="1" id="230" />
-<TGConnectingPoint num="2" id="231" />
-<TGConnectingPoint num="3" id="232" />
+<TGConnectingPoint num="0" id="1153" />
+<TGConnectingPoint num="1" id="1154" />
+<TGConnectingPoint num="2" id="1155" />
+<TGConnectingPoint num="3" id="1156" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2774,81 +2670,185 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="246" >
-<cdparam x="395" y="184" />
-<sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1170" >
+<cdparam x="354" y="406" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="ring()" />
-<TGConnectingPoint num="0" id="236" />
-<TGConnectingPoint num="1" id="237" />
-<TGConnectingPoint num="2" id="238" />
-<TGConnectingPoint num="3" id="239" />
-<TGConnectingPoint num="4" id="240" />
-<TGConnectingPoint num="5" id="241" />
-<TGConnectingPoint num="6" id="242" />
-<TGConnectingPoint num="7" id="243" />
-<TGConnectingPoint num="8" id="244" />
-<TGConnectingPoint num="9" id="245" />
+<infoparam name="Receive signal" value="okDoor()" />
+<TGConnectingPoint num="0" id="1160" />
+<TGConnectingPoint num="1" id="1161" />
+<TGConnectingPoint num="2" id="1162" />
+<TGConnectingPoint num="3" id="1163" />
+<TGConnectingPoint num="4" id="1164" />
+<TGConnectingPoint num="5" id="1165" />
+<TGConnectingPoint num="6" id="1166" />
+<TGConnectingPoint num="7" id="1167" />
+<TGConnectingPoint num="8" id="1168" />
+<TGConnectingPoint num="9" id="1169" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="287" >
-<cdparam x="369" y="98" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1181" >
+<cdparam x="369" y="205" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="Active" />
-<TGConnectingPoint num="0" id="247" />
-<TGConnectingPoint num="1" id="248" />
-<TGConnectingPoint num="2" id="249" />
-<TGConnectingPoint num="3" id="250" />
-<TGConnectingPoint num="4" id="251" />
-<TGConnectingPoint num="5" id="252" />
-<TGConnectingPoint num="6" id="253" />
-<TGConnectingPoint num="7" id="254" />
-<TGConnectingPoint num="8" id="255" />
-<TGConnectingPoint num="9" id="256" />
-<TGConnectingPoint num="10" id="257" />
-<TGConnectingPoint num="11" id="258" />
-<TGConnectingPoint num="12" id="259" />
-<TGConnectingPoint num="13" id="260" />
-<TGConnectingPoint num="14" id="261" />
-<TGConnectingPoint num="15" id="262" />
-<TGConnectingPoint num="16" id="263" />
-<TGConnectingPoint num="17" id="264" />
-<TGConnectingPoint num="18" id="265" />
-<TGConnectingPoint num="19" id="266" />
-<TGConnectingPoint num="20" id="267" />
-<TGConnectingPoint num="21" id="268" />
-<TGConnectingPoint num="22" id="269" />
-<TGConnectingPoint num="23" id="270" />
-<TGConnectingPoint num="24" id="271" />
-<TGConnectingPoint num="25" id="272" />
-<TGConnectingPoint num="26" id="273" />
-<TGConnectingPoint num="27" id="274" />
-<TGConnectingPoint num="28" id="275" />
-<TGConnectingPoint num="29" id="276" />
-<TGConnectingPoint num="30" id="277" />
-<TGConnectingPoint num="31" id="278" />
-<TGConnectingPoint num="32" id="279" />
-<TGConnectingPoint num="33" id="280" />
-<TGConnectingPoint num="34" id="281" />
-<TGConnectingPoint num="35" id="282" />
-<TGConnectingPoint num="36" id="283" />
-<TGConnectingPoint num="37" id="284" />
-<TGConnectingPoint num="38" id="285" />
-<TGConnectingPoint num="39" id="286" />
+<infoparam name="Receive signal" value="okDoor()" />
+<TGConnectingPoint num="0" id="1171" />
+<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="2" id="1173" />
+<TGConnectingPoint num="3" id="1174" />
+<TGConnectingPoint num="4" id="1175" />
+<TGConnectingPoint num="5" id="1176" />
+<TGConnectingPoint num="6" id="1177" />
+<TGConnectingPoint num="7" id="1178" />
+<TGConnectingPoint num="8" id="1179" />
+<TGConnectingPoint num="9" id="1180" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1222" >
+<cdparam x="354" y="243" />
+<sizeparam width="100" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="DoorIsOpened" />
+<TGConnectingPoint num="0" id="1182" />
+<TGConnectingPoint num="1" id="1183" />
+<TGConnectingPoint num="2" id="1184" />
+<TGConnectingPoint num="3" id="1185" />
+<TGConnectingPoint num="4" id="1186" />
+<TGConnectingPoint num="5" id="1187" />
+<TGConnectingPoint num="6" id="1188" />
+<TGConnectingPoint num="7" id="1189" />
+<TGConnectingPoint num="8" id="1190" />
+<TGConnectingPoint num="9" id="1191" />
+<TGConnectingPoint num="10" id="1192" />
+<TGConnectingPoint num="11" id="1193" />
+<TGConnectingPoint num="12" id="1194" />
+<TGConnectingPoint num="13" id="1195" />
+<TGConnectingPoint num="14" id="1196" />
+<TGConnectingPoint num="15" id="1197" />
+<TGConnectingPoint num="16" id="1198" />
+<TGConnectingPoint num="17" id="1199" />
+<TGConnectingPoint num="18" id="1200" />
+<TGConnectingPoint num="19" id="1201" />
+<TGConnectingPoint num="20" id="1202" />
+<TGConnectingPoint num="21" id="1203" />
+<TGConnectingPoint num="22" id="1204" />
+<TGConnectingPoint num="23" id="1205" />
+<TGConnectingPoint num="24" id="1206" />
+<TGConnectingPoint num="25" id="1207" />
+<TGConnectingPoint num="26" id="1208" />
+<TGConnectingPoint num="27" id="1209" />
+<TGConnectingPoint num="28" id="1210" />
+<TGConnectingPoint num="29" id="1211" />
+<TGConnectingPoint num="30" id="1212" />
+<TGConnectingPoint num="31" id="1213" />
+<TGConnectingPoint num="32" id="1214" />
+<TGConnectingPoint num="33" id="1215" />
+<TGConnectingPoint num="34" id="1216" />
+<TGConnectingPoint num="35" id="1217" />
+<TGConnectingPoint num="36" id="1218" />
+<TGConnectingPoint num="37" id="1219" />
+<TGConnectingPoint num="38" id="1220" />
+<TGConnectingPoint num="39" id="1221" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="289" >
+<COMPONENT type="5103" id="1233" >
+<cdparam x="377" y="356" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="closed()" />
+<TGConnectingPoint num="0" id="1223" />
+<TGConnectingPoint num="1" id="1224" />
+<TGConnectingPoint num="2" id="1225" />
+<TGConnectingPoint num="3" id="1226" />
+<TGConnectingPoint num="4" id="1227" />
+<TGConnectingPoint num="5" id="1228" />
+<TGConnectingPoint num="6" id="1229" />
+<TGConnectingPoint num="7" id="1230" />
+<TGConnectingPoint num="8" id="1231" />
+<TGConnectingPoint num="9" id="1232" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1244" >
+<cdparam x="381" y="160" />
+<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="open()" />
+<TGConnectingPoint num="0" id="1234" />
+<TGConnectingPoint num="1" id="1235" />
+<TGConnectingPoint num="2" id="1236" />
+<TGConnectingPoint num="3" id="1237" />
+<TGConnectingPoint num="4" id="1238" />
+<TGConnectingPoint num="5" id="1239" />
+<TGConnectingPoint num="6" id="1240" />
+<TGConnectingPoint num="7" id="1241" />
+<TGConnectingPoint num="8" id="1242" />
+<TGConnectingPoint num="9" id="1243" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1285" >
+<cdparam x="357" y="100" />
+<sizeparam width="100" height="31" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="IDLE" />
+<TGConnectingPoint num="0" id="1245" />
+<TGConnectingPoint num="1" id="1246" />
+<TGConnectingPoint num="2" id="1247" />
+<TGConnectingPoint num="3" id="1248" />
+<TGConnectingPoint num="4" id="1249" />
+<TGConnectingPoint num="5" id="1250" />
+<TGConnectingPoint num="6" id="1251" />
+<TGConnectingPoint num="7" id="1252" />
+<TGConnectingPoint num="8" id="1253" />
+<TGConnectingPoint num="9" id="1254" />
+<TGConnectingPoint num="10" id="1255" />
+<TGConnectingPoint num="11" id="1256" />
+<TGConnectingPoint num="12" id="1257" />
+<TGConnectingPoint num="13" id="1258" />
+<TGConnectingPoint num="14" id="1259" />
+<TGConnectingPoint num="15" id="1260" />
+<TGConnectingPoint num="16" id="1261" />
+<TGConnectingPoint num="17" id="1262" />
+<TGConnectingPoint num="18" id="1263" />
+<TGConnectingPoint num="19" id="1264" />
+<TGConnectingPoint num="20" id="1265" />
+<TGConnectingPoint num="21" id="1266" />
+<TGConnectingPoint num="22" id="1267" />
+<TGConnectingPoint num="23" id="1268" />
+<TGConnectingPoint num="24" id="1269" />
+<TGConnectingPoint num="25" id="1270" />
+<TGConnectingPoint num="26" id="1271" />
+<TGConnectingPoint num="27" id="1272" />
+<TGConnectingPoint num="28" id="1273" />
+<TGConnectingPoint num="29" id="1274" />
+<TGConnectingPoint num="30" id="1275" />
+<TGConnectingPoint num="31" id="1276" />
+<TGConnectingPoint num="32" id="1277" />
+<TGConnectingPoint num="33" id="1278" />
+<TGConnectingPoint num="34" id="1279" />
+<TGConnectingPoint num="35" id="1280" />
+<TGConnectingPoint num="36" id="1281" />
+<TGConnectingPoint num="37" id="1282" />
+<TGConnectingPoint num="38" id="1283" />
+<TGConnectingPoint num="39" id="1284" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1287" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="288" />
+<TGConnectingPoint num="0" id="1286" />
 </COMPONENT>
 
 
@@ -2861,216 +2861,216 @@
 
 <Modeling type="ADD" nameTab="Avatar Deployment" >
 <ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5355" id="1321" >
+<COMPONENT type="5355" id="1312" >
 <cdparam x="580" y="601" />
 <sizeparam width="674" height="210" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory1" value="name" />
-<TGConnectingPoint num="0" id="1297" />
-<TGConnectingPoint num="1" id="1298" />
-<TGConnectingPoint num="2" id="1299" />
-<TGConnectingPoint num="3" id="1300" />
-<TGConnectingPoint num="4" id="1301" />
-<TGConnectingPoint num="5" id="1302" />
-<TGConnectingPoint num="6" id="1303" />
-<TGConnectingPoint num="7" id="1304" />
-<TGConnectingPoint num="8" id="1305" />
-<TGConnectingPoint num="9" id="1306" />
-<TGConnectingPoint num="10" id="1307" />
-<TGConnectingPoint num="11" id="1308" />
-<TGConnectingPoint num="12" id="1309" />
-<TGConnectingPoint num="13" id="1310" />
-<TGConnectingPoint num="14" id="1311" />
-<TGConnectingPoint num="15" id="1312" />
-<TGConnectingPoint num="16" id="1313" />
-<TGConnectingPoint num="17" id="1314" />
-<TGConnectingPoint num="18" id="1315" />
-<TGConnectingPoint num="19" id="1316" />
-<TGConnectingPoint num="20" id="1317" />
-<TGConnectingPoint num="21" id="1318" />
-<TGConnectingPoint num="22" id="1319" />
-<TGConnectingPoint num="23" id="1320" />
+<TGConnectingPoint num="0" id="1288" />
+<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="2" id="1290" />
+<TGConnectingPoint num="3" id="1291" />
+<TGConnectingPoint num="4" id="1292" />
+<TGConnectingPoint num="5" id="1293" />
+<TGConnectingPoint num="6" id="1294" />
+<TGConnectingPoint num="7" id="1295" />
+<TGConnectingPoint num="8" id="1296" />
+<TGConnectingPoint num="9" id="1297" />
+<TGConnectingPoint num="10" id="1298" />
+<TGConnectingPoint num="11" id="1299" />
+<TGConnectingPoint num="12" id="1300" />
+<TGConnectingPoint num="13" id="1301" />
+<TGConnectingPoint num="14" id="1302" />
+<TGConnectingPoint num="15" id="1303" />
+<TGConnectingPoint num="16" id="1304" />
+<TGConnectingPoint num="17" id="1305" />
+<TGConnectingPoint num="18" id="1306" />
+<TGConnectingPoint num="19" id="1307" />
+<TGConnectingPoint num="20" id="1308" />
+<TGConnectingPoint num="21" id="1309" />
+<TGConnectingPoint num="22" id="1310" />
+<TGConnectingPoint num="23" id="1311" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory1" />
 <attributes byteDataSize="4"  index="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5361" id="1346" >
+<COMPONENT type="5361" id="1337" >
 <cdparam x="326" y="475" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Timer0" value="name" />
-<TGConnectingPoint num="0" id="1322" />
-<TGConnectingPoint num="1" id="1323" />
-<TGConnectingPoint num="2" id="1324" />
-<TGConnectingPoint num="3" id="1325" />
-<TGConnectingPoint num="4" id="1326" />
-<TGConnectingPoint num="5" id="1327" />
-<TGConnectingPoint num="6" id="1328" />
-<TGConnectingPoint num="7" id="1329" />
-<TGConnectingPoint num="8" id="1330" />
-<TGConnectingPoint num="9" id="1331" />
-<TGConnectingPoint num="10" id="1332" />
-<TGConnectingPoint num="11" id="1333" />
-<TGConnectingPoint num="12" id="1334" />
-<TGConnectingPoint num="13" id="1335" />
-<TGConnectingPoint num="14" id="1336" />
-<TGConnectingPoint num="15" id="1337" />
-<TGConnectingPoint num="16" id="1338" />
-<TGConnectingPoint num="17" id="1339" />
-<TGConnectingPoint num="18" id="1340" />
-<TGConnectingPoint num="19" id="1341" />
-<TGConnectingPoint num="20" id="1342" />
-<TGConnectingPoint num="21" id="1343" />
-<TGConnectingPoint num="22" id="1344" />
-<TGConnectingPoint num="23" id="1345" />
+<TGConnectingPoint num="0" id="1313" />
+<TGConnectingPoint num="1" id="1314" />
+<TGConnectingPoint num="2" id="1315" />
+<TGConnectingPoint num="3" id="1316" />
+<TGConnectingPoint num="4" id="1317" />
+<TGConnectingPoint num="5" id="1318" />
+<TGConnectingPoint num="6" id="1319" />
+<TGConnectingPoint num="7" id="1320" />
+<TGConnectingPoint num="8" id="1321" />
+<TGConnectingPoint num="9" id="1322" />
+<TGConnectingPoint num="10" id="1323" />
+<TGConnectingPoint num="11" id="1324" />
+<TGConnectingPoint num="12" id="1325" />
+<TGConnectingPoint num="13" id="1326" />
+<TGConnectingPoint num="14" id="1327" />
+<TGConnectingPoint num="15" id="1328" />
+<TGConnectingPoint num="16" id="1329" />
+<TGConnectingPoint num="17" id="1330" />
+<TGConnectingPoint num="18" id="1331" />
+<TGConnectingPoint num="19" id="1332" />
+<TGConnectingPoint num="20" id="1333" />
+<TGConnectingPoint num="21" id="1334" />
+<TGConnectingPoint num="22" id="1335" />
+<TGConnectingPoint num="23" id="1336" />
 <extraparam>
 <info stereotype="Timer" nodeName="Timer0" />
 <attributes index="1"  nIrq="2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5360" id="1371" >
+<COMPONENT type="5360" id="1362" >
 <cdparam x="909" y="102" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Copro0" value="name" />
-<TGConnectingPoint num="0" id="1347" />
-<TGConnectingPoint num="1" id="1348" />
-<TGConnectingPoint num="2" id="1349" />
-<TGConnectingPoint num="3" id="1350" />
-<TGConnectingPoint num="4" id="1351" />
-<TGConnectingPoint num="5" id="1352" />
-<TGConnectingPoint num="6" id="1353" />
-<TGConnectingPoint num="7" id="1354" />
-<TGConnectingPoint num="8" id="1355" />
-<TGConnectingPoint num="9" id="1356" />
-<TGConnectingPoint num="10" id="1357" />
-<TGConnectingPoint num="11" id="1358" />
-<TGConnectingPoint num="12" id="1359" />
-<TGConnectingPoint num="13" id="1360" />
-<TGConnectingPoint num="14" id="1361" />
-<TGConnectingPoint num="15" id="1362" />
-<TGConnectingPoint num="16" id="1363" />
-<TGConnectingPoint num="17" id="1364" />
-<TGConnectingPoint num="18" id="1365" />
-<TGConnectingPoint num="19" id="1366" />
-<TGConnectingPoint num="20" id="1367" />
-<TGConnectingPoint num="21" id="1368" />
-<TGConnectingPoint num="22" id="1369" />
-<TGConnectingPoint num="23" id="1370" />
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="4" id="1342" />
+<TGConnectingPoint num="5" id="1343" />
+<TGConnectingPoint num="6" id="1344" />
+<TGConnectingPoint num="7" id="1345" />
+<TGConnectingPoint num="8" id="1346" />
+<TGConnectingPoint num="9" id="1347" />
+<TGConnectingPoint num="10" id="1348" />
+<TGConnectingPoint num="11" id="1349" />
+<TGConnectingPoint num="12" id="1350" />
+<TGConnectingPoint num="13" id="1351" />
+<TGConnectingPoint num="14" id="1352" />
+<TGConnectingPoint num="15" id="1353" />
+<TGConnectingPoint num="16" id="1354" />
+<TGConnectingPoint num="17" id="1355" />
+<TGConnectingPoint num="18" id="1356" />
+<TGConnectingPoint num="19" id="1357" />
+<TGConnectingPoint num="20" id="1358" />
+<TGConnectingPoint num="21" id="1359" />
+<TGConnectingPoint num="22" id="1360" />
+<TGConnectingPoint num="23" id="1361" />
 <extraparam>
 <info stereotype="MWMR-CoPro" nodeName="Copro0" />
 <attributes srcid="1"  tgtid="2"  plaps="3"  fifoToCoprocDepth="4"  fifoFromCoprocDepth="5"  nToCopro="6"  nFromCopro="7"  nConfig="8"  nStatus="9"  useLLSC="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5359" id="1396" >
+<COMPONENT type="5359" id="1387" >
 <cdparam x="756" y="341" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="ICU0" value="name" />
-<TGConnectingPoint num="0" id="1372" />
-<TGConnectingPoint num="1" id="1373" />
-<TGConnectingPoint num="2" id="1374" />
-<TGConnectingPoint num="3" id="1375" />
-<TGConnectingPoint num="4" id="1376" />
-<TGConnectingPoint num="5" id="1377" />
-<TGConnectingPoint num="6" id="1378" />
-<TGConnectingPoint num="7" id="1379" />
-<TGConnectingPoint num="8" id="1380" />
-<TGConnectingPoint num="9" id="1381" />
-<TGConnectingPoint num="10" id="1382" />
-<TGConnectingPoint num="11" id="1383" />
-<TGConnectingPoint num="12" id="1384" />
-<TGConnectingPoint num="13" id="1385" />
-<TGConnectingPoint num="14" id="1386" />
-<TGConnectingPoint num="15" id="1387" />
-<TGConnectingPoint num="16" id="1388" />
-<TGConnectingPoint num="17" id="1389" />
-<TGConnectingPoint num="18" id="1390" />
-<TGConnectingPoint num="19" id="1391" />
-<TGConnectingPoint num="20" id="1392" />
-<TGConnectingPoint num="21" id="1393" />
-<TGConnectingPoint num="22" id="1394" />
-<TGConnectingPoint num="23" id="1395" />
+<TGConnectingPoint num="0" id="1363" />
+<TGConnectingPoint num="1" id="1364" />
+<TGConnectingPoint num="2" id="1365" />
+<TGConnectingPoint num="3" id="1366" />
+<TGConnectingPoint num="4" id="1367" />
+<TGConnectingPoint num="5" id="1368" />
+<TGConnectingPoint num="6" id="1369" />
+<TGConnectingPoint num="7" id="1370" />
+<TGConnectingPoint num="8" id="1371" />
+<TGConnectingPoint num="9" id="1372" />
+<TGConnectingPoint num="10" id="1373" />
+<TGConnectingPoint num="11" id="1374" />
+<TGConnectingPoint num="12" id="1375" />
+<TGConnectingPoint num="13" id="1376" />
+<TGConnectingPoint num="14" id="1377" />
+<TGConnectingPoint num="15" id="1378" />
+<TGConnectingPoint num="16" id="1379" />
+<TGConnectingPoint num="17" id="1380" />
+<TGConnectingPoint num="18" id="1381" />
+<TGConnectingPoint num="19" id="1382" />
+<TGConnectingPoint num="20" id="1383" />
+<TGConnectingPoint num="21" id="1384" />
+<TGConnectingPoint num="22" id="1385" />
+<TGConnectingPoint num="23" id="1386" />
 <extraparam>
 <info stereotype="ICU" nodeName="ICU0" />
 <attributes index="1"  nIrq="2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5355" id="1439" >
+<COMPONENT type="5355" id="1412" >
 <cdparam x="427" y="92" />
 <sizeparam width="451" height="201" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1415" />
-<TGConnectingPoint num="1" id="1416" />
-<TGConnectingPoint num="2" id="1417" />
-<TGConnectingPoint num="3" id="1418" />
-<TGConnectingPoint num="4" id="1419" />
-<TGConnectingPoint num="5" id="1420" />
-<TGConnectingPoint num="6" id="1421" />
-<TGConnectingPoint num="7" id="1422" />
-<TGConnectingPoint num="8" id="1423" />
-<TGConnectingPoint num="9" id="1424" />
-<TGConnectingPoint num="10" id="1425" />
-<TGConnectingPoint num="11" id="1426" />
-<TGConnectingPoint num="12" id="1427" />
-<TGConnectingPoint num="13" id="1428" />
-<TGConnectingPoint num="14" id="1429" />
-<TGConnectingPoint num="15" id="1430" />
-<TGConnectingPoint num="16" id="1431" />
-<TGConnectingPoint num="17" id="1432" />
-<TGConnectingPoint num="18" id="1433" />
-<TGConnectingPoint num="19" id="1434" />
-<TGConnectingPoint num="20" id="1435" />
-<TGConnectingPoint num="21" id="1436" />
-<TGConnectingPoint num="22" id="1437" />
-<TGConnectingPoint num="23" id="1438" />
+<TGConnectingPoint num="0" id="1388" />
+<TGConnectingPoint num="1" id="1389" />
+<TGConnectingPoint num="2" id="1390" />
+<TGConnectingPoint num="3" id="1391" />
+<TGConnectingPoint num="4" id="1392" />
+<TGConnectingPoint num="5" id="1393" />
+<TGConnectingPoint num="6" id="1394" />
+<TGConnectingPoint num="7" id="1395" />
+<TGConnectingPoint num="8" id="1396" />
+<TGConnectingPoint num="9" id="1397" />
+<TGConnectingPoint num="10" id="1398" />
+<TGConnectingPoint num="11" id="1399" />
+<TGConnectingPoint num="12" id="1400" />
+<TGConnectingPoint num="13" id="1401" />
+<TGConnectingPoint num="14" id="1402" />
+<TGConnectingPoint num="15" id="1403" />
+<TGConnectingPoint num="16" id="1404" />
+<TGConnectingPoint num="17" id="1405" />
+<TGConnectingPoint num="18" id="1406" />
+<TGConnectingPoint num="19" id="1407" />
+<TGConnectingPoint num="20" id="1408" />
+<TGConnectingPoint num="21" id="1409" />
+<TGConnectingPoint num="22" id="1410" />
+<TGConnectingPoint num="23" id="1411" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory0" />
 <attributes byteDataSize="4"  index="3" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5351" id="1507" >
+<COMPONENT type="5351" id="1437" >
 <cdparam x="159" y="89" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1483" />
-<TGConnectingPoint num="1" id="1484" />
-<TGConnectingPoint num="2" id="1485" />
-<TGConnectingPoint num="3" id="1486" />
-<TGConnectingPoint num="4" id="1487" />
-<TGConnectingPoint num="5" id="1488" />
-<TGConnectingPoint num="6" id="1489" />
-<TGConnectingPoint num="7" id="1490" />
-<TGConnectingPoint num="8" id="1491" />
-<TGConnectingPoint num="9" id="1492" />
-<TGConnectingPoint num="10" id="1493" />
-<TGConnectingPoint num="11" id="1494" />
-<TGConnectingPoint num="12" id="1495" />
-<TGConnectingPoint num="13" id="1496" />
-<TGConnectingPoint num="14" id="1497" />
-<TGConnectingPoint num="15" id="1498" />
-<TGConnectingPoint num="16" id="1499" />
-<TGConnectingPoint num="17" id="1500" />
-<TGConnectingPoint num="18" id="1501" />
-<TGConnectingPoint num="19" id="1502" />
-<TGConnectingPoint num="20" id="1503" />
-<TGConnectingPoint num="21" id="1504" />
-<TGConnectingPoint num="22" id="1505" />
-<TGConnectingPoint num="23" id="1506" />
+<TGConnectingPoint num="0" id="1413" />
+<TGConnectingPoint num="1" id="1414" />
+<TGConnectingPoint num="2" id="1415" />
+<TGConnectingPoint num="3" id="1416" />
+<TGConnectingPoint num="4" id="1417" />
+<TGConnectingPoint num="5" id="1418" />
+<TGConnectingPoint num="6" id="1419" />
+<TGConnectingPoint num="7" id="1420" />
+<TGConnectingPoint num="8" id="1421" />
+<TGConnectingPoint num="9" id="1422" />
+<TGConnectingPoint num="10" id="1423" />
+<TGConnectingPoint num="11" id="1424" />
+<TGConnectingPoint num="12" id="1425" />
+<TGConnectingPoint num="13" id="1426" />
+<TGConnectingPoint num="14" id="1427" />
+<TGConnectingPoint num="15" id="1428" />
+<TGConnectingPoint num="16" id="1429" />
+<TGConnectingPoint num="17" id="1430" />
+<TGConnectingPoint num="18" id="1431" />
+<TGConnectingPoint num="19" id="1432" />
+<TGConnectingPoint num="20" id="1433" />
+<TGConnectingPoint num="21" id="1434" />
+<TGConnectingPoint num="22" id="1435" />
+<TGConnectingPoint num="23" id="1436" />
 <extraparam>
 <info stereotype="CPU" nodeName="CPU0" />
 <attributes nbOfIrq="6"  iCacheWays="0"  iCacheSets="0"  iCacheWords="0"  dCacheWays="0"  dCacheSets="0"  dCacheWords="0" />
diff --git a/modeling/AVATAR/MicroWaveOven_SimpleSynchronousDeploy2CPU2RAM.xml b/modeling/AVATAR/MicroWaveOven_SimpleSynchronousDeploy2CPU2RAM.xml
index 486e4d5ee2..d8da2909a7 100644
--- a/modeling/AVATAR/MicroWaveOven_SimpleSynchronousDeploy2CPU2RAM.xml
+++ b/modeling/AVATAR/MicroWaveOven_SimpleSynchronousDeploy2CPU2RAM.xml
@@ -7,7 +7,7 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="MicroWaveOven;Bell;ControlPanel;Controller;Magnetron;Door;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="2" >
@@ -143,7 +143,7 @@
 <TGConnectingPoint num="23" id="32" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in ring()" />
+<Signal value="in ring()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="58" >
@@ -180,9 +180,9 @@
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
-<Signal value="in LEDOn()" />
-<Signal value="in LEDoff()" />
-<Signal value="out startButton(int duration)" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="83" >
@@ -220,15 +220,15 @@
 <CryptoBlock value="false" />
 <Attribute access="0" id="duration" value="5" type="8" typeOther="" />
 <Attribute access="0" id="remainingTime" value="0" type="8" typeOther="" />
-<Signal value="in start(int duration)" />
-<Signal value="in closed()" />
-<Signal value="in open()" />
-<Signal value="out ringBell()" />
-<Signal value="out startMagnetron()" />
-<Signal value="out stopMagnetron()" />
-<Signal value="out startCooking()" />
-<Signal value="out stopCooking()" />
-<Signal value="out okDoor()" />
+<Signal value="in start(int duration)" attached="true" />
+<Signal value="in closed()" attached="true" />
+<Signal value="in open()" attached="true" />
+<Signal value="out ringBell()" attached="true" />
+<Signal value="out startMagnetron()" attached="true" />
+<Signal value="out stopMagnetron()" attached="true" />
+<Signal value="out startCooking()" attached="false" />
+<Signal value="out stopCooking()" attached="false" />
+<Signal value="out okDoor()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="108" >
@@ -265,8 +265,8 @@
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Signal value="in startM()" />
-<Signal value="in stopM()" />
+<Signal value="in startM()" attached="true" />
+<Signal value="in stopM()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="133" >
@@ -302,9 +302,9 @@
 <TGConnectingPoint num="23" id="132" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="out closed()" />
-<Signal value="out open()" />
-<Signal value="in okDoor()" />
+<Signal value="out closed()" attached="true" />
+<Signal value="out open()" attached="true" />
+<Signal value="in okDoor()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3058,7 +3058,7 @@
 <TGConnectingPoint num="23" id="1413" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory1" />
-<attributes byteDataSize="4"  index="1024" />
+<attributes byteDataSize="4096"  index="1024" />
 </extraparam>
 </COMPONENT>
 
@@ -3094,7 +3094,7 @@
 <TGConnectingPoint num="23" id="1474" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory0" />
-<attributes byteDataSize="1024"  index="3" />
+<attributes byteDataSize="4096"  index="3" />
 </extraparam>
 </COMPONENT>
 <SUBCOMPONENT type="5362" id="1423" >
diff --git a/modeling/DASIP2016/DASIP2016_2RAM.xml b/modeling/DASIP2016/DASIP2016_2RAM.xml
index e1872b1047..a2ab50da6c 100644
--- a/modeling/DASIP2016/DASIP2016_2RAM.xml
+++ b/modeling/DASIP2016/DASIP2016_2RAM.xml
@@ -8,8 +8,8 @@
 <cdparam x="472" y="108" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="460" y="109" id="29" />
-<P2  x="195" y="81" id="219" />
+<P1  x="460" y="109" id="23" />
+<P2  x="208" y="94" id="215" />
 <Point x="460" y="95" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1" >
@@ -25,16 +25,16 @@
 <cdparam x="168" y="107" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="195" y="174" id="217" />
-<P2  x="355" y="174" id="31" />
+<P1  x="208" y="187" id="217" />
+<P2  x="342" y="187" id="21" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="5" >
 <cdparam x="1018" y="479" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1018" y="479" id="204" />
-<P2  x="525" y="154" id="27" />
+<P1  x="1018" y="479" id="196" />
+<P2  x="538" y="167" id="25" />
 <Point x="1018" y="168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="4" >
@@ -50,15 +50,15 @@
 <cdparam x="221" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="195" y="125" id="215" />
-<P2  x="355" y="125" id="25" />
+<P1  x="208" y="138" id="219" />
+<P2  x="342" y="138" id="27" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="7" >
 <cdparam x="1309" y="685" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1360" y="664" id="53" />
+<P1  x="1360" y="690" id="55" />
 <P2  x="1415" y="739" id="42" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -66,16 +66,16 @@
 <cdparam x="1183" y="534" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1138" y="555" id="196" />
-<P2  x="1241" y="625" id="55" />
+<P1  x="1138" y="581" id="204" />
+<P2  x="1228" y="638" id="53" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="9" >
 <cdparam x="1555" y="370" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1353" y="380" id="183" />
-<P2  x="1449" y="380" id="66" />
+<P1  x="1366" y="393" id="185" />
+<P2  x="1436" y="393" id="66" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="10" >
@@ -83,23 +83,23 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
 <P1  x="1080" y="479" id="200" />
-<P2  x="1160" y="382" id="185" />
+<P2  x="1147" y="395" id="183" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="11" >
 <cdparam x="843" y="483" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="828" y="457" id="129" />
-<P2  x="977" y="518" id="202" />
+<P1  x="841" y="470" id="133" />
+<P2  x="964" y="531" id="198" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="12" >
 <cdparam x="686" y="624" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="692" y="584" id="159" />
-<P2  x="692" y="487" id="127" />
+<P1  x="692" y="584" id="161" />
+<P2  x="692" y="513" id="135" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="13" >
@@ -107,15 +107,15 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
 <P1  x="695" y="707" id="172" />
-<P2  x="695" y="646" id="161" />
+<P2  x="695" y="672" id="159" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="14" >
 <cdparam x="247" y="495" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="208" id="23" />
-<P2  x="301" y="454" id="88" />
+<P1  x="375" y="234" id="29" />
+<P2  x="301" y="454" id="92" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="15" >
@@ -123,47 +123,47 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
 <P1  x="263" y="605" id="77" />
-<P2  x="317" y="516" id="90" />
+<P2  x="317" y="542" id="90" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="16" >
 <cdparam x="247" y="467" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="480" y="208" id="21" />
-<P2  x="521" y="291" id="103" />
+<P1  x="480" y="234" id="31" />
+<P2  x="521" y="291" id="105" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="17" >
 <cdparam x="555" y="415" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="548" y="495" id="92" />
-<P2  x="605" y="479" id="131" />
+<P1  x="561" y="508" id="88" />
+<P2  x="592" y="492" id="131" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="18" >
 <cdparam x="531" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="569" y="351" id="105" />
-<P2  x="605" y="444" id="133" />
+<P1  x="569" y="377" id="103" />
+<P2  x="592" y="457" id="129" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="19" >
 <cdparam x="708" y="372" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="708" y="359" id="146" />
-<P2  x="708" y="421" id="135" />
+<P1  x="708" y="385" id="148" />
+<P2  x="708" y="421" id="127" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="20" >
 <cdparam x="707" y="234" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="706" y="116" id="116" />
-<P2  x="706" y="302" id="148" />
+<P1  x="706" y="142" id="116" />
+<P2  x="706" y="302" id="146" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1202" id="41" >
@@ -187,14 +187,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="22" >
 <father id="41" num="0" />
-<cdparam x="467" y="208" />
+<cdparam x="342" y="174" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Event emergencyBrake" />
+<infoparam name="Primitive port" value="Channel neighbourhoodData" />
 <TGConnectingPoint num="0" id="21" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="neighbourhoodData" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -204,14 +204,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="24" >
 <father id="41" num="1" />
-<cdparam x="362" y="208" />
+<cdparam x="447" y="109" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Channel neighbourhoodInfo" />
+<infoparam name="Primitive port" value="Event broadcastInfoEmergencyBraking" />
 <TGConnectingPoint num="0" id="23" />
 <extraparam>
-<Prop commName="neighbourhoodInfo" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="broadcastInfoEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -221,14 +221,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="26" >
 <father id="41" num="2" />
-<cdparam x="342" y="125" />
+<cdparam x="512" y="154" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Event DSRCEmergencyBrake" />
+<infoparam name="Primitive port" value="Event sendEmergencyBraking" />
 <TGConnectingPoint num="0" id="25" />
 <extraparam>
-<Prop commName="DSRCEmergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sendEmergencyBraking" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -238,14 +238,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="28" >
 <father id="41" num="3" />
-<cdparam x="512" y="154" />
+<cdparam x="342" y="125" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Event sendEmergencyBraking" />
+<infoparam name="Primitive port" value="Event DSRCEmergencyBrake" />
 <TGConnectingPoint num="0" id="27" />
 <extraparam>
-<Prop commName="sendEmergencyBraking" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="DSRCEmergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -255,14 +255,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="30" >
 <father id="41" num="4" />
-<cdparam x="447" y="109" />
+<cdparam x="362" y="208" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Event broadcastInfoEmergencyBraking" />
+<infoparam name="Primitive port" value="Channel neighbourhoodInfo" />
 <TGConnectingPoint num="0" id="29" />
 <extraparam>
-<Prop commName="broadcastInfoEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="neighbourhoodInfo" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -272,14 +272,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="32" >
 <father id="41" num="5" />
-<cdparam x="342" y="174" />
+<cdparam x="467" y="208" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="157" minY="-13" maxY="86" />
-<infoparam name="Primitive port" value="Channel neighbourhoodData" />
+<infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="31" />
 <extraparam>
-<Prop commName="neighbourhoodData" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -342,14 +342,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="54" >
 <father id="65" num="0" />
-<cdparam x="1347" y="664" />
+<cdparam x="1228" y="625" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="232" minY="-13" maxY="51" />
-<infoparam name="Primitive port" value="Event commandDP" />
+<infoparam name="Primitive port" value="Event drivingPowerReduction" />
 <TGConnectingPoint num="0" id="53" />
 <extraparam>
-<Prop commName="commandDP" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="drivingPowerReduction" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -359,14 +359,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="56" >
 <father id="65" num="1" />
-<cdparam x="1228" y="625" />
+<cdparam x="1347" y="664" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="232" minY="-13" maxY="51" />
-<infoparam name="Primitive port" value="Event drivingPowerReduction" />
+<infoparam name="Primitive port" value="Event commandDP" />
 <TGConnectingPoint num="0" id="55" />
 <extraparam>
-<Prop commName="drivingPowerReduction" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="commandDP" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -464,14 +464,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="89" >
 <father id="102" num="0" />
-<cdparam x="288" y="454" />
+<cdparam x="535" y="495" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="262" minY="-13" maxY="49" />
-<infoparam name="Primitive port" value="Channel neighbourhoodInfo" />
+<infoparam name="Primitive port" value="Channel neigbourhoodTable" />
 <TGConnectingPoint num="0" id="88" />
 <extraparam>
-<Prop commName="neighbourhoodInfo" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="neigbourhoodTable" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -498,14 +498,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="93" >
 <father id="102" num="2" />
-<cdparam x="535" y="495" />
+<cdparam x="288" y="454" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="262" minY="-13" maxY="49" />
-<infoparam name="Primitive port" value="Channel neigbourhoodTable" />
+<infoparam name="Primitive port" value="Channel neighbourhoodInfo" />
 <TGConnectingPoint num="0" id="92" />
 <extraparam>
-<Prop commName="neigbourhoodTable" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="neighbourhoodInfo" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -533,14 +533,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="104" >
 <father id="115" num="0" />
-<cdparam x="508" y="291" />
+<cdparam x="556" y="351" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="163" minY="-13" maxY="47" />
 <infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="103" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -550,14 +550,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="106" >
 <father id="115" num="1" />
-<cdparam x="556" y="351" />
+<cdparam x="508" y="291" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="163" minY="-13" maxY="47" />
 <infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="105" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -620,14 +620,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="128" >
 <father id="145" num="0" />
-<cdparam x="679" y="487" />
+<cdparam x="695" y="421" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="210" minY="-13" maxY="53" />
-<infoparam name="Primitive port" value="Channel vehicleDynamics" />
+<infoparam name="Primitive port" value="Channel objList01" />
 <TGConnectingPoint num="0" id="127" />
 <extraparam>
-<Prop commName="vehicleDynamics" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="objList01" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -637,14 +637,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="130" >
 <father id="145" num="1" />
-<cdparam x="815" y="457" />
+<cdparam x="592" y="444" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="210" minY="-13" maxY="53" />
 <infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="129" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -671,14 +671,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="134" >
 <father id="145" num="3" />
-<cdparam x="592" y="444" />
+<cdparam x="815" y="457" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="210" minY="-13" maxY="53" />
 <infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="133" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -688,14 +688,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="136" >
 <father id="145" num="4" />
-<cdparam x="695" y="421" />
+<cdparam x="679" y="487" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="210" minY="-13" maxY="53" />
-<infoparam name="Primitive port" value="Channel objList01" />
+<infoparam name="Primitive port" value="Channel vehicleDynamics" />
 <TGConnectingPoint num="0" id="135" />
 <extraparam>
-<Prop commName="objList01" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="vehicleDynamics" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -723,14 +723,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="147" >
 <father id="158" num="0" />
-<cdparam x="695" y="359" />
+<cdparam x="693" y="302" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="214" minY="-13" maxY="44" />
-<infoparam name="Primitive port" value="Channel objList01" />
+<infoparam name="Primitive port" value="Channel rawData01" />
 <TGConnectingPoint num="0" id="146" />
 <extraparam>
-<Prop commName="objList01" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="rawData01" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -740,14 +740,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="149" >
 <father id="158" num="1" />
-<cdparam x="693" y="302" />
+<cdparam x="695" y="359" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="214" minY="-13" maxY="44" />
-<infoparam name="Primitive port" value="Channel rawData01" />
+<infoparam name="Primitive port" value="Channel objList01" />
 <TGConnectingPoint num="0" id="148" />
 <extraparam>
-<Prop commName="rawData01" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="objList01" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -775,14 +775,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="160" >
 <father id="171" num="0" />
-<cdparam x="679" y="584" />
+<cdparam x="682" y="646" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="229" minY="-13" maxY="49" />
-<infoparam name="Primitive port" value="Channel vehicleDynamics" />
+<infoparam name="Primitive port" value="Channel rawData02" />
 <TGConnectingPoint num="0" id="159" />
 <extraparam>
-<Prop commName="vehicleDynamics" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="rawData02" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -792,14 +792,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="162" >
 <father id="171" num="1" />
-<cdparam x="682" y="646" />
+<cdparam x="679" y="584" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="229" minY="-13" maxY="49" />
-<infoparam name="Primitive port" value="Channel rawData02" />
+<infoparam name="Primitive port" value="Channel vehicleDynamics" />
 <TGConnectingPoint num="0" id="161" />
 <extraparam>
-<Prop commName="rawData02" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="vehicleDynamics" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -862,14 +862,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="184" >
 <father id="195" num="0" />
-<cdparam x="1340" y="380" />
+<cdparam x="1147" y="382" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="180" minY="-13" maxY="47" />
-<infoparam name="Primitive port" value="Event brake" />
+<infoparam name="Primitive port" value="Event brakeCommand" />
 <TGConnectingPoint num="0" id="183" />
 <extraparam>
-<Prop commName="brake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="brakeCommand" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -879,14 +879,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="186" >
 <father id="195" num="1" />
-<cdparam x="1147" y="382" />
+<cdparam x="1340" y="380" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="180" minY="-13" maxY="47" />
-<infoparam name="Primitive port" value="Event brakeCommand" />
+<infoparam name="Primitive port" value="Event brake" />
 <TGConnectingPoint num="0" id="185" />
 <extraparam>
-<Prop commName="brakeCommand" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="brake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -914,14 +914,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="197" >
 <father id="214" num="0" />
-<cdparam x="1125" y="555" />
+<cdparam x="1005" y="479" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="63" />
-<infoparam name="Primitive port" value="Event drivingPowerReduction" />
+<infoparam name="Primitive port" value="Event sendEmergencyBraking" />
 <TGConnectingPoint num="0" id="196" />
 <extraparam>
-<Prop commName="drivingPowerReduction" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sendEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -931,14 +931,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="199" >
 <father id="214" num="1" />
-<cdparam x="1164" y="519" />
+<cdparam x="964" y="518" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="63" />
-<infoparam name="Primitive port" value="Event infoEmergencyBraking" />
+<infoparam name="Primitive port" value="Event emergencyBrake" />
 <TGConnectingPoint num="0" id="198" />
 <extraparam>
-<Prop commName="infoEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -965,14 +965,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="203" >
 <father id="214" num="3" />
-<cdparam x="964" y="518" />
+<cdparam x="1164" y="519" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="63" />
-<infoparam name="Primitive port" value="Event emergencyBrake" />
+<infoparam name="Primitive port" value="Event infoEmergencyBraking" />
 <TGConnectingPoint num="0" id="202" />
 <extraparam>
-<Prop commName="emergencyBrake" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="infoEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -982,14 +982,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="205" >
 <father id="214" num="4" />
-<cdparam x="1005" y="479" />
+<cdparam x="1125" y="555" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="63" />
-<infoparam name="Primitive port" value="Event sendEmergencyBraking" />
+<infoparam name="Primitive port" value="Event drivingPowerReduction" />
 <TGConnectingPoint num="0" id="204" />
 <extraparam>
-<Prop commName="sendEmergencyBraking" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="drivingPowerReduction" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1017,14 +1017,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="216" >
 <father id="229" num="0" />
-<cdparam x="182" y="125" />
+<cdparam x="182" y="81" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="145" minY="-13" maxY="136" />
-<infoparam name="Primitive port" value="Event DSRCEmergencyBrake" />
+<infoparam name="Primitive port" value="Event broadcastInfoEmergencyBraking" />
 <TGConnectingPoint num="0" id="215" />
 <extraparam>
-<Prop commName="DSRCEmergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="broadcastInfoEmergencyBraking" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1051,14 +1051,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="220" >
 <father id="229" num="2" />
-<cdparam x="182" y="81" />
+<cdparam x="182" y="125" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="145" minY="-13" maxY="136" />
-<infoparam name="Primitive port" value="Event broadcastInfoEmergencyBraking" />
+<infoparam name="Primitive port" value="Event DSRCEmergencyBrake" />
 <TGConnectingPoint num="0" id="219" />
 <extraparam>
-<Prop commName="broadcastInfoEmergencyBraking" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="DSRCEmergencyBrake" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1419,11 +1419,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="336" >
 <father id="370" num="0" />
-<cdparam x="1463" y="1073" />
-<sizeparam width="231" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1416" y="1017" />
+<sizeparam width="278" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="31" minY="0" maxY="122" />
-<infoparam name="TGComponent" value="Braking - FV::BrakeManagement" />
+<cdrectangleparam minX="0" maxX="-16" minY="0" maxY="122" />
+<infoparam name="TGComponent" value="Braking - FV::DangerAvoidanceStrategy" />
 <TGConnectingPoint num="0" id="328" />
 <TGConnectingPoint num="1" id="329" />
 <TGConnectingPoint num="2" id="330" />
@@ -1433,16 +1433,16 @@
 <TGConnectingPoint num="6" id="334" />
 <TGConnectingPoint num="7" id="335" />
 <extraparam>
-<info value="Braking - FV::BrakeManagement" taskName="BrakeManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::DangerAvoidanceStrategy" taskName="DangerAvoidanceStrategy" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="345" >
 <father id="370" num="1" />
-<cdparam x="1416" y="1017" />
-<sizeparam width="278" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1463" y="1073" />
+<sizeparam width="231" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="-16" minY="0" maxY="122" />
-<infoparam name="TGComponent" value="Braking - FV::DangerAvoidanceStrategy" />
+<cdrectangleparam minX="0" maxX="31" minY="0" maxY="122" />
+<infoparam name="TGComponent" value="Braking - FV::BrakeManagement" />
 <TGConnectingPoint num="0" id="337" />
 <TGConnectingPoint num="1" id="338" />
 <TGConnectingPoint num="2" id="339" />
@@ -1452,7 +1452,7 @@
 <TGConnectingPoint num="6" id="343" />
 <TGConnectingPoint num="7" id="344" />
 <extraparam>
-<info value="Braking - FV::DangerAvoidanceStrategy" taskName="DangerAvoidanceStrategy" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::BrakeManagement" taskName="BrakeManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1711,11 +1711,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="522" >
 <father id="565" num="0" />
-<cdparam x="670" y="1047" />
-<sizeparam width="298" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="711" y="927" />
+<sizeparam width="257" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="-21" minY="0" maxY="171" />
-<infoparam name="TGComponent" value="Braking - FV::VehicleDynamicsManagement" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="171" />
+<infoparam name="TGComponent" value="Braking - FV::ObjectListManagement" />
 <TGConnectingPoint num="0" id="514" />
 <TGConnectingPoint num="1" id="515" />
 <TGConnectingPoint num="2" id="516" />
@@ -1725,7 +1725,7 @@
 <TGConnectingPoint num="6" id="520" />
 <TGConnectingPoint num="7" id="521" />
 <extraparam>
-<info value="Braking - FV::VehicleDynamicsManagement" taskName="VehicleDynamicsManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::ObjectListManagement" taskName="ObjectListManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="531" >
@@ -1749,11 +1749,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="540" >
 <father id="565" num="2" />
-<cdparam x="711" y="927" />
-<sizeparam width="257" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="670" y="1047" />
+<sizeparam width="298" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="171" />
-<infoparam name="TGComponent" value="Braking - FV::ObjectListManagement" />
+<cdrectangleparam minX="0" maxX="-21" minY="0" maxY="171" />
+<infoparam name="TGComponent" value="Braking - FV::VehicleDynamicsManagement" />
 <TGConnectingPoint num="0" id="532" />
 <TGConnectingPoint num="1" id="533" />
 <TGConnectingPoint num="2" id="534" />
@@ -1763,7 +1763,7 @@
 <TGConnectingPoint num="6" id="538" />
 <TGConnectingPoint num="7" id="539" />
 <extraparam>
-<info value="Braking - FV::ObjectListManagement" taskName="ObjectListManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::VehicleDynamicsManagement" taskName="VehicleDynamicsManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2528,11 +2528,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="1060" >
 <father id="1103" num="0" />
-<cdparam x="179" y="230" />
-<sizeparam width="323" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="204" y="285" />
+<sizeparam width="230" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="-17" minY="0" maxY="165" />
-<infoparam name="TGComponent" value="Braking - FV::NeighbourhoodTableManagement" />
+<cdrectangleparam minX="0" maxX="76" minY="0" maxY="165" />
+<infoparam name="TGComponent" value="Braking - FV::DSRCManagement" />
 <TGConnectingPoint num="0" id="1052" />
 <TGConnectingPoint num="1" id="1053" />
 <TGConnectingPoint num="2" id="1054" />
@@ -2542,7 +2542,7 @@
 <TGConnectingPoint num="6" id="1058" />
 <TGConnectingPoint num="7" id="1059" />
 <extraparam>
-<info value="Braking - FV::NeighbourhoodTableManagement" taskName="NeighbourhoodTableManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::DSRCManagement" taskName="DSRCManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1069" >
@@ -2566,11 +2566,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1078" >
 <father id="1103" num="2" />
-<cdparam x="204" y="285" />
-<sizeparam width="230" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="179" y="230" />
+<sizeparam width="323" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="76" minY="0" maxY="165" />
-<infoparam name="TGComponent" value="Braking - FV::DSRCManagement" />
+<cdrectangleparam minX="0" maxX="-17" minY="0" maxY="165" />
+<infoparam name="TGComponent" value="Braking - FV::NeighbourhoodTableManagement" />
 <TGConnectingPoint num="0" id="1070" />
 <TGConnectingPoint num="1" id="1071" />
 <TGConnectingPoint num="2" id="1072" />
@@ -2580,7 +2580,7 @@
 <TGConnectingPoint num="6" id="1076" />
 <TGConnectingPoint num="7" id="1077" />
 <extraparam>
-<info value="Braking - FV::DSRCManagement" taskName="DSRCManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
+<info value="Braking - FV::NeighbourhoodTableManagement" taskName="NeighbourhoodTableManagement" referenceTaskName="Braking - FV" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5796,8 +5796,8 @@
 <TGConnectingPoint num="0" id="2673" />
 <TGConnectingPoint num="1" id="2674" />
 <TGConnectingPoint num="2" id="2675" />
-<P1  x="168" y="553" id="2883" />
-<P2  x="465" y="1085" id="3037" />
+<P1  x="168" y="553" id="2933" />
+<P2  x="465" y="1085" id="3062" />
 <Point x="367" y="632" />
 <Point x="367" y="915" />
 <AutomaticDrawing  data="true" />
@@ -5842,7 +5842,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2679" />
-<P1  x="465" y="1210" id="3039" />
+<P1  x="465" y="1210" id="3064" />
 <P2  x="362" y="1208" id="2990" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -5856,8 +5856,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2681" />
-<P1  x="777" y="1148" id="3031" />
-<P2  x="825" y="1148" id="3055" />
+<P1  x="777" y="1148" id="3056" />
+<P2  x="825" y="1148" id="3030" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in brake(int value)" />
@@ -5870,7 +5870,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2683" />
-<P1  x="621" y="1023" id="3028" />
+<P1  x="621" y="1023" id="3053" />
 <P2  x="527" y="862" id="3133" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -5887,7 +5887,7 @@
 <TGConnectingPoint num="1" id="2688" />
 <TGConnectingPoint num="2" id="2689" />
 <P1  x="587" y="862" id="3142" />
-<P2  x="973" y="855" id="3166" />
+<P2  x="973" y="855" id="3116" />
 <Point x="587" y="895" />
 <Point x="971" y="895" />
 <AutomaticDrawing  data="true" />
@@ -5918,8 +5918,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2691" />
-<P1  x="1057" y="276" id="2733" />
-<P2  x="973" y="707" id="3160" />
+<P1  x="1057" y="276" id="2833" />
+<P2  x="973" y="707" id="3110" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in updateOnSpeed(int speed)" />
@@ -5933,7 +5933,7 @@
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2693" />
 <P1  x="648" y="820" id="3140" />
-<P2  x="670" y="821" id="3114" />
+<P2  x="670" y="821" id="3164" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getInfoOnObstacle(int obstacle)" />
@@ -5946,8 +5946,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2695" />
-<P1  x="883" y="276" id="2767" />
-<P2  x="835" y="704" id="3111" />
+<P1  x="883" y="276" id="2817" />
+<P2  x="835" y="704" id="3161" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in isObstacleAhead(int info)" />
@@ -5960,7 +5960,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2697" />
-<P1  x="749" y="555" id="2942" />
+<P1  x="749" y="555" id="2892" />
 <P2  x="527" y="695" id="3128" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -5974,8 +5974,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2699" />
-<P1  x="297" y="553" id="2884" />
-<P2  x="596" y="555" id="2932" />
+<P1  x="297" y="553" id="2934" />
+<P2  x="596" y="555" id="2882" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in getEmergencyBrakingMessage(int id, int position)" />
@@ -5988,7 +5988,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2701" />
-<P1  x="297" y="460" id="2881" />
+<P1  x="297" y="460" id="2931" />
 <P2  x="329" y="464" id="2905" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -6002,8 +6002,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2703" />
-<P1  x="128" y="282" id="2808" />
-<P2  x="168" y="368" id="2878" />
+<P1  x="128" y="282" id="2758" />
+<P2  x="168" y="368" id="2928" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in carPosition(int id, int position)" />
@@ -6016,8 +6016,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2705" />
-<P1  x="284" y="282" id="2841" />
-<P2  x="232" y="368" id="2886" />
+<P1  x="284" y="282" id="2741" />
+<P2  x="232" y="368" id="2936" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in obstacleDetected(int id, int position)" />
@@ -6124,11 +6124,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="2751" >
 <father id="2876" num="0" />
-<cdparam x="959" y="98" />
-<sizeparam width="196" height="178" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="237" y="98" />
+<sizeparam width="190" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="950" minY="0" maxY="72" />
-<infoparam name="Block0" value="SpeedSensor" />
+<cdrectangleparam minX="0" maxX="956" minY="0" maxY="66" />
+<infoparam name="Block0" value="EmergencySimulator" />
 <TGConnectingPoint num="0" id="2727" />
 <TGConnectingPoint num="1" id="2728" />
 <TGConnectingPoint num="2" id="2729" />
@@ -6155,20 +6155,21 @@
 <TGConnectingPoint num="23" id="2750" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="minSpeedUpdate" value="150" type="8" typeOther="" />
-<Attribute access="0" id="maxSpeedUpdate" value="150" type="8" typeOther="" />
-<Attribute access="0" id="speed" value="" type="8" typeOther="" />
-<Attribute access="0" id="carinfo" value="" type="5" typeOther="CarInfo" />
-<Signal value="out updateOnSpeed(int speed)" />
+<Attribute access="0" id="minEmergencyInterval" value="1000" type="8" typeOther="" />
+<Attribute access="0" id="maxEmergencyInterval" value="1000" type="8" typeOther="" />
+<Attribute access="0" id="carid" value="" type="5" typeOther="CarInfo" />
+<Attribute access="0" id="id" value="" type="8" typeOther="" />
+<Attribute access="0" id="position" value="" type="8" typeOther="" />
+<Signal value="out obstacleDetected(int id, int position)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2776" >
 <father id="2876" num="1" />
-<cdparam x="701" y="100" />
-<sizeparam width="243" height="176" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="32" y="98" />
+<sizeparam width="193" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="903" minY="0" maxY="74" />
-<infoparam name="Block0" value="RadarSensor" />
+<cdrectangleparam minX="0" maxX="953" minY="0" maxY="66" />
+<infoparam name="Block0" value="CarPositionSimulator" />
 <TGConnectingPoint num="0" id="2752" />
 <TGConnectingPoint num="1" id="2753" />
 <TGConnectingPoint num="2" id="2754" />
@@ -6195,10 +6196,12 @@
 <TGConnectingPoint num="23" id="2775" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="minRadarUpdate" value="100" type="8" typeOther="" />
-<Attribute access="0" id="maxRadarUpdate" value="150" type="8" typeOther="" />
-<Attribute access="0" id="obstacleAhead" value="" type="8" typeOther="" />
-<Signal value="out obstacleAhead(int info)" />
+<Attribute access="0" id="carid" value="" type="5" typeOther="CarInfo" />
+<Attribute access="0" id="minCarPositionInterval" value="200" type="8" typeOther="" />
+<Attribute access="0" id="maxCarPositionInterval" value="250" type="8" typeOther="" />
+<Attribute access="0" id="id" value="" type="8" typeOther="" />
+<Attribute access="0" id="position" value="" type="8" typeOther="" />
+<Signal value="out carPosition(int id, int position)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2801" >
@@ -6238,16 +6241,16 @@
 <Attribute access="0" id="maxGPSUpdate" value="100" type="8" typeOther="" />
 <Attribute access="0" id="position" value="" type="8" typeOther="" />
 <Attribute access="0" id="carinfo" value="" type="5" typeOther="CarInfo" />
-<Signal value="out setPosition(int currentPosition)" />
+<Signal value="out setPosition(int currentPosition)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2826" >
 <father id="2876" num="3" />
-<cdparam x="32" y="98" />
-<sizeparam width="193" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="953" minY="0" maxY="66" />
-<infoparam name="Block0" value="CarPositionSimulator" />
+<cdparam x="701" y="100" />
+<sizeparam width="243" height="176" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="903" minY="0" maxY="74" />
+<infoparam name="Block0" value="RadarSensor" />
 <TGConnectingPoint num="0" id="2802" />
 <TGConnectingPoint num="1" id="2803" />
 <TGConnectingPoint num="2" id="2804" />
@@ -6274,21 +6277,19 @@
 <TGConnectingPoint num="23" id="2825" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="carid" value="" type="5" typeOther="CarInfo" />
-<Attribute access="0" id="minCarPositionInterval" value="200" type="8" typeOther="" />
-<Attribute access="0" id="maxCarPositionInterval" value="250" type="8" typeOther="" />
-<Attribute access="0" id="id" value="" type="8" typeOther="" />
-<Attribute access="0" id="position" value="" type="8" typeOther="" />
-<Signal value="out carPosition(int id, int position)" />
+<Attribute access="0" id="minRadarUpdate" value="100" type="8" typeOther="" />
+<Attribute access="0" id="maxRadarUpdate" value="150" type="8" typeOther="" />
+<Attribute access="0" id="obstacleAhead" value="" type="8" typeOther="" />
+<Signal value="out obstacleAhead(int info)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2851" >
 <father id="2876" num="4" />
-<cdparam x="237" y="98" />
-<sizeparam width="190" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="959" y="98" />
+<sizeparam width="196" height="178" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="956" minY="0" maxY="66" />
-<infoparam name="Block0" value="EmergencySimulator" />
+<cdrectangleparam minX="0" maxX="950" minY="0" maxY="72" />
+<infoparam name="Block0" value="SpeedSensor" />
 <TGConnectingPoint num="0" id="2827" />
 <TGConnectingPoint num="1" id="2828" />
 <TGConnectingPoint num="2" id="2829" />
@@ -6315,12 +6316,11 @@
 <TGConnectingPoint num="23" id="2850" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="minEmergencyInterval" value="1000" type="8" typeOther="" />
-<Attribute access="0" id="maxEmergencyInterval" value="1000" type="8" typeOther="" />
-<Attribute access="0" id="carid" value="" type="5" typeOther="CarInfo" />
-<Attribute access="0" id="id" value="" type="8" typeOther="" />
-<Attribute access="0" id="position" value="" type="8" typeOther="" />
-<Signal value="out obstacleDetected(int id, int position)" />
+<Attribute access="0" id="minSpeedUpdate" value="150" type="8" typeOther="" />
+<Attribute access="0" id="maxSpeedUpdate" value="150" type="8" typeOther="" />
+<Attribute access="0" id="speed" value="" type="8" typeOther="" />
+<Attribute access="0" id="carinfo" value="" type="5" typeOther="CarInfo" />
+<Signal value="out updateOnSpeed(int speed)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6360,11 +6360,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="2901" >
 <father id="2976" num="0" />
-<cdparam x="40" y="368" />
-<sizeparam width="257" height="185" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="596" y="371" />
+<sizeparam width="204" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="533" minY="0" maxY="83" />
-<infoparam name="Block0" value="DSRSC_Management" />
+<cdrectangleparam minX="0" maxX="586" minY="0" maxY="84" />
+<infoparam name="Block0" value="CorrectnessChecking" />
 <TGConnectingPoint num="0" id="2877" />
 <TGConnectingPoint num="1" id="2878" />
 <TGConnectingPoint num="2" id="2879" />
@@ -6393,12 +6393,12 @@
 <CryptoBlock value="false" />
 <Attribute access="0" id="id" value="" type="8" typeOther="" />
 <Attribute access="0" id="position" value="" type="8" typeOther="" />
-<Method value="sendMessage(int id, int position)" />
-<Signal value="in obstacleDetected(int id, int position)" />
-<Signal value="in carPosition(int id, int position)" />
-<Signal value="out setCarPosition(int id, int position)" />
-<Signal value="out forwardEmergencyBrakingMessage(int id, int position)" />
-<Signal value="in broadcastEmergencyBrakingMessage(int id, int position)" />
+<Attribute access="0" id="canHaveInvalid" value="false" type="4" typeOther="" />
+<Method value="checkingMessage()" />
+<Method value="invalidMessage()" />
+<Method value="validMessage()" />
+<Signal value="in getEmergencyBrakingMessage(int id, int position)" attached="true" />
+<Signal value="out toPlausibityCheckMessage(int id, int position)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2926" >
@@ -6439,18 +6439,18 @@
 <Attribute access="0" id="time_id" value="" type="8" typeOther="" />
 <Attribute access="0" id="listOfNodes" value="" type="5" typeOther="NodeList" />
 <Attribute access="0" id="currentPosition" value="" type="8" typeOther="" />
-<Signal value="in addANode(int id, int position)" />
-<Signal value="in setPosition(int currentPosition)" />
-<Signal value="out sendTable(int currentPosition, NodeList list)" />
+<Signal value="in addANode(int id, int position)" attached="true" />
+<Signal value="in setPosition(int currentPosition)" attached="true" />
+<Signal value="out sendTable(int currentPosition, NodeList list)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2951" >
 <father id="2976" num="2" />
-<cdparam x="596" y="371" />
-<sizeparam width="204" height="184" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="40" y="368" />
+<sizeparam width="257" height="185" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="586" minY="0" maxY="84" />
-<infoparam name="Block0" value="CorrectnessChecking" />
+<cdrectangleparam minX="0" maxX="533" minY="0" maxY="83" />
+<infoparam name="Block0" value="DSRSC_Management" />
 <TGConnectingPoint num="0" id="2927" />
 <TGConnectingPoint num="1" id="2928" />
 <TGConnectingPoint num="2" id="2929" />
@@ -6479,12 +6479,12 @@
 <CryptoBlock value="false" />
 <Attribute access="0" id="id" value="" type="8" typeOther="" />
 <Attribute access="0" id="position" value="" type="8" typeOther="" />
-<Attribute access="0" id="canHaveInvalid" value="false" type="4" typeOther="" />
-<Method value="checkingMessage()" />
-<Method value="invalidMessage()" />
-<Method value="validMessage()" />
-<Signal value="in getEmergencyBrakingMessage(int id, int position)" />
-<Signal value="out toPlausibityCheckMessage(int id, int position)" />
+<Method value="sendMessage(int id, int position)" />
+<Signal value="in obstacleDetected(int id, int position)" attached="true" />
+<Signal value="in carPosition(int id, int position)" attached="true" />
+<Signal value="out setCarPosition(int id, int position)" attached="true" />
+<Signal value="out forwardEmergencyBrakingMessage(int id, int position)" attached="true" />
+<Signal value="in broadcastEmergencyBrakingMessage(int id, int position)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6560,7 +6560,7 @@
 <Attribute access="0" id="maxReducePowerTime" value="20" type="8" typeOther="" />
 <Method value="applyReducePower(int value)" />
 <Method value="reducePowerDone()" />
-<Signal value="in getReducePowerOrder(int value)" />
+<Signal value="in getReducePowerOrder(int value)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6600,11 +6600,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="3051" >
 <father id="3101" num="0" />
-<cdparam x="465" y="1023" />
+<cdparam x="825" y="1023" />
 <sizeparam width="312" height="250" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="392" minY="0" maxY="60" />
-<infoparam name="Block0" value="DangerAvoidanceStrategy" />
+<infoparam name="Block0" value="BrakeManagement" />
 <TGConnectingPoint num="0" id="3027" />
 <TGConnectingPoint num="1" id="3028" />
 <TGConnectingPoint num="2" id="3029" />
@@ -6631,24 +6631,21 @@
 <TGConnectingPoint num="23" id="3050" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="speed" value="" type="8" typeOther="" />
-<Attribute access="0" id="position" value="" type="8" typeOther="" />
-<Attribute access="0" id="currentPosition" value="" type="8" typeOther="" />
-<Attribute access="0" id="carinfo" value="" type="5" typeOther="CarInfo" />
 <Attribute access="0" id="value" value="" type="8" typeOther="" />
-<Signal value="in brake(int speed, int currentPosition, int position)" />
-<Signal value="out reducePower(int value)" />
-<Signal value="out brakePower(int value)" />
-<Signal value="out forwardEmergency(int myID, int currentPosition)" />
+<Attribute access="0" id="deltaBrake" value="0" type="8" typeOther="" />
+<Attribute access="0" id="brakeMaxDuration" value="" type="8" typeOther="" />
+<Method value="applyBraking(int value)" />
+<Method value="brakingDone()" />
+<Signal value="in brake(int value)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="3076" >
 <father id="3101" num="1" />
-<cdparam x="825" y="1023" />
+<cdparam x="465" y="1023" />
 <sizeparam width="312" height="250" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="392" minY="0" maxY="60" />
-<infoparam name="Block0" value="BrakeManagement" />
+<infoparam name="Block0" value="DangerAvoidanceStrategy" />
 <TGConnectingPoint num="0" id="3052" />
 <TGConnectingPoint num="1" id="3053" />
 <TGConnectingPoint num="2" id="3054" />
@@ -6675,12 +6672,15 @@
 <TGConnectingPoint num="23" id="3075" />
 <extraparam>
 <CryptoBlock value="false" />
+<Attribute access="0" id="speed" value="" type="8" typeOther="" />
+<Attribute access="0" id="position" value="" type="8" typeOther="" />
+<Attribute access="0" id="currentPosition" value="" type="8" typeOther="" />
+<Attribute access="0" id="carinfo" value="" type="5" typeOther="CarInfo" />
 <Attribute access="0" id="value" value="" type="8" typeOther="" />
-<Attribute access="0" id="deltaBrake" value="0" type="8" typeOther="" />
-<Attribute access="0" id="brakeMaxDuration" value="" type="8" typeOther="" />
-<Method value="applyBraking(int value)" />
-<Method value="brakingDone()" />
-<Signal value="in brake(int value)" />
+<Signal value="in brake(int speed, int currentPosition, int position)" attached="true" />
+<Signal value="out reducePower(int value)" attached="true" />
+<Signal value="out brakePower(int value)" attached="true" />
+<Signal value="out forwardEmergency(int myID, int currentPosition)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6720,11 +6720,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="3126" >
 <father id="3201" num="0" />
-<cdparam x="670" y="704" />
-<sizeparam width="220" height="156" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="903" y="707" />
+<sizeparam width="281" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="578" minY="0" maxY="133" />
-<infoparam name="Block0" value="ObjectListManagement" />
+<cdrectangleparam minX="0" maxX="517" minY="0" maxY="141" />
+<infoparam name="Block0" value="VehiculeDynamicsManagement" />
 <TGConnectingPoint num="0" id="3102" />
 <TGConnectingPoint num="1" id="3103" />
 <TGConnectingPoint num="2" id="3104" />
@@ -6751,9 +6751,9 @@
 <TGConnectingPoint num="23" id="3125" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="obstacle" value="0" type="8" typeOther="" />
-<Signal value="in isObstacleAhead(int info)" />
-<Signal value="out getInfoOnObstacle(int info)" />
+<Attribute access="0" id="speed" value="" type="8" typeOther="" />
+<Signal value="in updateOnSpeed(int speed)" attached="true" />
+<Signal value="out getInfoOnSpeed(int speed)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="3151" >
@@ -6798,20 +6798,20 @@
 <Method value="emergencyIgnored()" />
 <Method value="emergencyTakenIntoAccount()" />
 <Method value="getNodeList(int currentPosition, NodeList list)" />
-<Signal value="in getEmergencyMessageToVerify(int id, int position)" />
-<Signal value="in getInfoOnObstacle(int obstacle)" />
-<Signal value="in getInfoOnSpeed(int speed)" />
-<Signal value="out brake(int speed, int currentPosition, int position)" />
-<Signal value="in getNodeList(NodeList list)" />
+<Signal value="in getEmergencyMessageToVerify(int id, int position)" attached="true" />
+<Signal value="in getInfoOnObstacle(int obstacle)" attached="true" />
+<Signal value="in getInfoOnSpeed(int speed)" attached="true" />
+<Signal value="out brake(int speed, int currentPosition, int position)" attached="true" />
+<Signal value="in getNodeList(NodeList list)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="3176" >
 <father id="3201" num="2" />
-<cdparam x="903" y="707" />
-<sizeparam width="281" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="670" y="704" />
+<sizeparam width="220" height="156" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="517" minY="0" maxY="141" />
-<infoparam name="Block0" value="VehiculeDynamicsManagement" />
+<cdrectangleparam minX="0" maxX="578" minY="0" maxY="133" />
+<infoparam name="Block0" value="ObjectListManagement" />
 <TGConnectingPoint num="0" id="3152" />
 <TGConnectingPoint num="1" id="3153" />
 <TGConnectingPoint num="2" id="3154" />
@@ -6838,9 +6838,9 @@
 <TGConnectingPoint num="23" id="3175" />
 <extraparam>
 <CryptoBlock value="false" />
-<Attribute access="0" id="speed" value="" type="8" typeOther="" />
-<Signal value="in updateOnSpeed(int speed)" />
-<Signal value="out getInfoOnSpeed(int speed)" />
+<Attribute access="0" id="obstacle" value="0" type="8" typeOther="" />
+<Signal value="in isObstacleAhead(int info)" attached="true" />
+<Signal value="out getInfoOnObstacle(int info)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6912,84 +6912,56 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="EmergencySimulator" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3218" >
-<cdparam x="524" y="259" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3217" />
-<P1  x="399" y="256" id="3308" />
-<P2  x="399" y="265" id="3253" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3216" >
-<father id="3218" num="0" />
-<cdparam x="524" y="299" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3212" />
-<TGConnectingPoint num="1" id="3213" />
-<TGConnectingPoint num="2" id="3214" />
-<TGConnectingPoint num="3" id="3215" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3231" >
-<cdparam x="400" y="271" />
+<AVATARStateMachineDiagramPanel name="SpeedSensor" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3224" >
+<cdparam x="390" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3227" />
-<TGConnectingPoint num="1" id="3228" />
-<TGConnectingPoint num="2" id="3229" />
-<TGConnectingPoint num="3" id="3230" />
-<P1  x="399" y="295" id="3254" />
-<P2  x="307" y="112" id="3267" />
-<Point x="399" y="314" />
-<Point x="169" y="313" />
-<Point x="156" y="111" />
+<TGConnectingPoint num="0" id="3220" />
+<TGConnectingPoint num="1" id="3221" />
+<TGConnectingPoint num="2" id="3222" />
+<TGConnectingPoint num="3" id="3223" />
+<P1  x="390" y="355" id="3250" />
+<P2  x="306" y="133" id="3281" />
+<Point x="390" y="376" />
+<Point x="209" y="376" />
+<Point x="209" y="133" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3219" >
-<father id="3231" num="0" />
-<cdparam x="399" y="314" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3212" >
+<father id="3224" num="0" />
+<cdparam x="390" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3220" >
-<father id="3231" num="1" />
-<cdparam x="169" y="313" />
+<SUBCOMPONENT type="-1" id="3213" >
+<father id="3224" num="1" />
+<cdparam x="209" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3221" >
-<father id="3231" num="2" />
-<cdparam x="156" y="111" />
+<SUBCOMPONENT type="-1" id="3214" >
+<father id="3224" num="2" />
+<cdparam x="209" y="133" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3226" >
-<father id="3231" num="3" />
-<cdparam x="400" y="311" />
+<SUBCOMPONENT type="-1" id="3219" >
+<father id="3224" num="3" />
+<cdparam x="390" y="371" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3222" />
-<TGConnectingPoint num="1" id="3223" />
-<TGConnectingPoint num="2" id="3224" />
-<TGConnectingPoint num="3" id="3225" />
+<TGConnectingPoint num="0" id="3215" />
+<TGConnectingPoint num="1" id="3216" />
+<TGConnectingPoint num="2" id="3217" />
+<TGConnectingPoint num="3" id="3218" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6999,17 +6971,45 @@
 </extraparam>
 </SUBCOMPONENT>
 
+<CONNECTOR type="5102" id="3231" >
+<cdparam x="410" y="165" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3230" />
+<P1  x="390" y="165" id="3266" />
+<P2  x="390" y="242" id="3246" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3229" >
+<father id="3231" num="0" />
+<cdparam x="404" y="195" />
+<sizeparam width="266" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3225" />
+<TGConnectingPoint num="1" id="3226" />
+<TGConnectingPoint num="2" id="3227" />
+<TGConnectingPoint num="3" id="3228" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="minSpeedUpdate" />
+<afterMax value="maxSpeedUpdate" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
 <CONNECTOR type="5102" id="3238" >
-<cdparam x="400" y="211" />
+<cdparam x="390" y="81" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to Send signal" value="null" />
+<infoparam name="connector from start state to state0" value="null" />
 <TGConnectingPoint num="0" id="3237" />
-<P1  x="400" y="211" id="3311" />
-<P2  x="399" y="226" id="3307" />
+<P1  x="390" y="81" id="3301" />
+<P2  x="390" y="115" id="3261" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="3236" >
 <father id="3238" num="0" />
-<cdparam x="400" y="251" />
+<cdparam x="390" y="121" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -7028,17 +7028,17 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="3245" >
-<cdparam x="407" y="70" />
+<cdparam x="390" y="272" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
+<infoparam name="connector from TGComponent to Send signal" value="null" />
 <TGConnectingPoint num="0" id="3244" />
-<P1  x="407" y="70" id="3305" />
-<P2  x="400" y="87" id="3265" />
+<P1  x="390" y="272" id="3247" />
+<P2  x="390" y="325" id="3249" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="3243" >
 <father id="3245" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="404" y="300" />
+<sizeparam width="168" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -7052,219 +7052,190 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="speed = carinfo.maxSpeed" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3252" >
-<cdparam x="493" y="137" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3251" />
-<P1  x="400" y="137" id="3270" />
-<P2  x="400" y="181" id="3310" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3250" >
-<father id="3252" num="0" />
-<cdparam x="493" y="177" />
-<sizeparam width="299" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="3248" >
+<cdparam x="208" y="247" />
+<sizeparam width="364" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="TGComponent" value="null" />
 <TGConnectingPoint num="0" id="3246" />
 <TGConnectingPoint num="1" id="3247" />
-<TGConnectingPoint num="2" id="3248" />
-<TGConnectingPoint num="3" id="3249" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="minEmergencyInterval" />
-<afterMax value="maxEmergencyInterval" />
-<computeMin value="" />
-<computeMax value="" />
+<Data variable="speed" minValue="carinfo.minSpeed" maxValue="carinfo.maxSpeed" functionId="0" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<COMPONENT type="5103" id="3263" >
-<cdparam x="308" y="270" />
-<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3259" >
+<cdparam x="310" y="330" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="obstacleDetected(id, position)" />
-<TGConnectingPoint num="0" id="3253" />
-<TGConnectingPoint num="1" id="3254" />
-<TGConnectingPoint num="2" id="3255" />
-<TGConnectingPoint num="3" id="3256" />
-<TGConnectingPoint num="4" id="3257" />
-<TGConnectingPoint num="5" id="3258" />
-<TGConnectingPoint num="6" id="3259" />
-<TGConnectingPoint num="7" id="3260" />
-<TGConnectingPoint num="8" id="3261" />
-<TGConnectingPoint num="9" id="3262" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3304" >
-<cdparam x="307" y="87" />
-<sizeparam width="186" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="updateOnSpeed(speed)" />
+<TGConnectingPoint num="0" id="3249" />
+<TGConnectingPoint num="1" id="3250" />
+<TGConnectingPoint num="2" id="3251" />
+<TGConnectingPoint num="3" id="3252" />
+<TGConnectingPoint num="4" id="3253" />
+<TGConnectingPoint num="5" id="3254" />
+<TGConnectingPoint num="6" id="3255" />
+<TGConnectingPoint num="7" id="3256" />
+<TGConnectingPoint num="8" id="3257" />
+<TGConnectingPoint num="9" id="3258" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3300" >
+<cdparam x="306" y="115" />
+<sizeparam width="169" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingforEmergency" />
-<TGConnectingPoint num="0" id="3264" />
-<TGConnectingPoint num="1" id="3265" />
-<TGConnectingPoint num="2" id="3266" />
-<TGConnectingPoint num="3" id="3267" />
-<TGConnectingPoint num="4" id="3268" />
-<TGConnectingPoint num="5" id="3269" />
-<TGConnectingPoint num="6" id="3270" />
-<TGConnectingPoint num="7" id="3271" />
-<TGConnectingPoint num="8" id="3272" />
-<TGConnectingPoint num="9" id="3273" />
-<TGConnectingPoint num="10" id="3274" />
-<TGConnectingPoint num="11" id="3275" />
-<TGConnectingPoint num="12" id="3276" />
-<TGConnectingPoint num="13" id="3277" />
-<TGConnectingPoint num="14" id="3278" />
-<TGConnectingPoint num="15" id="3279" />
-<TGConnectingPoint num="16" id="3280" />
-<TGConnectingPoint num="17" id="3281" />
-<TGConnectingPoint num="18" id="3282" />
-<TGConnectingPoint num="19" id="3283" />
-<TGConnectingPoint num="20" id="3284" />
-<TGConnectingPoint num="21" id="3285" />
-<TGConnectingPoint num="22" id="3286" />
-<TGConnectingPoint num="23" id="3287" />
-<TGConnectingPoint num="24" id="3288" />
-<TGConnectingPoint num="25" id="3289" />
-<TGConnectingPoint num="26" id="3290" />
-<TGConnectingPoint num="27" id="3291" />
-<TGConnectingPoint num="28" id="3292" />
-<TGConnectingPoint num="29" id="3293" />
-<TGConnectingPoint num="30" id="3294" />
-<TGConnectingPoint num="31" id="3295" />
-<TGConnectingPoint num="32" id="3296" />
-<TGConnectingPoint num="33" id="3297" />
-<TGConnectingPoint num="34" id="3298" />
-<TGConnectingPoint num="35" id="3299" />
-<TGConnectingPoint num="36" id="3300" />
-<TGConnectingPoint num="37" id="3301" />
-<TGConnectingPoint num="38" id="3302" />
-<TGConnectingPoint num="39" id="3303" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3306" >
-<cdparam x="400" y="50" />
+<infoparam name="state0" value="WaitingForSpeedUpdate" />
+<TGConnectingPoint num="0" id="3260" />
+<TGConnectingPoint num="1" id="3261" />
+<TGConnectingPoint num="2" id="3262" />
+<TGConnectingPoint num="3" id="3263" />
+<TGConnectingPoint num="4" id="3264" />
+<TGConnectingPoint num="5" id="3265" />
+<TGConnectingPoint num="6" id="3266" />
+<TGConnectingPoint num="7" id="3267" />
+<TGConnectingPoint num="8" id="3268" />
+<TGConnectingPoint num="9" id="3269" />
+<TGConnectingPoint num="10" id="3270" />
+<TGConnectingPoint num="11" id="3271" />
+<TGConnectingPoint num="12" id="3272" />
+<TGConnectingPoint num="13" id="3273" />
+<TGConnectingPoint num="14" id="3274" />
+<TGConnectingPoint num="15" id="3275" />
+<TGConnectingPoint num="16" id="3276" />
+<TGConnectingPoint num="17" id="3277" />
+<TGConnectingPoint num="18" id="3278" />
+<TGConnectingPoint num="19" id="3279" />
+<TGConnectingPoint num="20" id="3280" />
+<TGConnectingPoint num="21" id="3281" />
+<TGConnectingPoint num="22" id="3282" />
+<TGConnectingPoint num="23" id="3283" />
+<TGConnectingPoint num="24" id="3284" />
+<TGConnectingPoint num="25" id="3285" />
+<TGConnectingPoint num="26" id="3286" />
+<TGConnectingPoint num="27" id="3287" />
+<TGConnectingPoint num="28" id="3288" />
+<TGConnectingPoint num="29" id="3289" />
+<TGConnectingPoint num="30" id="3290" />
+<TGConnectingPoint num="31" id="3291" />
+<TGConnectingPoint num="32" id="3292" />
+<TGConnectingPoint num="33" id="3293" />
+<TGConnectingPoint num="34" id="3294" />
+<TGConnectingPoint num="35" id="3295" />
+<TGConnectingPoint num="36" id="3296" />
+<TGConnectingPoint num="37" id="3297" />
+<TGConnectingPoint num="38" id="3298" />
+<TGConnectingPoint num="39" id="3299" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3302" >
+<cdparam x="383" y="61" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3305" />
-</COMPONENT>
-
-<COMPONENT type="5108" id="3309" >
-<cdparam x="224" y="231" />
-<sizeparam width="350" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3307" />
-<TGConnectingPoint num="1" id="3308" />
-<extraparam>
-<Data variable="position" minValue="carid.minPosition" maxValue="carid.maxPosition" functionId="0" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5108" id="3312" >
-<cdparam x="274" y="186" />
-<sizeparam width="252" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3310" />
-<TGConnectingPoint num="1" id="3311" />
-<extraparam>
-<Data variable="id" minValue="carid.minID" maxValue="carid.maxID" functionId="0" />
-</extraparam>
+<TGConnectingPoint num="0" id="3301" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="CarPositionSimulator" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3319" >
-<cdparam x="424" y="254" />
+<AVATARStateMachineDiagramPanel name="RadarSensor" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3311" >
+<cdparam x="492" y="329" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3318" />
-<P1  x="424" y="254" id="3355" />
-<P2  x="422" y="274" id="3360" />
+<infoparam name="connector from choice to state0" value="null" />
+<TGConnectingPoint num="0" id="3309" />
+<TGConnectingPoint num="1" id="3310" />
+<P1  x="492" y="329" id="3398" />
+<P2  x="513" y="410" id="3374" />
+<Point x="536" y="357" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3317" >
-<father id="3319" num="0" />
-<cdparam x="424" y="294" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3303" >
+<father id="3311" num="0" />
+<cdparam x="536" y="357" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3308" >
+<father id="3311" num="1" />
+<cdparam x="492" y="369" />
+<sizeparam width="118" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3313" />
-<TGConnectingPoint num="1" id="3314" />
-<TGConnectingPoint num="2" id="3315" />
-<TGConnectingPoint num="3" id="3316" />
+<TGConnectingPoint num="0" id="3304" />
+<TGConnectingPoint num="1" id="3305" />
+<TGConnectingPoint num="2" id="3306" />
+<TGConnectingPoint num="3" id="3307" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="obstacleAhead = 1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3326" >
-<cdparam x="517" y="144" />
+<CONNECTOR type="5102" id="3318" >
+<cdparam x="459" y="192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3325" />
-<P1  x="424" y="144" id="3377" />
-<P2  x="424" y="188" id="3357" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3317" />
+<P1  x="439" y="192" id="3429" />
+<P2  x="467" y="304" id="3396" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3324" >
-<father id="3326" num="0" />
-<cdparam x="517" y="184" />
-<sizeparam width="301" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3316" >
+<father id="3318" num="0" />
+<cdparam x="453" y="222" />
+<sizeparam width="262" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3320" />
-<TGConnectingPoint num="1" id="3321" />
-<TGConnectingPoint num="2" id="3322" />
-<TGConnectingPoint num="3" id="3323" />
+<TGConnectingPoint num="0" id="3312" />
+<TGConnectingPoint num="1" id="3313" />
+<TGConnectingPoint num="2" id="3314" />
+<TGConnectingPoint num="3" id="3315" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="minCarPositionInterval" />
-<afterMax value="maxCarPositionInterval" />
-<computeMin value="" />
+<afterMin value="minRadarUpdate" />
+<afterMax value="maxRadarUpdate" />
+<computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3333" >
-<cdparam x="431" y="77" />
+<CONNECTOR type="5102" id="3325" >
+<cdparam x="439" y="108" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3332" />
-<P1  x="431" y="77" id="3412" />
-<P2  x="424" y="94" id="3372" />
+<TGConnectingPoint num="0" id="3324" />
+<P1  x="439" y="108" id="3464" />
+<P2  x="439" y="142" id="3424" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3331" >
-<father id="3333" num="0" />
-<cdparam x="431" y="117" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3323" >
+<father id="3325" num="0" />
+<cdparam x="439" y="148" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3327" />
-<TGConnectingPoint num="1" id="3328" />
-<TGConnectingPoint num="2" id="3329" />
-<TGConnectingPoint num="3" id="3330" />
+<TGConnectingPoint num="0" id="3319" />
+<TGConnectingPoint num="1" id="3320" />
+<TGConnectingPoint num="2" id="3321" />
+<TGConnectingPoint num="3" id="3322" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7274,83 +7245,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3340" >
-<cdparam x="424" y="218" />
+<CONNECTOR type="5102" id="3338" >
+<cdparam x="439" y="358" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3339" />
-<P1  x="424" y="218" id="3358" />
-<P2  x="424" y="224" id="3354" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3338" >
-<father id="3340" num="0" />
-<cdparam x="424" y="258" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="connector from Send signal to state0" value="null" />
 <TGConnectingPoint num="0" id="3334" />
 <TGConnectingPoint num="1" id="3335" />
 <TGConnectingPoint num="2" id="3336" />
 <TGConnectingPoint num="3" id="3337" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3353" >
-<cdparam x="424" y="278" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3349" />
-<TGConnectingPoint num="1" id="3350" />
-<TGConnectingPoint num="2" id="3351" />
-<TGConnectingPoint num="3" id="3352" />
-<P1  x="422" y="304" id="3361" />
-<P2  x="331" y="119" id="3374" />
-<Point x="423" y="321" />
-<Point x="293" y="320" />
-<Point x="280" y="118" />
+<P1  x="440" y="531" id="3413" />
+<P2  x="355" y="167" id="3426" />
+<Point x="436" y="572" />
+<Point x="308" y="582" />
+<Point x="318" y="171" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3341" >
-<father id="3353" num="0" />
-<cdparam x="423" y="321" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3326" >
+<father id="3338" num="0" />
+<cdparam x="436" y="572" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3342" >
-<father id="3353" num="1" />
-<cdparam x="293" y="320" />
+<SUBCOMPONENT type="-1" id="3327" >
+<father id="3338" num="1" />
+<cdparam x="308" y="582" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3343" >
-<father id="3353" num="2" />
-<cdparam x="280" y="118" />
+<SUBCOMPONENT type="-1" id="3328" >
+<father id="3338" num="2" />
+<cdparam x="318" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3348" >
-<father id="3353" num="3" />
-<cdparam x="424" y="318" />
+<SUBCOMPONENT type="-1" id="3333" >
+<father id="3338" num="3" />
+<cdparam x="439" y="398" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3344" />
-<TGConnectingPoint num="1" id="3345" />
-<TGConnectingPoint num="2" id="3346" />
-<TGConnectingPoint num="3" id="3347" />
+<TGConnectingPoint num="0" id="3329" />
+<TGConnectingPoint num="1" id="3330" />
+<TGConnectingPoint num="2" id="3331" />
+<TGConnectingPoint num="3" id="3332" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7360,162 +7303,276 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5108" id="3356" >
-<cdparam x="249" y="229" />
-<sizeparam width="350" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3347" >
+<cdparam x="467" y="354" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to state0" value="null" />
+<TGConnectingPoint num="0" id="3345" />
+<TGConnectingPoint num="1" id="3346" />
+<P1  x="442" y="329" id="3397" />
+<P2  x="463" y="410" id="3372" />
+<Point x="413" y="359" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3339" >
+<father id="3347" num="0" />
+<cdparam x="413" y="359" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3354" />
-<TGConnectingPoint num="1" id="3355" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3344" >
+<father id="3347" num="1" />
+<cdparam x="350" y="390" />
+<sizeparam width="118" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3340" />
+<TGConnectingPoint num="1" id="3341" />
+<TGConnectingPoint num="2" id="3342" />
+<TGConnectingPoint num="3" id="3343" />
 <extraparam>
-<Data variable="position" minValue="carid.minPosition" maxValue="carid.maxPosition" functionId="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="obstacleAhead = 1" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5108" id="3359" >
-<cdparam x="298" y="193" />
-<sizeparam width="252" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3354" >
+<cdparam x="445" y="483" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3353" />
+<P1  x="438" y="460" id="3383" />
+<P2  x="440" y="501" id="3412" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3352" >
+<father id="3354" num="0" />
+<cdparam x="445" y="523" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3357" />
-<TGConnectingPoint num="1" id="3358" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3348" />
+<TGConnectingPoint num="1" id="3349" />
+<TGConnectingPoint num="2" id="3350" />
+<TGConnectingPoint num="3" id="3351" />
 <extraparam>
-<Data variable="id" minValue="carid.minID" maxValue="carid.maxID" functionId="0" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3370" >
-<cdparam x="350" y="279" />
-<sizeparam width="144" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3395" >
+<cdparam x="426" y="410" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="carPosition(id, position)" />
-<TGConnectingPoint num="0" id="3360" />
-<TGConnectingPoint num="1" id="3361" />
-<TGConnectingPoint num="2" id="3362" />
-<TGConnectingPoint num="3" id="3363" />
-<TGConnectingPoint num="4" id="3364" />
-<TGConnectingPoint num="5" id="3365" />
-<TGConnectingPoint num="6" id="3366" />
-<TGConnectingPoint num="7" id="3367" />
-<TGConnectingPoint num="8" id="3368" />
-<TGConnectingPoint num="9" id="3369" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3411" >
-<cdparam x="331" y="94" />
-<sizeparam width="186" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="sendingUpdate" />
+<TGConnectingPoint num="0" id="3355" />
+<TGConnectingPoint num="1" id="3356" />
+<TGConnectingPoint num="2" id="3357" />
+<TGConnectingPoint num="3" id="3358" />
+<TGConnectingPoint num="4" id="3359" />
+<TGConnectingPoint num="5" id="3360" />
+<TGConnectingPoint num="6" id="3361" />
+<TGConnectingPoint num="7" id="3362" />
+<TGConnectingPoint num="8" id="3363" />
+<TGConnectingPoint num="9" id="3364" />
+<TGConnectingPoint num="10" id="3365" />
+<TGConnectingPoint num="11" id="3366" />
+<TGConnectingPoint num="12" id="3367" />
+<TGConnectingPoint num="13" id="3368" />
+<TGConnectingPoint num="14" id="3369" />
+<TGConnectingPoint num="15" id="3370" />
+<TGConnectingPoint num="16" id="3371" />
+<TGConnectingPoint num="17" id="3372" />
+<TGConnectingPoint num="18" id="3373" />
+<TGConnectingPoint num="19" id="3374" />
+<TGConnectingPoint num="20" id="3375" />
+<TGConnectingPoint num="21" id="3376" />
+<TGConnectingPoint num="22" id="3377" />
+<TGConnectingPoint num="23" id="3378" />
+<TGConnectingPoint num="24" id="3379" />
+<TGConnectingPoint num="25" id="3380" />
+<TGConnectingPoint num="26" id="3381" />
+<TGConnectingPoint num="27" id="3382" />
+<TGConnectingPoint num="28" id="3383" />
+<TGConnectingPoint num="29" id="3384" />
+<TGConnectingPoint num="30" id="3385" />
+<TGConnectingPoint num="31" id="3386" />
+<TGConnectingPoint num="32" id="3387" />
+<TGConnectingPoint num="33" id="3388" />
+<TGConnectingPoint num="34" id="3389" />
+<TGConnectingPoint num="35" id="3390" />
+<TGConnectingPoint num="36" id="3391" />
+<TGConnectingPoint num="37" id="3392" />
+<TGConnectingPoint num="38" id="3393" />
+<TGConnectingPoint num="39" id="3394" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="3411" >
+<cdparam x="452" y="314" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingforNewCarPosition" />
-<TGConnectingPoint num="0" id="3371" />
-<TGConnectingPoint num="1" id="3372" />
-<TGConnectingPoint num="2" id="3373" />
-<TGConnectingPoint num="3" id="3374" />
-<TGConnectingPoint num="4" id="3375" />
-<TGConnectingPoint num="5" id="3376" />
-<TGConnectingPoint num="6" id="3377" />
-<TGConnectingPoint num="7" id="3378" />
-<TGConnectingPoint num="8" id="3379" />
-<TGConnectingPoint num="9" id="3380" />
-<TGConnectingPoint num="10" id="3381" />
-<TGConnectingPoint num="11" id="3382" />
-<TGConnectingPoint num="12" id="3383" />
-<TGConnectingPoint num="13" id="3384" />
-<TGConnectingPoint num="14" id="3385" />
-<TGConnectingPoint num="15" id="3386" />
-<TGConnectingPoint num="16" id="3387" />
-<TGConnectingPoint num="17" id="3388" />
-<TGConnectingPoint num="18" id="3389" />
-<TGConnectingPoint num="19" id="3390" />
-<TGConnectingPoint num="20" id="3391" />
-<TGConnectingPoint num="21" id="3392" />
-<TGConnectingPoint num="22" id="3393" />
-<TGConnectingPoint num="23" id="3394" />
-<TGConnectingPoint num="24" id="3395" />
-<TGConnectingPoint num="25" id="3396" />
-<TGConnectingPoint num="26" id="3397" />
-<TGConnectingPoint num="27" id="3398" />
-<TGConnectingPoint num="28" id="3399" />
-<TGConnectingPoint num="29" id="3400" />
-<TGConnectingPoint num="30" id="3401" />
-<TGConnectingPoint num="31" id="3402" />
-<TGConnectingPoint num="32" id="3403" />
-<TGConnectingPoint num="33" id="3404" />
-<TGConnectingPoint num="34" id="3405" />
-<TGConnectingPoint num="35" id="3406" />
-<TGConnectingPoint num="36" id="3407" />
-<TGConnectingPoint num="37" id="3408" />
-<TGConnectingPoint num="38" id="3409" />
-<TGConnectingPoint num="39" id="3410" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3413" >
-<cdparam x="424" y="57" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="3396" />
+<TGConnectingPoint num="1" id="3397" />
+<TGConnectingPoint num="2" id="3398" />
+<TGConnectingPoint num="3" id="3399" />
+<TGConnectingPoint num="4" id="3400" />
+<TGConnectingPoint num="5" id="3401" />
+<TGConnectingPoint num="6" id="3402" />
+<TGConnectingPoint num="7" id="3403" />
+<TGConnectingPoint num="8" id="3404" />
+<TGConnectingPoint num="9" id="3405" />
+<TGConnectingPoint num="10" id="3406" />
+<TGConnectingPoint num="11" id="3407" />
+<TGConnectingPoint num="12" id="3408" />
+<TGConnectingPoint num="13" id="3409" />
+<TGConnectingPoint num="14" id="3410" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3422" >
+<cdparam x="337" y="506" />
+<sizeparam width="206" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="obstacleAhead(obstacleAhead)" />
+<TGConnectingPoint num="0" id="3412" />
+<TGConnectingPoint num="1" id="3413" />
+<TGConnectingPoint num="2" id="3414" />
+<TGConnectingPoint num="3" id="3415" />
+<TGConnectingPoint num="4" id="3416" />
+<TGConnectingPoint num="5" id="3417" />
+<TGConnectingPoint num="6" id="3418" />
+<TGConnectingPoint num="7" id="3419" />
+<TGConnectingPoint num="8" id="3420" />
+<TGConnectingPoint num="9" id="3421" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3463" >
+<cdparam x="355" y="142" />
+<sizeparam width="169" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingForRadarInfo" />
+<TGConnectingPoint num="0" id="3423" />
+<TGConnectingPoint num="1" id="3424" />
+<TGConnectingPoint num="2" id="3425" />
+<TGConnectingPoint num="3" id="3426" />
+<TGConnectingPoint num="4" id="3427" />
+<TGConnectingPoint num="5" id="3428" />
+<TGConnectingPoint num="6" id="3429" />
+<TGConnectingPoint num="7" id="3430" />
+<TGConnectingPoint num="8" id="3431" />
+<TGConnectingPoint num="9" id="3432" />
+<TGConnectingPoint num="10" id="3433" />
+<TGConnectingPoint num="11" id="3434" />
+<TGConnectingPoint num="12" id="3435" />
+<TGConnectingPoint num="13" id="3436" />
+<TGConnectingPoint num="14" id="3437" />
+<TGConnectingPoint num="15" id="3438" />
+<TGConnectingPoint num="16" id="3439" />
+<TGConnectingPoint num="17" id="3440" />
+<TGConnectingPoint num="18" id="3441" />
+<TGConnectingPoint num="19" id="3442" />
+<TGConnectingPoint num="20" id="3443" />
+<TGConnectingPoint num="21" id="3444" />
+<TGConnectingPoint num="22" id="3445" />
+<TGConnectingPoint num="23" id="3446" />
+<TGConnectingPoint num="24" id="3447" />
+<TGConnectingPoint num="25" id="3448" />
+<TGConnectingPoint num="26" id="3449" />
+<TGConnectingPoint num="27" id="3450" />
+<TGConnectingPoint num="28" id="3451" />
+<TGConnectingPoint num="29" id="3452" />
+<TGConnectingPoint num="30" id="3453" />
+<TGConnectingPoint num="31" id="3454" />
+<TGConnectingPoint num="32" id="3455" />
+<TGConnectingPoint num="33" id="3456" />
+<TGConnectingPoint num="34" id="3457" />
+<TGConnectingPoint num="35" id="3458" />
+<TGConnectingPoint num="36" id="3459" />
+<TGConnectingPoint num="37" id="3460" />
+<TGConnectingPoint num="38" id="3461" />
+<TGConnectingPoint num="39" id="3462" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3465" >
+<cdparam x="432" y="88" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3412" />
+<TGConnectingPoint num="0" id="3464" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="GPSSensor" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3426" >
+<CONNECTOR type="5102" id="3478" >
 <cdparam x="408" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3422" />
-<TGConnectingPoint num="1" id="3423" />
-<TGConnectingPoint num="2" id="3424" />
-<TGConnectingPoint num="3" id="3425" />
-<P1  x="408" y="353" id="3452" />
-<P2  x="324" y="162" id="3465" />
+<TGConnectingPoint num="0" id="3474" />
+<TGConnectingPoint num="1" id="3475" />
+<TGConnectingPoint num="2" id="3476" />
+<TGConnectingPoint num="3" id="3477" />
+<P1  x="408" y="353" id="3504" />
+<P2  x="324" y="162" id="3517" />
 <Point x="408" y="382" />
 <Point x="287" y="382" />
 <Point x="287" y="162" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3414" >
-<father id="3426" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3466" >
+<father id="3478" num="0" />
 <cdparam x="408" y="382" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3415" >
-<father id="3426" num="1" />
+<SUBCOMPONENT type="-1" id="3467" >
+<father id="3478" num="1" />
 <cdparam x="287" y="382" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3416" >
-<father id="3426" num="2" />
+<SUBCOMPONENT type="-1" id="3468" >
+<father id="3478" num="2" />
 <cdparam x="287" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3421" >
-<father id="3426" num="3" />
+<SUBCOMPONENT type="-1" id="3473" >
+<father id="3478" num="3" />
 <cdparam x="408" y="393" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3417" />
-<TGConnectingPoint num="1" id="3418" />
-<TGConnectingPoint num="2" id="3419" />
-<TGConnectingPoint num="3" id="3420" />
+<TGConnectingPoint num="0" id="3469" />
+<TGConnectingPoint num="1" id="3470" />
+<TGConnectingPoint num="2" id="3471" />
+<TGConnectingPoint num="3" id="3472" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7525,25 +7582,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3433" >
+<CONNECTOR type="5102" id="3485" >
 <cdparam x="408" y="294" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3432" />
-<P1  x="408" y="294" id="3449" />
-<P2  x="408" y="323" id="3451" />
+<TGConnectingPoint num="0" id="3484" />
+<P1  x="408" y="294" id="3501" />
+<P2  x="408" y="323" id="3503" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3431" >
-<father id="3433" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3483" >
+<father id="3485" num="0" />
 <cdparam x="428" y="312" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3427" />
-<TGConnectingPoint num="1" id="3428" />
-<TGConnectingPoint num="2" id="3429" />
-<TGConnectingPoint num="3" id="3430" />
+<TGConnectingPoint num="0" id="3479" />
+<TGConnectingPoint num="1" id="3480" />
+<TGConnectingPoint num="2" id="3481" />
+<TGConnectingPoint num="3" id="3482" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7553,25 +7610,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3440" >
+<CONNECTOR type="5102" id="3492" >
 <cdparam x="408" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3439" />
-<P1  x="408" y="103" id="3503" />
-<P2  x="408" y="137" id="3463" />
+<TGConnectingPoint num="0" id="3491" />
+<P1  x="408" y="103" id="3555" />
+<P2  x="408" y="137" id="3515" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3438" >
-<father id="3440" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3490" >
+<father id="3492" num="0" />
 <cdparam x="408" y="143" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3434" />
-<TGConnectingPoint num="1" id="3435" />
-<TGConnectingPoint num="2" id="3436" />
-<TGConnectingPoint num="3" id="3437" />
+<TGConnectingPoint num="0" id="3486" />
+<TGConnectingPoint num="1" id="3487" />
+<TGConnectingPoint num="2" id="3488" />
+<TGConnectingPoint num="3" id="3489" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7581,25 +7638,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3447" >
+<CONNECTOR type="5102" id="3499" >
 <cdparam x="428" y="187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3446" />
-<P1  x="408" y="187" id="3468" />
-<P2  x="408" y="264" id="3448" />
+<TGConnectingPoint num="0" id="3498" />
+<P1  x="408" y="187" id="3520" />
+<P2  x="408" y="264" id="3500" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3445" >
-<father id="3447" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3497" >
+<father id="3499" num="0" />
 <cdparam x="422" y="217" />
 <sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3441" />
-<TGConnectingPoint num="1" id="3442" />
-<TGConnectingPoint num="2" id="3443" />
-<TGConnectingPoint num="3" id="3444" />
+<TGConnectingPoint num="0" id="3493" />
+<TGConnectingPoint num="1" id="3494" />
+<TGConnectingPoint num="2" id="3495" />
+<TGConnectingPoint num="3" id="3496" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="minGPSUpdate" />
@@ -7609,186 +7666,175 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5108" id="3450" >
+<COMPONENT type="5108" id="3502" >
 <cdparam x="212" y="269" />
 <sizeparam width="392" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3448" />
-<TGConnectingPoint num="1" id="3449" />
+<TGConnectingPoint num="0" id="3500" />
+<TGConnectingPoint num="1" id="3501" />
 <extraparam>
 <Data variable="position" minValue="carinfo.minPosition" maxValue="carinfo.maxPosition" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3461" >
+<COMPONENT type="5103" id="3513" >
 <cdparam x="339" y="328" />
 <sizeparam width="138" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="setPosition(position)" />
-<TGConnectingPoint num="0" id="3451" />
-<TGConnectingPoint num="1" id="3452" />
-<TGConnectingPoint num="2" id="3453" />
-<TGConnectingPoint num="3" id="3454" />
-<TGConnectingPoint num="4" id="3455" />
-<TGConnectingPoint num="5" id="3456" />
-<TGConnectingPoint num="6" id="3457" />
-<TGConnectingPoint num="7" id="3458" />
-<TGConnectingPoint num="8" id="3459" />
-<TGConnectingPoint num="9" id="3460" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3502" >
+<TGConnectingPoint num="0" id="3503" />
+<TGConnectingPoint num="1" id="3504" />
+<TGConnectingPoint num="2" id="3505" />
+<TGConnectingPoint num="3" id="3506" />
+<TGConnectingPoint num="4" id="3507" />
+<TGConnectingPoint num="5" id="3508" />
+<TGConnectingPoint num="6" id="3509" />
+<TGConnectingPoint num="7" id="3510" />
+<TGConnectingPoint num="8" id="3511" />
+<TGConnectingPoint num="9" id="3512" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3554" >
 <cdparam x="324" y="137" />
 <sizeparam width="169" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WaitingForGPSInfo" />
-<TGConnectingPoint num="0" id="3462" />
-<TGConnectingPoint num="1" id="3463" />
-<TGConnectingPoint num="2" id="3464" />
-<TGConnectingPoint num="3" id="3465" />
-<TGConnectingPoint num="4" id="3466" />
-<TGConnectingPoint num="5" id="3467" />
-<TGConnectingPoint num="6" id="3468" />
-<TGConnectingPoint num="7" id="3469" />
-<TGConnectingPoint num="8" id="3470" />
-<TGConnectingPoint num="9" id="3471" />
-<TGConnectingPoint num="10" id="3472" />
-<TGConnectingPoint num="11" id="3473" />
-<TGConnectingPoint num="12" id="3474" />
-<TGConnectingPoint num="13" id="3475" />
-<TGConnectingPoint num="14" id="3476" />
-<TGConnectingPoint num="15" id="3477" />
-<TGConnectingPoint num="16" id="3478" />
-<TGConnectingPoint num="17" id="3479" />
-<TGConnectingPoint num="18" id="3480" />
-<TGConnectingPoint num="19" id="3481" />
-<TGConnectingPoint num="20" id="3482" />
-<TGConnectingPoint num="21" id="3483" />
-<TGConnectingPoint num="22" id="3484" />
-<TGConnectingPoint num="23" id="3485" />
-<TGConnectingPoint num="24" id="3486" />
-<TGConnectingPoint num="25" id="3487" />
-<TGConnectingPoint num="26" id="3488" />
-<TGConnectingPoint num="27" id="3489" />
-<TGConnectingPoint num="28" id="3490" />
-<TGConnectingPoint num="29" id="3491" />
-<TGConnectingPoint num="30" id="3492" />
-<TGConnectingPoint num="31" id="3493" />
-<TGConnectingPoint num="32" id="3494" />
-<TGConnectingPoint num="33" id="3495" />
-<TGConnectingPoint num="34" id="3496" />
-<TGConnectingPoint num="35" id="3497" />
-<TGConnectingPoint num="36" id="3498" />
-<TGConnectingPoint num="37" id="3499" />
-<TGConnectingPoint num="38" id="3500" />
-<TGConnectingPoint num="39" id="3501" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3504" >
+<TGConnectingPoint num="0" id="3514" />
+<TGConnectingPoint num="1" id="3515" />
+<TGConnectingPoint num="2" id="3516" />
+<TGConnectingPoint num="3" id="3517" />
+<TGConnectingPoint num="4" id="3518" />
+<TGConnectingPoint num="5" id="3519" />
+<TGConnectingPoint num="6" id="3520" />
+<TGConnectingPoint num="7" id="3521" />
+<TGConnectingPoint num="8" id="3522" />
+<TGConnectingPoint num="9" id="3523" />
+<TGConnectingPoint num="10" id="3524" />
+<TGConnectingPoint num="11" id="3525" />
+<TGConnectingPoint num="12" id="3526" />
+<TGConnectingPoint num="13" id="3527" />
+<TGConnectingPoint num="14" id="3528" />
+<TGConnectingPoint num="15" id="3529" />
+<TGConnectingPoint num="16" id="3530" />
+<TGConnectingPoint num="17" id="3531" />
+<TGConnectingPoint num="18" id="3532" />
+<TGConnectingPoint num="19" id="3533" />
+<TGConnectingPoint num="20" id="3534" />
+<TGConnectingPoint num="21" id="3535" />
+<TGConnectingPoint num="22" id="3536" />
+<TGConnectingPoint num="23" id="3537" />
+<TGConnectingPoint num="24" id="3538" />
+<TGConnectingPoint num="25" id="3539" />
+<TGConnectingPoint num="26" id="3540" />
+<TGConnectingPoint num="27" id="3541" />
+<TGConnectingPoint num="28" id="3542" />
+<TGConnectingPoint num="29" id="3543" />
+<TGConnectingPoint num="30" id="3544" />
+<TGConnectingPoint num="31" id="3545" />
+<TGConnectingPoint num="32" id="3546" />
+<TGConnectingPoint num="33" id="3547" />
+<TGConnectingPoint num="34" id="3548" />
+<TGConnectingPoint num="35" id="3549" />
+<TGConnectingPoint num="36" id="3550" />
+<TGConnectingPoint num="37" id="3551" />
+<TGConnectingPoint num="38" id="3552" />
+<TGConnectingPoint num="39" id="3553" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3556" >
 <cdparam x="401" y="83" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3503" />
+<TGConnectingPoint num="0" id="3555" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="RadarSensor" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3513" >
-<cdparam x="492" y="329" />
+<AVATARStateMachineDiagramPanel name="CarPositionSimulator" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3563" >
+<cdparam x="424" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3511" />
-<TGConnectingPoint num="1" id="3512" />
-<P1  x="492" y="329" id="3600" />
-<P2  x="513" y="410" id="3576" />
-<Point x="536" y="357" />
+<infoparam name="connector from TGComponent to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3562" />
+<P1  x="424" y="254" id="3599" />
+<P2  x="422" y="274" id="3604" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3505" >
-<father id="3513" num="0" />
-<cdparam x="536" y="357" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3510" >
-<father id="3513" num="1" />
-<cdparam x="492" y="369" />
-<sizeparam width="118" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3561" >
+<father id="3563" num="0" />
+<cdparam x="424" y="294" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3506" />
-<TGConnectingPoint num="1" id="3507" />
-<TGConnectingPoint num="2" id="3508" />
-<TGConnectingPoint num="3" id="3509" />
+<TGConnectingPoint num="0" id="3557" />
+<TGConnectingPoint num="1" id="3558" />
+<TGConnectingPoint num="2" id="3559" />
+<TGConnectingPoint num="3" id="3560" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="obstacleAhead = 1" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3520" >
-<cdparam x="459" y="192" />
+<CONNECTOR type="5102" id="3570" >
+<cdparam x="517" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3519" />
-<P1  x="439" y="192" id="3631" />
-<P2  x="467" y="304" id="3598" />
+<infoparam name="connector from state0 to TGComponent" value="null" />
+<TGConnectingPoint num="0" id="3569" />
+<P1  x="424" y="144" id="3621" />
+<P2  x="424" y="188" id="3601" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3518" >
-<father id="3520" num="0" />
-<cdparam x="453" y="222" />
-<sizeparam width="262" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3568" >
+<father id="3570" num="0" />
+<cdparam x="517" y="184" />
+<sizeparam width="301" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3514" />
-<TGConnectingPoint num="1" id="3515" />
-<TGConnectingPoint num="2" id="3516" />
-<TGConnectingPoint num="3" id="3517" />
+<TGConnectingPoint num="0" id="3564" />
+<TGConnectingPoint num="1" id="3565" />
+<TGConnectingPoint num="2" id="3566" />
+<TGConnectingPoint num="3" id="3567" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="minRadarUpdate" />
-<afterMax value="maxRadarUpdate" />
+<afterMin value="minCarPositionInterval" />
+<afterMax value="maxCarPositionInterval" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3527" >
-<cdparam x="439" y="108" />
+<CONNECTOR type="5102" id="3577" >
+<cdparam x="431" y="77" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3526" />
-<P1  x="439" y="108" id="3666" />
-<P2  x="439" y="142" id="3626" />
+<TGConnectingPoint num="0" id="3576" />
+<P1  x="431" y="77" id="3656" />
+<P2  x="424" y="94" id="3616" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3525" >
-<father id="3527" num="0" />
-<cdparam x="439" y="148" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3575" >
+<father id="3577" num="0" />
+<cdparam x="431" y="117" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3521" />
-<TGConnectingPoint num="1" id="3522" />
-<TGConnectingPoint num="2" id="3523" />
-<TGConnectingPoint num="3" id="3524" />
+<TGConnectingPoint num="0" id="3571" />
+<TGConnectingPoint num="1" id="3572" />
+<TGConnectingPoint num="2" id="3573" />
+<TGConnectingPoint num="3" id="3574" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7798,55 +7844,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3540" >
-<cdparam x="439" y="358" />
+<CONNECTOR type="5102" id="3584" >
+<cdparam x="424" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3536" />
-<TGConnectingPoint num="1" id="3537" />
-<TGConnectingPoint num="2" id="3538" />
-<TGConnectingPoint num="3" id="3539" />
-<P1  x="440" y="531" id="3615" />
-<P2  x="355" y="167" id="3628" />
-<Point x="436" y="572" />
-<Point x="308" y="582" />
-<Point x="318" y="171" />
+<infoparam name="connector from TGComponent to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3583" />
+<P1  x="424" y="218" id="3602" />
+<P2  x="424" y="224" id="3598" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3528" >
-<father id="3540" num="0" />
-<cdparam x="436" y="572" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3529" >
-<father id="3540" num="1" />
-<cdparam x="308" y="582" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3530" >
-<father id="3540" num="2" />
-<cdparam x="318" y="171" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3535" >
-<father id="3540" num="3" />
-<cdparam x="439" y="398" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3582" >
+<father id="3584" num="0" />
+<cdparam x="424" y="258" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3531" />
-<TGConnectingPoint num="1" id="3532" />
-<TGConnectingPoint num="2" id="3533" />
-<TGConnectingPoint num="3" id="3534" />
+<TGConnectingPoint num="0" id="3578" />
+<TGConnectingPoint num="1" id="3579" />
+<TGConnectingPoint num="2" id="3580" />
+<TGConnectingPoint num="3" id="3581" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7856,64 +7872,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3549" >
-<cdparam x="467" y="354" />
+<CONNECTOR type="5102" id="3597" >
+<cdparam x="424" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3547" />
-<TGConnectingPoint num="1" id="3548" />
-<P1  x="442" y="329" id="3599" />
-<P2  x="463" y="410" id="3574" />
-<Point x="413" y="359" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3593" />
+<TGConnectingPoint num="1" id="3594" />
+<TGConnectingPoint num="2" id="3595" />
+<TGConnectingPoint num="3" id="3596" />
+<P1  x="422" y="304" id="3605" />
+<P2  x="331" y="119" id="3618" />
+<Point x="423" y="321" />
+<Point x="293" y="320" />
+<Point x="280" y="118" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3541" >
-<father id="3549" num="0" />
-<cdparam x="413" y="359" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3585" >
+<father id="3597" num="0" />
+<cdparam x="423" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3546" >
-<father id="3549" num="1" />
-<cdparam x="350" y="390" />
-<sizeparam width="118" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="3586" >
+<father id="3597" num="1" />
+<cdparam x="293" y="320" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3542" />
-<TGConnectingPoint num="1" id="3543" />
-<TGConnectingPoint num="2" id="3544" />
-<TGConnectingPoint num="3" id="3545" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="obstacleAhead = 1" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3556" >
-<cdparam x="445" y="483" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3555" />
-<P1  x="438" y="460" id="3585" />
-<P2  x="440" y="501" id="3614" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3554" >
-<father id="3556" num="0" />
-<cdparam x="445" y="523" />
+<SUBCOMPONENT type="-1" id="3587" >
+<father id="3597" num="2" />
+<cdparam x="280" y="118" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3592" >
+<father id="3597" num="3" />
+<cdparam x="424" y="318" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3550" />
-<TGConnectingPoint num="1" id="3551" />
-<TGConnectingPoint num="2" id="3552" />
-<TGConnectingPoint num="3" id="3553" />
+<TGConnectingPoint num="0" id="3588" />
+<TGConnectingPoint num="1" id="3589" />
+<TGConnectingPoint num="2" id="3590" />
+<TGConnectingPoint num="3" id="3591" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7923,209 +7930,190 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="3597" >
-<cdparam x="426" y="410" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingUpdate" />
-<TGConnectingPoint num="0" id="3557" />
-<TGConnectingPoint num="1" id="3558" />
-<TGConnectingPoint num="2" id="3559" />
-<TGConnectingPoint num="3" id="3560" />
-<TGConnectingPoint num="4" id="3561" />
-<TGConnectingPoint num="5" id="3562" />
-<TGConnectingPoint num="6" id="3563" />
-<TGConnectingPoint num="7" id="3564" />
-<TGConnectingPoint num="8" id="3565" />
-<TGConnectingPoint num="9" id="3566" />
-<TGConnectingPoint num="10" id="3567" />
-<TGConnectingPoint num="11" id="3568" />
-<TGConnectingPoint num="12" id="3569" />
-<TGConnectingPoint num="13" id="3570" />
-<TGConnectingPoint num="14" id="3571" />
-<TGConnectingPoint num="15" id="3572" />
-<TGConnectingPoint num="16" id="3573" />
-<TGConnectingPoint num="17" id="3574" />
-<TGConnectingPoint num="18" id="3575" />
-<TGConnectingPoint num="19" id="3576" />
-<TGConnectingPoint num="20" id="3577" />
-<TGConnectingPoint num="21" id="3578" />
-<TGConnectingPoint num="22" id="3579" />
-<TGConnectingPoint num="23" id="3580" />
-<TGConnectingPoint num="24" id="3581" />
-<TGConnectingPoint num="25" id="3582" />
-<TGConnectingPoint num="26" id="3583" />
-<TGConnectingPoint num="27" id="3584" />
-<TGConnectingPoint num="28" id="3585" />
-<TGConnectingPoint num="29" id="3586" />
-<TGConnectingPoint num="30" id="3587" />
-<TGConnectingPoint num="31" id="3588" />
-<TGConnectingPoint num="32" id="3589" />
-<TGConnectingPoint num="33" id="3590" />
-<TGConnectingPoint num="34" id="3591" />
-<TGConnectingPoint num="35" id="3592" />
-<TGConnectingPoint num="36" id="3593" />
-<TGConnectingPoint num="37" id="3594" />
-<TGConnectingPoint num="38" id="3595" />
-<TGConnectingPoint num="39" id="3596" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="3613" >
-<cdparam x="452" y="314" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="3600" >
+<cdparam x="249" y="229" />
+<sizeparam width="350" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
+<infoparam name="TGComponent" value="null" />
 <TGConnectingPoint num="0" id="3598" />
 <TGConnectingPoint num="1" id="3599" />
-<TGConnectingPoint num="2" id="3600" />
-<TGConnectingPoint num="3" id="3601" />
-<TGConnectingPoint num="4" id="3602" />
-<TGConnectingPoint num="5" id="3603" />
-<TGConnectingPoint num="6" id="3604" />
-<TGConnectingPoint num="7" id="3605" />
-<TGConnectingPoint num="8" id="3606" />
-<TGConnectingPoint num="9" id="3607" />
-<TGConnectingPoint num="10" id="3608" />
-<TGConnectingPoint num="11" id="3609" />
-<TGConnectingPoint num="12" id="3610" />
-<TGConnectingPoint num="13" id="3611" />
-<TGConnectingPoint num="14" id="3612" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3624" >
-<cdparam x="337" y="506" />
-<sizeparam width="206" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<extraparam>
+<Data variable="position" minValue="carid.minPosition" maxValue="carid.maxPosition" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5108" id="3603" >
+<cdparam x="298" y="193" />
+<sizeparam width="252" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="obstacleAhead(obstacleAhead)" />
-<TGConnectingPoint num="0" id="3614" />
-<TGConnectingPoint num="1" id="3615" />
-<TGConnectingPoint num="2" id="3616" />
-<TGConnectingPoint num="3" id="3617" />
-<TGConnectingPoint num="4" id="3618" />
-<TGConnectingPoint num="5" id="3619" />
-<TGConnectingPoint num="6" id="3620" />
-<TGConnectingPoint num="7" id="3621" />
-<TGConnectingPoint num="8" id="3622" />
-<TGConnectingPoint num="9" id="3623" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3665" >
-<cdparam x="355" y="142" />
-<sizeparam width="169" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="3601" />
+<TGConnectingPoint num="1" id="3602" />
+<extraparam>
+<Data variable="id" minValue="carid.minID" maxValue="carid.maxID" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3614" >
+<cdparam x="350" y="279" />
+<sizeparam width="144" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingForRadarInfo" />
-<TGConnectingPoint num="0" id="3625" />
-<TGConnectingPoint num="1" id="3626" />
-<TGConnectingPoint num="2" id="3627" />
-<TGConnectingPoint num="3" id="3628" />
-<TGConnectingPoint num="4" id="3629" />
-<TGConnectingPoint num="5" id="3630" />
-<TGConnectingPoint num="6" id="3631" />
-<TGConnectingPoint num="7" id="3632" />
-<TGConnectingPoint num="8" id="3633" />
-<TGConnectingPoint num="9" id="3634" />
-<TGConnectingPoint num="10" id="3635" />
-<TGConnectingPoint num="11" id="3636" />
-<TGConnectingPoint num="12" id="3637" />
-<TGConnectingPoint num="13" id="3638" />
-<TGConnectingPoint num="14" id="3639" />
-<TGConnectingPoint num="15" id="3640" />
-<TGConnectingPoint num="16" id="3641" />
-<TGConnectingPoint num="17" id="3642" />
-<TGConnectingPoint num="18" id="3643" />
-<TGConnectingPoint num="19" id="3644" />
-<TGConnectingPoint num="20" id="3645" />
-<TGConnectingPoint num="21" id="3646" />
-<TGConnectingPoint num="22" id="3647" />
-<TGConnectingPoint num="23" id="3648" />
-<TGConnectingPoint num="24" id="3649" />
-<TGConnectingPoint num="25" id="3650" />
-<TGConnectingPoint num="26" id="3651" />
-<TGConnectingPoint num="27" id="3652" />
-<TGConnectingPoint num="28" id="3653" />
-<TGConnectingPoint num="29" id="3654" />
-<TGConnectingPoint num="30" id="3655" />
-<TGConnectingPoint num="31" id="3656" />
-<TGConnectingPoint num="32" id="3657" />
-<TGConnectingPoint num="33" id="3658" />
-<TGConnectingPoint num="34" id="3659" />
-<TGConnectingPoint num="35" id="3660" />
-<TGConnectingPoint num="36" id="3661" />
-<TGConnectingPoint num="37" id="3662" />
-<TGConnectingPoint num="38" id="3663" />
-<TGConnectingPoint num="39" id="3664" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3667" >
-<cdparam x="432" y="88" />
+<infoparam name="Send signal" value="carPosition(id, position)" />
+<TGConnectingPoint num="0" id="3604" />
+<TGConnectingPoint num="1" id="3605" />
+<TGConnectingPoint num="2" id="3606" />
+<TGConnectingPoint num="3" id="3607" />
+<TGConnectingPoint num="4" id="3608" />
+<TGConnectingPoint num="5" id="3609" />
+<TGConnectingPoint num="6" id="3610" />
+<TGConnectingPoint num="7" id="3611" />
+<TGConnectingPoint num="8" id="3612" />
+<TGConnectingPoint num="9" id="3613" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3655" >
+<cdparam x="331" y="94" />
+<sizeparam width="186" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingforNewCarPosition" />
+<TGConnectingPoint num="0" id="3615" />
+<TGConnectingPoint num="1" id="3616" />
+<TGConnectingPoint num="2" id="3617" />
+<TGConnectingPoint num="3" id="3618" />
+<TGConnectingPoint num="4" id="3619" />
+<TGConnectingPoint num="5" id="3620" />
+<TGConnectingPoint num="6" id="3621" />
+<TGConnectingPoint num="7" id="3622" />
+<TGConnectingPoint num="8" id="3623" />
+<TGConnectingPoint num="9" id="3624" />
+<TGConnectingPoint num="10" id="3625" />
+<TGConnectingPoint num="11" id="3626" />
+<TGConnectingPoint num="12" id="3627" />
+<TGConnectingPoint num="13" id="3628" />
+<TGConnectingPoint num="14" id="3629" />
+<TGConnectingPoint num="15" id="3630" />
+<TGConnectingPoint num="16" id="3631" />
+<TGConnectingPoint num="17" id="3632" />
+<TGConnectingPoint num="18" id="3633" />
+<TGConnectingPoint num="19" id="3634" />
+<TGConnectingPoint num="20" id="3635" />
+<TGConnectingPoint num="21" id="3636" />
+<TGConnectingPoint num="22" id="3637" />
+<TGConnectingPoint num="23" id="3638" />
+<TGConnectingPoint num="24" id="3639" />
+<TGConnectingPoint num="25" id="3640" />
+<TGConnectingPoint num="26" id="3641" />
+<TGConnectingPoint num="27" id="3642" />
+<TGConnectingPoint num="28" id="3643" />
+<TGConnectingPoint num="29" id="3644" />
+<TGConnectingPoint num="30" id="3645" />
+<TGConnectingPoint num="31" id="3646" />
+<TGConnectingPoint num="32" id="3647" />
+<TGConnectingPoint num="33" id="3648" />
+<TGConnectingPoint num="34" id="3649" />
+<TGConnectingPoint num="35" id="3650" />
+<TGConnectingPoint num="36" id="3651" />
+<TGConnectingPoint num="37" id="3652" />
+<TGConnectingPoint num="38" id="3653" />
+<TGConnectingPoint num="39" id="3654" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3657" >
+<cdparam x="424" y="57" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3666" />
+<TGConnectingPoint num="0" id="3656" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="SpeedSensor" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3680" >
-<cdparam x="390" y="331" />
+<AVATARStateMachineDiagramPanel name="EmergencySimulator" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3664" >
+<cdparam x="524" y="259" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3663" />
+<P1  x="399" y="256" id="3754" />
+<P2  x="399" y="265" id="3699" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3662" >
+<father id="3664" num="0" />
+<cdparam x="524" y="299" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3658" />
+<TGConnectingPoint num="1" id="3659" />
+<TGConnectingPoint num="2" id="3660" />
+<TGConnectingPoint num="3" id="3661" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="3677" >
+<cdparam x="400" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3676" />
-<TGConnectingPoint num="1" id="3677" />
-<TGConnectingPoint num="2" id="3678" />
-<TGConnectingPoint num="3" id="3679" />
-<P1  x="390" y="355" id="3706" />
-<P2  x="306" y="133" id="3737" />
-<Point x="390" y="376" />
-<Point x="209" y="376" />
-<Point x="209" y="133" />
+<TGConnectingPoint num="0" id="3673" />
+<TGConnectingPoint num="1" id="3674" />
+<TGConnectingPoint num="2" id="3675" />
+<TGConnectingPoint num="3" id="3676" />
+<P1  x="399" y="295" id="3700" />
+<P2  x="307" y="112" id="3713" />
+<Point x="399" y="314" />
+<Point x="169" y="313" />
+<Point x="156" y="111" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3668" >
-<father id="3680" num="0" />
-<cdparam x="390" y="376" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3665" >
+<father id="3677" num="0" />
+<cdparam x="399" y="314" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3669" >
-<father id="3680" num="1" />
-<cdparam x="209" y="376" />
+<SUBCOMPONENT type="-1" id="3666" >
+<father id="3677" num="1" />
+<cdparam x="169" y="313" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3670" >
-<father id="3680" num="2" />
-<cdparam x="209" y="133" />
+<SUBCOMPONENT type="-1" id="3667" >
+<father id="3677" num="2" />
+<cdparam x="156" y="111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3675" >
-<father id="3680" num="3" />
-<cdparam x="390" y="371" />
+<SUBCOMPONENT type="-1" id="3672" >
+<father id="3677" num="3" />
+<cdparam x="400" y="311" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3671" />
-<TGConnectingPoint num="1" id="3672" />
-<TGConnectingPoint num="2" id="3673" />
-<TGConnectingPoint num="3" id="3674" />
+<TGConnectingPoint num="0" id="3668" />
+<TGConnectingPoint num="1" id="3669" />
+<TGConnectingPoint num="2" id="3670" />
+<TGConnectingPoint num="3" id="3671" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8135,53 +8123,53 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3687" >
-<cdparam x="410" y="165" />
+<CONNECTOR type="5102" id="3684" >
+<cdparam x="400" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3686" />
-<P1  x="390" y="165" id="3722" />
-<P2  x="390" y="242" id="3702" />
+<infoparam name="connector from TGComponent to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3683" />
+<P1  x="400" y="211" id="3757" />
+<P2  x="399" y="226" id="3753" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3685" >
-<father id="3687" num="0" />
-<cdparam x="404" y="195" />
-<sizeparam width="266" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3682" >
+<father id="3684" num="0" />
+<cdparam x="400" y="251" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3681" />
-<TGConnectingPoint num="1" id="3682" />
-<TGConnectingPoint num="2" id="3683" />
-<TGConnectingPoint num="3" id="3684" />
+<TGConnectingPoint num="0" id="3678" />
+<TGConnectingPoint num="1" id="3679" />
+<TGConnectingPoint num="2" id="3680" />
+<TGConnectingPoint num="3" id="3681" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="minSpeedUpdate" />
-<afterMax value="maxSpeedUpdate" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3694" >
-<cdparam x="390" y="81" />
+<CONNECTOR type="5102" id="3691" >
+<cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3693" />
-<P1  x="390" y="81" id="3757" />
-<P2  x="390" y="115" id="3717" />
+<TGConnectingPoint num="0" id="3690" />
+<P1  x="407" y="70" id="3751" />
+<P2  x="400" y="87" id="3711" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3692" >
-<father id="3694" num="0" />
-<cdparam x="390" y="121" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3689" >
+<father id="3691" num="0" />
+<cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3688" />
-<TGConnectingPoint num="1" id="3689" />
-<TGConnectingPoint num="2" id="3690" />
-<TGConnectingPoint num="3" id="3691" />
+<TGConnectingPoint num="0" id="3685" />
+<TGConnectingPoint num="1" id="3686" />
+<TGConnectingPoint num="2" id="3687" />
+<TGConnectingPoint num="3" id="3688" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8191,237 +8179,363 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3701" >
-<cdparam x="390" y="272" />
+<CONNECTOR type="5102" id="3698" >
+<cdparam x="493" y="137" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3700" />
-<P1  x="390" y="272" id="3703" />
-<P2  x="390" y="325" id="3705" />
+<infoparam name="connector from state0 to TGComponent" value="null" />
+<TGConnectingPoint num="0" id="3697" />
+<P1  x="400" y="137" id="3716" />
+<P2  x="400" y="181" id="3756" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3699" >
-<father id="3701" num="0" />
-<cdparam x="404" y="300" />
-<sizeparam width="168" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3696" >
+<father id="3698" num="0" />
+<cdparam x="493" y="177" />
+<sizeparam width="299" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3695" />
-<TGConnectingPoint num="1" id="3696" />
-<TGConnectingPoint num="2" id="3697" />
-<TGConnectingPoint num="3" id="3698" />
+<TGConnectingPoint num="0" id="3692" />
+<TGConnectingPoint num="1" id="3693" />
+<TGConnectingPoint num="2" id="3694" />
+<TGConnectingPoint num="3" id="3695" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
+<afterMin value="minEmergencyInterval" />
+<afterMax value="maxEmergencyInterval" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="speed = carinfo.maxSpeed" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5108" id="3704" >
-<cdparam x="208" y="247" />
-<sizeparam width="364" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3709" >
+<cdparam x="308" y="270" />
+<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="obstacleDetected(id, position)" />
+<TGConnectingPoint num="0" id="3699" />
+<TGConnectingPoint num="1" id="3700" />
+<TGConnectingPoint num="2" id="3701" />
+<TGConnectingPoint num="3" id="3702" />
+<TGConnectingPoint num="4" id="3703" />
+<TGConnectingPoint num="5" id="3704" />
+<TGConnectingPoint num="6" id="3705" />
+<TGConnectingPoint num="7" id="3706" />
+<TGConnectingPoint num="8" id="3707" />
+<TGConnectingPoint num="9" id="3708" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3750" >
+<cdparam x="307" y="87" />
+<sizeparam width="186" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingforEmergency" />
+<TGConnectingPoint num="0" id="3710" />
+<TGConnectingPoint num="1" id="3711" />
+<TGConnectingPoint num="2" id="3712" />
+<TGConnectingPoint num="3" id="3713" />
+<TGConnectingPoint num="4" id="3714" />
+<TGConnectingPoint num="5" id="3715" />
+<TGConnectingPoint num="6" id="3716" />
+<TGConnectingPoint num="7" id="3717" />
+<TGConnectingPoint num="8" id="3718" />
+<TGConnectingPoint num="9" id="3719" />
+<TGConnectingPoint num="10" id="3720" />
+<TGConnectingPoint num="11" id="3721" />
+<TGConnectingPoint num="12" id="3722" />
+<TGConnectingPoint num="13" id="3723" />
+<TGConnectingPoint num="14" id="3724" />
+<TGConnectingPoint num="15" id="3725" />
+<TGConnectingPoint num="16" id="3726" />
+<TGConnectingPoint num="17" id="3727" />
+<TGConnectingPoint num="18" id="3728" />
+<TGConnectingPoint num="19" id="3729" />
+<TGConnectingPoint num="20" id="3730" />
+<TGConnectingPoint num="21" id="3731" />
+<TGConnectingPoint num="22" id="3732" />
+<TGConnectingPoint num="23" id="3733" />
+<TGConnectingPoint num="24" id="3734" />
+<TGConnectingPoint num="25" id="3735" />
+<TGConnectingPoint num="26" id="3736" />
+<TGConnectingPoint num="27" id="3737" />
+<TGConnectingPoint num="28" id="3738" />
+<TGConnectingPoint num="29" id="3739" />
+<TGConnectingPoint num="30" id="3740" />
+<TGConnectingPoint num="31" id="3741" />
+<TGConnectingPoint num="32" id="3742" />
+<TGConnectingPoint num="33" id="3743" />
+<TGConnectingPoint num="34" id="3744" />
+<TGConnectingPoint num="35" id="3745" />
+<TGConnectingPoint num="36" id="3746" />
+<TGConnectingPoint num="37" id="3747" />
+<TGConnectingPoint num="38" id="3748" />
+<TGConnectingPoint num="39" id="3749" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3752" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3751" />
+</COMPONENT>
+
+<COMPONENT type="5108" id="3755" >
+<cdparam x="224" y="231" />
+<sizeparam width="350" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="3702" />
-<TGConnectingPoint num="1" id="3703" />
+<TGConnectingPoint num="0" id="3753" />
+<TGConnectingPoint num="1" id="3754" />
 <extraparam>
-<Data variable="speed" minValue="carinfo.minSpeed" maxValue="carinfo.maxSpeed" functionId="0" />
+<Data variable="position" minValue="carid.minPosition" maxValue="carid.maxPosition" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3715" >
-<cdparam x="310" y="330" />
-<sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="3758" >
+<cdparam x="274" y="186" />
+<sizeparam width="252" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="updateOnSpeed(speed)" />
-<TGConnectingPoint num="0" id="3705" />
-<TGConnectingPoint num="1" id="3706" />
-<TGConnectingPoint num="2" id="3707" />
-<TGConnectingPoint num="3" id="3708" />
-<TGConnectingPoint num="4" id="3709" />
-<TGConnectingPoint num="5" id="3710" />
-<TGConnectingPoint num="6" id="3711" />
-<TGConnectingPoint num="7" id="3712" />
-<TGConnectingPoint num="8" id="3713" />
-<TGConnectingPoint num="9" id="3714" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3756" >
-<cdparam x="306" y="115" />
-<sizeparam width="169" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="3756" />
+<TGConnectingPoint num="1" id="3757" />
+<extraparam>
+<Data variable="id" minValue="carid.minID" maxValue="carid.maxID" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="DSRSC_Management" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="3765" >
+<cdparam x="507" y="267" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Receive signal to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3764" />
+<P1  x="507" y="267" id="3863" />
+<P2  x="631" y="277" id="3840" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3763" >
+<father id="3765" num="0" />
+<cdparam x="507" y="307" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingForSpeedUpdate" />
-<TGConnectingPoint num="0" id="3716" />
-<TGConnectingPoint num="1" id="3717" />
-<TGConnectingPoint num="2" id="3718" />
-<TGConnectingPoint num="3" id="3719" />
-<TGConnectingPoint num="4" id="3720" />
-<TGConnectingPoint num="5" id="3721" />
-<TGConnectingPoint num="6" id="3722" />
-<TGConnectingPoint num="7" id="3723" />
-<TGConnectingPoint num="8" id="3724" />
-<TGConnectingPoint num="9" id="3725" />
-<TGConnectingPoint num="10" id="3726" />
-<TGConnectingPoint num="11" id="3727" />
-<TGConnectingPoint num="12" id="3728" />
-<TGConnectingPoint num="13" id="3729" />
-<TGConnectingPoint num="14" id="3730" />
-<TGConnectingPoint num="15" id="3731" />
-<TGConnectingPoint num="16" id="3732" />
-<TGConnectingPoint num="17" id="3733" />
-<TGConnectingPoint num="18" id="3734" />
-<TGConnectingPoint num="19" id="3735" />
-<TGConnectingPoint num="20" id="3736" />
-<TGConnectingPoint num="21" id="3737" />
-<TGConnectingPoint num="22" id="3738" />
-<TGConnectingPoint num="23" id="3739" />
-<TGConnectingPoint num="24" id="3740" />
-<TGConnectingPoint num="25" id="3741" />
-<TGConnectingPoint num="26" id="3742" />
-<TGConnectingPoint num="27" id="3743" />
-<TGConnectingPoint num="28" id="3744" />
-<TGConnectingPoint num="29" id="3745" />
-<TGConnectingPoint num="30" id="3746" />
-<TGConnectingPoint num="31" id="3747" />
-<TGConnectingPoint num="32" id="3748" />
-<TGConnectingPoint num="33" id="3749" />
-<TGConnectingPoint num="34" id="3750" />
-<TGConnectingPoint num="35" id="3751" />
-<TGConnectingPoint num="36" id="3752" />
-<TGConnectingPoint num="37" id="3753" />
-<TGConnectingPoint num="38" id="3754" />
-<TGConnectingPoint num="39" id="3755" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3758" >
-<cdparam x="383" y="61" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3759" />
+<TGConnectingPoint num="1" id="3760" />
+<TGConnectingPoint num="2" id="3761" />
+<TGConnectingPoint num="3" id="3762" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="3778" >
+<cdparam x="440" y="432" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3774" />
+<TGConnectingPoint num="1" id="3775" />
+<TGConnectingPoint num="2" id="3776" />
+<TGConnectingPoint num="3" id="3777" />
+<P1  x="440" y="432" id="3852" />
+<P2  x="530" y="110" id="3917" />
+<Point x="442" y="479" />
+<Point x="974" y="511" />
+<Point x="957" y="129" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3766" >
+<father id="3778" num="0" />
+<cdparam x="442" y="479" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3757" />
-</COMPONENT>
-
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3767" >
+<father id="3778" num="1" />
+<cdparam x="974" y="511" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3768" >
+<father id="3778" num="2" />
+<cdparam x="957" y="129" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="3773" >
+<father id="3778" num="3" />
+<cdparam x="457" y="473" />
+<sizeparam width="150" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3769" />
+<TGConnectingPoint num="1" id="3770" />
+<TGConnectingPoint num="2" id="3771" />
+<TGConnectingPoint num="3" id="3772" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="sendMessage(id, position)" />
+</extraparam>
+</SUBCOMPONENT>
 
-</AVATARStateMachineDiagramPanel>
+<CONNECTOR type="5102" id="3785" >
+<cdparam x="407" y="182" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="3784" />
+<P1  x="407" y="182" id="3901" />
+<P2  x="440" y="402" id="3851" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3783" >
+<father id="3785" num="0" />
+<cdparam x="407" y="222" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3779" />
+<TGConnectingPoint num="1" id="3780" />
+<TGConnectingPoint num="2" id="3781" />
+<TGConnectingPoint num="3" id="3782" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
 
-<AVATARStateMachineDiagramPanel name="CorrectnessChecking" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3771" >
-<cdparam x="432" y="279" />
+<CONNECTOR type="5102" id="3798" >
+<cdparam x="507" y="267" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3767" />
-<TGConnectingPoint num="1" id="3768" />
-<TGConnectingPoint num="2" id="3769" />
-<TGConnectingPoint num="3" id="3770" />
-<P1  x="432" y="279" id="3826" />
-<P2  x="517" y="124" id="3855" />
-<Point x="504" y="393" />
-<Point x="621" y="397" />
-<Point x="623" y="107" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3794" />
+<TGConnectingPoint num="1" id="3795" />
+<TGConnectingPoint num="2" id="3796" />
+<TGConnectingPoint num="3" id="3797" />
+<P1  x="631" y="307" id="3841" />
+<P2  x="530" y="141" id="3899" />
+<Point x="644" y="343" />
+<Point x="829" y="341" />
+<Point x="848" y="153" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3759" >
-<father id="3771" num="0" />
-<cdparam x="504" y="393" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3786" >
+<father id="3798" num="0" />
+<cdparam x="644" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3760" >
-<father id="3771" num="1" />
-<cdparam x="621" y="397" />
+<SUBCOMPONENT type="-1" id="3787" >
+<father id="3798" num="1" />
+<cdparam x="829" y="341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3761" >
-<father id="3771" num="2" />
-<cdparam x="623" y="107" />
+<SUBCOMPONENT type="-1" id="3788" >
+<father id="3798" num="2" />
+<cdparam x="848" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3766" >
-<father id="3771" num="3" />
-<cdparam x="479" y="319" />
-<sizeparam width="98" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="3793" >
+<father id="3798" num="3" />
+<cdparam x="507" y="307" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3762" />
-<TGConnectingPoint num="1" id="3763" />
-<TGConnectingPoint num="2" id="3764" />
-<TGConnectingPoint num="3" id="3765" />
+<TGConnectingPoint num="0" id="3789" />
+<TGConnectingPoint num="1" id="3790" />
+<TGConnectingPoint num="2" id="3791" />
+<TGConnectingPoint num="3" id="3792" />
 <extraparam>
-<guard value="[ canHaveInvalid]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="invalidMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3784" >
-<cdparam x="290" y="387" />
+<CONNECTOR type="5102" id="3811" >
+<cdparam x="289" y="344" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3780" />
-<TGConnectingPoint num="1" id="3781" />
-<TGConnectingPoint num="2" id="3782" />
-<TGConnectingPoint num="3" id="3783" />
-<P1  x="290" y="387" id="3814" />
-<P2  x="298" y="117" id="3872" />
-<Point x="297" y="425" />
-<Point x="160" y="415" />
-<Point x="172" y="94" />
+<TGConnectingPoint num="0" id="3807" />
+<TGConnectingPoint num="1" id="3808" />
+<TGConnectingPoint num="2" id="3809" />
+<TGConnectingPoint num="3" id="3810" />
+<P1  x="289" y="344" id="3874" />
+<P2  x="285" y="141" id="3898" />
+<Point x="285" y="384" />
+<Point x="189" y="387" />
+<Point x="176" y="154" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3772" >
-<father id="3784" num="0" />
-<cdparam x="297" y="425" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3799" >
+<father id="3811" num="0" />
+<cdparam x="285" y="384" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3773" >
-<father id="3784" num="1" />
-<cdparam x="160" y="415" />
+<SUBCOMPONENT type="-1" id="3800" >
+<father id="3811" num="1" />
+<cdparam x="189" y="387" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3774" >
-<father id="3784" num="2" />
-<cdparam x="172" y="94" />
+<SUBCOMPONENT type="-1" id="3801" >
+<father id="3811" num="2" />
+<cdparam x="176" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3779" >
-<father id="3784" num="3" />
-<cdparam x="290" y="427" />
+<SUBCOMPONENT type="-1" id="3806" >
+<father id="3811" num="3" />
+<cdparam x="289" y="384" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3775" />
-<TGConnectingPoint num="1" id="3776" />
-<TGConnectingPoint num="2" id="3777" />
-<TGConnectingPoint num="3" id="3778" />
+<TGConnectingPoint num="0" id="3802" />
+<TGConnectingPoint num="1" id="3803" />
+<TGConnectingPoint num="2" id="3804" />
+<TGConnectingPoint num="3" id="3805" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8431,25 +8545,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3791" >
+<CONNECTOR type="5102" id="3818" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3790" />
-<P1  x="407" y="70" id="3892" />
-<P2  x="407" y="99" id="3852" />
+<TGConnectingPoint num="0" id="3817" />
+<P1  x="407" y="70" id="3936" />
+<P2  x="407" y="101" id="3896" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3789" >
-<father id="3791" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3816" >
+<father id="3818" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3785" />
-<TGConnectingPoint num="1" id="3786" />
-<TGConnectingPoint num="2" id="3787" />
-<TGConnectingPoint num="3" id="3788" />
+<TGConnectingPoint num="0" id="3812" />
+<TGConnectingPoint num="1" id="3813" />
+<TGConnectingPoint num="2" id="3814" />
+<TGConnectingPoint num="3" id="3815" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8459,25 +8573,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3798" >
-<cdparam x="407" y="149" />
+<CONNECTOR type="5102" id="3825" >
+<cdparam x="314" y="182" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3797" />
-<P1  x="407" y="149" id="3857" />
-<P2  x="407" y="188" id="3840" />
+<TGConnectingPoint num="0" id="3824" />
+<P1  x="314" y="182" id="3923" />
+<P2  x="296" y="256" id="3884" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3796" >
-<father id="3798" num="0" />
-<cdparam x="407" y="189" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3823" >
+<father id="3825" num="0" />
+<cdparam x="314" y="222" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3792" />
-<TGConnectingPoint num="1" id="3793" />
-<TGConnectingPoint num="2" id="3794" />
-<TGConnectingPoint num="3" id="3795" />
+<TGConnectingPoint num="0" id="3819" />
+<TGConnectingPoint num="1" id="3820" />
+<TGConnectingPoint num="2" id="3821" />
+<TGConnectingPoint num="3" id="3822" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8487,111 +8601,68 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3805" >
-<cdparam x="407" y="218" />
+<CONNECTOR type="5102" id="3832" >
+<cdparam x="296" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to choice" value="null" />
-<TGConnectingPoint num="0" id="3804" />
-<P1  x="407" y="218" id="3841" />
-<P2  x="407" y="254" id="3824" />
+<infoparam name="connector from Receive signal to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3831" />
+<P1  x="296" y="286" id="3885" />
+<P2  x="289" y="314" id="3873" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3803" >
-<father id="3805" num="0" />
-<cdparam x="419" y="243" />
-<sizeparam width="108" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3830" >
+<father id="3832" num="0" />
+<cdparam x="296" y="326" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3799" />
-<TGConnectingPoint num="1" id="3800" />
-<TGConnectingPoint num="2" id="3801" />
-<TGConnectingPoint num="3" id="3802" />
+<TGConnectingPoint num="0" id="3826" />
+<TGConnectingPoint num="1" id="3827" />
+<TGConnectingPoint num="2" id="3828" />
+<TGConnectingPoint num="3" id="3829" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="checkingMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3812" >
-<cdparam x="382" y="279" />
+<CONNECTOR type="5102" id="3839" >
+<cdparam x="498" y="182" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3811" />
-<P1  x="382" y="279" id="3828" />
-<P2  x="290" y="357" id="3813" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="3838" />
+<P1  x="498" y="182" id="3926" />
+<P2  x="507" y="237" id="3862" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3810" >
-<father id="3812" num="0" />
-<cdparam x="259" y="312" />
-<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3837" >
+<father id="3839" num="0" />
+<cdparam x="498" y="222" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3806" />
-<TGConnectingPoint num="1" id="3807" />
-<TGConnectingPoint num="2" id="3808" />
-<TGConnectingPoint num="3" id="3809" />
+<TGConnectingPoint num="0" id="3833" />
+<TGConnectingPoint num="1" id="3834" />
+<TGConnectingPoint num="2" id="3835" />
+<TGConnectingPoint num="3" id="3836" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="validMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3823" >
-<cdparam x="174" y="362" />
-<sizeparam width="232" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="toPlausibityCheckMessage(id, position)" />
-<TGConnectingPoint num="0" id="3813" />
-<TGConnectingPoint num="1" id="3814" />
-<TGConnectingPoint num="2" id="3815" />
-<TGConnectingPoint num="3" id="3816" />
-<TGConnectingPoint num="4" id="3817" />
-<TGConnectingPoint num="5" id="3818" />
-<TGConnectingPoint num="6" id="3819" />
-<TGConnectingPoint num="7" id="3820" />
-<TGConnectingPoint num="8" id="3821" />
-<TGConnectingPoint num="9" id="3822" />
-</COMPONENT>
-
-<COMPONENT type="5107" id="3839" >
-<cdparam x="392" y="264" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="3824" />
-<TGConnectingPoint num="1" id="3825" />
-<TGConnectingPoint num="2" id="3826" />
-<TGConnectingPoint num="3" id="3827" />
-<TGConnectingPoint num="4" id="3828" />
-<TGConnectingPoint num="5" id="3829" />
-<TGConnectingPoint num="6" id="3830" />
-<TGConnectingPoint num="7" id="3831" />
-<TGConnectingPoint num="8" id="3832" />
-<TGConnectingPoint num="9" id="3833" />
-<TGConnectingPoint num="10" id="3834" />
-<TGConnectingPoint num="11" id="3835" />
-<TGConnectingPoint num="12" id="3836" />
-<TGConnectingPoint num="13" id="3837" />
-<TGConnectingPoint num="14" id="3838" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3850" >
-<cdparam x="275" y="193" />
-<sizeparam width="264" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3850" >
+<cdparam x="490" y="282" />
+<sizeparam width="283" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="getEmergencyBrakingMessage(id, position)" />
+<infoparam name="Send signal" value="forwardEmergencyBrakingMessage(id, position)" />
 <TGConnectingPoint num="0" id="3840" />
 <TGConnectingPoint num="1" id="3841" />
 <TGConnectingPoint num="2" id="3842" />
@@ -8604,12 +8675,12 @@
 <TGConnectingPoint num="9" id="3849" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3891" >
-<cdparam x="298" y="99" />
-<sizeparam width="219" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3861" >
+<cdparam x="288" y="407" />
+<sizeparam width="304" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingForMessageToAnalyze" />
+<infoparam name="Receive signal" value="broadcastEmergencyBrakingMessage(id, position)" />
 <TGConnectingPoint num="0" id="3851" />
 <TGConnectingPoint num="1" id="3852" />
 <TGConnectingPoint num="2" id="3853" />
@@ -8620,102 +8691,174 @@
 <TGConnectingPoint num="7" id="3858" />
 <TGConnectingPoint num="8" id="3859" />
 <TGConnectingPoint num="9" id="3860" />
-<TGConnectingPoint num="10" id="3861" />
-<TGConnectingPoint num="11" id="3862" />
-<TGConnectingPoint num="12" id="3863" />
-<TGConnectingPoint num="13" id="3864" />
-<TGConnectingPoint num="14" id="3865" />
-<TGConnectingPoint num="15" id="3866" />
-<TGConnectingPoint num="16" id="3867" />
-<TGConnectingPoint num="17" id="3868" />
-<TGConnectingPoint num="18" id="3869" />
-<TGConnectingPoint num="19" id="3870" />
-<TGConnectingPoint num="20" id="3871" />
-<TGConnectingPoint num="21" id="3872" />
-<TGConnectingPoint num="22" id="3873" />
-<TGConnectingPoint num="23" id="3874" />
-<TGConnectingPoint num="24" id="3875" />
-<TGConnectingPoint num="25" id="3876" />
-<TGConnectingPoint num="26" id="3877" />
-<TGConnectingPoint num="27" id="3878" />
-<TGConnectingPoint num="28" id="3879" />
-<TGConnectingPoint num="29" id="3880" />
-<TGConnectingPoint num="30" id="3881" />
-<TGConnectingPoint num="31" id="3882" />
-<TGConnectingPoint num="32" id="3883" />
-<TGConnectingPoint num="33" id="3884" />
-<TGConnectingPoint num="34" id="3885" />
-<TGConnectingPoint num="35" id="3886" />
-<TGConnectingPoint num="36" id="3887" />
-<TGConnectingPoint num="37" id="3888" />
-<TGConnectingPoint num="38" id="3889" />
-<TGConnectingPoint num="39" id="3890" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3893" >
+</COMPONENT>
+
+<COMPONENT type="5104" id="3872" >
+<cdparam x="412" y="242" />
+<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="obstacleDetected(id, position)" />
+<TGConnectingPoint num="0" id="3862" />
+<TGConnectingPoint num="1" id="3863" />
+<TGConnectingPoint num="2" id="3864" />
+<TGConnectingPoint num="3" id="3865" />
+<TGConnectingPoint num="4" id="3866" />
+<TGConnectingPoint num="5" id="3867" />
+<TGConnectingPoint num="6" id="3868" />
+<TGConnectingPoint num="7" id="3869" />
+<TGConnectingPoint num="8" id="3870" />
+<TGConnectingPoint num="9" id="3871" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3883" >
+<cdparam x="208" y="319" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="setCarPosition(id, position)" />
+<TGConnectingPoint num="0" id="3873" />
+<TGConnectingPoint num="1" id="3874" />
+<TGConnectingPoint num="2" id="3875" />
+<TGConnectingPoint num="3" id="3876" />
+<TGConnectingPoint num="4" id="3877" />
+<TGConnectingPoint num="5" id="3878" />
+<TGConnectingPoint num="6" id="3879" />
+<TGConnectingPoint num="7" id="3880" />
+<TGConnectingPoint num="8" id="3881" />
+<TGConnectingPoint num="9" id="3882" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3894" >
+<cdparam x="220" y="261" />
+<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="carPosition(id, position)" />
+<TGConnectingPoint num="0" id="3884" />
+<TGConnectingPoint num="1" id="3885" />
+<TGConnectingPoint num="2" id="3886" />
+<TGConnectingPoint num="3" id="3887" />
+<TGConnectingPoint num="4" id="3888" />
+<TGConnectingPoint num="5" id="3889" />
+<TGConnectingPoint num="6" id="3890" />
+<TGConnectingPoint num="7" id="3891" />
+<TGConnectingPoint num="8" id="3892" />
+<TGConnectingPoint num="9" id="3893" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3935" >
+<cdparam x="285" y="101" />
+<sizeparam width="245" height="81" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingForEnvironmentInput" />
+<TGConnectingPoint num="0" id="3895" />
+<TGConnectingPoint num="1" id="3896" />
+<TGConnectingPoint num="2" id="3897" />
+<TGConnectingPoint num="3" id="3898" />
+<TGConnectingPoint num="4" id="3899" />
+<TGConnectingPoint num="5" id="3900" />
+<TGConnectingPoint num="6" id="3901" />
+<TGConnectingPoint num="7" id="3902" />
+<TGConnectingPoint num="8" id="3903" />
+<TGConnectingPoint num="9" id="3904" />
+<TGConnectingPoint num="10" id="3905" />
+<TGConnectingPoint num="11" id="3906" />
+<TGConnectingPoint num="12" id="3907" />
+<TGConnectingPoint num="13" id="3908" />
+<TGConnectingPoint num="14" id="3909" />
+<TGConnectingPoint num="15" id="3910" />
+<TGConnectingPoint num="16" id="3911" />
+<TGConnectingPoint num="17" id="3912" />
+<TGConnectingPoint num="18" id="3913" />
+<TGConnectingPoint num="19" id="3914" />
+<TGConnectingPoint num="20" id="3915" />
+<TGConnectingPoint num="21" id="3916" />
+<TGConnectingPoint num="22" id="3917" />
+<TGConnectingPoint num="23" id="3918" />
+<TGConnectingPoint num="24" id="3919" />
+<TGConnectingPoint num="25" id="3920" />
+<TGConnectingPoint num="26" id="3921" />
+<TGConnectingPoint num="27" id="3922" />
+<TGConnectingPoint num="28" id="3923" />
+<TGConnectingPoint num="29" id="3924" />
+<TGConnectingPoint num="30" id="3925" />
+<TGConnectingPoint num="31" id="3926" />
+<TGConnectingPoint num="32" id="3927" />
+<TGConnectingPoint num="33" id="3928" />
+<TGConnectingPoint num="34" id="3929" />
+<TGConnectingPoint num="35" id="3930" />
+<TGConnectingPoint num="36" id="3931" />
+<TGConnectingPoint num="37" id="3932" />
+<TGConnectingPoint num="38" id="3933" />
+<TGConnectingPoint num="39" id="3934" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3937" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3892" />
+<TGConnectingPoint num="0" id="3936" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="NeighbourhoodTableManagement" minX="10" maxX="1900" minY="10" maxY="1900" >
-<CONNECTOR type="5102" id="3906" >
+<CONNECTOR type="5102" id="3950" >
 <cdparam x="371" y="281" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3902" />
-<TGConnectingPoint num="1" id="3903" />
-<TGConnectingPoint num="2" id="3904" />
-<TGConnectingPoint num="3" id="3905" />
-<P1  x="371" y="281" id="4148" />
-<P2  x="453" y="163" id="4540" />
+<TGConnectingPoint num="0" id="3946" />
+<TGConnectingPoint num="1" id="3947" />
+<TGConnectingPoint num="2" id="3948" />
+<TGConnectingPoint num="3" id="3949" />
+<P1  x="371" y="281" id="4192" />
+<P2  x="453" y="163" id="4584" />
 <Point x="372" y="309" />
 <Point x="272" y="313" />
 <Point x="255" y="142" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3894" >
-<father id="3906" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3938" >
+<father id="3950" num="0" />
 <cdparam x="372" y="309" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3895" >
-<father id="3906" num="1" />
+<SUBCOMPONENT type="-1" id="3939" >
+<father id="3950" num="1" />
 <cdparam x="272" y="313" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3896" >
-<father id="3906" num="2" />
+<SUBCOMPONENT type="-1" id="3940" >
+<father id="3950" num="2" />
 <cdparam x="255" y="142" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3901" >
-<father id="3906" num="3" />
+<SUBCOMPONENT type="-1" id="3945" >
+<father id="3950" num="3" />
 <cdparam x="371" y="321" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3897" />
-<TGConnectingPoint num="1" id="3898" />
-<TGConnectingPoint num="2" id="3899" />
-<TGConnectingPoint num="3" id="3900" />
+<TGConnectingPoint num="0" id="3941" />
+<TGConnectingPoint num="1" id="3942" />
+<TGConnectingPoint num="2" id="3943" />
+<TGConnectingPoint num="3" id="3944" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8725,25 +8868,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3913" >
+<CONNECTOR type="5102" id="3957" >
 <cdparam x="862" y="884" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3912" />
-<P1  x="740" y="812" id="4161" />
-<P2  x="729" y="1182" id="4466" />
+<TGConnectingPoint num="0" id="3956" />
+<P1  x="740" y="812" id="4205" />
+<P2  x="729" y="1182" id="4510" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3911" >
-<father id="3913" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3955" >
+<father id="3957" num="0" />
 <cdparam x="512" y="935" />
 <sizeparam width="614" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3907" />
-<TGConnectingPoint num="1" id="3908" />
-<TGConnectingPoint num="2" id="3909" />
-<TGConnectingPoint num="3" id="3910" />
+<TGConnectingPoint num="0" id="3951" />
+<TGConnectingPoint num="1" id="3952" />
+<TGConnectingPoint num="2" id="3953" />
+<TGConnectingPoint num="3" id="3954" />
 <extraparam>
 <guard value="[ (listOfNodes.position2 &gt;= listOfNodes.position1) and  (listOfNodes.position2 &gt;= listOfNodes.position1) ]" />
 <afterMin value="" />
@@ -8754,25 +8897,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3920" >
+<CONNECTOR type="5102" id="3964" >
 <cdparam x="765" y="787" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<TGConnectingPoint num="0" id="3919" />
-<P1  x="765" y="787" id="4160" />
-<P2  x="793" y="1182" id="4457" />
+<TGConnectingPoint num="0" id="3963" />
+<P1  x="765" y="787" id="4204" />
+<P2  x="793" y="1182" id="4501" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3918" >
-<father id="3920" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3962" >
+<father id="3964" num="0" />
 <cdparam x="653" y="869" />
 <sizeparam width="614" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3914" />
-<TGConnectingPoint num="1" id="3915" />
-<TGConnectingPoint num="2" id="3916" />
-<TGConnectingPoint num="3" id="3917" />
+<TGConnectingPoint num="0" id="3958" />
+<TGConnectingPoint num="1" id="3959" />
+<TGConnectingPoint num="2" id="3960" />
+<TGConnectingPoint num="3" id="3961" />
 <extraparam>
 <guard value="[ (listOfNodes.position1 &gt;= listOfNodes.position0) and  (listOfNodes.position1 &gt;= listOfNodes.position2) ]" />
 <afterMin value="" />
@@ -8783,25 +8926,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3927" >
+<CONNECTOR type="5102" id="3971" >
 <cdparam x="715" y="787" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3926" />
-<P1  x="715" y="787" id="4159" />
-<P2  x="607" y="1182" id="4465" />
+<TGConnectingPoint num="0" id="3970" />
+<P1  x="715" y="787" id="4203" />
+<P2  x="607" y="1182" id="4509" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3925" >
-<father id="3927" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3969" >
+<father id="3971" num="0" />
 <cdparam x="347" y="830" />
 <sizeparam width="614" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3921" />
-<TGConnectingPoint num="1" id="3922" />
-<TGConnectingPoint num="2" id="3923" />
-<TGConnectingPoint num="3" id="3924" />
+<TGConnectingPoint num="0" id="3965" />
+<TGConnectingPoint num="1" id="3966" />
+<TGConnectingPoint num="2" id="3967" />
+<TGConnectingPoint num="3" id="3968" />
 <extraparam>
 <guard value="[ (listOfNodes.position0 &gt;= listOfNodes.position1) and  (listOfNodes.position0 &gt;= listOfNodes.position2) ]" />
 <afterMin value="" />
@@ -8812,25 +8955,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3934" >
+<CONNECTOR type="5102" id="3978" >
 <cdparam x="330" y="819" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3933" />
-<P1  x="330" y="819" id="4176" />
-<P2  x="485" y="1182" id="4464" />
+<TGConnectingPoint num="0" id="3977" />
+<P1  x="330" y="819" id="4220" />
+<P2  x="485" y="1182" id="4508" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3932" >
-<father id="3934" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3976" >
+<father id="3978" num="0" />
 <cdparam x="339" y="869" />
 <sizeparam width="250" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3928" />
-<TGConnectingPoint num="1" id="3929" />
-<TGConnectingPoint num="2" id="3930" />
-<TGConnectingPoint num="3" id="3931" />
+<TGConnectingPoint num="0" id="3972" />
+<TGConnectingPoint num="1" id="3973" />
+<TGConnectingPoint num="2" id="3974" />
+<TGConnectingPoint num="3" id="3975" />
 <extraparam>
 <guard value="[ (listOfNodes.position2 &lt; currentPosition) ]" />
 <afterMin value="" />
@@ -8841,25 +8984,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3941" >
+<CONNECTOR type="5102" id="3985" >
 <cdparam x="305" y="844" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3940" />
-<P1  x="305" y="844" id="4177" />
-<P2  x="427" y="1207" id="4451" />
+<TGConnectingPoint num="0" id="3984" />
+<P1  x="305" y="844" id="4221" />
+<P2  x="427" y="1207" id="4495" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3939" >
-<father id="3941" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3983" >
+<father id="3985" num="0" />
 <cdparam x="281" y="907" />
 <sizeparam width="250" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3935" />
-<TGConnectingPoint num="1" id="3936" />
-<TGConnectingPoint num="2" id="3937" />
-<TGConnectingPoint num="3" id="3938" />
+<TGConnectingPoint num="0" id="3979" />
+<TGConnectingPoint num="1" id="3980" />
+<TGConnectingPoint num="2" id="3981" />
+<TGConnectingPoint num="3" id="3982" />
 <extraparam>
 <guard value="[ (listOfNodes.position1 &lt; currentPosition) ]" />
 <afterMin value="" />
@@ -8870,35 +9013,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3950" >
+<CONNECTOR type="5102" id="3994" >
 <cdparam x="280" y="819" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3948" />
-<TGConnectingPoint num="1" id="3949" />
-<P1  x="280" y="819" id="4175" />
-<P2  x="427" y="1225" id="4473" />
+<TGConnectingPoint num="0" id="3992" />
+<TGConnectingPoint num="1" id="3993" />
+<P1  x="280" y="819" id="4219" />
+<P2  x="427" y="1225" id="4517" />
 <Point x="245" y="990" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3942" >
-<father id="3950" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3986" >
+<father id="3994" num="0" />
 <cdparam x="245" y="990" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3947" >
-<father id="3950" num="1" />
+<SUBCOMPONENT type="-1" id="3991" >
+<father id="3994" num="1" />
 <cdparam x="28" y="885" />
 <sizeparam width="250" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3943" />
-<TGConnectingPoint num="1" id="3944" />
-<TGConnectingPoint num="2" id="3945" />
-<TGConnectingPoint num="3" id="3946" />
+<TGConnectingPoint num="0" id="3987" />
+<TGConnectingPoint num="1" id="3988" />
+<TGConnectingPoint num="2" id="3989" />
+<TGConnectingPoint num="3" id="3990" />
 <extraparam>
 <guard value="[ (listOfNodes.position0 &lt; currentPosition) ]" />
 <afterMin value="" />
@@ -8909,35 +9052,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3959" >
+<CONNECTOR type="5102" id="4003" >
 <cdparam x="535" y="705" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3957" />
-<TGConnectingPoint num="1" id="3958" />
-<P1  x="522" y="668" id="4400" />
-<P2  x="740" y="762" id="4158" />
+<TGConnectingPoint num="0" id="4001" />
+<TGConnectingPoint num="1" id="4002" />
+<P1  x="522" y="668" id="4444" />
+<P2  x="740" y="762" id="4202" />
 <Point x="653" y="702" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3951" >
-<father id="3959" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3995" >
+<father id="4003" num="0" />
 <cdparam x="653" y="702" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3956" >
-<father id="3959" num="1" />
+<SUBCOMPONENT type="-1" id="4000" >
+<father id="4003" num="1" />
 <cdparam x="589" y="673" />
 <sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3952" />
-<TGConnectingPoint num="1" id="3953" />
-<TGConnectingPoint num="2" id="3954" />
-<TGConnectingPoint num="3" id="3955" />
+<TGConnectingPoint num="0" id="3996" />
+<TGConnectingPoint num="1" id="3997" />
+<TGConnectingPoint num="2" id="3998" />
+<TGConnectingPoint num="3" id="3999" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -8947,25 +9090,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3966" >
+<CONNECTOR type="5102" id="4010" >
 <cdparam x="851" y="1232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3965" />
-<P1  x="851" y="1232" id="4479" />
-<P2  x="759" y="1409" id="4209" />
+<TGConnectingPoint num="0" id="4009" />
+<P1  x="851" y="1232" id="4523" />
+<P2  x="759" y="1409" id="4253" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3964" >
-<father id="3966" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4008" >
+<father id="4010" num="0" />
 <cdparam x="829" y="1296" />
 <sizeparam width="186" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3960" />
-<TGConnectingPoint num="1" id="3961" />
-<TGConnectingPoint num="2" id="3962" />
-<TGConnectingPoint num="3" id="3963" />
+<TGConnectingPoint num="0" id="4004" />
+<TGConnectingPoint num="1" id="4005" />
+<TGConnectingPoint num="2" id="4006" />
+<TGConnectingPoint num="3" id="4007" />
 <extraparam>
 <guard value="[ listOfNodes.id2 == 0]" />
 <afterMin value="" />
@@ -8977,25 +9120,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3973" >
+<CONNECTOR type="5102" id="4017" >
 <cdparam x="671" y="1232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3972" />
-<P1  x="671" y="1232" id="4454" />
-<P2  x="640" y="1409" id="4191" />
+<TGConnectingPoint num="0" id="4016" />
+<P1  x="671" y="1232" id="4498" />
+<P2  x="640" y="1409" id="4235" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3971" >
-<father id="3973" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4015" >
+<father id="4017" num="0" />
 <cdparam x="570" y="1299" />
 <sizeparam width="186" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3967" />
-<TGConnectingPoint num="1" id="3968" />
-<TGConnectingPoint num="2" id="3969" />
-<TGConnectingPoint num="3" id="3970" />
+<TGConnectingPoint num="0" id="4011" />
+<TGConnectingPoint num="1" id="4012" />
+<TGConnectingPoint num="2" id="4013" />
+<TGConnectingPoint num="3" id="4014" />
 <extraparam>
 <guard value="[ listOfNodes.id1 == 0]" />
 <afterMin value="" />
@@ -9007,25 +9150,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3980" >
+<CONNECTOR type="5102" id="4024" >
 <cdparam x="549" y="1232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3979" />
-<P1  x="485" y="1232" id="4476" />
-<P2  x="517" y="1409" id="4206" />
+<TGConnectingPoint num="0" id="4023" />
+<P1  x="485" y="1232" id="4520" />
+<P2  x="517" y="1409" id="4250" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3978" >
-<father id="3980" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4022" >
+<father id="4024" num="0" />
 <cdparam x="293" y="1279" />
 <sizeparam width="186" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3974" />
-<TGConnectingPoint num="1" id="3975" />
-<TGConnectingPoint num="2" id="3976" />
-<TGConnectingPoint num="3" id="3977" />
+<TGConnectingPoint num="0" id="4018" />
+<TGConnectingPoint num="1" id="4019" />
+<TGConnectingPoint num="2" id="4020" />
+<TGConnectingPoint num="3" id="4021" />
 <extraparam>
 <guard value="[ listOfNodes.id0 == 0]" />
 <afterMin value="" />
@@ -9037,45 +9180,45 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3991" >
+<CONNECTOR type="5102" id="4035" >
 <cdparam x="820" y="1233" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3988" />
-<TGConnectingPoint num="1" id="3989" />
-<TGConnectingPoint num="2" id="3990" />
-<P1  x="801" y="1434" id="4194" />
-<P2  x="710" y="145" id="4532" />
+<TGConnectingPoint num="0" id="4032" />
+<TGConnectingPoint num="1" id="4033" />
+<TGConnectingPoint num="2" id="4034" />
+<P1  x="801" y="1434" id="4238" />
+<P2  x="710" y="145" id="4576" />
 <Point x="1377" y="1228" />
 <Point x="1356" y="105" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3981" >
-<father id="3991" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4025" >
+<father id="4035" num="0" />
 <cdparam x="1377" y="1228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3982" >
-<father id="3991" num="1" />
+<SUBCOMPONENT type="-1" id="4026" >
+<father id="4035" num="1" />
 <cdparam x="1356" y="105" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3987" >
-<father id="3991" num="2" />
+<SUBCOMPONENT type="-1" id="4031" >
+<father id="4035" num="2" />
 <cdparam x="820" y="1273" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3983" />
-<TGConnectingPoint num="1" id="3984" />
-<TGConnectingPoint num="2" id="3985" />
-<TGConnectingPoint num="3" id="3986" />
+<TGConnectingPoint num="0" id="4027" />
+<TGConnectingPoint num="1" id="4028" />
+<TGConnectingPoint num="2" id="4029" />
+<TGConnectingPoint num="3" id="4030" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9085,35 +9228,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4000" >
+<CONNECTOR type="5102" id="4044" >
 <cdparam x="1056" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="3998" />
-<TGConnectingPoint num="1" id="3999" />
-<P1  x="1170" y="495" id="4133" />
-<P2  x="1082" y="649" id="4242" />
+<TGConnectingPoint num="0" id="4042" />
+<TGConnectingPoint num="1" id="4043" />
+<P1  x="1170" y="495" id="4177" />
+<P2  x="1082" y="649" id="4286" />
 <Point x="1204" y="597" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3992" >
-<father id="4000" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4036" >
+<father id="4044" num="0" />
 <cdparam x="1204" y="597" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3997" >
-<father id="4000" num="1" />
+<SUBCOMPONENT type="-1" id="4041" >
+<father id="4044" num="1" />
 <cdparam x="1198" y="537" />
 <sizeparam width="186" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3993" />
-<TGConnectingPoint num="1" id="3994" />
-<TGConnectingPoint num="2" id="3995" />
-<TGConnectingPoint num="3" id="3996" />
+<TGConnectingPoint num="0" id="4037" />
+<TGConnectingPoint num="1" id="4038" />
+<TGConnectingPoint num="2" id="4039" />
+<TGConnectingPoint num="3" id="4040" />
 <extraparam>
 <guard value="[ else]" />
 <afterMin value="" />
@@ -9124,35 +9267,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4009" >
+<CONNECTOR type="5102" id="4053" >
 <cdparam x="1006" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="4007" />
-<TGConnectingPoint num="1" id="4008" />
-<P1  x="1002" y="448" id="4273" />
-<P2  x="982" y="637" id="4231" />
+<TGConnectingPoint num="0" id="4051" />
+<TGConnectingPoint num="1" id="4052" />
+<P1  x="1002" y="448" id="4317" />
+<P2  x="982" y="637" id="4275" />
 <Point x="946" y="594" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4001" >
-<father id="4009" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4045" >
+<father id="4053" num="0" />
 <cdparam x="946" y="594" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4006" >
-<father id="4009" num="1" />
+<SUBCOMPONENT type="-1" id="4050" >
+<father id="4053" num="1" />
 <cdparam x="797" y="485" />
 <sizeparam width="186" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4002" />
-<TGConnectingPoint num="1" id="4003" />
-<TGConnectingPoint num="2" id="4004" />
-<TGConnectingPoint num="3" id="4005" />
+<TGConnectingPoint num="0" id="4046" />
+<TGConnectingPoint num="1" id="4047" />
+<TGConnectingPoint num="2" id="4048" />
+<TGConnectingPoint num="3" id="4049" />
 <extraparam>
 <guard value="[ listOfNodes.id0 == id]" />
 <afterMin value="" />
@@ -9163,55 +9306,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4022" >
+<CONNECTOR type="5102" id="4066" >
 <cdparam x="1032" y="687" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4018" />
-<TGConnectingPoint num="1" id="4019" />
-<TGConnectingPoint num="2" id="4020" />
-<TGConnectingPoint num="3" id="4021" />
-<P1  x="1032" y="687" id="4237" />
-<P2  x="710" y="163" id="4541" />
+<TGConnectingPoint num="0" id="4062" />
+<TGConnectingPoint num="1" id="4063" />
+<TGConnectingPoint num="2" id="4064" />
+<TGConnectingPoint num="3" id="4065" />
+<P1  x="1032" y="687" id="4281" />
+<P2  x="710" y="163" id="4585" />
 <Point x="1038" y="721" />
 <Point x="1296" y="719" />
 <Point x="1226" y="164" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4010" >
-<father id="4022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4054" >
+<father id="4066" num="0" />
 <cdparam x="1038" y="721" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4011" >
-<father id="4022" num="1" />
+<SUBCOMPONENT type="-1" id="4055" >
+<father id="4066" num="1" />
 <cdparam x="1296" y="719" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4012" >
-<father id="4022" num="2" />
+<SUBCOMPONENT type="-1" id="4056" >
+<father id="4066" num="2" />
 <cdparam x="1226" y="164" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4017" >
-<father id="4022" num="3" />
+<SUBCOMPONENT type="-1" id="4061" >
+<father id="4066" num="3" />
 <cdparam x="1032" y="727" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4013" />
-<TGConnectingPoint num="1" id="4014" />
-<TGConnectingPoint num="2" id="4015" />
-<TGConnectingPoint num="3" id="4016" />
+<TGConnectingPoint num="0" id="4057" />
+<TGConnectingPoint num="1" id="4058" />
+<TGConnectingPoint num="2" id="4059" />
+<TGConnectingPoint num="3" id="4060" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9221,25 +9364,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4029" >
+<CONNECTOR type="5102" id="4073" >
 <cdparam x="556" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4028" />
-<P1  x="556" y="347" id="4343" />
-<P2  x="556" y="435" id="4497" />
+<TGConnectingPoint num="0" id="4072" />
+<P1  x="556" y="347" id="4387" />
+<P2  x="556" y="435" id="4541" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4027" >
-<father id="4029" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4071" >
+<father id="4073" num="0" />
 <cdparam x="463" y="415" />
 <sizeparam width="450" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4023" />
-<TGConnectingPoint num="1" id="4024" />
-<TGConnectingPoint num="2" id="4025" />
-<TGConnectingPoint num="3" id="4026" />
+<TGConnectingPoint num="0" id="4067" />
+<TGConnectingPoint num="1" id="4068" />
+<TGConnectingPoint num="2" id="4069" />
+<TGConnectingPoint num="3" id="4070" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -9249,55 +9392,55 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4042" >
+<CONNECTOR type="5102" id="4086" >
 <cdparam x="782" y="281" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4038" />
-<TGConnectingPoint num="1" id="4039" />
-<TGConnectingPoint num="2" id="4040" />
-<TGConnectingPoint num="3" id="4041" />
-<P1  x="782" y="281" id="4371" />
-<P2  x="710" y="199" id="4543" />
+<TGConnectingPoint num="0" id="4082" />
+<TGConnectingPoint num="1" id="4083" />
+<TGConnectingPoint num="2" id="4084" />
+<TGConnectingPoint num="3" id="4085" />
+<P1  x="782" y="281" id="4415" />
+<P2  x="710" y="199" id="4587" />
 <Point x="782" y="307" />
 <Point x="916" y="307" />
 <Point x="916" y="199" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4030" >
-<father id="4042" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4074" >
+<father id="4086" num="0" />
 <cdparam x="782" y="307" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4031" >
-<father id="4042" num="1" />
+<SUBCOMPONENT type="-1" id="4075" >
+<father id="4086" num="1" />
 <cdparam x="916" y="307" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4032" >
-<father id="4042" num="2" />
+<SUBCOMPONENT type="-1" id="4076" >
+<father id="4086" num="2" />
 <cdparam x="916" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4037" >
-<father id="4042" num="3" />
+<SUBCOMPONENT type="-1" id="4081" >
+<father id="4086" num="3" />
 <cdparam x="921" y="264" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4033" />
-<TGConnectingPoint num="1" id="4034" />
-<TGConnectingPoint num="2" id="4035" />
-<TGConnectingPoint num="3" id="4036" />
+<TGConnectingPoint num="0" id="4077" />
+<TGConnectingPoint num="1" id="4078" />
+<TGConnectingPoint num="2" id="4079" />
+<TGConnectingPoint num="3" id="4080" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9307,25 +9450,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4049" >
+<CONNECTOR type="5102" id="4093" >
 <cdparam x="663" y="216" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4048" />
-<P1  x="710" y="217" id="4537" />
-<P2  x="782" y="251" id="4370" />
+<TGConnectingPoint num="0" id="4092" />
+<P1  x="710" y="217" id="4581" />
+<P2  x="782" y="251" id="4414" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4047" >
-<father id="4049" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4091" >
+<father id="4093" num="0" />
 <cdparam x="663" y="256" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4043" />
-<TGConnectingPoint num="1" id="4044" />
-<TGConnectingPoint num="2" id="4045" />
-<TGConnectingPoint num="3" id="4046" />
+<TGConnectingPoint num="0" id="4087" />
+<TGConnectingPoint num="1" id="4088" />
+<TGConnectingPoint num="2" id="4089" />
+<TGConnectingPoint num="3" id="4090" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9335,45 +9478,45 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4060" >
+<CONNECTOR type="5102" id="4104" >
 <cdparam x="618" y="592" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4057" />
-<TGConnectingPoint num="1" id="4058" />
-<TGConnectingPoint num="2" id="4059" />
-<P1  x="618" y="485" id="4520" />
-<P2  x="851" y="1182" id="4467" />
+<TGConnectingPoint num="0" id="4101" />
+<TGConnectingPoint num="1" id="4102" />
+<TGConnectingPoint num="2" id="4103" />
+<P1  x="618" y="485" id="4564" />
+<P2  x="851" y="1182" id="4511" />
 <Point x="939" y="640" />
 <Point x="1080" y="938" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4050" >
-<father id="4060" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4094" >
+<father id="4104" num="0" />
 <cdparam x="939" y="640" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4051" >
-<father id="4060" num="1" />
+<SUBCOMPONENT type="-1" id="4095" >
+<father id="4104" num="1" />
 <cdparam x="1080" y="938" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4056" >
-<father id="4060" num="2" />
+<SUBCOMPONENT type="-1" id="4100" >
+<father id="4104" num="2" />
 <cdparam x="679" y="584" />
 <sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4052" />
-<TGConnectingPoint num="1" id="4053" />
-<TGConnectingPoint num="2" id="4054" />
-<TGConnectingPoint num="3" id="4055" />
+<TGConnectingPoint num="0" id="4096" />
+<TGConnectingPoint num="1" id="4097" />
+<TGConnectingPoint num="2" id="4098" />
+<TGConnectingPoint num="3" id="4099" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -9383,25 +9526,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4067" >
+<CONNECTOR type="5102" id="4111" >
 <cdparam x="581" y="216" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4066" />
-<P1  x="581" y="217" id="4536" />
-<P2  x="581" y="249" id="4571" />
+<TGConnectingPoint num="0" id="4110" />
+<P1  x="581" y="217" id="4580" />
+<P2  x="581" y="249" id="4615" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4065" >
-<father id="4067" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4109" >
+<father id="4111" num="0" />
 <cdparam x="581" y="256" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4061" />
-<TGConnectingPoint num="1" id="4062" />
-<TGConnectingPoint num="2" id="4063" />
-<TGConnectingPoint num="3" id="4064" />
+<TGConnectingPoint num="0" id="4105" />
+<TGConnectingPoint num="1" id="4106" />
+<TGConnectingPoint num="2" id="4107" />
+<TGConnectingPoint num="3" id="4108" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9411,25 +9554,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4074" >
+<CONNECTOR type="5102" id="4118" >
 <cdparam x="582" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4073" />
-<P1  x="581" y="100" id="4582" />
-<P2  x="581" y="145" id="4531" />
+<TGConnectingPoint num="0" id="4117" />
+<P1  x="581" y="100" id="4626" />
+<P2  x="581" y="145" id="4575" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4072" >
-<father id="4074" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4116" >
+<father id="4118" num="0" />
 <cdparam x="608" y="98" />
 <sizeparam width="115" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4068" />
-<TGConnectingPoint num="1" id="4069" />
-<TGConnectingPoint num="2" id="4070" />
-<TGConnectingPoint num="3" id="4071" />
+<TGConnectingPoint num="0" id="4112" />
+<TGConnectingPoint num="1" id="4113" />
+<TGConnectingPoint num="2" id="4114" />
+<TGConnectingPoint num="3" id="4115" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9442,25 +9585,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4081" >
+<CONNECTOR type="5102" id="4125" >
 <cdparam x="581" y="279" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to choice" value="null" />
-<TGConnectingPoint num="0" id="4080" />
-<P1  x="581" y="279" id="4572" />
-<P2  x="581" y="297" id="4330" />
+<TGConnectingPoint num="0" id="4124" />
+<P1  x="581" y="279" id="4616" />
+<P2  x="581" y="297" id="4374" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4079" >
-<father id="4081" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4123" >
+<father id="4125" num="0" />
 <cdparam x="581" y="319" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4075" />
-<TGConnectingPoint num="1" id="4076" />
-<TGConnectingPoint num="2" id="4077" />
-<TGConnectingPoint num="3" id="4078" />
+<TGConnectingPoint num="0" id="4119" />
+<TGConnectingPoint num="1" id="4120" />
+<TGConnectingPoint num="2" id="4121" />
+<TGConnectingPoint num="3" id="4122" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9470,25 +9613,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4088" >
+<CONNECTOR type="5102" id="4132" >
 <cdparam x="631" y="592" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4087" />
-<P1  x="543" y="485" id="4517" />
-<P2  x="497" y="643" id="4398" />
+<TGConnectingPoint num="0" id="4131" />
+<P1  x="543" y="485" id="4561" />
+<P2  x="497" y="643" id="4442" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4086" >
-<father id="4088" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4130" >
+<father id="4132" num="0" />
 <cdparam x="177" y="619" />
 <sizeparam width="437" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4082" />
-<TGConnectingPoint num="1" id="4083" />
-<TGConnectingPoint num="2" id="4084" />
-<TGConnectingPoint num="3" id="4085" />
+<TGConnectingPoint num="0" id="4126" />
+<TGConnectingPoint num="1" id="4127" />
+<TGConnectingPoint num="2" id="4128" />
+<TGConnectingPoint num="3" id="4129" />
 <extraparam>
 <guard value="[(listOfNodes.id0 &gt; 0) and (listOfNodes.id1 &gt; 0) and (listOfNodes.id2 &gt; 0)]" />
 <afterMin value="" />
@@ -9498,25 +9641,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4095" >
+<CONNECTOR type="5102" id="4139" >
 <cdparam x="331" y="732" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="4094" />
-<P1  x="472" y="668" id="4399" />
-<P2  x="305" y="794" id="4174" />
+<TGConnectingPoint num="0" id="4138" />
+<P1  x="472" y="668" id="4443" />
+<P2  x="305" y="794" id="4218" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4093" >
-<father id="4095" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4137" >
+<father id="4139" num="0" />
 <cdparam x="10" y="771" />
 <sizeparam width="754" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4089" />
-<TGConnectingPoint num="1" id="4090" />
-<TGConnectingPoint num="2" id="4091" />
-<TGConnectingPoint num="3" id="4092" />
+<TGConnectingPoint num="0" id="4133" />
+<TGConnectingPoint num="1" id="4134" />
+<TGConnectingPoint num="2" id="4135" />
+<TGConnectingPoint num="3" id="4136" />
 <extraparam>
 <guard value="[ (listOfNodes.position0 &lt; currentPosition) or (listOfNodes.position1 &lt; currentPosition) or (listOfNodes.position2 &lt; currentPosition)]" />
 <afterMin value="" />
@@ -9526,25 +9669,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4102" >
+<CONNECTOR type="5102" id="4146" >
 <cdparam x="664" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4101" />
-<P1  x="581" y="347" id="4335" />
-<P2  x="971" y="369" id="4298" />
+<TGConnectingPoint num="0" id="4145" />
+<P1  x="581" y="347" id="4379" />
+<P2  x="971" y="369" id="4342" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4100" >
-<father id="4102" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4144" >
+<father id="4146" num="0" />
 <cdparam x="780" y="351" />
 <sizeparam width="456" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4096" />
-<TGConnectingPoint num="1" id="4097" />
-<TGConnectingPoint num="2" id="4098" />
-<TGConnectingPoint num="3" id="4099" />
+<TGConnectingPoint num="0" id="4140" />
+<TGConnectingPoint num="1" id="4141" />
+<TGConnectingPoint num="2" id="4142" />
+<TGConnectingPoint num="3" id="4143" />
 <extraparam>
 <guard value="[(listOfNodes.id0 == id) or (listOfNodes.id1 == id) or (listOfNodes.id2 == id)]" />
 <afterMin value="" />
@@ -9554,25 +9697,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4109" >
+<CONNECTOR type="5102" id="4153" >
 <cdparam x="1019" y="473" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to choice" value="null" />
-<TGConnectingPoint num="0" id="4108" />
-<P1  x="1021" y="407" id="4294" />
-<P2  x="1027" y="423" id="4272" />
+<TGConnectingPoint num="0" id="4152" />
+<P1  x="1021" y="407" id="4338" />
+<P2  x="1027" y="423" id="4316" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4107" >
-<father id="4109" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4151" >
+<father id="4153" num="0" />
 <cdparam x="1019" y="513" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4103" />
-<TGConnectingPoint num="1" id="4104" />
-<TGConnectingPoint num="2" id="4105" />
-<TGConnectingPoint num="3" id="4106" />
+<TGConnectingPoint num="0" id="4147" />
+<TGConnectingPoint num="1" id="4148" />
+<TGConnectingPoint num="2" id="4149" />
+<TGConnectingPoint num="3" id="4150" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9582,25 +9725,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4116" >
+<CONNECTOR type="5102" id="4160" >
 <cdparam x="1031" y="549" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="4115" />
-<P1  x="1120" y="495" id="4132" />
-<P2  x="1032" y="637" id="4232" />
+<TGConnectingPoint num="0" id="4159" />
+<P1  x="1120" y="495" id="4176" />
+<P2  x="1032" y="637" id="4276" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4114" >
-<father id="4116" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4158" >
+<father id="4160" num="0" />
 <cdparam x="971" y="536" />
 <sizeparam width="186" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4110" />
-<TGConnectingPoint num="1" id="4111" />
-<TGConnectingPoint num="2" id="4112" />
-<TGConnectingPoint num="3" id="4113" />
+<TGConnectingPoint num="0" id="4154" />
+<TGConnectingPoint num="1" id="4155" />
+<TGConnectingPoint num="2" id="4156" />
+<TGConnectingPoint num="3" id="4157" />
 <extraparam>
 <guard value="[ listOfNodes.id1 == id]" />
 <afterMin value="" />
@@ -9611,25 +9754,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4123" >
+<CONNECTOR type="5102" id="4167" >
 <cdparam x="453" y="217" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4122" />
-<P1  x="453" y="217" id="4535" />
-<P2  x="371" y="251" id="4147" />
+<TGConnectingPoint num="0" id="4166" />
+<P1  x="453" y="217" id="4579" />
+<P2  x="371" y="251" id="4191" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4121" >
-<father id="4123" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4165" >
+<father id="4167" num="0" />
 <cdparam x="453" y="257" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4117" />
-<TGConnectingPoint num="1" id="4118" />
-<TGConnectingPoint num="2" id="4119" />
-<TGConnectingPoint num="3" id="4120" />
+<TGConnectingPoint num="0" id="4161" />
+<TGConnectingPoint num="1" id="4162" />
+<TGConnectingPoint num="2" id="4163" />
+<TGConnectingPoint num="3" id="4164" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -9639,25 +9782,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4130" >
+<CONNECTOR type="5102" id="4174" >
 <cdparam x="1052" y="448" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<TGConnectingPoint num="0" id="4129" />
-<P1  x="1052" y="448" id="4277" />
-<P2  x="1145" y="470" id="4131" />
+<TGConnectingPoint num="0" id="4173" />
+<P1  x="1052" y="448" id="4321" />
+<P2  x="1145" y="470" id="4175" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4128" >
-<father id="4130" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4172" >
+<father id="4174" num="0" />
 <cdparam x="1107" y="440" />
 <sizeparam width="39" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4124" />
-<TGConnectingPoint num="1" id="4125" />
-<TGConnectingPoint num="2" id="4126" />
-<TGConnectingPoint num="3" id="4127" />
+<TGConnectingPoint num="0" id="4168" />
+<TGConnectingPoint num="1" id="4169" />
+<TGConnectingPoint num="2" id="4170" />
+<TGConnectingPoint num="3" id="4171" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -9667,335 +9810,335 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5107" id="4146" >
+<COMPONENT type="5107" id="4190" >
 <cdparam x="1130" y="480" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4131" />
-<TGConnectingPoint num="1" id="4132" />
-<TGConnectingPoint num="2" id="4133" />
-<TGConnectingPoint num="3" id="4134" />
-<TGConnectingPoint num="4" id="4135" />
-<TGConnectingPoint num="5" id="4136" />
-<TGConnectingPoint num="6" id="4137" />
-<TGConnectingPoint num="7" id="4138" />
-<TGConnectingPoint num="8" id="4139" />
-<TGConnectingPoint num="9" id="4140" />
-<TGConnectingPoint num="10" id="4141" />
-<TGConnectingPoint num="11" id="4142" />
-<TGConnectingPoint num="12" id="4143" />
-<TGConnectingPoint num="13" id="4144" />
-<TGConnectingPoint num="14" id="4145" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="4157" >
+<TGConnectingPoint num="0" id="4175" />
+<TGConnectingPoint num="1" id="4176" />
+<TGConnectingPoint num="2" id="4177" />
+<TGConnectingPoint num="3" id="4178" />
+<TGConnectingPoint num="4" id="4179" />
+<TGConnectingPoint num="5" id="4180" />
+<TGConnectingPoint num="6" id="4181" />
+<TGConnectingPoint num="7" id="4182" />
+<TGConnectingPoint num="8" id="4183" />
+<TGConnectingPoint num="9" id="4184" />
+<TGConnectingPoint num="10" id="4185" />
+<TGConnectingPoint num="11" id="4186" />
+<TGConnectingPoint num="12" id="4187" />
+<TGConnectingPoint num="13" id="4188" />
+<TGConnectingPoint num="14" id="4189" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="4201" >
 <cdparam x="252" y="256" />
 <sizeparam width="238" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="Send signal" value="sendTable(currentPosition, listOfNodes)" />
-<TGConnectingPoint num="0" id="4147" />
-<TGConnectingPoint num="1" id="4148" />
-<TGConnectingPoint num="2" id="4149" />
-<TGConnectingPoint num="3" id="4150" />
-<TGConnectingPoint num="4" id="4151" />
-<TGConnectingPoint num="5" id="4152" />
-<TGConnectingPoint num="6" id="4153" />
-<TGConnectingPoint num="7" id="4154" />
-<TGConnectingPoint num="8" id="4155" />
-<TGConnectingPoint num="9" id="4156" />
-</COMPONENT>
-
-<COMPONENT type="5107" id="4173" >
+<TGConnectingPoint num="0" id="4191" />
+<TGConnectingPoint num="1" id="4192" />
+<TGConnectingPoint num="2" id="4193" />
+<TGConnectingPoint num="3" id="4194" />
+<TGConnectingPoint num="4" id="4195" />
+<TGConnectingPoint num="5" id="4196" />
+<TGConnectingPoint num="6" id="4197" />
+<TGConnectingPoint num="7" id="4198" />
+<TGConnectingPoint num="8" id="4199" />
+<TGConnectingPoint num="9" id="4200" />
+</COMPONENT>
+
+<COMPONENT type="5107" id="4217" >
 <cdparam x="725" y="772" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4158" />
-<TGConnectingPoint num="1" id="4159" />
-<TGConnectingPoint num="2" id="4160" />
-<TGConnectingPoint num="3" id="4161" />
-<TGConnectingPoint num="4" id="4162" />
-<TGConnectingPoint num="5" id="4163" />
-<TGConnectingPoint num="6" id="4164" />
-<TGConnectingPoint num="7" id="4165" />
-<TGConnectingPoint num="8" id="4166" />
-<TGConnectingPoint num="9" id="4167" />
-<TGConnectingPoint num="10" id="4168" />
-<TGConnectingPoint num="11" id="4169" />
-<TGConnectingPoint num="12" id="4170" />
-<TGConnectingPoint num="13" id="4171" />
-<TGConnectingPoint num="14" id="4172" />
-</COMPONENT>
-
-<COMPONENT type="5107" id="4189" >
+<TGConnectingPoint num="0" id="4202" />
+<TGConnectingPoint num="1" id="4203" />
+<TGConnectingPoint num="2" id="4204" />
+<TGConnectingPoint num="3" id="4205" />
+<TGConnectingPoint num="4" id="4206" />
+<TGConnectingPoint num="5" id="4207" />
+<TGConnectingPoint num="6" id="4208" />
+<TGConnectingPoint num="7" id="4209" />
+<TGConnectingPoint num="8" id="4210" />
+<TGConnectingPoint num="9" id="4211" />
+<TGConnectingPoint num="10" id="4212" />
+<TGConnectingPoint num="11" id="4213" />
+<TGConnectingPoint num="12" id="4214" />
+<TGConnectingPoint num="13" id="4215" />
+<TGConnectingPoint num="14" id="4216" />
+</COMPONENT>
+
+<COMPONENT type="5107" id="4233" >
 <cdparam x="290" y="804" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4174" />
-<TGConnectingPoint num="1" id="4175" />
-<TGConnectingPoint num="2" id="4176" />
-<TGConnectingPoint num="3" id="4177" />
-<TGConnectingPoint num="4" id="4178" />
-<TGConnectingPoint num="5" id="4179" />
-<TGConnectingPoint num="6" id="4180" />
-<TGConnectingPoint num="7" id="4181" />
-<TGConnectingPoint num="8" id="4182" />
-<TGConnectingPoint num="9" id="4183" />
-<TGConnectingPoint num="10" id="4184" />
-<TGConnectingPoint num="11" id="4185" />
-<TGConnectingPoint num="12" id="4186" />
-<TGConnectingPoint num="13" id="4187" />
-<TGConnectingPoint num="14" id="4188" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4230" >
+<TGConnectingPoint num="0" id="4218" />
+<TGConnectingPoint num="1" id="4219" />
+<TGConnectingPoint num="2" id="4220" />
+<TGConnectingPoint num="3" id="4221" />
+<TGConnectingPoint num="4" id="4222" />
+<TGConnectingPoint num="5" id="4223" />
+<TGConnectingPoint num="6" id="4224" />
+<TGConnectingPoint num="7" id="4225" />
+<TGConnectingPoint num="8" id="4226" />
+<TGConnectingPoint num="9" id="4227" />
+<TGConnectingPoint num="10" id="4228" />
+<TGConnectingPoint num="11" id="4229" />
+<TGConnectingPoint num="12" id="4230" />
+<TGConnectingPoint num="13" id="4231" />
+<TGConnectingPoint num="14" id="4232" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4274" >
 <cdparam x="479" y="1409" />
 <sizeparam width="322" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="IDAdded" />
-<TGConnectingPoint num="0" id="4190" />
-<TGConnectingPoint num="1" id="4191" />
-<TGConnectingPoint num="2" id="4192" />
-<TGConnectingPoint num="3" id="4193" />
-<TGConnectingPoint num="4" id="4194" />
-<TGConnectingPoint num="5" id="4195" />
-<TGConnectingPoint num="6" id="4196" />
-<TGConnectingPoint num="7" id="4197" />
-<TGConnectingPoint num="8" id="4198" />
-<TGConnectingPoint num="9" id="4199" />
-<TGConnectingPoint num="10" id="4200" />
-<TGConnectingPoint num="11" id="4201" />
-<TGConnectingPoint num="12" id="4202" />
-<TGConnectingPoint num="13" id="4203" />
-<TGConnectingPoint num="14" id="4204" />
-<TGConnectingPoint num="15" id="4205" />
-<TGConnectingPoint num="16" id="4206" />
-<TGConnectingPoint num="17" id="4207" />
-<TGConnectingPoint num="18" id="4208" />
-<TGConnectingPoint num="19" id="4209" />
-<TGConnectingPoint num="20" id="4210" />
-<TGConnectingPoint num="21" id="4211" />
-<TGConnectingPoint num="22" id="4212" />
-<TGConnectingPoint num="23" id="4213" />
-<TGConnectingPoint num="24" id="4214" />
-<TGConnectingPoint num="25" id="4215" />
-<TGConnectingPoint num="26" id="4216" />
-<TGConnectingPoint num="27" id="4217" />
-<TGConnectingPoint num="28" id="4218" />
-<TGConnectingPoint num="29" id="4219" />
-<TGConnectingPoint num="30" id="4220" />
-<TGConnectingPoint num="31" id="4221" />
-<TGConnectingPoint num="32" id="4222" />
-<TGConnectingPoint num="33" id="4223" />
-<TGConnectingPoint num="34" id="4224" />
-<TGConnectingPoint num="35" id="4225" />
-<TGConnectingPoint num="36" id="4226" />
-<TGConnectingPoint num="37" id="4227" />
-<TGConnectingPoint num="38" id="4228" />
-<TGConnectingPoint num="39" id="4229" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4271" >
+<TGConnectingPoint num="0" id="4234" />
+<TGConnectingPoint num="1" id="4235" />
+<TGConnectingPoint num="2" id="4236" />
+<TGConnectingPoint num="3" id="4237" />
+<TGConnectingPoint num="4" id="4238" />
+<TGConnectingPoint num="5" id="4239" />
+<TGConnectingPoint num="6" id="4240" />
+<TGConnectingPoint num="7" id="4241" />
+<TGConnectingPoint num="8" id="4242" />
+<TGConnectingPoint num="9" id="4243" />
+<TGConnectingPoint num="10" id="4244" />
+<TGConnectingPoint num="11" id="4245" />
+<TGConnectingPoint num="12" id="4246" />
+<TGConnectingPoint num="13" id="4247" />
+<TGConnectingPoint num="14" id="4248" />
+<TGConnectingPoint num="15" id="4249" />
+<TGConnectingPoint num="16" id="4250" />
+<TGConnectingPoint num="17" id="4251" />
+<TGConnectingPoint num="18" id="4252" />
+<TGConnectingPoint num="19" id="4253" />
+<TGConnectingPoint num="20" id="4254" />
+<TGConnectingPoint num="21" id="4255" />
+<TGConnectingPoint num="22" id="4256" />
+<TGConnectingPoint num="23" id="4257" />
+<TGConnectingPoint num="24" id="4258" />
+<TGConnectingPoint num="25" id="4259" />
+<TGConnectingPoint num="26" id="4260" />
+<TGConnectingPoint num="27" id="4261" />
+<TGConnectingPoint num="28" id="4262" />
+<TGConnectingPoint num="29" id="4263" />
+<TGConnectingPoint num="30" id="4264" />
+<TGConnectingPoint num="31" id="4265" />
+<TGConnectingPoint num="32" id="4266" />
+<TGConnectingPoint num="33" id="4267" />
+<TGConnectingPoint num="34" id="4268" />
+<TGConnectingPoint num="35" id="4269" />
+<TGConnectingPoint num="36" id="4270" />
+<TGConnectingPoint num="37" id="4271" />
+<TGConnectingPoint num="38" id="4272" />
+<TGConnectingPoint num="39" id="4273" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4315" >
 <cdparam x="982" y="637" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="PositionUpdated" />
-<TGConnectingPoint num="0" id="4231" />
-<TGConnectingPoint num="1" id="4232" />
-<TGConnectingPoint num="2" id="4233" />
-<TGConnectingPoint num="3" id="4234" />
-<TGConnectingPoint num="4" id="4235" />
-<TGConnectingPoint num="5" id="4236" />
-<TGConnectingPoint num="6" id="4237" />
-<TGConnectingPoint num="7" id="4238" />
-<TGConnectingPoint num="8" id="4239" />
-<TGConnectingPoint num="9" id="4240" />
-<TGConnectingPoint num="10" id="4241" />
-<TGConnectingPoint num="11" id="4242" />
-<TGConnectingPoint num="12" id="4243" />
-<TGConnectingPoint num="13" id="4244" />
-<TGConnectingPoint num="14" id="4245" />
-<TGConnectingPoint num="15" id="4246" />
-<TGConnectingPoint num="16" id="4247" />
-<TGConnectingPoint num="17" id="4248" />
-<TGConnectingPoint num="18" id="4249" />
-<TGConnectingPoint num="19" id="4250" />
-<TGConnectingPoint num="20" id="4251" />
-<TGConnectingPoint num="21" id="4252" />
-<TGConnectingPoint num="22" id="4253" />
-<TGConnectingPoint num="23" id="4254" />
-<TGConnectingPoint num="24" id="4255" />
-<TGConnectingPoint num="25" id="4256" />
-<TGConnectingPoint num="26" id="4257" />
-<TGConnectingPoint num="27" id="4258" />
-<TGConnectingPoint num="28" id="4259" />
-<TGConnectingPoint num="29" id="4260" />
-<TGConnectingPoint num="30" id="4261" />
-<TGConnectingPoint num="31" id="4262" />
-<TGConnectingPoint num="32" id="4263" />
-<TGConnectingPoint num="33" id="4264" />
-<TGConnectingPoint num="34" id="4265" />
-<TGConnectingPoint num="35" id="4266" />
-<TGConnectingPoint num="36" id="4267" />
-<TGConnectingPoint num="37" id="4268" />
-<TGConnectingPoint num="38" id="4269" />
-<TGConnectingPoint num="39" id="4270" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="4287" >
+<TGConnectingPoint num="0" id="4275" />
+<TGConnectingPoint num="1" id="4276" />
+<TGConnectingPoint num="2" id="4277" />
+<TGConnectingPoint num="3" id="4278" />
+<TGConnectingPoint num="4" id="4279" />
+<TGConnectingPoint num="5" id="4280" />
+<TGConnectingPoint num="6" id="4281" />
+<TGConnectingPoint num="7" id="4282" />
+<TGConnectingPoint num="8" id="4283" />
+<TGConnectingPoint num="9" id="4284" />
+<TGConnectingPoint num="10" id="4285" />
+<TGConnectingPoint num="11" id="4286" />
+<TGConnectingPoint num="12" id="4287" />
+<TGConnectingPoint num="13" id="4288" />
+<TGConnectingPoint num="14" id="4289" />
+<TGConnectingPoint num="15" id="4290" />
+<TGConnectingPoint num="16" id="4291" />
+<TGConnectingPoint num="17" id="4292" />
+<TGConnectingPoint num="18" id="4293" />
+<TGConnectingPoint num="19" id="4294" />
+<TGConnectingPoint num="20" id="4295" />
+<TGConnectingPoint num="21" id="4296" />
+<TGConnectingPoint num="22" id="4297" />
+<TGConnectingPoint num="23" id="4298" />
+<TGConnectingPoint num="24" id="4299" />
+<TGConnectingPoint num="25" id="4300" />
+<TGConnectingPoint num="26" id="4301" />
+<TGConnectingPoint num="27" id="4302" />
+<TGConnectingPoint num="28" id="4303" />
+<TGConnectingPoint num="29" id="4304" />
+<TGConnectingPoint num="30" id="4305" />
+<TGConnectingPoint num="31" id="4306" />
+<TGConnectingPoint num="32" id="4307" />
+<TGConnectingPoint num="33" id="4308" />
+<TGConnectingPoint num="34" id="4309" />
+<TGConnectingPoint num="35" id="4310" />
+<TGConnectingPoint num="36" id="4311" />
+<TGConnectingPoint num="37" id="4312" />
+<TGConnectingPoint num="38" id="4313" />
+<TGConnectingPoint num="39" id="4314" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="4331" >
 <cdparam x="1012" y="433" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4272" />
-<TGConnectingPoint num="1" id="4273" />
-<TGConnectingPoint num="2" id="4274" />
-<TGConnectingPoint num="3" id="4275" />
-<TGConnectingPoint num="4" id="4276" />
-<TGConnectingPoint num="5" id="4277" />
-<TGConnectingPoint num="6" id="4278" />
-<TGConnectingPoint num="7" id="4279" />
-<TGConnectingPoint num="8" id="4280" />
-<TGConnectingPoint num="9" id="4281" />
-<TGConnectingPoint num="10" id="4282" />
-<TGConnectingPoint num="11" id="4283" />
-<TGConnectingPoint num="12" id="4284" />
-<TGConnectingPoint num="13" id="4285" />
-<TGConnectingPoint num="14" id="4286" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4328" >
+<TGConnectingPoint num="0" id="4316" />
+<TGConnectingPoint num="1" id="4317" />
+<TGConnectingPoint num="2" id="4318" />
+<TGConnectingPoint num="3" id="4319" />
+<TGConnectingPoint num="4" id="4320" />
+<TGConnectingPoint num="5" id="4321" />
+<TGConnectingPoint num="6" id="4322" />
+<TGConnectingPoint num="7" id="4323" />
+<TGConnectingPoint num="8" id="4324" />
+<TGConnectingPoint num="9" id="4325" />
+<TGConnectingPoint num="10" id="4326" />
+<TGConnectingPoint num="11" id="4327" />
+<TGConnectingPoint num="12" id="4328" />
+<TGConnectingPoint num="13" id="4329" />
+<TGConnectingPoint num="14" id="4330" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4372" >
 <cdparam x="971" y="357" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="UpdatingPosition" />
-<TGConnectingPoint num="0" id="4288" />
-<TGConnectingPoint num="1" id="4289" />
-<TGConnectingPoint num="2" id="4290" />
-<TGConnectingPoint num="3" id="4291" />
-<TGConnectingPoint num="4" id="4292" />
-<TGConnectingPoint num="5" id="4293" />
-<TGConnectingPoint num="6" id="4294" />
-<TGConnectingPoint num="7" id="4295" />
-<TGConnectingPoint num="8" id="4296" />
-<TGConnectingPoint num="9" id="4297" />
-<TGConnectingPoint num="10" id="4298" />
-<TGConnectingPoint num="11" id="4299" />
-<TGConnectingPoint num="12" id="4300" />
-<TGConnectingPoint num="13" id="4301" />
-<TGConnectingPoint num="14" id="4302" />
-<TGConnectingPoint num="15" id="4303" />
-<TGConnectingPoint num="16" id="4304" />
-<TGConnectingPoint num="17" id="4305" />
-<TGConnectingPoint num="18" id="4306" />
-<TGConnectingPoint num="19" id="4307" />
-<TGConnectingPoint num="20" id="4308" />
-<TGConnectingPoint num="21" id="4309" />
-<TGConnectingPoint num="22" id="4310" />
-<TGConnectingPoint num="23" id="4311" />
-<TGConnectingPoint num="24" id="4312" />
-<TGConnectingPoint num="25" id="4313" />
-<TGConnectingPoint num="26" id="4314" />
-<TGConnectingPoint num="27" id="4315" />
-<TGConnectingPoint num="28" id="4316" />
-<TGConnectingPoint num="29" id="4317" />
-<TGConnectingPoint num="30" id="4318" />
-<TGConnectingPoint num="31" id="4319" />
-<TGConnectingPoint num="32" id="4320" />
-<TGConnectingPoint num="33" id="4321" />
-<TGConnectingPoint num="34" id="4322" />
-<TGConnectingPoint num="35" id="4323" />
-<TGConnectingPoint num="36" id="4324" />
-<TGConnectingPoint num="37" id="4325" />
-<TGConnectingPoint num="38" id="4326" />
-<TGConnectingPoint num="39" id="4327" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4369" >
+<TGConnectingPoint num="0" id="4332" />
+<TGConnectingPoint num="1" id="4333" />
+<TGConnectingPoint num="2" id="4334" />
+<TGConnectingPoint num="3" id="4335" />
+<TGConnectingPoint num="4" id="4336" />
+<TGConnectingPoint num="5" id="4337" />
+<TGConnectingPoint num="6" id="4338" />
+<TGConnectingPoint num="7" id="4339" />
+<TGConnectingPoint num="8" id="4340" />
+<TGConnectingPoint num="9" id="4341" />
+<TGConnectingPoint num="10" id="4342" />
+<TGConnectingPoint num="11" id="4343" />
+<TGConnectingPoint num="12" id="4344" />
+<TGConnectingPoint num="13" id="4345" />
+<TGConnectingPoint num="14" id="4346" />
+<TGConnectingPoint num="15" id="4347" />
+<TGConnectingPoint num="16" id="4348" />
+<TGConnectingPoint num="17" id="4349" />
+<TGConnectingPoint num="18" id="4350" />
+<TGConnectingPoint num="19" id="4351" />
+<TGConnectingPoint num="20" id="4352" />
+<TGConnectingPoint num="21" id="4353" />
+<TGConnectingPoint num="22" id="4354" />
+<TGConnectingPoint num="23" id="4355" />
+<TGConnectingPoint num="24" id="4356" />
+<TGConnectingPoint num="25" id="4357" />
+<TGConnectingPoint num="26" id="4358" />
+<TGConnectingPoint num="27" id="4359" />
+<TGConnectingPoint num="28" id="4360" />
+<TGConnectingPoint num="29" id="4361" />
+<TGConnectingPoint num="30" id="4362" />
+<TGConnectingPoint num="31" id="4363" />
+<TGConnectingPoint num="32" id="4364" />
+<TGConnectingPoint num="33" id="4365" />
+<TGConnectingPoint num="34" id="4366" />
+<TGConnectingPoint num="35" id="4367" />
+<TGConnectingPoint num="36" id="4368" />
+<TGConnectingPoint num="37" id="4369" />
+<TGConnectingPoint num="38" id="4370" />
+<TGConnectingPoint num="39" id="4371" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4413" >
 <cdparam x="531" y="297" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="IsKnownID" />
-<TGConnectingPoint num="0" id="4329" />
-<TGConnectingPoint num="1" id="4330" />
-<TGConnectingPoint num="2" id="4331" />
-<TGConnectingPoint num="3" id="4332" />
-<TGConnectingPoint num="4" id="4333" />
-<TGConnectingPoint num="5" id="4334" />
-<TGConnectingPoint num="6" id="4335" />
-<TGConnectingPoint num="7" id="4336" />
-<TGConnectingPoint num="8" id="4337" />
-<TGConnectingPoint num="9" id="4338" />
-<TGConnectingPoint num="10" id="4339" />
-<TGConnectingPoint num="11" id="4340" />
-<TGConnectingPoint num="12" id="4341" />
-<TGConnectingPoint num="13" id="4342" />
-<TGConnectingPoint num="14" id="4343" />
-<TGConnectingPoint num="15" id="4344" />
-<TGConnectingPoint num="16" id="4345" />
-<TGConnectingPoint num="17" id="4346" />
-<TGConnectingPoint num="18" id="4347" />
-<TGConnectingPoint num="19" id="4348" />
-<TGConnectingPoint num="20" id="4349" />
-<TGConnectingPoint num="21" id="4350" />
-<TGConnectingPoint num="22" id="4351" />
-<TGConnectingPoint num="23" id="4352" />
-<TGConnectingPoint num="24" id="4353" />
-<TGConnectingPoint num="25" id="4354" />
-<TGConnectingPoint num="26" id="4355" />
-<TGConnectingPoint num="27" id="4356" />
-<TGConnectingPoint num="28" id="4357" />
-<TGConnectingPoint num="29" id="4358" />
-<TGConnectingPoint num="30" id="4359" />
-<TGConnectingPoint num="31" id="4360" />
-<TGConnectingPoint num="32" id="4361" />
-<TGConnectingPoint num="33" id="4362" />
-<TGConnectingPoint num="34" id="4363" />
-<TGConnectingPoint num="35" id="4364" />
-<TGConnectingPoint num="36" id="4365" />
-<TGConnectingPoint num="37" id="4366" />
-<TGConnectingPoint num="38" id="4367" />
-<TGConnectingPoint num="39" id="4368" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="4380" >
+<TGConnectingPoint num="0" id="4373" />
+<TGConnectingPoint num="1" id="4374" />
+<TGConnectingPoint num="2" id="4375" />
+<TGConnectingPoint num="3" id="4376" />
+<TGConnectingPoint num="4" id="4377" />
+<TGConnectingPoint num="5" id="4378" />
+<TGConnectingPoint num="6" id="4379" />
+<TGConnectingPoint num="7" id="4380" />
+<TGConnectingPoint num="8" id="4381" />
+<TGConnectingPoint num="9" id="4382" />
+<TGConnectingPoint num="10" id="4383" />
+<TGConnectingPoint num="11" id="4384" />
+<TGConnectingPoint num="12" id="4385" />
+<TGConnectingPoint num="13" id="4386" />
+<TGConnectingPoint num="14" id="4387" />
+<TGConnectingPoint num="15" id="4388" />
+<TGConnectingPoint num="16" id="4389" />
+<TGConnectingPoint num="17" id="4390" />
+<TGConnectingPoint num="18" id="4391" />
+<TGConnectingPoint num="19" id="4392" />
+<TGConnectingPoint num="20" id="4393" />
+<TGConnectingPoint num="21" id="4394" />
+<TGConnectingPoint num="22" id="4395" />
+<TGConnectingPoint num="23" id="4396" />
+<TGConnectingPoint num="24" id="4397" />
+<TGConnectingPoint num="25" id="4398" />
+<TGConnectingPoint num="26" id="4399" />
+<TGConnectingPoint num="27" id="4400" />
+<TGConnectingPoint num="28" id="4401" />
+<TGConnectingPoint num="29" id="4402" />
+<TGConnectingPoint num="30" id="4403" />
+<TGConnectingPoint num="31" id="4404" />
+<TGConnectingPoint num="32" id="4405" />
+<TGConnectingPoint num="33" id="4406" />
+<TGConnectingPoint num="34" id="4407" />
+<TGConnectingPoint num="35" id="4408" />
+<TGConnectingPoint num="36" id="4409" />
+<TGConnectingPoint num="37" id="4410" />
+<TGConnectingPoint num="38" id="4411" />
+<TGConnectingPoint num="39" id="4412" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="4424" >
 <cdparam x="696" y="256" />
 <sizeparam width="172" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="Receive signal" value="setPosition(currentPosition)" />
-<TGConnectingPoint num="0" id="4370" />
-<TGConnectingPoint num="1" id="4371" />
-<TGConnectingPoint num="2" id="4372" />
-<TGConnectingPoint num="3" id="4373" />
-<TGConnectingPoint num="4" id="4374" />
-<TGConnectingPoint num="5" id="4375" />
-<TGConnectingPoint num="6" id="4376" />
-<TGConnectingPoint num="7" id="4377" />
-<TGConnectingPoint num="8" id="4378" />
-<TGConnectingPoint num="9" id="4379" />
-</COMPONENT>
-
-<COMPONENT type="301" id="4397" >
+<TGConnectingPoint num="0" id="4414" />
+<TGConnectingPoint num="1" id="4415" />
+<TGConnectingPoint num="2" id="4416" />
+<TGConnectingPoint num="3" id="4417" />
+<TGConnectingPoint num="4" id="4418" />
+<TGConnectingPoint num="5" id="4419" />
+<TGConnectingPoint num="6" id="4420" />
+<TGConnectingPoint num="7" id="4421" />
+<TGConnectingPoint num="8" id="4422" />
+<TGConnectingPoint num="9" id="4423" />
+</COMPONENT>
+
+<COMPONENT type="301" id="4441" >
 <cdparam x="265" y="634" />
 <sizeparam width="195" height="50" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -10003,510 +10146,396 @@
 <infoparam name="UML Note" value="We first one behind if possible
 Otherwise, the most far away
 " />
-<TGConnectingPoint num="0" id="4381" />
-<TGConnectingPoint num="1" id="4382" />
-<TGConnectingPoint num="2" id="4383" />
-<TGConnectingPoint num="3" id="4384" />
-<TGConnectingPoint num="4" id="4385" />
-<TGConnectingPoint num="5" id="4386" />
-<TGConnectingPoint num="6" id="4387" />
-<TGConnectingPoint num="7" id="4388" />
-<TGConnectingPoint num="8" id="4389" />
-<TGConnectingPoint num="9" id="4390" />
-<TGConnectingPoint num="10" id="4391" />
-<TGConnectingPoint num="11" id="4392" />
-<TGConnectingPoint num="12" id="4393" />
-<TGConnectingPoint num="13" id="4394" />
-<TGConnectingPoint num="14" id="4395" />
-<TGConnectingPoint num="15" id="4396" />
+<TGConnectingPoint num="0" id="4425" />
+<TGConnectingPoint num="1" id="4426" />
+<TGConnectingPoint num="2" id="4427" />
+<TGConnectingPoint num="3" id="4428" />
+<TGConnectingPoint num="4" id="4429" />
+<TGConnectingPoint num="5" id="4430" />
+<TGConnectingPoint num="6" id="4431" />
+<TGConnectingPoint num="7" id="4432" />
+<TGConnectingPoint num="8" id="4433" />
+<TGConnectingPoint num="9" id="4434" />
+<TGConnectingPoint num="10" id="4435" />
+<TGConnectingPoint num="11" id="4436" />
+<TGConnectingPoint num="12" id="4437" />
+<TGConnectingPoint num="13" id="4438" />
+<TGConnectingPoint num="14" id="4439" />
+<TGConnectingPoint num="15" id="4440" />
 <extraparam>
 <Line value="We first one behind if possible" />
 <Line value="Otherwise, the most far away" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5107" id="4413" >
+<COMPONENT type="5107" id="4457" >
 <cdparam x="482" y="653" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="4398" />
-<TGConnectingPoint num="1" id="4399" />
-<TGConnectingPoint num="2" id="4400" />
-<TGConnectingPoint num="3" id="4401" />
-<TGConnectingPoint num="4" id="4402" />
-<TGConnectingPoint num="5" id="4403" />
-<TGConnectingPoint num="6" id="4404" />
-<TGConnectingPoint num="7" id="4405" />
-<TGConnectingPoint num="8" id="4406" />
-<TGConnectingPoint num="9" id="4407" />
-<TGConnectingPoint num="10" id="4408" />
-<TGConnectingPoint num="11" id="4409" />
-<TGConnectingPoint num="12" id="4410" />
-<TGConnectingPoint num="13" id="4411" />
-<TGConnectingPoint num="14" id="4412" />
-</COMPONENT>
-
-<COMPONENT type="301" id="4430" >
+<TGConnectingPoint num="0" id="4442" />
+<TGConnectingPoint num="1" id="4443" />
+<TGConnectingPoint num="2" id="4444" />
+<TGConnectingPoint num="3" id="4445" />
+<TGConnectingPoint num="4" id="4446" />
+<TGConnectingPoint num="5" id="4447" />
+<TGConnectingPoint num="6" id="4448" />
+<TGConnectingPoint num="7" id="4449" />
+<TGConnectingPoint num="8" id="4450" />
+<TGConnectingPoint num="9" id="4451" />
+<TGConnectingPoint num="10" id="4452" />
+<TGConnectingPoint num="11" id="4453" />
+<TGConnectingPoint num="12" id="4454" />
+<TGConnectingPoint num="13" id="4455" />
+<TGConnectingPoint num="14" id="4456" />
+</COMPONENT>
+
+<COMPONENT type="301" id="4474" >
 <cdparam x="425" y="562" />
 <sizeparam width="78" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="No free id
 " />
-<TGConnectingPoint num="0" id="4414" />
-<TGConnectingPoint num="1" id="4415" />
-<TGConnectingPoint num="2" id="4416" />
-<TGConnectingPoint num="3" id="4417" />
-<TGConnectingPoint num="4" id="4418" />
-<TGConnectingPoint num="5" id="4419" />
-<TGConnectingPoint num="6" id="4420" />
-<TGConnectingPoint num="7" id="4421" />
-<TGConnectingPoint num="8" id="4422" />
-<TGConnectingPoint num="9" id="4423" />
-<TGConnectingPoint num="10" id="4424" />
-<TGConnectingPoint num="11" id="4425" />
-<TGConnectingPoint num="12" id="4426" />
-<TGConnectingPoint num="13" id="4427" />
-<TGConnectingPoint num="14" id="4428" />
-<TGConnectingPoint num="15" id="4429" />
+<TGConnectingPoint num="0" id="4458" />
+<TGConnectingPoint num="1" id="4459" />
+<TGConnectingPoint num="2" id="4460" />
+<TGConnectingPoint num="3" id="4461" />
+<TGConnectingPoint num="4" id="4462" />
+<TGConnectingPoint num="5" id="4463" />
+<TGConnectingPoint num="6" id="4464" />
+<TGConnectingPoint num="7" id="4465" />
+<TGConnectingPoint num="8" id="4466" />
+<TGConnectingPoint num="9" id="4467" />
+<TGConnectingPoint num="10" id="4468" />
+<TGConnectingPoint num="11" id="4469" />
+<TGConnectingPoint num="12" id="4470" />
+<TGConnectingPoint num="13" id="4471" />
+<TGConnectingPoint num="14" id="4472" />
+<TGConnectingPoint num="15" id="4473" />
 <extraparam>
 <Line value="No free id" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4447" >
+<COMPONENT type="301" id="4491" >
 <cdparam x="733" y="597" />
 <sizeparam width="131" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="One free id at least
 " />
-<TGConnectingPoint num="0" id="4431" />
-<TGConnectingPoint num="1" id="4432" />
-<TGConnectingPoint num="2" id="4433" />
-<TGConnectingPoint num="3" id="4434" />
-<TGConnectingPoint num="4" id="4435" />
-<TGConnectingPoint num="5" id="4436" />
-<TGConnectingPoint num="6" id="4437" />
-<TGConnectingPoint num="7" id="4438" />
-<TGConnectingPoint num="8" id="4439" />
-<TGConnectingPoint num="9" id="4440" />
-<TGConnectingPoint num="10" id="4441" />
-<TGConnectingPoint num="11" id="4442" />
-<TGConnectingPoint num="12" id="4443" />
-<TGConnectingPoint num="13" id="4444" />
-<TGConnectingPoint num="14" id="4445" />
-<TGConnectingPoint num="15" id="4446" />
+<TGConnectingPoint num="0" id="4475" />
+<TGConnectingPoint num="1" id="4476" />
+<TGConnectingPoint num="2" id="4477" />
+<TGConnectingPoint num="3" id="4478" />
+<TGConnectingPoint num="4" id="4479" />
+<TGConnectingPoint num="5" id="4480" />
+<TGConnectingPoint num="6" id="4481" />
+<TGConnectingPoint num="7" id="4482" />
+<TGConnectingPoint num="8" id="4483" />
+<TGConnectingPoint num="9" id="4484" />
+<TGConnectingPoint num="10" id="4485" />
+<TGConnectingPoint num="11" id="4486" />
+<TGConnectingPoint num="12" id="4487" />
+<TGConnectingPoint num="13" id="4488" />
+<TGConnectingPoint num="14" id="4489" />
+<TGConnectingPoint num="15" id="4490" />
 <extraparam>
 <Line value="One free id at least" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4488" >
+<COMPONENT type="5106" id="4532" >
 <cdparam x="427" y="1182" />
 <sizeparam width="488" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="AddingNewID" />
-<TGConnectingPoint num="0" id="4448" />
-<TGConnectingPoint num="1" id="4449" />
-<TGConnectingPoint num="2" id="4450" />
-<TGConnectingPoint num="3" id="4451" />
-<TGConnectingPoint num="4" id="4452" />
-<TGConnectingPoint num="5" id="4453" />
-<TGConnectingPoint num="6" id="4454" />
-<TGConnectingPoint num="7" id="4455" />
-<TGConnectingPoint num="8" id="4456" />
-<TGConnectingPoint num="9" id="4457" />
-<TGConnectingPoint num="10" id="4458" />
-<TGConnectingPoint num="11" id="4459" />
-<TGConnectingPoint num="12" id="4460" />
-<TGConnectingPoint num="13" id="4461" />
-<TGConnectingPoint num="14" id="4462" />
-<TGConnectingPoint num="15" id="4463" />
-<TGConnectingPoint num="16" id="4464" />
-<TGConnectingPoint num="17" id="4465" />
-<TGConnectingPoint num="18" id="4466" />
-<TGConnectingPoint num="19" id="4467" />
-<TGConnectingPoint num="20" id="4468" />
-<TGConnectingPoint num="21" id="4469" />
-<TGConnectingPoint num="22" id="4470" />
-<TGConnectingPoint num="23" id="4471" />
-<TGConnectingPoint num="24" id="4472" />
-<TGConnectingPoint num="25" id="4473" />
-<TGConnectingPoint num="26" id="4474" />
-<TGConnectingPoint num="27" id="4475" />
-<TGConnectingPoint num="28" id="4476" />
-<TGConnectingPoint num="29" id="4477" />
-<TGConnectingPoint num="30" id="4478" />
-<TGConnectingPoint num="31" id="4479" />
-<TGConnectingPoint num="32" id="4480" />
-<TGConnectingPoint num="33" id="4481" />
-<TGConnectingPoint num="34" id="4482" />
-<TGConnectingPoint num="35" id="4483" />
-<TGConnectingPoint num="36" id="4484" />
-<TGConnectingPoint num="37" id="4485" />
-<TGConnectingPoint num="38" id="4486" />
-<TGConnectingPoint num="39" id="4487" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4529" >
+<TGConnectingPoint num="0" id="4492" />
+<TGConnectingPoint num="1" id="4493" />
+<TGConnectingPoint num="2" id="4494" />
+<TGConnectingPoint num="3" id="4495" />
+<TGConnectingPoint num="4" id="4496" />
+<TGConnectingPoint num="5" id="4497" />
+<TGConnectingPoint num="6" id="4498" />
+<TGConnectingPoint num="7" id="4499" />
+<TGConnectingPoint num="8" id="4500" />
+<TGConnectingPoint num="9" id="4501" />
+<TGConnectingPoint num="10" id="4502" />
+<TGConnectingPoint num="11" id="4503" />
+<TGConnectingPoint num="12" id="4504" />
+<TGConnectingPoint num="13" id="4505" />
+<TGConnectingPoint num="14" id="4506" />
+<TGConnectingPoint num="15" id="4507" />
+<TGConnectingPoint num="16" id="4508" />
+<TGConnectingPoint num="17" id="4509" />
+<TGConnectingPoint num="18" id="4510" />
+<TGConnectingPoint num="19" id="4511" />
+<TGConnectingPoint num="20" id="4512" />
+<TGConnectingPoint num="21" id="4513" />
+<TGConnectingPoint num="22" id="4514" />
+<TGConnectingPoint num="23" id="4515" />
+<TGConnectingPoint num="24" id="4516" />
+<TGConnectingPoint num="25" id="4517" />
+<TGConnectingPoint num="26" id="4518" />
+<TGConnectingPoint num="27" id="4519" />
+<TGConnectingPoint num="28" id="4520" />
+<TGConnectingPoint num="29" id="4521" />
+<TGConnectingPoint num="30" id="4522" />
+<TGConnectingPoint num="31" id="4523" />
+<TGConnectingPoint num="32" id="4524" />
+<TGConnectingPoint num="33" id="4525" />
+<TGConnectingPoint num="34" id="4526" />
+<TGConnectingPoint num="35" id="4527" />
+<TGConnectingPoint num="36" id="4528" />
+<TGConnectingPoint num="37" id="4529" />
+<TGConnectingPoint num="38" id="4530" />
+<TGConnectingPoint num="39" id="4531" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4573" >
 <cdparam x="531" y="435" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="RemovingOldIDs" />
-<TGConnectingPoint num="0" id="4489" />
-<TGConnectingPoint num="1" id="4490" />
-<TGConnectingPoint num="2" id="4491" />
-<TGConnectingPoint num="3" id="4492" />
-<TGConnectingPoint num="4" id="4493" />
-<TGConnectingPoint num="5" id="4494" />
-<TGConnectingPoint num="6" id="4495" />
-<TGConnectingPoint num="7" id="4496" />
-<TGConnectingPoint num="8" id="4497" />
-<TGConnectingPoint num="9" id="4498" />
-<TGConnectingPoint num="10" id="4499" />
-<TGConnectingPoint num="11" id="4500" />
-<TGConnectingPoint num="12" id="4501" />
-<TGConnectingPoint num="13" id="4502" />
-<TGConnectingPoint num="14" id="4503" />
-<TGConnectingPoint num="15" id="4504" />
-<TGConnectingPoint num="16" id="4505" />
-<TGConnectingPoint num="17" id="4506" />
-<TGConnectingPoint num="18" id="4507" />
-<TGConnectingPoint num="19" id="4508" />
-<TGConnectingPoint num="20" id="4509" />
-<TGConnectingPoint num="21" id="4510" />
-<TGConnectingPoint num="22" id="4511" />
-<TGConnectingPoint num="23" id="4512" />
-<TGConnectingPoint num="24" id="4513" />
-<TGConnectingPoint num="25" id="4514" />
-<TGConnectingPoint num="26" id="4515" />
-<TGConnectingPoint num="27" id="4516" />
-<TGConnectingPoint num="28" id="4517" />
-<TGConnectingPoint num="29" id="4518" />
-<TGConnectingPoint num="30" id="4519" />
-<TGConnectingPoint num="31" id="4520" />
-<TGConnectingPoint num="32" id="4521" />
-<TGConnectingPoint num="33" id="4522" />
-<TGConnectingPoint num="34" id="4523" />
-<TGConnectingPoint num="35" id="4524" />
-<TGConnectingPoint num="36" id="4525" />
-<TGConnectingPoint num="37" id="4526" />
-<TGConnectingPoint num="38" id="4527" />
-<TGConnectingPoint num="39" id="4528" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4570" >
+<TGConnectingPoint num="0" id="4533" />
+<TGConnectingPoint num="1" id="4534" />
+<TGConnectingPoint num="2" id="4535" />
+<TGConnectingPoint num="3" id="4536" />
+<TGConnectingPoint num="4" id="4537" />
+<TGConnectingPoint num="5" id="4538" />
+<TGConnectingPoint num="6" id="4539" />
+<TGConnectingPoint num="7" id="4540" />
+<TGConnectingPoint num="8" id="4541" />
+<TGConnectingPoint num="9" id="4542" />
+<TGConnectingPoint num="10" id="4543" />
+<TGConnectingPoint num="11" id="4544" />
+<TGConnectingPoint num="12" id="4545" />
+<TGConnectingPoint num="13" id="4546" />
+<TGConnectingPoint num="14" id="4547" />
+<TGConnectingPoint num="15" id="4548" />
+<TGConnectingPoint num="16" id="4549" />
+<TGConnectingPoint num="17" id="4550" />
+<TGConnectingPoint num="18" id="4551" />
+<TGConnectingPoint num="19" id="4552" />
+<TGConnectingPoint num="20" id="4553" />
+<TGConnectingPoint num="21" id="4554" />
+<TGConnectingPoint num="22" id="4555" />
+<TGConnectingPoint num="23" id="4556" />
+<TGConnectingPoint num="24" id="4557" />
+<TGConnectingPoint num="25" id="4558" />
+<TGConnectingPoint num="26" id="4559" />
+<TGConnectingPoint num="27" id="4560" />
+<TGConnectingPoint num="28" id="4561" />
+<TGConnectingPoint num="29" id="4562" />
+<TGConnectingPoint num="30" id="4563" />
+<TGConnectingPoint num="31" id="4564" />
+<TGConnectingPoint num="32" id="4565" />
+<TGConnectingPoint num="33" id="4566" />
+<TGConnectingPoint num="34" id="4567" />
+<TGConnectingPoint num="35" id="4568" />
+<TGConnectingPoint num="36" id="4569" />
+<TGConnectingPoint num="37" id="4570" />
+<TGConnectingPoint num="38" id="4571" />
+<TGConnectingPoint num="39" id="4572" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4614" >
 <cdparam x="453" y="145" />
 <sizeparam width="257" height="72" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="state0" value="WaitingForNewNodesOrPosition" />
-<TGConnectingPoint num="0" id="4530" />
-<TGConnectingPoint num="1" id="4531" />
-<TGConnectingPoint num="2" id="4532" />
-<TGConnectingPoint num="3" id="4533" />
-<TGConnectingPoint num="4" id="4534" />
-<TGConnectingPoint num="5" id="4535" />
-<TGConnectingPoint num="6" id="4536" />
-<TGConnectingPoint num="7" id="4537" />
-<TGConnectingPoint num="8" id="4538" />
-<TGConnectingPoint num="9" id="4539" />
-<TGConnectingPoint num="10" id="4540" />
-<TGConnectingPoint num="11" id="4541" />
-<TGConnectingPoint num="12" id="4542" />
-<TGConnectingPoint num="13" id="4543" />
-<TGConnectingPoint num="14" id="4544" />
-<TGConnectingPoint num="15" id="4545" />
-<TGConnectingPoint num="16" id="4546" />
-<TGConnectingPoint num="17" id="4547" />
-<TGConnectingPoint num="18" id="4548" />
-<TGConnectingPoint num="19" id="4549" />
-<TGConnectingPoint num="20" id="4550" />
-<TGConnectingPoint num="21" id="4551" />
-<TGConnectingPoint num="22" id="4552" />
-<TGConnectingPoint num="23" id="4553" />
-<TGConnectingPoint num="24" id="4554" />
-<TGConnectingPoint num="25" id="4555" />
-<TGConnectingPoint num="26" id="4556" />
-<TGConnectingPoint num="27" id="4557" />
-<TGConnectingPoint num="28" id="4558" />
-<TGConnectingPoint num="29" id="4559" />
-<TGConnectingPoint num="30" id="4560" />
-<TGConnectingPoint num="31" id="4561" />
-<TGConnectingPoint num="32" id="4562" />
-<TGConnectingPoint num="33" id="4563" />
-<TGConnectingPoint num="34" id="4564" />
-<TGConnectingPoint num="35" id="4565" />
-<TGConnectingPoint num="36" id="4566" />
-<TGConnectingPoint num="37" id="4567" />
-<TGConnectingPoint num="38" id="4568" />
-<TGConnectingPoint num="39" id="4569" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="4581" >
+<TGConnectingPoint num="0" id="4574" />
+<TGConnectingPoint num="1" id="4575" />
+<TGConnectingPoint num="2" id="4576" />
+<TGConnectingPoint num="3" id="4577" />
+<TGConnectingPoint num="4" id="4578" />
+<TGConnectingPoint num="5" id="4579" />
+<TGConnectingPoint num="6" id="4580" />
+<TGConnectingPoint num="7" id="4581" />
+<TGConnectingPoint num="8" id="4582" />
+<TGConnectingPoint num="9" id="4583" />
+<TGConnectingPoint num="10" id="4584" />
+<TGConnectingPoint num="11" id="4585" />
+<TGConnectingPoint num="12" id="4586" />
+<TGConnectingPoint num="13" id="4587" />
+<TGConnectingPoint num="14" id="4588" />
+<TGConnectingPoint num="15" id="4589" />
+<TGConnectingPoint num="16" id="4590" />
+<TGConnectingPoint num="17" id="4591" />
+<TGConnectingPoint num="18" id="4592" />
+<TGConnectingPoint num="19" id="4593" />
+<TGConnectingPoint num="20" id="4594" />
+<TGConnectingPoint num="21" id="4595" />
+<TGConnectingPoint num="22" id="4596" />
+<TGConnectingPoint num="23" id="4597" />
+<TGConnectingPoint num="24" id="4598" />
+<TGConnectingPoint num="25" id="4599" />
+<TGConnectingPoint num="26" id="4600" />
+<TGConnectingPoint num="27" id="4601" />
+<TGConnectingPoint num="28" id="4602" />
+<TGConnectingPoint num="29" id="4603" />
+<TGConnectingPoint num="30" id="4604" />
+<TGConnectingPoint num="31" id="4605" />
+<TGConnectingPoint num="32" id="4606" />
+<TGConnectingPoint num="33" id="4607" />
+<TGConnectingPoint num="34" id="4608" />
+<TGConnectingPoint num="35" id="4609" />
+<TGConnectingPoint num="36" id="4610" />
+<TGConnectingPoint num="37" id="4611" />
+<TGConnectingPoint num="38" id="4612" />
+<TGConnectingPoint num="39" id="4613" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="4625" >
 <cdparam x="505" y="254" />
 <sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="Receive signal" value="addANode(id, position)" />
-<TGConnectingPoint num="0" id="4571" />
-<TGConnectingPoint num="1" id="4572" />
-<TGConnectingPoint num="2" id="4573" />
-<TGConnectingPoint num="3" id="4574" />
-<TGConnectingPoint num="4" id="4575" />
-<TGConnectingPoint num="5" id="4576" />
-<TGConnectingPoint num="6" id="4577" />
-<TGConnectingPoint num="7" id="4578" />
-<TGConnectingPoint num="8" id="4579" />
-<TGConnectingPoint num="9" id="4580" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4583" >
+<TGConnectingPoint num="0" id="4615" />
+<TGConnectingPoint num="1" id="4616" />
+<TGConnectingPoint num="2" id="4617" />
+<TGConnectingPoint num="3" id="4618" />
+<TGConnectingPoint num="4" id="4619" />
+<TGConnectingPoint num="5" id="4620" />
+<TGConnectingPoint num="6" id="4621" />
+<TGConnectingPoint num="7" id="4622" />
+<TGConnectingPoint num="8" id="4623" />
+<TGConnectingPoint num="9" id="4624" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="4627" >
 <cdparam x="574" y="80" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4582" />
+<TGConnectingPoint num="0" id="4626" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="DSRSC_Management" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4590" >
-<cdparam x="507" y="267" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4589" />
-<P1  x="507" y="267" id="4688" />
-<P2  x="631" y="277" id="4665" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4588" >
-<father id="4590" num="0" />
-<cdparam x="507" y="307" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4584" />
-<TGConnectingPoint num="1" id="4585" />
-<TGConnectingPoint num="2" id="4586" />
-<TGConnectingPoint num="3" id="4587" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4603" >
-<cdparam x="440" y="432" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4599" />
-<TGConnectingPoint num="1" id="4600" />
-<TGConnectingPoint num="2" id="4601" />
-<TGConnectingPoint num="3" id="4602" />
-<P1  x="440" y="432" id="4677" />
-<P2  x="530" y="110" id="4742" />
-<Point x="442" y="479" />
-<Point x="974" y="511" />
-<Point x="957" y="129" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4591" >
-<father id="4603" num="0" />
-<cdparam x="442" y="479" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4592" >
-<father id="4603" num="1" />
-<cdparam x="974" y="511" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4593" >
-<father id="4603" num="2" />
-<cdparam x="957" y="129" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4598" >
-<father id="4603" num="3" />
-<cdparam x="457" y="473" />
-<sizeparam width="150" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4594" />
-<TGConnectingPoint num="1" id="4595" />
-<TGConnectingPoint num="2" id="4596" />
-<TGConnectingPoint num="3" id="4597" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="sendMessage(id, position)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4610" >
-<cdparam x="407" y="182" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4609" />
-<P1  x="407" y="182" id="4726" />
-<P2  x="440" y="402" id="4676" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4608" >
-<father id="4610" num="0" />
-<cdparam x="407" y="222" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4604" />
-<TGConnectingPoint num="1" id="4605" />
-<TGConnectingPoint num="2" id="4606" />
-<TGConnectingPoint num="3" id="4607" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4623" >
-<cdparam x="507" y="267" />
+<AVATARStateMachineDiagramPanel name="CorrectnessChecking" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="4640" >
+<cdparam x="432" y="279" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4619" />
-<TGConnectingPoint num="1" id="4620" />
-<TGConnectingPoint num="2" id="4621" />
-<TGConnectingPoint num="3" id="4622" />
-<P1  x="631" y="307" id="4666" />
-<P2  x="530" y="141" id="4724" />
-<Point x="644" y="343" />
-<Point x="829" y="341" />
-<Point x="848" y="153" />
+<infoparam name="connector from choice to state0" value="null" />
+<TGConnectingPoint num="0" id="4636" />
+<TGConnectingPoint num="1" id="4637" />
+<TGConnectingPoint num="2" id="4638" />
+<TGConnectingPoint num="3" id="4639" />
+<P1  x="432" y="279" id="4695" />
+<P2  x="517" y="124" id="4724" />
+<Point x="504" y="393" />
+<Point x="621" y="397" />
+<Point x="623" y="107" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4611" >
-<father id="4623" num="0" />
-<cdparam x="644" y="343" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4628" >
+<father id="4640" num="0" />
+<cdparam x="504" y="393" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4612" >
-<father id="4623" num="1" />
-<cdparam x="829" y="341" />
+<SUBCOMPONENT type="-1" id="4629" >
+<father id="4640" num="1" />
+<cdparam x="621" y="397" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4613" >
-<father id="4623" num="2" />
-<cdparam x="848" y="153" />
+<SUBCOMPONENT type="-1" id="4630" >
+<father id="4640" num="2" />
+<cdparam x="623" y="107" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4618" >
-<father id="4623" num="3" />
-<cdparam x="507" y="307" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="4635" >
+<father id="4640" num="3" />
+<cdparam x="479" y="319" />
+<sizeparam width="98" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4614" />
-<TGConnectingPoint num="1" id="4615" />
-<TGConnectingPoint num="2" id="4616" />
-<TGConnectingPoint num="3" id="4617" />
+<TGConnectingPoint num="0" id="4631" />
+<TGConnectingPoint num="1" id="4632" />
+<TGConnectingPoint num="2" id="4633" />
+<TGConnectingPoint num="3" id="4634" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ canHaveInvalid]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="invalidMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4636" >
-<cdparam x="289" y="344" />
+<CONNECTOR type="5102" id="4653" >
+<cdparam x="290" y="387" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4632" />
-<TGConnectingPoint num="1" id="4633" />
-<TGConnectingPoint num="2" id="4634" />
-<TGConnectingPoint num="3" id="4635" />
-<P1  x="289" y="344" id="4699" />
-<P2  x="285" y="141" id="4723" />
-<Point x="285" y="384" />
-<Point x="189" y="387" />
-<Point x="176" y="154" />
+<TGConnectingPoint num="0" id="4649" />
+<TGConnectingPoint num="1" id="4650" />
+<TGConnectingPoint num="2" id="4651" />
+<TGConnectingPoint num="3" id="4652" />
+<P1  x="290" y="387" id="4683" />
+<P2  x="298" y="117" id="4741" />
+<Point x="297" y="425" />
+<Point x="160" y="415" />
+<Point x="172" y="94" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4624" >
-<father id="4636" num="0" />
-<cdparam x="285" y="384" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4641" >
+<father id="4653" num="0" />
+<cdparam x="297" y="425" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4625" >
-<father id="4636" num="1" />
-<cdparam x="189" y="387" />
+<SUBCOMPONENT type="-1" id="4642" >
+<father id="4653" num="1" />
+<cdparam x="160" y="415" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4626" >
-<father id="4636" num="2" />
-<cdparam x="176" y="154" />
+<SUBCOMPONENT type="-1" id="4643" >
+<father id="4653" num="2" />
+<cdparam x="172" y="94" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4631" >
-<father id="4636" num="3" />
-<cdparam x="289" y="384" />
+<SUBCOMPONENT type="-1" id="4648" >
+<father id="4653" num="3" />
+<cdparam x="290" y="427" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4627" />
-<TGConnectingPoint num="1" id="4628" />
-<TGConnectingPoint num="2" id="4629" />
-<TGConnectingPoint num="3" id="4630" />
+<TGConnectingPoint num="0" id="4644" />
+<TGConnectingPoint num="1" id="4645" />
+<TGConnectingPoint num="2" id="4646" />
+<TGConnectingPoint num="3" id="4647" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10516,25 +10545,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4643" >
+<CONNECTOR type="5102" id="4660" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4642" />
+<TGConnectingPoint num="0" id="4659" />
 <P1  x="407" y="70" id="4761" />
-<P2  x="407" y="101" id="4721" />
+<P2  x="407" y="99" id="4721" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4641" >
-<father id="4643" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4658" >
+<father id="4660" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4637" />
-<TGConnectingPoint num="1" id="4638" />
-<TGConnectingPoint num="2" id="4639" />
-<TGConnectingPoint num="3" id="4640" />
+<TGConnectingPoint num="0" id="4654" />
+<TGConnectingPoint num="1" id="4655" />
+<TGConnectingPoint num="2" id="4656" />
+<TGConnectingPoint num="3" id="4657" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10544,25 +10573,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4650" >
-<cdparam x="314" y="182" />
+<CONNECTOR type="5102" id="4667" >
+<cdparam x="407" y="149" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4649" />
-<P1  x="314" y="182" id="4748" />
-<P2  x="296" y="256" id="4709" />
+<TGConnectingPoint num="0" id="4666" />
+<P1  x="407" y="149" id="4726" />
+<P2  x="407" y="188" id="4709" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4648" >
-<father id="4650" num="0" />
-<cdparam x="314" y="222" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4665" >
+<father id="4667" num="0" />
+<cdparam x="407" y="189" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4644" />
-<TGConnectingPoint num="1" id="4645" />
-<TGConnectingPoint num="2" id="4646" />
-<TGConnectingPoint num="3" id="4647" />
+<TGConnectingPoint num="0" id="4661" />
+<TGConnectingPoint num="1" id="4662" />
+<TGConnectingPoint num="2" id="4663" />
+<TGConnectingPoint num="3" id="4664" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10572,140 +10601,111 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4657" >
-<cdparam x="296" y="286" />
+<CONNECTOR type="5102" id="4674" >
+<cdparam x="407" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4656" />
-<P1  x="296" y="286" id="4710" />
-<P2  x="289" y="314" id="4698" />
+<infoparam name="connector from Receive signal to choice" value="null" />
+<TGConnectingPoint num="0" id="4673" />
+<P1  x="407" y="218" id="4710" />
+<P2  x="407" y="254" id="4693" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4655" >
-<father id="4657" num="0" />
-<cdparam x="296" y="326" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4672" >
+<father id="4674" num="0" />
+<cdparam x="419" y="243" />
+<sizeparam width="108" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4651" />
-<TGConnectingPoint num="1" id="4652" />
-<TGConnectingPoint num="2" id="4653" />
-<TGConnectingPoint num="3" id="4654" />
+<TGConnectingPoint num="0" id="4668" />
+<TGConnectingPoint num="1" id="4669" />
+<TGConnectingPoint num="2" id="4670" />
+<TGConnectingPoint num="3" id="4671" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="checkingMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4664" >
-<cdparam x="498" y="182" />
+<CONNECTOR type="5102" id="4681" >
+<cdparam x="382" y="279" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4663" />
-<P1  x="498" y="182" id="4751" />
-<P2  x="507" y="237" id="4687" />
+<infoparam name="connector from choice to Send signal" value="null" />
+<TGConnectingPoint num="0" id="4680" />
+<P1  x="382" y="279" id="4697" />
+<P2  x="290" y="357" id="4682" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4662" >
-<father id="4664" num="0" />
-<cdparam x="498" y="222" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4679" >
+<father id="4681" num="0" />
+<cdparam x="259" y="312" />
+<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4658" />
-<TGConnectingPoint num="1" id="4659" />
-<TGConnectingPoint num="2" id="4660" />
-<TGConnectingPoint num="3" id="4661" />
+<TGConnectingPoint num="0" id="4675" />
+<TGConnectingPoint num="1" id="4676" />
+<TGConnectingPoint num="2" id="4677" />
+<TGConnectingPoint num="3" id="4678" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="validMessage()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="4675" >
-<cdparam x="490" y="282" />
-<sizeparam width="283" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="forwardEmergencyBrakingMessage(id, position)" />
-<TGConnectingPoint num="0" id="4665" />
-<TGConnectingPoint num="1" id="4666" />
-<TGConnectingPoint num="2" id="4667" />
-<TGConnectingPoint num="3" id="4668" />
-<TGConnectingPoint num="4" id="4669" />
-<TGConnectingPoint num="5" id="4670" />
-<TGConnectingPoint num="6" id="4671" />
-<TGConnectingPoint num="7" id="4672" />
-<TGConnectingPoint num="8" id="4673" />
-<TGConnectingPoint num="9" id="4674" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4686" >
-<cdparam x="288" y="407" />
-<sizeparam width="304" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="broadcastEmergencyBrakingMessage(id, position)" />
-<TGConnectingPoint num="0" id="4676" />
-<TGConnectingPoint num="1" id="4677" />
-<TGConnectingPoint num="2" id="4678" />
-<TGConnectingPoint num="3" id="4679" />
-<TGConnectingPoint num="4" id="4680" />
-<TGConnectingPoint num="5" id="4681" />
-<TGConnectingPoint num="6" id="4682" />
-<TGConnectingPoint num="7" id="4683" />
-<TGConnectingPoint num="8" id="4684" />
-<TGConnectingPoint num="9" id="4685" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4697" >
-<cdparam x="412" y="242" />
-<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="4692" >
+<cdparam x="174" y="362" />
+<sizeparam width="232" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="obstacleDetected(id, position)" />
-<TGConnectingPoint num="0" id="4687" />
-<TGConnectingPoint num="1" id="4688" />
-<TGConnectingPoint num="2" id="4689" />
-<TGConnectingPoint num="3" id="4690" />
-<TGConnectingPoint num="4" id="4691" />
-<TGConnectingPoint num="5" id="4692" />
-<TGConnectingPoint num="6" id="4693" />
-<TGConnectingPoint num="7" id="4694" />
-<TGConnectingPoint num="8" id="4695" />
-<TGConnectingPoint num="9" id="4696" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="4708" >
-<cdparam x="208" y="319" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="toPlausibityCheckMessage(id, position)" />
+<TGConnectingPoint num="0" id="4682" />
+<TGConnectingPoint num="1" id="4683" />
+<TGConnectingPoint num="2" id="4684" />
+<TGConnectingPoint num="3" id="4685" />
+<TGConnectingPoint num="4" id="4686" />
+<TGConnectingPoint num="5" id="4687" />
+<TGConnectingPoint num="6" id="4688" />
+<TGConnectingPoint num="7" id="4689" />
+<TGConnectingPoint num="8" id="4690" />
+<TGConnectingPoint num="9" id="4691" />
+</COMPONENT>
+
+<COMPONENT type="5107" id="4708" >
+<cdparam x="392" y="264" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="setCarPosition(id, position)" />
-<TGConnectingPoint num="0" id="4698" />
-<TGConnectingPoint num="1" id="4699" />
-<TGConnectingPoint num="2" id="4700" />
-<TGConnectingPoint num="3" id="4701" />
-<TGConnectingPoint num="4" id="4702" />
-<TGConnectingPoint num="5" id="4703" />
-<TGConnectingPoint num="6" id="4704" />
-<TGConnectingPoint num="7" id="4705" />
-<TGConnectingPoint num="8" id="4706" />
-<TGConnectingPoint num="9" id="4707" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="4693" />
+<TGConnectingPoint num="1" id="4694" />
+<TGConnectingPoint num="2" id="4695" />
+<TGConnectingPoint num="3" id="4696" />
+<TGConnectingPoint num="4" id="4697" />
+<TGConnectingPoint num="5" id="4698" />
+<TGConnectingPoint num="6" id="4699" />
+<TGConnectingPoint num="7" id="4700" />
+<TGConnectingPoint num="8" id="4701" />
+<TGConnectingPoint num="9" id="4702" />
+<TGConnectingPoint num="10" id="4703" />
+<TGConnectingPoint num="11" id="4704" />
+<TGConnectingPoint num="12" id="4705" />
+<TGConnectingPoint num="13" id="4706" />
+<TGConnectingPoint num="14" id="4707" />
 </COMPONENT>
 
 <COMPONENT type="5104" id="4719" >
-<cdparam x="220" y="261" />
-<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="275" y="193" />
+<sizeparam width="264" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="carPosition(id, position)" />
+<infoparam name="Receive signal" value="getEmergencyBrakingMessage(id, position)" />
 <TGConnectingPoint num="0" id="4709" />
 <TGConnectingPoint num="1" id="4710" />
 <TGConnectingPoint num="2" id="4711" />
@@ -10719,11 +10719,11 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5106" id="4760" >
-<cdparam x="285" y="101" />
-<sizeparam width="245" height="81" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="298" y="99" />
+<sizeparam width="219" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingForEnvironmentInput" />
+<infoparam name="state0" value="WaitingForMessageToAnalyze" />
 <TGConnectingPoint num="0" id="4720" />
 <TGConnectingPoint num="1" id="4721" />
 <TGConnectingPoint num="2" id="4722" />
@@ -11055,24 +11055,24 @@ Otherwise, the most far away
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="BrakeManagement" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARStateMachineDiagramPanel name="DangerAvoidanceStrategy" minX="10" maxX="1400" minY="10" maxY="900" >
 <CONNECTOR type="5102" id="4904" >
-<cdparam x="514" y="350" />
+<cdparam x="512" y="766" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
+<infoparam name="connector from Send signal to state0" value="null" />
 <TGConnectingPoint num="0" id="4900" />
 <TGConnectingPoint num="1" id="4901" />
 <TGConnectingPoint num="2" id="4902" />
 <TGConnectingPoint num="3" id="4903" />
-<P1  x="497" y="343" id="4932" />
-<P2  x="570" y="148" id="4982" />
-<Point x="497" y="396" />
-<Point x="697" y="396" />
-<Point x="697" y="148" />
+<P1  x="512" y="766" id="4969" />
+<P2  x="636" y="162" id="5150" />
+<Point x="516" y="826" />
+<Point x="776" y="833" />
+<Point x="781" y="165" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="4892" >
 <father id="4904" num="0" />
-<cdparam x="497" y="396" />
+<cdparam x="516" y="826" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -11080,7 +11080,7 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="4893" >
 <father id="4904" num="1" />
-<cdparam x="697" y="396" />
+<cdparam x="776" y="833" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -11088,7 +11088,7 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="4894" >
 <father id="4904" num="2" />
-<cdparam x="697" y="148" />
+<cdparam x="781" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -11096,8 +11096,8 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 <SUBCOMPONENT type="-1" id="4899" >
 <father id="4904" num="3" />
-<cdparam x="508" y="363" />
-<sizeparam width="193" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="512" y="806" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -11107,25 +11107,24 @@ Otherwise, the most far away
 <TGConnectingPoint num="3" id="4898" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="value" />
-<afterMax value="brakeMaxDuration" />
+<afterMin value="" />
+<afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="brakingDone()" />
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="4911" >
-<cdparam x="407" y="70" />
+<cdparam x="518" y="602" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
+<infoparam name="connector from Send signal to state0" value="null" />
 <TGConnectingPoint num="0" id="4910" />
-<P1  x="475" y="89" id="5019" />
-<P2  x="484" y="124" id="4979" />
+<P1  x="510" y="605" id="4980" />
+<P2  x="511" y="642" id="4991" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="4909" >
 <father id="4911" num="0" />
-<cdparam x="407" y="110" />
+<cdparam x="518" y="642" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -11143,302 +11142,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4918" >
-<cdparam x="484" y="172" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4917" />
-<P1  x="441" y="172" id="4992" />
-<P2  x="441" y="195" id="4967" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4916" >
-<father id="4918" num="0" />
-<cdparam x="484" y="212" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4912" />
-<TGConnectingPoint num="1" id="4913" />
-<TGConnectingPoint num="2" id="4914" />
-<TGConnectingPoint num="3" id="4915" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4925" >
-<cdparam x="485" y="230" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4924" />
-<P1  x="441" y="225" id="4968" />
-<P2  x="441" y="293" id="4934" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4923" >
-<father id="4925" num="0" />
-<cdparam x="447" y="243" />
-<sizeparam width="250" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4919" />
-<TGConnectingPoint num="1" id="4920" />
-<TGConnectingPoint num="2" id="4921" />
-<TGConnectingPoint num="3" id="4922" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="applyBraking(value)" />
-<actions value="value = value * 10" />
-<actions value="brakeMaxDuration = value + deltaBrake" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="4966" >
-<cdparam x="386" y="293" />
-<sizeparam width="223" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingforBrakingToBeCompleted" />
-<TGConnectingPoint num="0" id="4926" />
-<TGConnectingPoint num="1" id="4927" />
-<TGConnectingPoint num="2" id="4928" />
-<TGConnectingPoint num="3" id="4929" />
-<TGConnectingPoint num="4" id="4930" />
-<TGConnectingPoint num="5" id="4931" />
-<TGConnectingPoint num="6" id="4932" />
-<TGConnectingPoint num="7" id="4933" />
-<TGConnectingPoint num="8" id="4934" />
-<TGConnectingPoint num="9" id="4935" />
-<TGConnectingPoint num="10" id="4936" />
-<TGConnectingPoint num="11" id="4937" />
-<TGConnectingPoint num="12" id="4938" />
-<TGConnectingPoint num="13" id="4939" />
-<TGConnectingPoint num="14" id="4940" />
-<TGConnectingPoint num="15" id="4941" />
-<TGConnectingPoint num="16" id="4942" />
-<TGConnectingPoint num="17" id="4943" />
-<TGConnectingPoint num="18" id="4944" />
-<TGConnectingPoint num="19" id="4945" />
-<TGConnectingPoint num="20" id="4946" />
-<TGConnectingPoint num="21" id="4947" />
-<TGConnectingPoint num="22" id="4948" />
-<TGConnectingPoint num="23" id="4949" />
-<TGConnectingPoint num="24" id="4950" />
-<TGConnectingPoint num="25" id="4951" />
-<TGConnectingPoint num="26" id="4952" />
-<TGConnectingPoint num="27" id="4953" />
-<TGConnectingPoint num="28" id="4954" />
-<TGConnectingPoint num="29" id="4955" />
-<TGConnectingPoint num="30" id="4956" />
-<TGConnectingPoint num="31" id="4957" />
-<TGConnectingPoint num="32" id="4958" />
-<TGConnectingPoint num="33" id="4959" />
-<TGConnectingPoint num="34" id="4960" />
-<TGConnectingPoint num="35" id="4961" />
-<TGConnectingPoint num="36" id="4962" />
-<TGConnectingPoint num="37" id="4963" />
-<TGConnectingPoint num="38" id="4964" />
-<TGConnectingPoint num="39" id="4965" />
-<invariant />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="4977" >
-<cdparam x="393" y="200" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="brake(value)" />
-<TGConnectingPoint num="0" id="4967" />
-<TGConnectingPoint num="1" id="4968" />
-<TGConnectingPoint num="2" id="4969" />
-<TGConnectingPoint num="3" id="4970" />
-<TGConnectingPoint num="4" id="4971" />
-<TGConnectingPoint num="5" id="4972" />
-<TGConnectingPoint num="6" id="4973" />
-<TGConnectingPoint num="7" id="4974" />
-<TGConnectingPoint num="8" id="4975" />
-<TGConnectingPoint num="9" id="4976" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5018" >
-<cdparam x="398" y="124" />
-<sizeparam width="172" height="48" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitForBrakingOrder" />
-<TGConnectingPoint num="0" id="4978" />
-<TGConnectingPoint num="1" id="4979" />
-<TGConnectingPoint num="2" id="4980" />
-<TGConnectingPoint num="3" id="4981" />
-<TGConnectingPoint num="4" id="4982" />
-<TGConnectingPoint num="5" id="4983" />
-<TGConnectingPoint num="6" id="4984" />
-<TGConnectingPoint num="7" id="4985" />
-<TGConnectingPoint num="8" id="4986" />
-<TGConnectingPoint num="9" id="4987" />
-<TGConnectingPoint num="10" id="4988" />
-<TGConnectingPoint num="11" id="4989" />
-<TGConnectingPoint num="12" id="4990" />
-<TGConnectingPoint num="13" id="4991" />
-<TGConnectingPoint num="14" id="4992" />
-<TGConnectingPoint num="15" id="4993" />
-<TGConnectingPoint num="16" id="4994" />
-<TGConnectingPoint num="17" id="4995" />
-<TGConnectingPoint num="18" id="4996" />
-<TGConnectingPoint num="19" id="4997" />
-<TGConnectingPoint num="20" id="4998" />
-<TGConnectingPoint num="21" id="4999" />
-<TGConnectingPoint num="22" id="5000" />
-<TGConnectingPoint num="23" id="5001" />
-<TGConnectingPoint num="24" id="5002" />
-<TGConnectingPoint num="25" id="5003" />
-<TGConnectingPoint num="26" id="5004" />
-<TGConnectingPoint num="27" id="5005" />
-<TGConnectingPoint num="28" id="5006" />
-<TGConnectingPoint num="29" id="5007" />
-<TGConnectingPoint num="30" id="5008" />
-<TGConnectingPoint num="31" id="5009" />
-<TGConnectingPoint num="32" id="5010" />
-<TGConnectingPoint num="33" id="5011" />
-<TGConnectingPoint num="34" id="5012" />
-<TGConnectingPoint num="35" id="5013" />
-<TGConnectingPoint num="36" id="5014" />
-<TGConnectingPoint num="37" id="5015" />
-<TGConnectingPoint num="38" id="5016" />
-<TGConnectingPoint num="39" id="5017" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="5020" >
-<cdparam x="468" y="69" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5019" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="DangerAvoidanceStrategy" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5033" >
-<cdparam x="512" y="766" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5029" />
-<TGConnectingPoint num="1" id="5030" />
-<TGConnectingPoint num="2" id="5031" />
-<TGConnectingPoint num="3" id="5032" />
-<P1  x="512" y="766" id="5098" />
-<P2  x="636" y="162" id="5279" />
-<Point x="516" y="826" />
-<Point x="776" y="833" />
-<Point x="781" y="165" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5021" >
-<father id="5033" num="0" />
-<cdparam x="516" y="826" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5022" >
-<father id="5033" num="1" />
-<cdparam x="776" y="833" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5023" >
-<father id="5033" num="2" />
-<cdparam x="781" y="165" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5028" >
-<father id="5033" num="3" />
-<cdparam x="512" y="806" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5024" />
-<TGConnectingPoint num="1" id="5025" />
-<TGConnectingPoint num="2" id="5026" />
-<TGConnectingPoint num="3" id="5027" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5040" >
-<cdparam x="518" y="602" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5039" />
-<P1  x="510" y="605" id="5109" />
-<P2  x="511" y="642" id="5120" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5038" >
-<father id="5040" num="0" />
-<cdparam x="518" y="642" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5034" />
-<TGConnectingPoint num="1" id="5035" />
-<TGConnectingPoint num="2" id="5036" />
-<TGConnectingPoint num="3" id="5037" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5047" >
+<CONNECTOR type="5102" id="4918" >
 <cdparam x="586" y="530" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5046" />
-<P1  x="510" y="530" id="5189" />
-<P2  x="510" y="575" id="5108" />
+<TGConnectingPoint num="0" id="4917" />
+<P1  x="510" y="530" id="5060" />
+<P2  x="510" y="575" id="4979" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5045" >
-<father id="5047" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4916" >
+<father id="4918" num="0" />
 <cdparam x="523" y="558" />
 <sizeparam width="244" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5041" />
-<TGConnectingPoint num="1" id="5042" />
-<TGConnectingPoint num="2" id="5043" />
-<TGConnectingPoint num="3" id="5044" />
+<TGConnectingPoint num="0" id="4912" />
+<TGConnectingPoint num="1" id="4913" />
+<TGConnectingPoint num="2" id="4914" />
+<TGConnectingPoint num="3" id="4915" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11449,25 +11171,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5054" >
+<CONNECTOR type="5102" id="4925" >
 <cdparam x="524" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to state0" value="null" />
-<TGConnectingPoint num="0" id="5053" />
-<P1  x="524" y="331" id="5231" />
-<P2  x="560" y="480" id="5178" />
+<TGConnectingPoint num="0" id="4924" />
+<P1  x="524" y="331" id="5102" />
+<P2  x="560" y="480" id="5049" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5052" >
-<father id="5054" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4923" >
+<father id="4925" num="0" />
 <cdparam x="548" y="369" />
 <sizeparam width="44" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5048" />
-<TGConnectingPoint num="1" id="5049" />
-<TGConnectingPoint num="2" id="5050" />
-<TGConnectingPoint num="3" id="5051" />
+<TGConnectingPoint num="0" id="4919" />
+<TGConnectingPoint num="1" id="4920" />
+<TGConnectingPoint num="2" id="4921" />
+<TGConnectingPoint num="3" id="4922" />
 <extraparam>
 <guard value="[ else ]" />
 <afterMin value="" />
@@ -11477,25 +11199,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5061" >
+<CONNECTOR type="5102" id="4932" >
 <cdparam x="419" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5060" />
-<P1  x="419" y="125" id="5297" />
-<P2  x="431" y="144" id="5264" />
+<TGConnectingPoint num="0" id="4931" />
+<P1  x="419" y="125" id="5168" />
+<P2  x="431" y="144" id="5135" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5059" >
-<father id="5061" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4930" >
+<father id="4932" num="0" />
 <cdparam x="419" y="165" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5055" />
-<TGConnectingPoint num="1" id="5056" />
-<TGConnectingPoint num="2" id="5057" />
-<TGConnectingPoint num="3" id="5058" />
+<TGConnectingPoint num="0" id="4926" />
+<TGConnectingPoint num="1" id="4927" />
+<TGConnectingPoint num="2" id="4928" />
+<TGConnectingPoint num="3" id="4929" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11505,25 +11227,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5068" >
+<CONNECTOR type="5102" id="4939" >
 <cdparam x="499" y="194" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5067" />
-<P1  x="499" y="194" id="5262" />
-<P2  x="499" y="228" id="5245" />
+<TGConnectingPoint num="0" id="4938" />
+<P1  x="499" y="194" id="5133" />
+<P2  x="499" y="228" id="5116" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5066" >
-<father id="5068" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4937" >
+<father id="4939" num="0" />
 <cdparam x="499" y="234" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5062" />
-<TGConnectingPoint num="1" id="5063" />
-<TGConnectingPoint num="2" id="5064" />
-<TGConnectingPoint num="3" id="5065" />
+<TGConnectingPoint num="0" id="4933" />
+<TGConnectingPoint num="1" id="4934" />
+<TGConnectingPoint num="2" id="4935" />
+<TGConnectingPoint num="3" id="4936" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11533,25 +11255,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5075" >
+<CONNECTOR type="5102" id="4946" >
 <cdparam x="499" y="258" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to choice" value="null" />
-<TGConnectingPoint num="0" id="5074" />
-<P1  x="499" y="258" id="5246" />
-<P2  x="499" y="306" id="5229" />
+<TGConnectingPoint num="0" id="4945" />
+<P1  x="499" y="258" id="5117" />
+<P2  x="499" y="306" id="5100" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5073" >
-<father id="5075" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4944" >
+<father id="4946" num="0" />
 <cdparam x="499" y="298" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5069" />
-<TGConnectingPoint num="1" id="5070" />
-<TGConnectingPoint num="2" id="5071" />
-<TGConnectingPoint num="3" id="5072" />
+<TGConnectingPoint num="0" id="4940" />
+<TGConnectingPoint num="1" id="4941" />
+<TGConnectingPoint num="2" id="4942" />
+<TGConnectingPoint num="3" id="4943" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11561,25 +11283,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5082" >
+<CONNECTOR type="5102" id="4953" >
 <cdparam x="474" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5081" />
-<P1  x="474" y="331" id="5233" />
-<P2  x="393" y="394" id="5201" />
+<TGConnectingPoint num="0" id="4952" />
+<P1  x="474" y="331" id="5104" />
+<P2  x="393" y="394" id="5072" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5080" >
-<father id="5082" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4951" >
+<father id="4953" num="0" />
 <cdparam x="356" y="357" />
 <sizeparam width="78" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5076" />
-<TGConnectingPoint num="1" id="5077" />
-<TGConnectingPoint num="2" id="5078" />
-<TGConnectingPoint num="3" id="5079" />
+<TGConnectingPoint num="0" id="4947" />
+<TGConnectingPoint num="1" id="4948" />
+<TGConnectingPoint num="2" id="4949" />
+<TGConnectingPoint num="3" id="4950" />
 <extraparam>
 <guard value="[ speed &gt; 5]" />
 <afterMin value="" />
@@ -11589,25 +11311,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5089" >
+<CONNECTOR type="5102" id="4960" >
 <cdparam x="390" y="432" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5088" />
-<P1  x="393" y="424" id="5202" />
-<P2  x="436" y="480" id="5160" />
+<TGConnectingPoint num="0" id="4959" />
+<P1  x="393" y="424" id="5073" />
+<P2  x="436" y="480" id="5031" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5087" >
-<father id="5089" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4958" >
+<father id="4960" num="0" />
 <cdparam x="390" y="472" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5083" />
-<TGConnectingPoint num="1" id="5084" />
-<TGConnectingPoint num="2" id="5085" />
-<TGConnectingPoint num="3" id="5086" />
+<TGConnectingPoint num="0" id="4954" />
+<TGConnectingPoint num="1" id="4955" />
+<TGConnectingPoint num="2" id="4956" />
+<TGConnectingPoint num="3" id="4957" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11617,25 +11339,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5096" >
+<CONNECTOR type="5102" id="4967" >
 <cdparam x="537" y="692" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5095" />
-<P1  x="511" y="692" id="5125" />
-<P2  x="512" y="736" id="5097" />
+<TGConnectingPoint num="0" id="4966" />
+<P1  x="511" y="692" id="4996" />
+<P2  x="512" y="736" id="4968" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5094" >
-<father id="5096" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4965" >
+<father id="4967" num="0" />
 <cdparam x="534" y="724" />
 <sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5090" />
-<TGConnectingPoint num="1" id="5091" />
-<TGConnectingPoint num="2" id="5092" />
-<TGConnectingPoint num="3" id="5093" />
+<TGConnectingPoint num="0" id="4961" />
+<TGConnectingPoint num="1" id="4962" />
+<TGConnectingPoint num="2" id="4963" />
+<TGConnectingPoint num="3" id="4964" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11646,217 +11368,495 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="5107" >
+<COMPONENT type="5103" id="4978" >
 <cdparam x="378" y="741" />
 <sizeparam width="269" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="forwardEmergency(value, currentPosition)" />
-<TGConnectingPoint num="0" id="5097" />
-<TGConnectingPoint num="1" id="5098" />
-<TGConnectingPoint num="2" id="5099" />
-<TGConnectingPoint num="3" id="5100" />
-<TGConnectingPoint num="4" id="5101" />
-<TGConnectingPoint num="5" id="5102" />
-<TGConnectingPoint num="6" id="5103" />
-<TGConnectingPoint num="7" id="5104" />
-<TGConnectingPoint num="8" id="5105" />
-<TGConnectingPoint num="9" id="5106" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="5118" >
+<TGConnectingPoint num="0" id="4968" />
+<TGConnectingPoint num="1" id="4969" />
+<TGConnectingPoint num="2" id="4970" />
+<TGConnectingPoint num="3" id="4971" />
+<TGConnectingPoint num="4" id="4972" />
+<TGConnectingPoint num="5" id="4973" />
+<TGConnectingPoint num="6" id="4974" />
+<TGConnectingPoint num="7" id="4975" />
+<TGConnectingPoint num="8" id="4976" />
+<TGConnectingPoint num="9" id="4977" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="4989" >
 <cdparam x="446" y="580" />
 <sizeparam width="128" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="brakePower(value)" />
-<TGConnectingPoint num="0" id="5108" />
-<TGConnectingPoint num="1" id="5109" />
-<TGConnectingPoint num="2" id="5110" />
-<TGConnectingPoint num="3" id="5111" />
-<TGConnectingPoint num="4" id="5112" />
-<TGConnectingPoint num="5" id="5113" />
-<TGConnectingPoint num="6" id="5114" />
-<TGConnectingPoint num="7" id="5115" />
-<TGConnectingPoint num="8" id="5116" />
-<TGConnectingPoint num="9" id="5117" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5159" >
+<TGConnectingPoint num="0" id="4979" />
+<TGConnectingPoint num="1" id="4980" />
+<TGConnectingPoint num="2" id="4981" />
+<TGConnectingPoint num="3" id="4982" />
+<TGConnectingPoint num="4" id="4983" />
+<TGConnectingPoint num="5" id="4984" />
+<TGConnectingPoint num="6" id="4985" />
+<TGConnectingPoint num="7" id="4986" />
+<TGConnectingPoint num="8" id="4987" />
+<TGConnectingPoint num="9" id="4988" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5030" >
 <cdparam x="403" y="642" />
 <sizeparam width="217" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="ForwardManagement" />
-<TGConnectingPoint num="0" id="5119" />
-<TGConnectingPoint num="1" id="5120" />
-<TGConnectingPoint num="2" id="5121" />
-<TGConnectingPoint num="3" id="5122" />
-<TGConnectingPoint num="4" id="5123" />
-<TGConnectingPoint num="5" id="5124" />
-<TGConnectingPoint num="6" id="5125" />
-<TGConnectingPoint num="7" id="5126" />
-<TGConnectingPoint num="8" id="5127" />
-<TGConnectingPoint num="9" id="5128" />
-<TGConnectingPoint num="10" id="5129" />
-<TGConnectingPoint num="11" id="5130" />
-<TGConnectingPoint num="12" id="5131" />
-<TGConnectingPoint num="13" id="5132" />
-<TGConnectingPoint num="14" id="5133" />
-<TGConnectingPoint num="15" id="5134" />
-<TGConnectingPoint num="16" id="5135" />
-<TGConnectingPoint num="17" id="5136" />
-<TGConnectingPoint num="18" id="5137" />
-<TGConnectingPoint num="19" id="5138" />
-<TGConnectingPoint num="20" id="5139" />
-<TGConnectingPoint num="21" id="5140" />
-<TGConnectingPoint num="22" id="5141" />
-<TGConnectingPoint num="23" id="5142" />
-<TGConnectingPoint num="24" id="5143" />
-<TGConnectingPoint num="25" id="5144" />
-<TGConnectingPoint num="26" id="5145" />
-<TGConnectingPoint num="27" id="5146" />
-<TGConnectingPoint num="28" id="5147" />
-<TGConnectingPoint num="29" id="5148" />
-<TGConnectingPoint num="30" id="5149" />
-<TGConnectingPoint num="31" id="5150" />
-<TGConnectingPoint num="32" id="5151" />
-<TGConnectingPoint num="33" id="5152" />
-<TGConnectingPoint num="34" id="5153" />
-<TGConnectingPoint num="35" id="5154" />
-<TGConnectingPoint num="36" id="5155" />
-<TGConnectingPoint num="37" id="5156" />
-<TGConnectingPoint num="38" id="5157" />
-<TGConnectingPoint num="39" id="5158" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="5200" >
+<TGConnectingPoint num="0" id="4990" />
+<TGConnectingPoint num="1" id="4991" />
+<TGConnectingPoint num="2" id="4992" />
+<TGConnectingPoint num="3" id="4993" />
+<TGConnectingPoint num="4" id="4994" />
+<TGConnectingPoint num="5" id="4995" />
+<TGConnectingPoint num="6" id="4996" />
+<TGConnectingPoint num="7" id="4997" />
+<TGConnectingPoint num="8" id="4998" />
+<TGConnectingPoint num="9" id="4999" />
+<TGConnectingPoint num="10" id="5000" />
+<TGConnectingPoint num="11" id="5001" />
+<TGConnectingPoint num="12" id="5002" />
+<TGConnectingPoint num="13" id="5003" />
+<TGConnectingPoint num="14" id="5004" />
+<TGConnectingPoint num="15" id="5005" />
+<TGConnectingPoint num="16" id="5006" />
+<TGConnectingPoint num="17" id="5007" />
+<TGConnectingPoint num="18" id="5008" />
+<TGConnectingPoint num="19" id="5009" />
+<TGConnectingPoint num="20" id="5010" />
+<TGConnectingPoint num="21" id="5011" />
+<TGConnectingPoint num="22" id="5012" />
+<TGConnectingPoint num="23" id="5013" />
+<TGConnectingPoint num="24" id="5014" />
+<TGConnectingPoint num="25" id="5015" />
+<TGConnectingPoint num="26" id="5016" />
+<TGConnectingPoint num="27" id="5017" />
+<TGConnectingPoint num="28" id="5018" />
+<TGConnectingPoint num="29" id="5019" />
+<TGConnectingPoint num="30" id="5020" />
+<TGConnectingPoint num="31" id="5021" />
+<TGConnectingPoint num="32" id="5022" />
+<TGConnectingPoint num="33" id="5023" />
+<TGConnectingPoint num="34" id="5024" />
+<TGConnectingPoint num="35" id="5025" />
+<TGConnectingPoint num="36" id="5026" />
+<TGConnectingPoint num="37" id="5027" />
+<TGConnectingPoint num="38" id="5028" />
+<TGConnectingPoint num="39" id="5029" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5071" >
 <cdparam x="436" y="480" />
 <sizeparam width="201" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="BrakingManagement" />
-<TGConnectingPoint num="0" id="5160" />
-<TGConnectingPoint num="1" id="5161" />
-<TGConnectingPoint num="2" id="5162" />
-<TGConnectingPoint num="3" id="5163" />
-<TGConnectingPoint num="4" id="5164" />
-<TGConnectingPoint num="5" id="5165" />
-<TGConnectingPoint num="6" id="5166" />
-<TGConnectingPoint num="7" id="5167" />
-<TGConnectingPoint num="8" id="5168" />
-<TGConnectingPoint num="9" id="5169" />
-<TGConnectingPoint num="10" id="5170" />
-<TGConnectingPoint num="11" id="5171" />
-<TGConnectingPoint num="12" id="5172" />
-<TGConnectingPoint num="13" id="5173" />
-<TGConnectingPoint num="14" id="5174" />
-<TGConnectingPoint num="15" id="5175" />
-<TGConnectingPoint num="16" id="5176" />
-<TGConnectingPoint num="17" id="5177" />
-<TGConnectingPoint num="18" id="5178" />
-<TGConnectingPoint num="19" id="5179" />
-<TGConnectingPoint num="20" id="5180" />
-<TGConnectingPoint num="21" id="5181" />
-<TGConnectingPoint num="22" id="5182" />
-<TGConnectingPoint num="23" id="5183" />
-<TGConnectingPoint num="24" id="5184" />
-<TGConnectingPoint num="25" id="5185" />
-<TGConnectingPoint num="26" id="5186" />
-<TGConnectingPoint num="27" id="5187" />
-<TGConnectingPoint num="28" id="5188" />
-<TGConnectingPoint num="29" id="5189" />
-<TGConnectingPoint num="30" id="5190" />
-<TGConnectingPoint num="31" id="5191" />
-<TGConnectingPoint num="32" id="5192" />
-<TGConnectingPoint num="33" id="5193" />
-<TGConnectingPoint num="34" id="5194" />
-<TGConnectingPoint num="35" id="5195" />
-<TGConnectingPoint num="36" id="5196" />
-<TGConnectingPoint num="37" id="5197" />
-<TGConnectingPoint num="38" id="5198" />
-<TGConnectingPoint num="39" id="5199" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="5211" >
+<TGConnectingPoint num="0" id="5031" />
+<TGConnectingPoint num="1" id="5032" />
+<TGConnectingPoint num="2" id="5033" />
+<TGConnectingPoint num="3" id="5034" />
+<TGConnectingPoint num="4" id="5035" />
+<TGConnectingPoint num="5" id="5036" />
+<TGConnectingPoint num="6" id="5037" />
+<TGConnectingPoint num="7" id="5038" />
+<TGConnectingPoint num="8" id="5039" />
+<TGConnectingPoint num="9" id="5040" />
+<TGConnectingPoint num="10" id="5041" />
+<TGConnectingPoint num="11" id="5042" />
+<TGConnectingPoint num="12" id="5043" />
+<TGConnectingPoint num="13" id="5044" />
+<TGConnectingPoint num="14" id="5045" />
+<TGConnectingPoint num="15" id="5046" />
+<TGConnectingPoint num="16" id="5047" />
+<TGConnectingPoint num="17" id="5048" />
+<TGConnectingPoint num="18" id="5049" />
+<TGConnectingPoint num="19" id="5050" />
+<TGConnectingPoint num="20" id="5051" />
+<TGConnectingPoint num="21" id="5052" />
+<TGConnectingPoint num="22" id="5053" />
+<TGConnectingPoint num="23" id="5054" />
+<TGConnectingPoint num="24" id="5055" />
+<TGConnectingPoint num="25" id="5056" />
+<TGConnectingPoint num="26" id="5057" />
+<TGConnectingPoint num="27" id="5058" />
+<TGConnectingPoint num="28" id="5059" />
+<TGConnectingPoint num="29" id="5060" />
+<TGConnectingPoint num="30" id="5061" />
+<TGConnectingPoint num="31" id="5062" />
+<TGConnectingPoint num="32" id="5063" />
+<TGConnectingPoint num="33" id="5064" />
+<TGConnectingPoint num="34" id="5065" />
+<TGConnectingPoint num="35" id="5066" />
+<TGConnectingPoint num="36" id="5067" />
+<TGConnectingPoint num="37" id="5068" />
+<TGConnectingPoint num="38" id="5069" />
+<TGConnectingPoint num="39" id="5070" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="5082" >
 <cdparam x="326" y="399" />
 <sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="reducePower(value)" />
-<TGConnectingPoint num="0" id="5201" />
-<TGConnectingPoint num="1" id="5202" />
-<TGConnectingPoint num="2" id="5203" />
-<TGConnectingPoint num="3" id="5204" />
-<TGConnectingPoint num="4" id="5205" />
-<TGConnectingPoint num="5" id="5206" />
-<TGConnectingPoint num="6" id="5207" />
-<TGConnectingPoint num="7" id="5208" />
-<TGConnectingPoint num="8" id="5209" />
-<TGConnectingPoint num="9" id="5210" />
-</COMPONENT>
-
-<COMPONENT type="301" id="5228" >
+<TGConnectingPoint num="0" id="5072" />
+<TGConnectingPoint num="1" id="5073" />
+<TGConnectingPoint num="2" id="5074" />
+<TGConnectingPoint num="3" id="5075" />
+<TGConnectingPoint num="4" id="5076" />
+<TGConnectingPoint num="5" id="5077" />
+<TGConnectingPoint num="6" id="5078" />
+<TGConnectingPoint num="7" id="5079" />
+<TGConnectingPoint num="8" id="5080" />
+<TGConnectingPoint num="9" id="5081" />
+</COMPONENT>
+
+<COMPONENT type="301" id="5099" >
 <cdparam x="561" y="301" />
 <sizeparam width="169" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Have to reduce Power ?
 " />
-<TGConnectingPoint num="0" id="5212" />
-<TGConnectingPoint num="1" id="5213" />
-<TGConnectingPoint num="2" id="5214" />
-<TGConnectingPoint num="3" id="5215" />
-<TGConnectingPoint num="4" id="5216" />
-<TGConnectingPoint num="5" id="5217" />
-<TGConnectingPoint num="6" id="5218" />
-<TGConnectingPoint num="7" id="5219" />
-<TGConnectingPoint num="8" id="5220" />
-<TGConnectingPoint num="9" id="5221" />
-<TGConnectingPoint num="10" id="5222" />
-<TGConnectingPoint num="11" id="5223" />
-<TGConnectingPoint num="12" id="5224" />
-<TGConnectingPoint num="13" id="5225" />
-<TGConnectingPoint num="14" id="5226" />
-<TGConnectingPoint num="15" id="5227" />
+<TGConnectingPoint num="0" id="5083" />
+<TGConnectingPoint num="1" id="5084" />
+<TGConnectingPoint num="2" id="5085" />
+<TGConnectingPoint num="3" id="5086" />
+<TGConnectingPoint num="4" id="5087" />
+<TGConnectingPoint num="5" id="5088" />
+<TGConnectingPoint num="6" id="5089" />
+<TGConnectingPoint num="7" id="5090" />
+<TGConnectingPoint num="8" id="5091" />
+<TGConnectingPoint num="9" id="5092" />
+<TGConnectingPoint num="10" id="5093" />
+<TGConnectingPoint num="11" id="5094" />
+<TGConnectingPoint num="12" id="5095" />
+<TGConnectingPoint num="13" id="5096" />
+<TGConnectingPoint num="14" id="5097" />
+<TGConnectingPoint num="15" id="5098" />
 <extraparam>
 <Line value="Have to reduce Power ?" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5107" id="5244" >
+<COMPONENT type="5107" id="5115" >
 <cdparam x="484" y="316" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="5229" />
-<TGConnectingPoint num="1" id="5230" />
-<TGConnectingPoint num="2" id="5231" />
-<TGConnectingPoint num="3" id="5232" />
-<TGConnectingPoint num="4" id="5233" />
-<TGConnectingPoint num="5" id="5234" />
-<TGConnectingPoint num="6" id="5235" />
-<TGConnectingPoint num="7" id="5236" />
-<TGConnectingPoint num="8" id="5237" />
-<TGConnectingPoint num="9" id="5238" />
-<TGConnectingPoint num="10" id="5239" />
-<TGConnectingPoint num="11" id="5240" />
-<TGConnectingPoint num="12" id="5241" />
-<TGConnectingPoint num="13" id="5242" />
-<TGConnectingPoint num="14" id="5243" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="5255" >
+<TGConnectingPoint num="0" id="5100" />
+<TGConnectingPoint num="1" id="5101" />
+<TGConnectingPoint num="2" id="5102" />
+<TGConnectingPoint num="3" id="5103" />
+<TGConnectingPoint num="4" id="5104" />
+<TGConnectingPoint num="5" id="5105" />
+<TGConnectingPoint num="6" id="5106" />
+<TGConnectingPoint num="7" id="5107" />
+<TGConnectingPoint num="8" id="5108" />
+<TGConnectingPoint num="9" id="5109" />
+<TGConnectingPoint num="10" id="5110" />
+<TGConnectingPoint num="11" id="5111" />
+<TGConnectingPoint num="12" id="5112" />
+<TGConnectingPoint num="13" id="5113" />
+<TGConnectingPoint num="14" id="5114" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5126" >
 <cdparam x="370" y="233" />
 <sizeparam width="258" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="brake(speed, currentPosition, position)" />
+<TGConnectingPoint num="0" id="5116" />
+<TGConnectingPoint num="1" id="5117" />
+<TGConnectingPoint num="2" id="5118" />
+<TGConnectingPoint num="3" id="5119" />
+<TGConnectingPoint num="4" id="5120" />
+<TGConnectingPoint num="5" id="5121" />
+<TGConnectingPoint num="6" id="5122" />
+<TGConnectingPoint num="7" id="5123" />
+<TGConnectingPoint num="8" id="5124" />
+<TGConnectingPoint num="9" id="5125" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5167" >
+<cdparam x="363" y="144" />
+<sizeparam width="273" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingForActionsToTake" />
+<TGConnectingPoint num="0" id="5127" />
+<TGConnectingPoint num="1" id="5128" />
+<TGConnectingPoint num="2" id="5129" />
+<TGConnectingPoint num="3" id="5130" />
+<TGConnectingPoint num="4" id="5131" />
+<TGConnectingPoint num="5" id="5132" />
+<TGConnectingPoint num="6" id="5133" />
+<TGConnectingPoint num="7" id="5134" />
+<TGConnectingPoint num="8" id="5135" />
+<TGConnectingPoint num="9" id="5136" />
+<TGConnectingPoint num="10" id="5137" />
+<TGConnectingPoint num="11" id="5138" />
+<TGConnectingPoint num="12" id="5139" />
+<TGConnectingPoint num="13" id="5140" />
+<TGConnectingPoint num="14" id="5141" />
+<TGConnectingPoint num="15" id="5142" />
+<TGConnectingPoint num="16" id="5143" />
+<TGConnectingPoint num="17" id="5144" />
+<TGConnectingPoint num="18" id="5145" />
+<TGConnectingPoint num="19" id="5146" />
+<TGConnectingPoint num="20" id="5147" />
+<TGConnectingPoint num="21" id="5148" />
+<TGConnectingPoint num="22" id="5149" />
+<TGConnectingPoint num="23" id="5150" />
+<TGConnectingPoint num="24" id="5151" />
+<TGConnectingPoint num="25" id="5152" />
+<TGConnectingPoint num="26" id="5153" />
+<TGConnectingPoint num="27" id="5154" />
+<TGConnectingPoint num="28" id="5155" />
+<TGConnectingPoint num="29" id="5156" />
+<TGConnectingPoint num="30" id="5157" />
+<TGConnectingPoint num="31" id="5158" />
+<TGConnectingPoint num="32" id="5159" />
+<TGConnectingPoint num="33" id="5160" />
+<TGConnectingPoint num="34" id="5161" />
+<TGConnectingPoint num="35" id="5162" />
+<TGConnectingPoint num="36" id="5163" />
+<TGConnectingPoint num="37" id="5164" />
+<TGConnectingPoint num="38" id="5165" />
+<TGConnectingPoint num="39" id="5166" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="5169" >
+<cdparam x="412" y="105" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="5168" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="BrakeManagement" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="5182" >
+<cdparam x="514" y="350" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5178" />
+<TGConnectingPoint num="1" id="5179" />
+<TGConnectingPoint num="2" id="5180" />
+<TGConnectingPoint num="3" id="5181" />
+<P1  x="497" y="343" id="5210" />
+<P2  x="570" y="148" id="5260" />
+<Point x="497" y="396" />
+<Point x="697" y="396" />
+<Point x="697" y="148" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5170" >
+<father id="5182" num="0" />
+<cdparam x="497" y="396" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5171" >
+<father id="5182" num="1" />
+<cdparam x="697" y="396" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5172" >
+<father id="5182" num="2" />
+<cdparam x="697" y="148" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5177" >
+<father id="5182" num="3" />
+<cdparam x="508" y="363" />
+<sizeparam width="193" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5173" />
+<TGConnectingPoint num="1" id="5174" />
+<TGConnectingPoint num="2" id="5175" />
+<TGConnectingPoint num="3" id="5176" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="value" />
+<afterMax value="brakeMaxDuration" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="brakingDone()" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="5189" >
+<cdparam x="407" y="70" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="5188" />
+<P1  x="475" y="89" id="5297" />
+<P2  x="484" y="124" id="5257" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5187" >
+<father id="5189" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5183" />
+<TGConnectingPoint num="1" id="5184" />
+<TGConnectingPoint num="2" id="5185" />
+<TGConnectingPoint num="3" id="5186" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="5196" >
+<cdparam x="484" y="172" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="5195" />
+<P1  x="441" y="172" id="5270" />
+<P2  x="441" y="195" id="5245" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5194" >
+<father id="5196" num="0" />
+<cdparam x="484" y="212" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5190" />
+<TGConnectingPoint num="1" id="5191" />
+<TGConnectingPoint num="2" id="5192" />
+<TGConnectingPoint num="3" id="5193" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="5203" >
+<cdparam x="485" y="230" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5202" />
+<P1  x="441" y="225" id="5246" />
+<P2  x="441" y="293" id="5212" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5201" >
+<father id="5203" num="0" />
+<cdparam x="447" y="243" />
+<sizeparam width="250" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5197" />
+<TGConnectingPoint num="1" id="5198" />
+<TGConnectingPoint num="2" id="5199" />
+<TGConnectingPoint num="3" id="5200" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="applyBraking(value)" />
+<actions value="value = value * 10" />
+<actions value="brakeMaxDuration = value + deltaBrake" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5106" id="5244" >
+<cdparam x="386" y="293" />
+<sizeparam width="223" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="WaitingforBrakingToBeCompleted" />
+<TGConnectingPoint num="0" id="5204" />
+<TGConnectingPoint num="1" id="5205" />
+<TGConnectingPoint num="2" id="5206" />
+<TGConnectingPoint num="3" id="5207" />
+<TGConnectingPoint num="4" id="5208" />
+<TGConnectingPoint num="5" id="5209" />
+<TGConnectingPoint num="6" id="5210" />
+<TGConnectingPoint num="7" id="5211" />
+<TGConnectingPoint num="8" id="5212" />
+<TGConnectingPoint num="9" id="5213" />
+<TGConnectingPoint num="10" id="5214" />
+<TGConnectingPoint num="11" id="5215" />
+<TGConnectingPoint num="12" id="5216" />
+<TGConnectingPoint num="13" id="5217" />
+<TGConnectingPoint num="14" id="5218" />
+<TGConnectingPoint num="15" id="5219" />
+<TGConnectingPoint num="16" id="5220" />
+<TGConnectingPoint num="17" id="5221" />
+<TGConnectingPoint num="18" id="5222" />
+<TGConnectingPoint num="19" id="5223" />
+<TGConnectingPoint num="20" id="5224" />
+<TGConnectingPoint num="21" id="5225" />
+<TGConnectingPoint num="22" id="5226" />
+<TGConnectingPoint num="23" id="5227" />
+<TGConnectingPoint num="24" id="5228" />
+<TGConnectingPoint num="25" id="5229" />
+<TGConnectingPoint num="26" id="5230" />
+<TGConnectingPoint num="27" id="5231" />
+<TGConnectingPoint num="28" id="5232" />
+<TGConnectingPoint num="29" id="5233" />
+<TGConnectingPoint num="30" id="5234" />
+<TGConnectingPoint num="31" id="5235" />
+<TGConnectingPoint num="32" id="5236" />
+<TGConnectingPoint num="33" id="5237" />
+<TGConnectingPoint num="34" id="5238" />
+<TGConnectingPoint num="35" id="5239" />
+<TGConnectingPoint num="36" id="5240" />
+<TGConnectingPoint num="37" id="5241" />
+<TGConnectingPoint num="38" id="5242" />
+<TGConnectingPoint num="39" id="5243" />
+<invariant />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="5255" >
+<cdparam x="393" y="200" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="brake(value)" />
 <TGConnectingPoint num="0" id="5245" />
 <TGConnectingPoint num="1" id="5246" />
 <TGConnectingPoint num="2" id="5247" />
@@ -11870,11 +11870,11 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5106" id="5296" >
-<cdparam x="363" y="144" />
-<sizeparam width="273" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="398" y="124" />
+<sizeparam width="172" height="48" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="WaitingForActionsToTake" />
+<infoparam name="state0" value="WaitForBrakingOrder" />
 <TGConnectingPoint num="0" id="5256" />
 <TGConnectingPoint num="1" id="5257" />
 <TGConnectingPoint num="2" id="5258" />
@@ -11920,7 +11920,7 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5100" id="5298" >
-<cdparam x="412" y="105" />
+<cdparam x="468" y="69" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -11931,82 +11931,56 @@ Otherwise, the most far away
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="VehiculeDynamicsManagement" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5305" >
-<cdparam x="686" y="231" />
+<AVATARStateMachineDiagramPanel name="ObjectListManagement" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="5311" >
+<cdparam x="548" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5304" />
-<P1  x="686" y="231" id="5383" />
-<P2  x="697" y="301" id="5346" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5307" />
+<TGConnectingPoint num="1" id="5308" />
+<TGConnectingPoint num="2" id="5309" />
+<TGConnectingPoint num="3" id="5310" />
+<P1  x="548" y="343" id="5347" />
+<P2  x="606" y="211" id="5391" />
+<Point x="546" y="362" />
+<Point x="658" y="366" />
+<Point x="672" y="172" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5303" >
-<father id="5305" num="0" />
-<cdparam x="686" y="271" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5299" >
+<father id="5311" num="0" />
+<cdparam x="546" y="362" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5299" />
-<TGConnectingPoint num="1" id="5300" />
-<TGConnectingPoint num="2" id="5301" />
-<TGConnectingPoint num="3" id="5302" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5312" >
-<cdparam x="513" y="231" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5311" />
-<P1  x="513" y="231" id="5396" />
-<P2  x="467" y="300" id="5357" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5310" >
-<father id="5312" num="0" />
-<cdparam x="513" y="271" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="5300" >
+<father id="5311" num="1" />
+<cdparam x="658" y="366" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5306" />
-<TGConnectingPoint num="1" id="5307" />
-<TGConnectingPoint num="2" id="5308" />
-<TGConnectingPoint num="3" id="5309" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5319" >
-<cdparam x="597" y="156" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5318" />
-<P1  x="539" y="137" id="5409" />
-<P2  x="549" y="181" id="5376" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5317" >
-<father id="5319" num="0" />
-<cdparam x="597" y="196" />
+<SUBCOMPONENT type="-1" id="5301" >
+<father id="5311" num="2" />
+<cdparam x="672" y="172" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5306" >
+<father id="5311" num="3" />
+<cdparam x="548" y="383" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5313" />
-<TGConnectingPoint num="1" id="5314" />
-<TGConnectingPoint num="2" id="5315" />
-<TGConnectingPoint num="3" id="5316" />
+<TGConnectingPoint num="0" id="5302" />
+<TGConnectingPoint num="1" id="5303" />
+<TGConnectingPoint num="2" id="5304" />
+<TGConnectingPoint num="3" id="5305" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12016,55 +11990,111 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5332" >
-<cdparam x="467" y="330" />
+<CONNECTOR type="5102" id="5324" >
+<cdparam x="318" y="342" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5328" />
-<TGConnectingPoint num="1" id="5329" />
-<TGConnectingPoint num="2" id="5330" />
-<TGConnectingPoint num="3" id="5331" />
-<P1  x="467" y="330" id="5358" />
-<P2  x="481" y="199" id="5389" />
-<Point x="466" y="362" />
-<Point x="356" y="376" />
-<Point x="363" y="193" />
+<TGConnectingPoint num="0" id="5320" />
+<TGConnectingPoint num="1" id="5321" />
+<TGConnectingPoint num="2" id="5322" />
+<TGConnectingPoint num="3" id="5323" />
+<P1  x="318" y="342" id="5358" />
+<P2  x="332" y="211" id="5389" />
+<Point x="317" y="374" />
+<Point x="207" y="388" />
+<Point x="214" y="205" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5320" >
-<father id="5332" num="0" />
-<cdparam x="466" y="362" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5312" >
+<father id="5324" num="0" />
+<cdparam x="317" y="374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5321" >
-<father id="5332" num="1" />
-<cdparam x="356" y="376" />
+<SUBCOMPONENT type="-1" id="5313" >
+<father id="5324" num="1" />
+<cdparam x="207" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5322" >
-<father id="5332" num="2" />
-<cdparam x="363" y="193" />
+<SUBCOMPONENT type="-1" id="5314" >
+<father id="5324" num="2" />
+<cdparam x="214" y="205" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5319" >
+<father id="5324" num="3" />
+<cdparam x="318" y="382" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5315" />
+<TGConnectingPoint num="1" id="5316" />
+<TGConnectingPoint num="2" id="5317" />
+<TGConnectingPoint num="3" id="5318" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="5331" >
+<cdparam x="448" y="168" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="5330" />
+<P1  x="390" y="149" id="5409" />
+<P2  x="400" y="193" id="5376" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5329" >
+<father id="5331" num="0" />
+<cdparam x="448" y="208" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="5325" />
+<TGConnectingPoint num="1" id="5326" />
+<TGConnectingPoint num="2" id="5327" />
+<TGConnectingPoint num="3" id="5328" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5327" >
-<father id="5332" num="3" />
-<cdparam x="467" y="370" />
+
+<CONNECTOR type="5102" id="5338" >
+<cdparam x="364" y="243" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="5337" />
+<P1  x="364" y="243" id="5396" />
+<P2  x="318" y="312" id="5357" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5336" >
+<father id="5338" num="0" />
+<cdparam x="364" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5323" />
-<TGConnectingPoint num="1" id="5324" />
-<TGConnectingPoint num="2" id="5325" />
-<TGConnectingPoint num="3" id="5326" />
+<TGConnectingPoint num="0" id="5332" />
+<TGConnectingPoint num="1" id="5333" />
+<TGConnectingPoint num="2" id="5334" />
+<TGConnectingPoint num="3" id="5335" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12075,54 +12105,24 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="5345" >
-<cdparam x="697" y="331" />
+<cdparam x="537" y="243" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5341" />
-<TGConnectingPoint num="1" id="5342" />
-<TGConnectingPoint num="2" id="5343" />
-<TGConnectingPoint num="3" id="5344" />
-<P1  x="697" y="331" id="5347" />
-<P2  x="755" y="199" id="5391" />
-<Point x="695" y="350" />
-<Point x="807" y="354" />
-<Point x="821" y="160" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="5344" />
+<P1  x="537" y="243" id="5383" />
+<P2  x="548" y="313" id="5346" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5333" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="5343" >
 <father id="5345" num="0" />
-<cdparam x="695" y="350" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5334" >
-<father id="5345" num="1" />
-<cdparam x="807" y="354" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5335" >
-<father id="5345" num="2" />
-<cdparam x="821" y="160" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5340" >
-<father id="5345" num="3" />
-<cdparam x="697" y="371" />
+<cdparam x="537" y="283" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5336" />
-<TGConnectingPoint num="1" id="5337" />
-<TGConnectingPoint num="2" id="5338" />
-<TGConnectingPoint num="3" id="5339" />
+<TGConnectingPoint num="0" id="5339" />
+<TGConnectingPoint num="1" id="5340" />
+<TGConnectingPoint num="2" id="5341" />
+<TGConnectingPoint num="3" id="5342" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -12133,11 +12133,11 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 
 <COMPONENT type="5103" id="5356" >
-<cdparam x="625" y="306" />
-<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="463" y="318" />
+<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="getInfoOnSpeed(speed)" />
+<infoparam name="Send signal" value="getInfoOnObstacle(obstacle)" />
 <TGConnectingPoint num="0" id="5346" />
 <TGConnectingPoint num="1" id="5347" />
 <TGConnectingPoint num="2" id="5348" />
@@ -12151,11 +12151,11 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5104" id="5367" >
-<cdparam x="390" y="305" />
-<sizeparam width="155" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="233" y="317" />
+<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="updateOnSpeed(speed)" />
+<infoparam name="Receive signal" value="isObstacleAhead(obstacle)" />
 <TGConnectingPoint num="0" id="5357" />
 <TGConnectingPoint num="1" id="5358" />
 <TGConnectingPoint num="2" id="5359" />
@@ -12169,7 +12169,7 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5106" id="5408" >
-<cdparam x="481" y="181" />
+<cdparam x="332" y="193" />
 <sizeparam width="274" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -12219,7 +12219,7 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5100" id="5410" >
-<cdparam x="532" y="117" />
+<cdparam x="383" y="129" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -13237,56 +13237,26 @@ Otherwise, the most far away
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ObjectListManagement" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="5868" >
-<cdparam x="548" y="343" />
+<AVATARStateMachineDiagramPanel name="VehiculeDynamicsManagement" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="5862" >
+<cdparam x="686" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5864" />
-<TGConnectingPoint num="1" id="5865" />
-<TGConnectingPoint num="2" id="5866" />
-<TGConnectingPoint num="3" id="5867" />
-<P1  x="548" y="343" id="5904" />
-<P2  x="606" y="211" id="5948" />
-<Point x="546" y="362" />
-<Point x="658" y="366" />
-<Point x="672" y="172" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="5861" />
+<P1  x="686" y="231" id="5940" />
+<P2  x="697" y="301" id="5903" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5856" >
-<father id="5868" num="0" />
-<cdparam x="546" y="362" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5857" >
-<father id="5868" num="1" />
-<cdparam x="658" y="366" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5858" >
-<father id="5868" num="2" />
-<cdparam x="672" y="172" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5863" >
-<father id="5868" num="3" />
-<cdparam x="548" y="383" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5860" >
+<father id="5862" num="0" />
+<cdparam x="686" y="271" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5859" />
-<TGConnectingPoint num="1" id="5860" />
-<TGConnectingPoint num="2" id="5861" />
-<TGConnectingPoint num="3" id="5862" />
+<TGConnectingPoint num="0" id="5856" />
+<TGConnectingPoint num="1" id="5857" />
+<TGConnectingPoint num="2" id="5858" />
+<TGConnectingPoint num="3" id="5859" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13296,55 +13266,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5881" >
-<cdparam x="318" y="342" />
+<CONNECTOR type="5102" id="5869" >
+<cdparam x="513" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5877" />
-<TGConnectingPoint num="1" id="5878" />
-<TGConnectingPoint num="2" id="5879" />
-<TGConnectingPoint num="3" id="5880" />
-<P1  x="318" y="342" id="5915" />
-<P2  x="332" y="211" id="5946" />
-<Point x="317" y="374" />
-<Point x="207" y="388" />
-<Point x="214" y="205" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="5868" />
+<P1  x="513" y="231" id="5953" />
+<P2  x="467" y="300" id="5914" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5869" >
-<father id="5881" num="0" />
-<cdparam x="317" y="374" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5870" >
-<father id="5881" num="1" />
-<cdparam x="207" y="388" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5871" >
-<father id="5881" num="2" />
-<cdparam x="214" y="205" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="5876" >
-<father id="5881" num="3" />
-<cdparam x="318" y="382" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5867" >
+<father id="5869" num="0" />
+<cdparam x="513" y="271" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5872" />
-<TGConnectingPoint num="1" id="5873" />
-<TGConnectingPoint num="2" id="5874" />
-<TGConnectingPoint num="3" id="5875" />
+<TGConnectingPoint num="0" id="5863" />
+<TGConnectingPoint num="1" id="5864" />
+<TGConnectingPoint num="2" id="5865" />
+<TGConnectingPoint num="3" id="5866" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13354,25 +13294,25 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5888" >
-<cdparam x="448" y="168" />
+<CONNECTOR type="5102" id="5876" >
+<cdparam x="597" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5887" />
-<P1  x="390" y="149" id="5966" />
-<P2  x="400" y="193" id="5933" />
+<TGConnectingPoint num="0" id="5875" />
+<P1  x="539" y="137" id="5966" />
+<P2  x="549" y="181" id="5933" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5886" >
-<father id="5888" num="0" />
-<cdparam x="448" y="208" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5874" >
+<father id="5876" num="0" />
+<cdparam x="597" y="196" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5882" />
-<TGConnectingPoint num="1" id="5883" />
-<TGConnectingPoint num="2" id="5884" />
-<TGConnectingPoint num="3" id="5885" />
+<TGConnectingPoint num="0" id="5870" />
+<TGConnectingPoint num="1" id="5871" />
+<TGConnectingPoint num="2" id="5872" />
+<TGConnectingPoint num="3" id="5873" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13382,25 +13322,55 @@ Otherwise, the most far away
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5895" >
-<cdparam x="364" y="243" />
+<CONNECTOR type="5102" id="5889" >
+<cdparam x="467" y="330" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5894" />
-<P1  x="364" y="243" id="5953" />
-<P2  x="318" y="312" id="5914" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5885" />
+<TGConnectingPoint num="1" id="5886" />
+<TGConnectingPoint num="2" id="5887" />
+<TGConnectingPoint num="3" id="5888" />
+<P1  x="467" y="330" id="5915" />
+<P2  x="481" y="199" id="5946" />
+<Point x="466" y="362" />
+<Point x="356" y="376" />
+<Point x="363" y="193" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5893" >
-<father id="5895" num="0" />
-<cdparam x="364" y="283" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5877" >
+<father id="5889" num="0" />
+<cdparam x="466" y="362" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5878" >
+<father id="5889" num="1" />
+<cdparam x="356" y="376" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5879" >
+<father id="5889" num="2" />
+<cdparam x="363" y="193" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5884" >
+<father id="5889" num="3" />
+<cdparam x="467" y="370" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5889" />
-<TGConnectingPoint num="1" id="5890" />
-<TGConnectingPoint num="2" id="5891" />
-<TGConnectingPoint num="3" id="5892" />
+<TGConnectingPoint num="0" id="5880" />
+<TGConnectingPoint num="1" id="5881" />
+<TGConnectingPoint num="2" id="5882" />
+<TGConnectingPoint num="3" id="5883" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13411,24 +13381,54 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="5902" >
-<cdparam x="537" y="243" />
+<cdparam x="697" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5901" />
-<P1  x="537" y="243" id="5940" />
-<P2  x="548" y="313" id="5903" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5898" />
+<TGConnectingPoint num="1" id="5899" />
+<TGConnectingPoint num="2" id="5900" />
+<TGConnectingPoint num="3" id="5901" />
+<P1  x="697" y="331" id="5904" />
+<P2  x="755" y="199" id="5948" />
+<Point x="695" y="350" />
+<Point x="807" y="354" />
+<Point x="821" y="160" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5900" >
+</CONNECTOR><SUBCOMPONENT type="-1" id="5890" >
 <father id="5902" num="0" />
-<cdparam x="537" y="283" />
+<cdparam x="695" y="350" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5891" >
+<father id="5902" num="1" />
+<cdparam x="807" y="354" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5892" >
+<father id="5902" num="2" />
+<cdparam x="821" y="160" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="5897" >
+<father id="5902" num="3" />
+<cdparam x="697" y="371" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5896" />
-<TGConnectingPoint num="1" id="5897" />
-<TGConnectingPoint num="2" id="5898" />
-<TGConnectingPoint num="3" id="5899" />
+<TGConnectingPoint num="0" id="5893" />
+<TGConnectingPoint num="1" id="5894" />
+<TGConnectingPoint num="2" id="5895" />
+<TGConnectingPoint num="3" id="5896" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -13439,11 +13439,11 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 
 <COMPONENT type="5103" id="5913" >
-<cdparam x="463" y="318" />
-<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="625" y="306" />
+<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="getInfoOnObstacle(obstacle)" />
+<infoparam name="Send signal" value="getInfoOnSpeed(speed)" />
 <TGConnectingPoint num="0" id="5903" />
 <TGConnectingPoint num="1" id="5904" />
 <TGConnectingPoint num="2" id="5905" />
@@ -13457,11 +13457,11 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5104" id="5924" >
-<cdparam x="233" y="317" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="390" y="305" />
+<sizeparam width="155" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="isObstacleAhead(obstacle)" />
+<infoparam name="Receive signal" value="updateOnSpeed(speed)" />
 <TGConnectingPoint num="0" id="5914" />
 <TGConnectingPoint num="1" id="5915" />
 <TGConnectingPoint num="2" id="5916" />
@@ -13475,7 +13475,7 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5106" id="5965" >
-<cdparam x="332" y="193" />
+<cdparam x="481" y="181" />
 <sizeparam width="274" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -13525,7 +13525,7 @@ Otherwise, the most far away
 </COMPONENT>
 
 <COMPONENT type="5100" id="5967" >
-<cdparam x="383" y="129" />
+<cdparam x="532" y="117" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -13652,11 +13652,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5352" id="6026" >
 <father id="6078" num="0" />
-<cdparam x="902" y="193" />
-<sizeparam width="325" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="904" y="56" />
+<sizeparam width="170" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="39" minY="0" maxY="197" />
-<infoparam name="TGComponent" value="AVATAR Design::VehiculeDynamicsManagement" />
+<cdrectangleparam minX="0" maxX="194" minY="0" maxY="197" />
+<infoparam name="TGComponent" value="AVATAR Design::CSCU" />
 <TGConnectingPoint num="0" id="6018" />
 <TGConnectingPoint num="1" id="6019" />
 <TGConnectingPoint num="2" id="6020" />
@@ -13666,16 +13666,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6024" />
 <TGConnectingPoint num="7" id="6025" />
 <extraparam>
-<info value="AVATAR Design::VehiculeDynamicsManagement" taskName="VehiculeDynamicsManagement" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::CSCU" taskName="CSCU" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6035" >
 <father id="6078" num="1" />
-<cdparam x="902" y="147" />
-<sizeparam width="238" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="903" y="102" />
+<sizeparam width="277" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="126" minY="0" maxY="197" />
-<infoparam name="TGComponent" value="AVATAR Design::PlausibilityCheck" />
+<cdrectangleparam minX="0" maxX="87" minY="0" maxY="197" />
+<infoparam name="TGComponent" value="AVATAR Design::ObjectListManagement" />
 <TGConnectingPoint num="0" id="6027" />
 <TGConnectingPoint num="1" id="6028" />
 <TGConnectingPoint num="2" id="6029" />
@@ -13685,16 +13685,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6033" />
 <TGConnectingPoint num="7" id="6034" />
 <extraparam>
-<info value="AVATAR Design::PlausibilityCheck" taskName="PlausibilityCheck" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::ObjectListManagement" taskName="ObjectListManagement" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6044" >
 <father id="6078" num="2" />
-<cdparam x="903" y="102" />
-<sizeparam width="277" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="902" y="147" />
+<sizeparam width="238" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="87" minY="0" maxY="197" />
-<infoparam name="TGComponent" value="AVATAR Design::ObjectListManagement" />
+<cdrectangleparam minX="0" maxX="126" minY="0" maxY="197" />
+<infoparam name="TGComponent" value="AVATAR Design::PlausibilityCheck" />
 <TGConnectingPoint num="0" id="6036" />
 <TGConnectingPoint num="1" id="6037" />
 <TGConnectingPoint num="2" id="6038" />
@@ -13704,16 +13704,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6042" />
 <TGConnectingPoint num="7" id="6043" />
 <extraparam>
-<info value="AVATAR Design::ObjectListManagement" taskName="ObjectListManagement" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::PlausibilityCheck" taskName="PlausibilityCheck" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6053" >
 <father id="6078" num="3" />
-<cdparam x="904" y="56" />
-<sizeparam width="170" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="902" y="193" />
+<sizeparam width="325" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="194" minY="0" maxY="197" />
-<infoparam name="TGComponent" value="AVATAR Design::CSCU" />
+<cdrectangleparam minX="0" maxX="39" minY="0" maxY="197" />
+<infoparam name="TGComponent" value="AVATAR Design::VehiculeDynamicsManagement" />
 <TGConnectingPoint num="0" id="6045" />
 <TGConnectingPoint num="1" id="6046" />
 <TGConnectingPoint num="2" id="6047" />
@@ -13723,7 +13723,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6051" />
 <TGConnectingPoint num="7" id="6052" />
 <extraparam>
-<info value="AVATAR Design::CSCU" taskName="CSCU" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::VehiculeDynamicsManagement" taskName="VehiculeDynamicsManagement" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -13764,11 +13764,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5352" id="6087" >
 <father id="6139" num="0" />
-<cdparam x="55" y="189" />
-<sizeparam width="267" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="57" y="55" />
+<sizeparam width="229" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="187" />
-<infoparam name="TGComponent" value="AVATAR Design::CorrectnessChecking" />
+<cdrectangleparam minX="0" maxX="150" minY="0" maxY="187" />
+<infoparam name="TGComponent" value="AVATAR Design::Communication" />
 <TGConnectingPoint num="0" id="6079" />
 <TGConnectingPoint num="1" id="6080" />
 <TGConnectingPoint num="2" id="6081" />
@@ -13778,16 +13778,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6085" />
 <TGConnectingPoint num="7" id="6086" />
 <extraparam>
-<info value="AVATAR Design::CorrectnessChecking" taskName="CorrectnessChecking" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::Communication" taskName="Communication" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6096" >
 <father id="6139" num="1" />
-<cdparam x="55" y="144" />
-<sizeparam width="343" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="57" y="99" />
+<sizeparam width="264" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="36" minY="0" maxY="187" />
-<infoparam name="TGComponent" value="AVATAR Design::NeighbourhoodTableManagement" />
+<cdrectangleparam minX="0" maxX="115" minY="0" maxY="187" />
+<infoparam name="TGComponent" value="AVATAR Design::DSRSC_Management" />
 <TGConnectingPoint num="0" id="6088" />
 <TGConnectingPoint num="1" id="6089" />
 <TGConnectingPoint num="2" id="6090" />
@@ -13797,16 +13797,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6094" />
 <TGConnectingPoint num="7" id="6095" />
 <extraparam>
-<info value="AVATAR Design::NeighbourhoodTableManagement" taskName="NeighbourhoodTableManagement" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::DSRSC_Management" taskName="DSRSC_Management" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6105" >
 <father id="6139" num="2" />
-<cdparam x="57" y="99" />
-<sizeparam width="264" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="55" y="144" />
+<sizeparam width="343" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="115" minY="0" maxY="187" />
-<infoparam name="TGComponent" value="AVATAR Design::DSRSC_Management" />
+<cdrectangleparam minX="0" maxX="36" minY="0" maxY="187" />
+<infoparam name="TGComponent" value="AVATAR Design::NeighbourhoodTableManagement" />
 <TGConnectingPoint num="0" id="6097" />
 <TGConnectingPoint num="1" id="6098" />
 <TGConnectingPoint num="2" id="6099" />
@@ -13816,16 +13816,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6103" />
 <TGConnectingPoint num="7" id="6104" />
 <extraparam>
-<info value="AVATAR Design::DSRSC_Management" taskName="DSRSC_Management" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::NeighbourhoodTableManagement" taskName="NeighbourhoodTableManagement" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6114" >
 <father id="6139" num="3" />
-<cdparam x="57" y="55" />
-<sizeparam width="229" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="55" y="189" />
+<sizeparam width="267" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="150" minY="0" maxY="187" />
-<infoparam name="TGComponent" value="AVATAR Design::Communication" />
+<cdrectangleparam minX="0" maxX="112" minY="0" maxY="187" />
+<infoparam name="TGComponent" value="AVATAR Design::CorrectnessChecking" />
 <TGConnectingPoint num="0" id="6106" />
 <TGConnectingPoint num="1" id="6107" />
 <TGConnectingPoint num="2" id="6108" />
@@ -13835,7 +13835,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6112" />
 <TGConnectingPoint num="7" id="6113" />
 <extraparam>
-<info value="AVATAR Design::Communication" taskName="Communication" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::CorrectnessChecking" taskName="CorrectnessChecking" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -13876,11 +13876,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5352" id="6148" >
 <father id="6182" num="0" />
-<cdparam x="42" y="348" />
-<sizeparam width="332" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="44" y="294" />
+<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="25" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="AVATAR Design::DrivingPowerReductionStrategy" />
+<cdrectangleparam minX="0" maxX="198" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="AVATAR Design::PTC" />
 <TGConnectingPoint num="0" id="6140" />
 <TGConnectingPoint num="1" id="6141" />
 <TGConnectingPoint num="2" id="6142" />
@@ -13890,16 +13890,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6146" />
 <TGConnectingPoint num="7" id="6147" />
 <extraparam>
-<info value="AVATAR Design::DrivingPowerReductionStrategy" taskName="DrivingPowerReductionStrategy" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::PTC" taskName="PTC" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6157" >
 <father id="6182" num="1" />
-<cdparam x="44" y="294" />
-<sizeparam width="159" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="42" y="348" />
+<sizeparam width="332" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="198" minY="0" maxY="109" />
-<infoparam name="TGComponent" value="AVATAR Design::PTC" />
+<cdrectangleparam minX="0" maxX="25" minY="0" maxY="109" />
+<infoparam name="TGComponent" value="AVATAR Design::DrivingPowerReductionStrategy" />
 <TGConnectingPoint num="0" id="6149" />
 <TGConnectingPoint num="1" id="6150" />
 <TGConnectingPoint num="2" id="6151" />
@@ -13909,7 +13909,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6155" />
 <TGConnectingPoint num="7" id="6156" />
 <extraparam>
-<info value="AVATAR Design::PTC" taskName="PTC" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::DrivingPowerReductionStrategy" taskName="DrivingPowerReductionStrategy" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -13950,11 +13950,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5352" id="6191" >
 <father id="6234" num="0" />
-<cdparam x="978" y="420" />
-<sizeparam width="251" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="977" y="327" />
+<sizeparam width="161" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="99" minY="0" maxY="149" />
-<infoparam name="TGComponent" value="AVATAR Design::BrakeManagement" />
+<cdrectangleparam minX="0" maxX="189" minY="0" maxY="149" />
+<infoparam name="TGComponent" value="AVATAR Design::BCU" />
 <TGConnectingPoint num="0" id="6183" />
 <TGConnectingPoint num="1" id="6184" />
 <TGConnectingPoint num="2" id="6185" />
@@ -13964,7 +13964,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6189" />
 <TGConnectingPoint num="7" id="6190" />
 <extraparam>
-<info value="AVATAR Design::BrakeManagement" taskName="BrakeManagement" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::BCU" taskName="BCU" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6200" >
@@ -13988,11 +13988,11 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6209" >
 <father id="6234" num="2" />
-<cdparam x="977" y="327" />
-<sizeparam width="161" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="978" y="420" />
+<sizeparam width="251" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="189" minY="0" maxY="149" />
-<infoparam name="TGComponent" value="AVATAR Design::BCU" />
+<cdrectangleparam minX="0" maxX="99" minY="0" maxY="149" />
+<infoparam name="TGComponent" value="AVATAR Design::BrakeManagement" />
 <TGConnectingPoint num="0" id="6201" />
 <TGConnectingPoint num="1" id="6202" />
 <TGConnectingPoint num="2" id="6203" />
@@ -14002,7 +14002,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6207" />
 <TGConnectingPoint num="7" id="6208" />
 <extraparam>
-<info value="AVATAR Design::BCU" taskName="BCU" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::BrakeManagement" taskName="BrakeManagement" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -14043,11 +14043,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5352" id="6243" >
 <father id="6313" num="0" />
-<cdparam x="498" y="275" />
-<sizeparam width="261" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="496" y="53" />
+<sizeparam width="199" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="68" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::EmergencySimulator" />
+<cdrectangleparam minX="0" maxX="130" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::TestBench" />
 <TGConnectingPoint num="0" id="6235" />
 <TGConnectingPoint num="1" id="6236" />
 <TGConnectingPoint num="2" id="6237" />
@@ -14057,16 +14057,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6241" />
 <TGConnectingPoint num="7" id="6242" />
 <extraparam>
-<info value="AVATAR Design::EmergencySimulator" taskName="EmergencySimulator" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::TestBench" taskName="TestBench" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6252" >
 <father id="6313" num="1" />
-<cdparam x="498" y="232" />
-<sizeparam width="264" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="497" y="99" />
+<sizeparam width="218" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="65" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::CarPositionSimulator" />
+<cdrectangleparam minX="0" maxX="111" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::SpeedSensor" />
 <TGConnectingPoint num="0" id="6244" />
 <TGConnectingPoint num="1" id="6245" />
 <TGConnectingPoint num="2" id="6246" />
@@ -14076,16 +14076,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6250" />
 <TGConnectingPoint num="7" id="6251" />
 <extraparam>
-<info value="AVATAR Design::CarPositionSimulator" taskName="CarPositionSimulator" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::SpeedSensor" taskName="SpeedSensor" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6261" >
 <father id="6313" num="2" />
-<cdparam x="497" y="145" />
-<sizeparam width="216" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="497" y="188" />
+<sizeparam width="204" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="113" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::RadarSensor" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::GPSSensor" />
 <TGConnectingPoint num="0" id="6253" />
 <TGConnectingPoint num="1" id="6254" />
 <TGConnectingPoint num="2" id="6255" />
@@ -14095,16 +14095,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6259" />
 <TGConnectingPoint num="7" id="6260" />
 <extraparam>
-<info value="AVATAR Design::RadarSensor" taskName="RadarSensor" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::GPSSensor" taskName="GPSSensor" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6270" >
 <father id="6313" num="3" />
-<cdparam x="497" y="188" />
-<sizeparam width="204" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="497" y="145" />
+<sizeparam width="216" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::GPSSensor" />
+<cdrectangleparam minX="0" maxX="113" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::RadarSensor" />
 <TGConnectingPoint num="0" id="6262" />
 <TGConnectingPoint num="1" id="6263" />
 <TGConnectingPoint num="2" id="6264" />
@@ -14114,16 +14114,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6268" />
 <TGConnectingPoint num="7" id="6269" />
 <extraparam>
-<info value="AVATAR Design::GPSSensor" taskName="GPSSensor" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::RadarSensor" taskName="RadarSensor" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6279" >
 <father id="6313" num="4" />
-<cdparam x="497" y="99" />
-<sizeparam width="218" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="498" y="232" />
+<sizeparam width="264" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="111" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::SpeedSensor" />
+<cdrectangleparam minX="0" maxX="65" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::CarPositionSimulator" />
 <TGConnectingPoint num="0" id="6271" />
 <TGConnectingPoint num="1" id="6272" />
 <TGConnectingPoint num="2" id="6273" />
@@ -14133,16 +14133,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6277" />
 <TGConnectingPoint num="7" id="6278" />
 <extraparam>
-<info value="AVATAR Design::SpeedSensor" taskName="SpeedSensor" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::CarPositionSimulator" taskName="CarPositionSimulator" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5352" id="6288" >
 <father id="6313" num="5" />
-<cdparam x="496" y="53" />
-<sizeparam width="199" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="498" y="275" />
+<sizeparam width="261" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="130" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AVATAR Design::TestBench" />
+<cdrectangleparam minX="0" maxX="68" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AVATAR Design::EmergencySimulator" />
 <TGConnectingPoint num="0" id="6280" />
 <TGConnectingPoint num="1" id="6281" />
 <TGConnectingPoint num="2" id="6282" />
@@ -14152,7 +14152,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6286" />
 <TGConnectingPoint num="7" id="6287" />
 <extraparam>
-<info value="AVATAR Design::TestBench" taskName="TestBench" referenceTaskName="AVATAR Design" />
+<info value="AVATAR Design::EmergencySimulator" taskName="EmergencySimulator" referenceTaskName="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -14193,11 +14193,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5362" id="6322" >
 <father id="6383" num="0" />
-<cdparam x="684" y="539" />
-<sizeparam width="361" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="685" y="685" />
+<sizeparam width="335" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="97" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="CorrectnessChecking/out toPlausibityCheckMessage" />
+<cdrectangleparam minX="0" maxX="123" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="NeighbourhoodTableManagement/out sendTable" />
 <TGConnectingPoint num="0" id="6314" />
 <TGConnectingPoint num="1" id="6315" />
 <TGConnectingPoint num="2" id="6316" />
@@ -14207,16 +14207,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6320" />
 <TGConnectingPoint num="7" id="6321" />
 <extraparam>
-<info value="CorrectnessChecking/out toPlausibityCheckMessage" channelName="CorrectnessChecking/out toPlausibityCheckMessage(int id, int position) #--# PlausibilityCheck/in getEmergencyMessageToVerify(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="NeighbourhoodTableManagement/out sendTable" channelName="NeighbourhoodTableManagement/out sendTable(int currentPosition, NodeList list) #--# PlausibilityCheck/in getNodeList(NodeList list)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6331" >
 <father id="6383" num="1" />
-<cdparam x="684" y="634" />
-<sizeparam width="410" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="684" y="593" />
+<sizeparam width="416" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="48" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="DSRSC_Management/out forwardEmergencyBrakingMessage" />
+<cdrectangleparam minX="0" maxX="42" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="DSRSC_Management/in broadcastEmergencyBrakingMessage" />
 <TGConnectingPoint num="0" id="6323" />
 <TGConnectingPoint num="1" id="6324" />
 <TGConnectingPoint num="2" id="6325" />
@@ -14226,7 +14226,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6329" />
 <TGConnectingPoint num="7" id="6330" />
 <extraparam>
-<info value="DSRSC_Management/out forwardEmergencyBrakingMessage" channelName="DSRSC_Management/out forwardEmergencyBrakingMessage(int id, int position) #--# CorrectnessChecking/in getEmergencyBrakingMessage(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="DSRSC_Management/in broadcastEmergencyBrakingMessage" channelName="DSRSC_Management/in broadcastEmergencyBrakingMessage(int id, int position) #--# DangerAvoidanceStrategy/out forwardEmergency(int myID, int currentPosition)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6340" >
@@ -14250,11 +14250,11 @@ Otherwise, the most far away
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6349" >
 <father id="6383" num="3" />
-<cdparam x="684" y="593" />
-<sizeparam width="416" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="684" y="634" />
+<sizeparam width="410" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="42" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="DSRSC_Management/in broadcastEmergencyBrakingMessage" />
+<cdrectangleparam minX="0" maxX="48" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="DSRSC_Management/out forwardEmergencyBrakingMessage" />
 <TGConnectingPoint num="0" id="6341" />
 <TGConnectingPoint num="1" id="6342" />
 <TGConnectingPoint num="2" id="6343" />
@@ -14264,16 +14264,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6347" />
 <TGConnectingPoint num="7" id="6348" />
 <extraparam>
-<info value="DSRSC_Management/in broadcastEmergencyBrakingMessage" channelName="DSRSC_Management/in broadcastEmergencyBrakingMessage(int id, int position) #--# DangerAvoidanceStrategy/out forwardEmergency(int myID, int currentPosition)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="DSRSC_Management/out forwardEmergencyBrakingMessage" channelName="DSRSC_Management/out forwardEmergencyBrakingMessage(int id, int position) #--# CorrectnessChecking/in getEmergencyBrakingMessage(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6358" >
 <father id="6383" num="4" />
-<cdparam x="685" y="685" />
-<sizeparam width="335" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="684" y="539" />
+<sizeparam width="361" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="123" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="NeighbourhoodTableManagement/out sendTable" />
+<cdrectangleparam minX="0" maxX="97" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="CorrectnessChecking/out toPlausibityCheckMessage" />
 <TGConnectingPoint num="0" id="6350" />
 <TGConnectingPoint num="1" id="6351" />
 <TGConnectingPoint num="2" id="6352" />
@@ -14283,7 +14283,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6356" />
 <TGConnectingPoint num="7" id="6357" />
 <extraparam>
-<info value="NeighbourhoodTableManagement/out sendTable" channelName="NeighbourhoodTableManagement/out sendTable(int currentPosition, NodeList list) #--# PlausibilityCheck/in getNodeList(NodeList list)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="CorrectnessChecking/out toPlausibityCheckMessage" channelName="CorrectnessChecking/out toPlausibityCheckMessage(int id, int position) #--# PlausibilityCheck/in getEmergencyMessageToVerify(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -14324,11 +14324,11 @@ Otherwise, the most far away
 </COMPONENT>
 <SUBCOMPONENT type="5362" id="6392" >
 <father id="6498" num="0" />
-<cdparam x="252" y="591" />
-<sizeparam width="237" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="521" />
+<sizeparam width="301" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="189" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="RadarSensor/out obstacleAhead" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="EmergencySimulator/out obstacleDetected" />
 <TGConnectingPoint num="0" id="6384" />
 <TGConnectingPoint num="1" id="6385" />
 <TGConnectingPoint num="2" id="6386" />
@@ -14338,16 +14338,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6390" />
 <TGConnectingPoint num="7" id="6391" />
 <extraparam>
-<info value="RadarSensor/out obstacleAhead" channelName="RadarSensor/out obstacleAhead(int info) #--# ObjectListManagement/in isObstacleAhead(int info)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="EmergencySimulator/out obstacleDetected" channelName="EmergencySimulator/out obstacleDetected(int id, int position) #--# DSRSC_Management/in obstacleDetected(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6401" >
 <father id="6498" num="1" />
-<cdparam x="251" y="657" />
-<sizeparam width="272" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="540" />
+<sizeparam width="261" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="154" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="PlausibilityCheck/in getInfoOnObstacle" />
+<cdrectangleparam minX="0" maxX="165" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="CarPositionSimulator/out carPosition" />
 <TGConnectingPoint num="0" id="6393" />
 <TGConnectingPoint num="1" id="6394" />
 <TGConnectingPoint num="2" id="6395" />
@@ -14357,16 +14357,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6399" />
 <TGConnectingPoint num="7" id="6400" />
 <extraparam>
-<info value="PlausibilityCheck/in getInfoOnObstacle" channelName="PlausibilityCheck/in getInfoOnObstacle(int obstacle) #--# ObjectListManagement/out getInfoOnObstacle(int info)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="CarPositionSimulator/out carPosition" channelName="CarPositionSimulator/out carPosition(int id, int position) #--# DSRSC_Management/in carPosition(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6410" >
 <father id="6498" num="2" />
-<cdparam x="252" y="574" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="557" />
+<sizeparam width="201" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="179" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="SpeedSensor/out updateOnSpeed" />
+<cdrectangleparam minX="0" maxX="225" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="GPSSensor/out setPosition" />
 <TGConnectingPoint num="0" id="6402" />
 <TGConnectingPoint num="1" id="6403" />
 <TGConnectingPoint num="2" id="6404" />
@@ -14376,16 +14376,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6408" />
 <TGConnectingPoint num="7" id="6409" />
 <extraparam>
-<info value="SpeedSensor/out updateOnSpeed" channelName="SpeedSensor/out updateOnSpeed(int speed) #--# VehiculeDynamicsManagement/in updateOnSpeed(int speed)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="GPSSensor/out setPosition" channelName="GPSSensor/out setPosition(int currentPosition) #--# NeighbourhoodTableManagement/in setPosition(int currentPosition)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6419" >
 <father id="6498" num="3" />
-<cdparam x="251" y="636" />
-<sizeparam width="256" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="251" y="706" />
+<sizeparam width="308" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="170" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="PlausibilityCheck/in getInfoOnSpeed" />
+<cdrectangleparam minX="0" maxX="118" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="DangerAvoidanceStrategy/out reducePower" />
 <TGConnectingPoint num="0" id="6411" />
 <TGConnectingPoint num="1" id="6412" />
 <TGConnectingPoint num="2" id="6413" />
@@ -14395,16 +14395,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6417" />
 <TGConnectingPoint num="7" id="6418" />
 <extraparam>
-<info value="PlausibilityCheck/in getInfoOnSpeed" channelName="PlausibilityCheck/in getInfoOnSpeed(int speed) #--# VehiculeDynamicsManagement/out getInfoOnSpeed(int speed)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="DangerAvoidanceStrategy/out reducePower" channelName="DangerAvoidanceStrategy/out reducePower(int value) #--# DrivingPowerReductionStrategy/in getReducePowerOrder(int value)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6428" >
 <father id="6498" num="4" />
-<cdparam x="251" y="740" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="251" y="723" />
+<sizeparam width="301" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="174" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="DangerAvoidanceStrategy/in brake" />
+<cdrectangleparam minX="0" maxX="125" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="DangerAvoidanceStrategy/out brakePower" />
 <TGConnectingPoint num="0" id="6420" />
 <TGConnectingPoint num="1" id="6421" />
 <TGConnectingPoint num="2" id="6422" />
@@ -14414,16 +14414,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6426" />
 <TGConnectingPoint num="7" id="6427" />
 <extraparam>
-<info value="DangerAvoidanceStrategy/in brake" channelName="DangerAvoidanceStrategy/in brake(int speed, int currentPosition, int position) #--# PlausibilityCheck/out brake(int speed, int currentPosition, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="DangerAvoidanceStrategy/out brakePower" channelName="DangerAvoidanceStrategy/out brakePower(int value) #--# BrakeManagement/in brake(int value)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6437" >
 <father id="6498" num="5" />
-<cdparam x="251" y="723" />
-<sizeparam width="301" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="251" y="740" />
+<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="DangerAvoidanceStrategy/out brakePower" />
+<cdrectangleparam minX="0" maxX="174" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="DangerAvoidanceStrategy/in brake" />
 <TGConnectingPoint num="0" id="6429" />
 <TGConnectingPoint num="1" id="6430" />
 <TGConnectingPoint num="2" id="6431" />
@@ -14433,16 +14433,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6435" />
 <TGConnectingPoint num="7" id="6436" />
 <extraparam>
-<info value="DangerAvoidanceStrategy/out brakePower" channelName="DangerAvoidanceStrategy/out brakePower(int value) #--# BrakeManagement/in brake(int value)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="DangerAvoidanceStrategy/in brake" channelName="DangerAvoidanceStrategy/in brake(int speed, int currentPosition, int position) #--# PlausibilityCheck/out brake(int speed, int currentPosition, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6446" >
 <father id="6498" num="6" />
-<cdparam x="251" y="706" />
-<sizeparam width="308" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="251" y="636" />
+<sizeparam width="256" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="118" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="DangerAvoidanceStrategy/out reducePower" />
+<cdrectangleparam minX="0" maxX="170" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="PlausibilityCheck/in getInfoOnSpeed" />
 <TGConnectingPoint num="0" id="6438" />
 <TGConnectingPoint num="1" id="6439" />
 <TGConnectingPoint num="2" id="6440" />
@@ -14452,16 +14452,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6444" />
 <TGConnectingPoint num="7" id="6445" />
 <extraparam>
-<info value="DangerAvoidanceStrategy/out reducePower" channelName="DangerAvoidanceStrategy/out reducePower(int value) #--# DrivingPowerReductionStrategy/in getReducePowerOrder(int value)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="PlausibilityCheck/in getInfoOnSpeed" channelName="PlausibilityCheck/in getInfoOnSpeed(int speed) #--# VehiculeDynamicsManagement/out getInfoOnSpeed(int speed)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6455" >
 <father id="6498" num="7" />
-<cdparam x="252" y="557" />
-<sizeparam width="201" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="574" />
+<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="225" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="GPSSensor/out setPosition" />
+<cdrectangleparam minX="0" maxX="179" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="SpeedSensor/out updateOnSpeed" />
 <TGConnectingPoint num="0" id="6447" />
 <TGConnectingPoint num="1" id="6448" />
 <TGConnectingPoint num="2" id="6449" />
@@ -14471,16 +14471,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6453" />
 <TGConnectingPoint num="7" id="6454" />
 <extraparam>
-<info value="GPSSensor/out setPosition" channelName="GPSSensor/out setPosition(int currentPosition) #--# NeighbourhoodTableManagement/in setPosition(int currentPosition)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="SpeedSensor/out updateOnSpeed" channelName="SpeedSensor/out updateOnSpeed(int speed) #--# VehiculeDynamicsManagement/in updateOnSpeed(int speed)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6464" >
 <father id="6498" num="8" />
-<cdparam x="252" y="540" />
-<sizeparam width="261" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="251" y="657" />
+<sizeparam width="272" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="165" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="CarPositionSimulator/out carPosition" />
+<cdrectangleparam minX="0" maxX="154" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="PlausibilityCheck/in getInfoOnObstacle" />
 <TGConnectingPoint num="0" id="6456" />
 <TGConnectingPoint num="1" id="6457" />
 <TGConnectingPoint num="2" id="6458" />
@@ -14490,16 +14490,16 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6462" />
 <TGConnectingPoint num="7" id="6463" />
 <extraparam>
-<info value="CarPositionSimulator/out carPosition" channelName="CarPositionSimulator/out carPosition(int id, int position) #--# DSRSC_Management/in carPosition(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="PlausibilityCheck/in getInfoOnObstacle" channelName="PlausibilityCheck/in getInfoOnObstacle(int obstacle) #--# ObjectListManagement/out getInfoOnObstacle(int info)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5362" id="6473" >
 <father id="6498" num="9" />
-<cdparam x="252" y="521" />
-<sizeparam width="301" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="252" y="591" />
+<sizeparam width="237" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="275" />
-<infoparam name="TGComponent" value="EmergencySimulator/out obstacleDetected" />
+<cdrectangleparam minX="0" maxX="189" minY="0" maxY="275" />
+<infoparam name="TGComponent" value="RadarSensor/out obstacleAhead" />
 <TGConnectingPoint num="0" id="6465" />
 <TGConnectingPoint num="1" id="6466" />
 <TGConnectingPoint num="2" id="6467" />
@@ -14509,7 +14509,7 @@ Otherwise, the most far away
 <TGConnectingPoint num="6" id="6471" />
 <TGConnectingPoint num="7" id="6472" />
 <extraparam>
-<info value="EmergencySimulator/out obstacleDetected" channelName="EmergencySimulator/out obstacleDetected(int id, int position) #--# DSRSC_Management/in obstacleDetected(int id, int position)" fullChannelName="" referenceDiagram="AVATAR Design" />
+<info value="RadarSensor/out obstacleAhead" channelName="RadarSensor/out obstacleAhead(int info) #--# ObjectListManagement/in isObstacleAhead(int info)" fullChannelName="" referenceDiagram="AVATAR Design" />
 </extraparam>
 </SUBCOMPONENT>
 
diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 8dd742f107..a8124e6732 100755
--- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -170,13 +170,8 @@ public class TasksAndMainGenerator {
             //mainFile.appendToBeforeMainCode("\n/* End of User code */\n\n");
         }
         
-	//DG 6.2.
-        int test = makeTasks();
+        makeTasks();
 
-        if (test != 0) {
-	    System.out.println("Warning: blocks not all mapped!");
-	}
- 
         makeMainHeader();
 
         makeMainMutex();
@@ -355,23 +350,18 @@ public class TasksAndMainGenerator {
 		return task.getCPUNo();
 	    }
 	}
-	//return 0;//DG 6.2.
+	//return 0;
 	return -1;
     }
 
-    //DG 6.2. en cours de modification
-    public int makeTasks() {
-	LinkedList<AvatarBlock> unmappedBlocks = new LinkedList<AvatarBlock>();//DG
+    public void makeTasks() {
         for(AvatarBlock block: avspec.getListOfBlocks()) {
-	    makeTask(block,FindCPUidFromTask(block));	   
-	    if (FindCPUidFromTask(block)==-1){
-		System.out.println("******Block "+block.getName()+" not mapped********");
-		unmappedBlocks.add((AvatarBlock)block);          
-	    } 
-	    //ToDo afficher une fenetre avec la liste des blocks non mappes
-	    return 1;
+	      if (FindCPUidFromTask(block)!=-1)
+	      makeTask(block,FindCPUidFromTask(block));
+	      else {
+		  System.out.println("Warning: Unmapped Block "+block.getName());
+	      }
         }
-	return 0;
     }
 
     public void makeTask(AvatarBlock block , int cpuId) {
diff --git a/ttool.exe b/ttool.exe
index 8fb3d730f7..6379af8f6a 100755
--- a/ttool.exe
+++ b/ttool.exe
@@ -2,6 +2,6 @@
 
 java -version
 cd bin;
-java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456  -jar ttool.jar -config config.xml -experimental -debug -avatar -uppaal -launcher 
+java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456  -jar ttool.jar -config config-daniela.xml -experimental -debug -avatar -uppaal -launcher 
 
  
-- 
GitLab