===================================================================
--- original.js
+++ change.js
@@ -414,8 +414,9 @@
 				var neighbor = neighbors[i];
 				if (closedSet.findIndex(function (node) {
 					return node.x === neighbor.x && node.y === neighbor.y;
 				}) !== -1 || self.cells[neighbor.x][neighbor.y].building && !ignoreSpecificBuilding) {
+					// TODO : Be more specific here ! ignore just 1 building
 					continue;
 				}
 				var gScore = currentNode.g + 1; // 1 is the distance from a node to a neighbor
 				var gScoreIsBest = false;
@@ -628,20 +629,23 @@
 });
 var Unit = Container.expand(function (x, y, playerId, type) {
 	var self = Container.call(this);
 	self.moveAlongPath = function (path, callback) {
-		console.log("moveAlongPath", path);
+		console.log("moveAlongPath", path, callback);
 		self.path = path;
 		self.pathIndex = 0;
 		self.isMoving = true;
 		self.onArrivedCallback = callback;
 	};
 	self.updateMovement = function (delta) {
 		//console.log("updateMovement", delta);
 		if (!self.isMoving || !self.path || self.pathIndex >= self.path.length) {
+			console.log("updateMovement will stop ", self.path, self.pathIndex, self.onArrivedCallback);
 			self.isMoving = false;
 			if (self.onArrivedCallback) {
+				console.log("updateMovement call onArrivedCallback 1");
 				self.onArrivedCallback();
+				self.onArrivedCallback = null;
 			}
 			return;
 		}
 		var targetPathStep = self.path[self.pathIndex];
@@ -679,10 +683,11 @@
 			self.pathIndex++;
 			if (self.pathIndex >= self.path.length) {
 				self.isMoving = false;
 				if (self.onArrivedCallback) {
+					console.log("updateMovement call onArrivedCallback 2");
 					self.onArrivedCallback();
-					//self.onArrivedCallback = null;
+					self.onArrivedCallback = null;
 				}
 			}
 		} else {
 			//console.log("advance by ", dx / distance * step);
@@ -730,11 +735,12 @@
 	var self = Unit.call(this, x, y, playerId, 'unitHarvester');
 	self.harvestedSpiceCapacity = 600;
 	self.harvestedSpiceOnTripCounter = 0;
 	self.harvestedSpiceOnCellCounter = 0;
-	self.harvestingMode = false;
+	self.harvestingMode = 0; // 0 : Idle / 1 : harvesting / 2 : unload
 	self.harvestSpeed = 2; // TEMP DEBUG !!!TEMP DEBUG !!!TEMP DEBUG !!! 0.25; // Adjust this value to control the speed of harvesting
 	self.startHarvesting = function () {
+		console.log("startHarvesting...");
 		var closestSpiceSpot = findClosestSpiceSpot(self.cellX, self.cellY);
 		if (closestSpiceSpot) {
 			var path = gameMap.findPath({
 				x: self.cellX,
@@ -743,13 +749,17 @@
 				x: closestSpiceSpot.x,
 				y: closestSpiceSpot.y
 			});
 			self.moveAlongPath(path);
-			self.harvestingMode = true;
+			self.harvestingMode = 1;
 		}
 	};
+	self.startUnloading = function () {
+		self.harvestingMode = 2;
+		console.log("Unloading spice...");
+	};
 	self.update = function () {
-		if (self.harvestingMode && self.harvestedSpiceOnCellCounter < 200 && gameMap.cells[self.cellX][self.cellY].spice) {
+		if (self.harvestingMode == 1 && self.harvestedSpiceOnCellCounter < 200 && gameMap.cells[self.cellX][self.cellY].spice) {
 			self.harvestedSpiceOnTripCounter += self.harvestSpeed;
 			self.harvestedSpiceOnCellCounter += self.harvestSpeed;
 			//console.log('Harvested Spice Counter:', self.harvestedSpiceOnCellCounter); //, ' cell ' + self.cellX + ',' + self.cellY, ' of map ', gameMap.cells[self.cellX][self.cellY]);
 			if (self.harvestedSpiceOnCellCounter >= 200) {
@@ -764,9 +774,14 @@
 						}, {
 							x: closestRefinery.cellX,
 							y: closestRefinery.cellY
 						}, closestRefinery);
-						self.moveAlongPath(path);
+						if (path.length > 0) {
+							console.log("Returning to Refiniery...");
+							self.moveAlongPath(path, self.startUnloading);
+						} else {
+							console.warn("No path to Refinery !");
+						}
 					}
 				} else {
 					self.harvestedSpiceOnCellCounter = 0;
 					self.startHarvesting();
@@ -776,8 +791,10 @@
 				var blinkPhase = Math.sin(Date.now() * 0.01) * 0.5 + 0.5;
 				self.asset.tint = blinkPhase < 0.5 ? 0xFFA500 : 0xFFFFFF;
 				self.asset.rotation += 45 / 400 * (Math.PI / 180);
 			}
+		} else {
+			//console.log("update : not harvesting " + self.harvestingMode);
 		}
 	};
 	// Additional properties and methods for UnitHarvester can be added here
 	return self;
@@ -898,12 +915,8 @@
 	} : function (o) {
 		return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
 	}, _typeof(o);
 }
-// CONTINUER ICI : xxxActionLogic => change currentSelection to unit param !!!!
-// CONTINUER ICI : xxxActionLogic => change currentSelection to unit param !!!!
-// CONTINUER ICI : xxxActionLogic => change currentSelection to unit param !!!!
-// CONTINUER ICI : xxxActionLogic => change currentSelection to unit param !!!!
 function moveActionLogic(targetUnit, destinationX, destinationY) {
 	console.log("MoveActionLogic...", destinationX, ',', destinationY);
 	if (targetUnit && targetUnit.isUnit) {
 		var path = gameMap.findPath({