diff --git a/buzz_scripts/include/act/barrier.bzz b/buzz_scripts/include/act/barrier.bzz
index 6f1588b..3a922c7 100644
--- a/buzz_scripts/include/act/barrier.bzz
+++ b/buzz_scripts/include/act/barrier.bzz
@@ -87,7 +87,7 @@ function barrier_wait(threshold, transf, resumef, bc) {
 function barrier_allgood(barrier, bc) {
   barriergood = 1
   barrier.foreach(function(key, value, robot){
-      log("VS entry : ", key, " ", value, " ", robot)
+      #log("VS entry : ", key, " ", value, " ", robot)
       if(key == "d"){
         if(value == 1)
           return 1
diff --git a/buzz_scripts/include/act/states.bzz b/buzz_scripts/include/act/states.bzz
index 0399abf..9df236e 100644
--- a/buzz_scripts/include/act/states.bzz
+++ b/buzz_scripts/include/act/states.bzz
@@ -100,7 +100,7 @@ function stop() {
 
 wpreached = 1
 function indiWP() {
-	BVMSTATE = "INDIWP"
+	BVMSTATE = "WAYPOINT"
 	check_rc_wp()
 
 	wpi = v_wp.get(id)
diff --git a/buzz_scripts/main.bzz b/buzz_scripts/main.bzz
index 2353a62..d9703f4 100644
--- a/buzz_scripts/main.bzz
+++ b/buzz_scripts/main.bzz
@@ -72,7 +72,7 @@ function step() {
 			statef=launch_switch
 	else if(BVMSTATE=="GOHOME") # ends on AUTO_LAUNCH_STATE
 		statef=goinghome
-	else if(BVMSTATE=="INDIWP")
+	else if(BVMSTATE=="WAYPOINT")
 		statef=indiWP
 	else if(BVMSTATE=="IDLE")
 		statef=idle