===================================================================
--- original.js
+++ change.js
@@ -398,10 +398,13 @@
 		if (distance < step) {
 			console.log("reached step", distance);
 			self.x = targetCoords.x;
 			self.y = targetCoords.y;
+			// Update map
+			gameMap.cells[self.cellX][self.cellY].unit = null;
 			self.cellX = targetCell.cellX;
-			self.cellY = targetCell.cellY;
+			self.cellY = targetCell.cellY; // Update map
+			gameMap.cells[self.cellX][self.cellY].unit = self;
 			self.pathIndex++;
 			if (self.pathIndex >= self.path.length) {
 				self.isMoving = false;
 			}
@@ -789,8 +792,10 @@
 var previousEnergyLevel = 0;
 var currentSelection = null;
 var currentBuildingForPlacement = null;
 var selectionMarker = null;
+var tickCounter = 0;
+var fps = 0;
 // Gui
 var commandPanel = null;
 var player1SpiceText = null;
 var player1EnergyText = null;
@@ -900,8 +905,22 @@
 		var inputPosition = {
 			x: Math.round(-deltaX / 100),
 			y: Math.round(-deltaY / 100)
 		};
+		var allUnits = player1.units.concat(player2.units);
+		allUnits.forEach(function (unit) {
+			var targetX = Math.max(11, Math.min(gameMap.currentViewCenter.x + inputPosition.x, mapXSize - 4));
+			var targetY = Math.max(14, Math.min(gameMap.currentViewCenter.y + inputPosition.y, mapYSize - 9));
+			var newCenterX = Math.round(gameMap.currentViewCenter.x + (targetX - gameMap.currentViewCenter.x) * dragSpeed);
+			var newCenterY = Math.round(gameMap.currentViewCenter.y + (targetY - gameMap.currentViewCenter.y) * dragSpeed);
+			var deltaX = gameMap.currentViewCenter.x - newCenterX;
+			var deltaY = gameMap.currentViewCenter.y - newCenterY;
+			console.log("unit coords : " + unit.x + ',' + unit.y);
+			console.log("target coords : " + targetX + ',' + targetY);
+			console.log("delta coords : " + deltaX + ',' + deltaY);
+			unit.x += deltaX * 100;
+			unit.y += deltaY * 100;
+		});
 		gameMap.handleDrag(inputPosition);
 	}
 }
 function handleDragEnd(obj) {
@@ -1188,13 +1207,17 @@
 	} else {
 		player1EnergyText.setText(player1.energy.toString() + energyOffsetSufix);
 	}
 };
-var updateFps = function updateFps() {
-	var fps = 60;
-	if (fpsText) {
-		fpsText.setText(Math.floor(fps));
-	}
+var startFpsCounter = function startFpsCounter() {
+	var fpsInterval = LK.setInterval(function () {
+		// Set the FPS value to the tick counter
+		fps = tickCounter;
+		// Reset the tick counter
+		tickCounter = 0;
+		// Update the FPS text on the screen
+		fpsText.setText('FPS: ' + fps);
+	}, 1000); // 1000 milliseconds = 1 second
 };
 function initGame() {
 	// Create players
 	player1 = new Player(1, 0x5e86ff);
@@ -1237,16 +1260,17 @@
 	});
 	player1EnergyText.anchor.set(1.0, 0.25);
 	LK.gui.topRight.addChild(player1EnergyText);
 	// Create a Text2 object to display the FPS in the bottom right corner
-	fpsText = new Text2('60', {
+	fpsText = new Text2('', {
 		size: 50,
 		fill: '#000000',
 		font: "'GillSans-Bold',Impact,'Arial Black',Tahoma"
 	});
-	fpsText.anchor.set(1.0, 1.0);
+	fpsText.anchor.set(1.5, 1.0);
 	LK.gui.bottomRight.addChild(fpsText);
 	gameIsRunning = true;
+	startFpsCounter();
 }
 // Game tick
 LK.on('tick', function () {
 	// Render the map and update unit movement each tick
@@ -1271,8 +1295,9 @@
 			unit.x = screenX;
 			unit.y = screenY;*/
 		});
 	}
+	tickCounter++;
 });
 // Start the game with Player 1 construction yard preselected
 LK.setTimeout(function () {
 	initGame();