diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java
index 5264f37f..583bbadf 100644
--- a/2006Redone Client/src/Game.java	
+++ b/2006Redone Client/src/Game.java	
@@ -5970,7 +5970,6 @@ public class Game extends RSApplet {
 			}
 
 		}
-
 		int j3 = j2;
 		int k3 = j1;
 		anIntArrayArray901[j2][j1] = 99;
diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java b/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
index c77efb2a..674e09d6 100644
--- a/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java	
+++ b/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java	
@@ -117,17 +117,12 @@ public class DwarfCannon {
 			}
 		}, 2);
 	}
-	
-		public boolean needsCannon() {
-			return (player.lostCannon == true);
-		}
 		
 		public void loginCheck() {
-			if (needsCannon()) {
+			if (player.lostCannon) {
 				player.getPacketSender().sendMessage("@red@You can collect your cannon from Nulodion.");
 			}
 		}
-		
 		private boolean canSetUp() {
 			if (setUpStage == 0) {
 				if (player.getItemAssistant().playerHasItem(ITEM_PARTS[0])  && player.getItemAssistant().playerHasItem(ITEM_PARTS[1]) && player.getItemAssistant().playerHasItem(ITEM_PARTS[2]) && player.getItemAssistant().playerHasItem(ITEM_PARTS[3])) {
diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
index e28eea05..fd3cc3b1 100644
--- a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java	
+++ b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java	
@@ -6843,7 +6843,7 @@ public class DialogueHandler {
 			 * @author Andrew
 			 */
 			case 3500:
-				if (player.getCannon().needsCannon()) {
+				if (player.lostCannon) {
 					sendNpcChat2("Hello, " + Misc.capitalize(player.playerName) + ".", "I see that you lost your cannon.", player.talkingNpc, "Nulodion");
 					player.nextChat = 3501;
 				} else {
@@ -6853,7 +6853,7 @@ public class DialogueHandler {
 				break;
 
 			case 3501:
-				if (player.getCannon().needsCannon()) {
+				if (player.lostCannon) {
 					if (player.getItemAssistant().freeSlots() >= 4) {
 						sendNpcChat1("Here is your cannon, try not to lose it again.", player.talkingNpc, "Nulodion");
 						for (int i = 0; i < 4; i++) {
diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java b/2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java
index eee1da88..5949b5f9 100644
--- a/2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java	
+++ b/2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java	
@@ -161,35 +161,49 @@ public class Walking implements PacketType {
 			packetSize -= 14;
 		}
 
-		int steps = (packetSize - 5) / 2;
-		player.getNewWalkCmdX()[0] = player.getNewWalkCmdY()[0] = 0;
-
-		int[][] path = new int[steps][2];
-		int firstStepX = player.getInStream().readSignedWordBigEndianA();
-		for (int i = 0; i < steps; i++) {
-			path[i][0] = player.getInStream().readSignedByte();
-			path[i][1] = player.getInStream().readSignedByte();
-		}
-		int firstStepY = player.getInStream().readSignedWordBigEndian();
-		int x = firstStepX;
-		int y = firstStepY;
-		player.setNewWalkCmdIsRunning(player.isRunning2 && player.playerEnergy > 0);
-		for (int i = 0; i < steps; i++) {
-			path[i][0] += firstStepX;
-			path[i][1] += firstStepY;
-			x = path[i][0];
-			y = path[i][1];
-		}
-
-		if (!player.clickToTele) {
-			if (player.distanceToPoint(x, y) > 30) {
+		if (player.clickToTele) {
+			player.newWalkCmdSteps = (packetSize - 5) / 2;
+			if (++player.newWalkCmdSteps > player.walkingQueueSize) {
+				player.newWalkCmdSteps = 0;
 				return;
 			}
+			player.getNewWalkCmdX()[0] = player.getNewWalkCmdY()[0] = 0;
+			int firstStepX, firstStepY;
+			firstStepX = player.getInStream().readSignedWordBigEndianA();
+			for (int i = 1; i < player.newWalkCmdSteps; i++) {
+				player.getNewWalkCmdX()[i] = player.getInStream().readSignedByte();
+				player.getNewWalkCmdY()[i] = player.getInStream().readSignedByte();
+			}
+			firstStepY = player.getInStream().readSignedWordBigEndian();
+			player.setNewWalkCmdIsRunning(player.getInStream().readSignedByteC() == 1 && player.playerEnergy > 0);
+			for (int i1 = 0; i1 < player.newWalkCmdSteps; i1++) {
+				player.getPlayerAssistant().movePlayer(player.getNewWalkCmdX()[i1] + firstStepX, player.getNewWalkCmdY()[i1] + firstStepY, player.heightLevel);
+				player.getNewWalkCmdX()[i1] += firstStepX;
+				player.getNewWalkCmdY()[i1] += firstStepY;
+			}
 		}
-		//System.out.println("Player has requested to walk to: "+x+","+y);
-		player.getPlayerAssistant().playerWalk(x, y);
-
+		else {
+			player.getNewWalkCmdX()[0] = player.getNewWalkCmdY()[0] = 0;
+			int steps = (packetSize - 5) / 2;
 
+			int[][] path = new int[steps][2];
+			int firstStepX = player.getInStream().readSignedWordBigEndianA();
+			for (int i = 0; i < steps; i++) {
+				path[i][0] = player.getInStream().readSignedByte();
+				path[i][1] = player.getInStream().readSignedByte();
+			}
+			int firstStepY = player.getInStream().readSignedWordBigEndian();
+			int x = firstStepX;
+			int y = firstStepY;
+			player.setNewWalkCmdIsRunning(player.isRunning2 && player.playerEnergy > 0);
+			for (int i = 0; i < steps; i++) {
+				path[i][0] += firstStepX;
+				path[i][1] += firstStepY;
+				x = path[i][0];
+				y = path[i][1];
+			}
+			//System.out.println("Player has requested to walk to: "+x+","+y);
+			player.getPlayerAssistant().playerWalk(x, y);
+		}
 	}
-
 }
\ No newline at end of file
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class
index 58a2a13e..70f706fd 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class differ