diff --git a/2006Redone Client/src/ClientSettings.java b/2006Redone Client/src/ClientSettings.java
index 0d0e2889..a8ec9e75 100644
--- a/2006Redone Client/src/ClientSettings.java	
+++ b/2006Redone Client/src/ClientSettings.java	
@@ -10,11 +10,11 @@ public class ClientSettings {
 	/**
 	 * The Servers Name
 	 */
-	public final static String SERVER_NAME = "2006Redone";
+	public final static String SERVER_NAME = "2006rebotted";
 	/**
 	 * The Servers Website
 	 */
-	public final static String SERVER_WEBSITE = "www.2006redone.org";
+	public final static String SERVER_WEBSITE = "www.2006rebotted.tk";
 	/**
 	 * The Servers Ip
 	 *
diff --git a/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java b/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java
index 8d37c187..2d90ca5e 100644
--- a/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java	
+++ b/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java	
@@ -930,9 +930,6 @@ public class CombatAssistant {
 				resetPlayerAttack();
 				return;
 			}
-			// c.getPacketDispatcher().sendMessage("Made it here0.");
-			c.followId = i;
-			c.followId2 = 0;
 			if (c.attackTimer <= 0) {
 				c.usingBow = false;
 				c.specEffect = 0;
@@ -953,8 +950,6 @@ public class CombatAssistant {
 					c.attackTimer = 0;
 					return;
 				}
-
-				// c.getPacketDispatcher().sendMessage("Made it here1.");
 				if (!c.usingMagic) {
 					for (int bowId : RangeData.BOWS) {
 						if (c.playerEquipment[c.playerWeapon] == bowId) {
@@ -977,7 +972,6 @@ public class CombatAssistant {
 					c.spellId = c.autocastId;
 					c.usingMagic = true;
 				}
-				// c.getPacketDispatcher().sendMessage("Made it here2.");
 				if (c.spellId > 0) {
 					c.usingMagic = true;
 				}
@@ -997,7 +991,6 @@ public class CombatAssistant {
 						return;
 					}
 				}
-				// c.getPacketDispatcher().sendMessage("Made it here3.");
 				if (c.duelRule[2] && (usingBow || usingOtherRangeWeapons)) {
 					c.getActionSender().sendMessage(
 							"Range has been disabled in this duel!");
@@ -1189,8 +1182,6 @@ public class CombatAssistant {
 								CombatSounds.getMagicSound(c, c.spellId), 100,
 								0);
 					}
-					c.mageFollow = true;
-					c.followId = c.playerIndex;
 				}
 				PlayerHandler.players[i].underAttackBy = c.playerId;
 				PlayerHandler.players[i].logoutDelay = System.currentTimeMillis();
diff --git a/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java b/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java
index 7ac21afc..fb63e6d7 100644
--- a/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java	
+++ b/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java	
@@ -181,7 +181,6 @@ public class AttackPlayer implements PacketType {
 		 * Attack player with magic
 		 **/
 		case MAGE_PLAYER:
-			c.getActionSender().sendMessage("maging");
 			if (!c.mageAllowed) {
 				c.mageAllowed = true;
 				break;
@@ -305,17 +304,6 @@ public class AttackPlayer implements PacketType {
 					c.stopMovement();
 					c.getCombatAssistant().resetPlayerAttack();
 				}
-
-				if (c.usingMagic) {
-					if (c.goodDistance(c.getX(), c.getY(), PlayerHandler.players[c.playerIndex].getX(), PlayerHandler.players[c.playerIndex].getY(), 7))
-					{
-						c.stopMovement();
-					}
-					if (c.getCombatAssistant().checkReqs()) {
-						c.followId = c.playerIndex;
-						c.mageFollow = true;
-					}
-				}
 			}
 			break;
 		}
diff --git a/CompiledServer/production/2006rebotted/ClientSettings.class b/CompiledServer/production/2006rebotted/ClientSettings.class
index 0f9f4d98..95e6716a 100644
Binary files a/CompiledServer/production/2006rebotted/ClientSettings.class and b/CompiledServer/production/2006rebotted/ClientSettings.class differ
diff --git a/CompiledServer/production/2006rebotted/Game.class b/CompiledServer/production/2006rebotted/Game.class
index 2377e2f4..98b8dacb 100644
Binary files a/CompiledServer/production/2006rebotted/Game.class and b/CompiledServer/production/2006rebotted/Game.class differ
diff --git a/CompiledServer/production/2006rebotted/RSFrame.class b/CompiledServer/production/2006rebotted/RSFrame.class
index 8128da45..3c1c7704 100644
Binary files a/CompiledServer/production/2006rebotted/RSFrame.class and b/CompiledServer/production/2006rebotted/RSFrame.class differ
diff --git a/CompiledServer/production/2006rebotted/RSInterface.class b/CompiledServer/production/2006rebotted/RSInterface.class
index 379e4c24..aee85bc0 100644
Binary files a/CompiledServer/production/2006rebotted/RSInterface.class and b/CompiledServer/production/2006rebotted/RSInterface.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class
index 795068b1..50cdb2b5 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class
index 4879bb4a..f91c7ca1 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class b/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class
index 1cd7962a..31e29347 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class
index a537e52b..d13b64f5 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class and b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class
index cc8200d7..ab004dfe 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class
index 10d3af79..007202b2 100644
Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class differ