diff --git a/lib/MCore.jar b/lib/MCore.jar
new file mode 100644
index 00000000..4cc81d78
Binary files /dev/null and b/lib/MCore.jar differ
diff --git a/lib/capi.jar b/lib/capi.jar
index 1310588c..7659562e 100644
Binary files a/lib/capi.jar and b/lib/capi.jar differ
diff --git a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
index 4748f93e..c1dbc013 100644
--- a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
+++ b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
@@ -1,8 +1,6 @@
 package com.massivecraft.factions.integration.capi;
 
 import org.bukkit.Bukkit;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
 import org.bukkit.plugin.Plugin;
 
 import com.massivecraft.factions.P;
@@ -11,11 +9,11 @@ public class CapiFeatures
 {
 	public static void setup()
 	{
-		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("CAPI");
-		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.CAPI"))
+		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("capi");
+		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.P"))
 		{
 			P.p.log("Integration with the CAPI plugin was successful");
-			P.p.registerEvent(Event.Type.CUSTOM_EVENT, new PluginCapiListener(P.p), Priority.Normal);
+			Bukkit.getPluginManager().registerEvents(new PluginCapiListener(P.p), P.p);
 		}
 	}
 }
diff --git a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java b/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
index 316c9163..6e66057c 100644
--- a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
+++ b/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
@@ -5,6 +5,9 @@ import java.util.Set;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 
 import com.massivecraft.capi.Channel;
 import com.massivecraft.capi.Channels;
@@ -12,14 +15,13 @@ import com.massivecraft.capi.events.CAPIListChannelsEvent;
 import com.massivecraft.capi.events.CAPIMessageToChannelEvent;
 import com.massivecraft.capi.events.CAPIMessageToPlayerEvent;
 import com.massivecraft.capi.events.CAPISelectChannelEvent;
-import com.massivecraft.capi.listeners.CapiListener;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.P;
 import com.massivecraft.factions.struct.Relation;
 
-public class PluginCapiListener extends CapiListener
+public class PluginCapiListener implements Listener
 {
 	P p;
 	
@@ -50,10 +52,10 @@ public class PluginCapiListener extends CapiListener
 		return format;
 	}
 	
-	@Override
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onListChannelsEvent(CAPIListChannelsEvent event)
 	{
-		for (Channel c : Channels.i.get())
+		for (Channel c : Channels.i.getAll())
 		{
 			if (myChannelIds.contains(c.getId()))
 			{
@@ -62,7 +64,7 @@ public class PluginCapiListener extends CapiListener
 		}
 	}
 	
-	@Override
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onMessageToChannel(CAPIMessageToChannelEvent event)
 	{
 		if (event.isCancelled()) return;
@@ -81,7 +83,7 @@ public class PluginCapiListener extends CapiListener
 			for (Player somePlayer : Bukkit.getServer().getOnlinePlayers())
 			{
 				FPlayer someFPlayer = FPlayers.i.get(somePlayer);
-				if (someFPlayer.getRelationTo(fme).value >= Relation.ALLY.value)
+				if (someFPlayer.getRelationTo(fme).isAtLeast(Relation.ALLY))
 				{
 					event.getThem().add(somePlayer);
 				}
@@ -89,14 +91,14 @@ public class PluginCapiListener extends CapiListener
 		}
 	}
 	
-	@Override
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onMessageToPlayer(CAPIMessageToPlayerEvent event)
 	{
 		if (event.isCancelled()) return;
 		event.setFormat(this.replacePlayerTags(event.getFormat(), FPlayers.i.get(event.getMe()), FPlayers.i.get(event.getYou())));
 	}
 	
-	@Override
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onSelectChannel(CAPISelectChannelEvent event)
 	{
 		if (event.isCancelled()) return;