diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index f005e67c8d1e0d5e5c34cf7b6df437b6e54e8ed9..bdbdd4f06eabdb3c881f0cbb1de5d720cdf7d532 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/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/Block0.c generated_src/Block2.c generated_src/Block1.c 
\ No newline at end of file
diff --git a/executablecode/src/mytimelib.c b/executablecode/src/mytimelib.c
index 2282f5ac0b0b8c613118def1bdb7cea8b6fd60cb..d39c07ea85c258ce227365364163ce1761038663 100644
--- a/executablecode/src/mytimelib.c
+++ b/executablecode/src/mytimelib.c
@@ -90,8 +90,11 @@ void waitFor(long minDelay, long maxDelay) {
   struct timespec tsret;
   int delay;
 
-  debugMsg("Computing random");
 
+  
+  debugMsg("Computing random delay");
+  //debugLong("Min delay", minDelay);
+  //debugLong("Max delay", maxDelay);
   delay = computeLongRandom(minDelay, maxDelay);
 
   debugLong("Random delay=", delay);
diff --git a/executablecode/src/random.c b/executablecode/src/random.c
index 239d0891f17f03b8802c52d7e1e0ae9d17837c31..b4bbddb19ac1e4a51bf5c0205aab571a7580dd32 100644
--- a/executablecode/src/random.c
+++ b/executablecode/src/random.c
@@ -23,13 +23,14 @@ long computeLongRandom(long min, long max) {
     return min;
   }
 
-  long rand0 = (((long)(rand()))*powl(2, ((((sizeof(long)-2))*8)-1)));
+
+  long rand0 = (long)rand();
   long rand1 = rand0 % (max - min);
   //debugLong("min=", min);
   //debugLong("max=", max);
   //debugLong("rand0", rand0);
-  //debugLong("rand1", rand1);
-  debugLong("Random long", rand1 + min);
+ //debugLong("rand1", rand1);
+ //debugLong("Random long", rand1 + min);
   return rand1 + min;
 }