diff --git a/lib/Essentials.jar b/lib/Essentials.jar
index d022397b..e5eb8479 100644
Binary files a/lib/Essentials.jar and b/lib/Essentials.jar differ
diff --git a/lib/EssentialsChat_2.8.1.jar b/lib/EssentialsChat_2.8.1.jar
deleted file mode 100644
index 88246d6e..00000000
Binary files a/lib/EssentialsChat_2.8.1.jar and /dev/null differ
diff --git a/lib/EssentialsChat_2.x.jar b/lib/EssentialsChat_2.x.jar
new file mode 100644
index 00000000..f4b54b72
Binary files /dev/null and b/lib/EssentialsChat_2.x.jar differ
diff --git a/lib/EssentialsChat.jar b/lib/EssentialsChat_3_dev.jar
similarity index 100%
rename from lib/EssentialsChat.jar
rename to lib/EssentialsChat_3_dev.jar
diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java
index 3fff9600..6ef7f36e 100644
--- a/src/com/massivecraft/factions/P.java
+++ b/src/com/massivecraft/factions/P.java
@@ -11,7 +11,7 @@ import org.bukkit.block.Block;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.Location;
 import org.bukkit.Material;
 
@@ -221,8 +221,7 @@ public class P extends MPlugin
 	// Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
 	// enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
 	
-	
-	public boolean shouldLetFactionsHandleThisChat(PlayerChatEvent event)
+	public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event)
 	{
 		if (event == null) return false;
 		return (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));
diff --git a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
index e867820a..50591743 100644
--- a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
+++ b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
@@ -1,7 +1,7 @@
 package com.massivecraft.factions.integration;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.P;
@@ -25,11 +25,11 @@ public class EssentialsOldVersionFeatures
 		{
 			essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener()
 			{
-				public boolean shouldHandleThisChat(PlayerChatEvent event)
+				public boolean shouldHandleThisChat(AsyncPlayerChatEvent event)
 				{
 					return P.p.shouldLetFactionsHandleThisChat(event);
 				}
-				public String modifyMessage(PlayerChatEvent event, Player target, String message)
+				public String modifyMessage(AsyncPlayerChatEvent event, Player target, String message)
 				{
 					return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer()));
 				}