diff --git a/Maps/Sheep Quest/Sheep_BiomeSplit.zip b/Maps/Sheep Quest/Sheep_BiomeSplit.zip
new file mode 100644
index 000000000..cc3cb157d
Binary files /dev/null and b/Maps/Sheep Quest/Sheep_BiomeSplit.zip differ
diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar
index 33d9d09f4..da436cf1c 100644
Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
index f54d30c38..cfbf28e96 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
@@ -203,7 +203,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 	{		
 		int slots = Plugin.GetRequiredSlots(player, serverInfo.ServerType);
 		
-		if ((serverInfo.Name.contains("BETA") && ! Client.GetRank().Has(Rank.HERO)) || (serverInfo.MaxPlayers - serverInfo.CurrentPlayers < slots && !(DonationManager.Get(Player.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || Client.GetRank().Has(Rank.ULTRA))))
+		if ((serverInfo.Name.contains("BETA") && !Client.GetRank().Has(Rank.ULTRA)) || (serverInfo.MaxPlayers - serverInfo.CurrentPlayers < slots && !(DonationManager.Get(Player.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || Client.GetRank().Has(Rank.ULTRA))))
 		{
 			PlayDenySound(player);
 			return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
index b79437eb3..98997ac35 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
@@ -11,20 +11,21 @@ import org.bukkit.event.entity.ItemDespawnEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 
 import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.classcombat.shop.ClassCombatCustomBuildShop;
-import mineplex.minecraft.game.core.combat.CombatComponent;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
-import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.champions.kits.KitAssassin;
+import nautilus.game.arcade.game.games.champions.kits.KitBrute;
 import nautilus.game.arcade.game.games.champions.kits.KitKnight;
+import nautilus.game.arcade.game.games.champions.kits.KitMage;
+import nautilus.game.arcade.game.games.champions.kits.KitRanger;
 import nautilus.game.arcade.game.games.champions.map.*;
 import nautilus.game.arcade.game.games.smash.kits.*;
 import nautilus.game.arcade.kit.Kit;
@@ -96,22 +97,20 @@ public class Champions extends TeamGame
 			_emerald.add(new Emerald(this, loc));
 		}
 
-		/*
 		for (Location loc : WorldData.GetDataLocs("GRAY"))		//Knight
-			SpawnNPC(Knight, loc);
+			new KitKnight(Manager).SpawnEntity(loc);
 
 		for (Location loc : WorldData.GetDataLocs("GREEN"))		//Ranger
-			SpawnNPC(Ranger, loc);
+			new KitRanger(Manager).SpawnEntity(loc);
 
 		for (Location loc : WorldData.GetDataLocs("BLUE"))		//Brute
-			SpawnNPC(Brute, loc);
+			new KitBrute(Manager).SpawnEntity(loc);
 
 		for (Location loc : WorldData.GetDataLocs("BLACK"))		//Assassin
-			SpawnNPC(Assasin, loc);
+			new KitAssassin(Manager).SpawnEntity(loc);
 
 		for (Location loc : WorldData.GetDataLocs("ORANGE"))	//Mage
-			SpawnNPC(Mage, loc);
-		*/
+			new KitMage(Manager).SpawnEntity(loc);
 	}
 
 	@EventHandler
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 c2ff6d558..fb3b17b67 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
@@ -8,12 +8,8 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import me.chiss.Core.ClientData.IClientClass;
-import mineplex.core.common.util.F;
-import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.minecraft.game.classcombat.Class.ClientClass;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass;
-import mineplex.minecraft.game.classcombat.shop.page.CustomBuildPage;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -64,21 +60,6 @@ public class KitKnight extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD));
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.ARROW, 64));
-
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.FENCE, (byte)0, 2, F.item("Castle Barricade")));
-		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-
-		
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
-		
 		_class.get(player).ResetToDefaults(true, true);
 	}