diff --git a/generator.c b/generator.c
index 73ba965..2b52f2c 100644
--- a/generator.c
+++ b/generator.c
@@ -29,9 +29,10 @@ typedef struct{
 } t_biome;
 
 // variables
-int sp_x[2], sp_y[2];
+int sp_x[NB_TEAMS], sp_y[NB_TEAMS];
 t_biome* l_biomes;
 int size_biomes;
+int nb_plains, nb_forests, nb_mountains;
 int cpt_biome = 0;
 int width, height;
 
@@ -51,9 +52,6 @@ void create_map(int w, int h){
 	int i,j;
 	
 	//biome variable
-	int nb_plains, nb_forests, nb_mountains;
-	
-	int spawn_color = 0;
 	
 	width = w;
 	height = h;
@@ -88,10 +86,14 @@ void create_map(int w, int h){
 		for(j=0;j<height;j++){
 			if (i == 0 || j == 0 || i == w-1 || j == h-1){
 				map[i][j].type = BEDROCK;
-			}else if((i == sp_x[0] && j == sp_y[0]) || (i == sp_x[1] && j == sp_y[1])){
+			}else if((i == sp_x[PURPLE] && j == sp_y[PURPLE])){
 				map[i][j].type = SPAWN;
 				map[i][j].data=malloc(sizeof(int));
-				memset(map[i][j].data,spawn_color++,sizeof(int));
+				*((int*)(map[i][j].data)) = PURPLE;
+			}else if(i == sp_x[ORANGE] && j == sp_y[ORANGE]){
+				map[i][j].type = SPAWN;
+				map[i][j].data=malloc(sizeof(int));
+				*((int*)(map[i][j].data)) = ORANGE;
 			}else{
 				map[i][j].type = generate(i,j);
 			}
diff --git a/orange.c b/orange.c
index 200c9dc..14e031d 100644
--- a/orange.c
+++ b/orange.c
@@ -102,13 +102,13 @@ void checkActionSuccess(t_info_data* data, int success){
 				if (distance(data->pos,data->res_spot.pos) == 0){
 					data->aim = NO_AIM;
 				}
-			}/*else{
-				/*aim_pos.x = 0;
+			}else{
+				aim_pos.x = 0;
 				aim_pos.y = 0;
 				if(distance(data->pos, aim_pos) == 1){
 					data->aim=AIM_SPOT;
 				}
-			}*/
+			}
 			break;
 		case ATTACK:
 		case PICK:
@@ -188,6 +188,11 @@ int newDir(t_info_data* data){
 		new_dist = distance(orangeNewPos(data->pos,dir),aim_pos);
 	}while(current_dist <= new_dist);
 	
+	if (getNear(dir) == DUDE || getNear(dir) == TREE || getNear(dir) == ROCK || getNear(dir) == IRON_ORE){
+		int offset = (rand()%3)-1;
+		dir+=offset;
+		dir%=4;
+	}
 	return dir;
 }
 t_coord orangeNewPos(t_coord pos, int dir){