diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
index 6fbb41a1b..ad84a3c62 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
@@ -27,7 +27,7 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 
 public class ClientClass
 {
-	public static int MAX_TOKENS = 12;
+	public static int MAX_TOKENS = 60;
 	
 	private ClassManager _classFactory;
 	private SkillFactory _skillFactory;
@@ -364,11 +364,6 @@ public class ClientClass
 		ClearSkills();
 
 		_gameClass = gameClass;
-
-		if (_gameClass == null)
-			return;
-
-		EquipCustomBuild(_customBuilds.get(gameClass).get(0));
 	}
     
 	public IPvpClass GetGameClass() 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java
index 159f99c92..d4cfea278 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java
@@ -56,6 +56,7 @@ public class KitAssassin extends Kit
 		clientClass.SetGameClass(pvpClass);
 		pvpClass.ApplyArmor(player);
 		clientClass.ClearDefaults();
+		clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
 		
 		if (!Manager.GetGame().InProgress())
 			clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java
index 700907c62..5a2be1d98 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java
@@ -55,6 +55,7 @@ public class KitBrute extends Kit
 		clientClass.SetGameClass(pvpClass);
 		pvpClass.ApplyArmor(player);
 		clientClass.ClearDefaults();
+		clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
 		
 		if (!Manager.GetGame().InProgress())
 			clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java
index 5fc315885..ac5b4a581 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java
@@ -52,6 +52,7 @@ public class KitKnight extends Kit
 		clientClass.SetGameClass(pvpClass);
 		pvpClass.ApplyArmor(player);		
 		clientClass.ClearDefaults();
+		clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
 		
 		if (!Manager.GetGame().InProgress())
 			clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java
index c85c05d33..175496916 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java
@@ -52,6 +52,7 @@ public class KitMage extends Kit
 		clientClass.SetGameClass(pvpClass);
 		pvpClass.ApplyArmor(player);
 		clientClass.ClearDefaults();
+		clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
 		
 		if (!Manager.GetGame().InProgress())
 			clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java
index e2513ddec..0db49711a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java
@@ -52,6 +52,7 @@ public class KitRanger extends Kit
 		clientClass.SetGameClass(pvpClass);
 		pvpClass.ApplyArmor(player);
 		clientClass.ClearDefaults();
+		clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
 		
 		if (!Manager.GetGame().InProgress())
 			clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());