diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 2a9f1c3..24e9eb2 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
index 1b69d2b..ddb761e 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
@@ -32,6 +32,7 @@ import java.util.Timer;
 public class Commands implements CommandExecutor {
 
 	public static MaybeOfflinePlayer Lastlol = null;
+	public static boolean Lastlolornot;
 
 	// This method is called, when somebody uses our command
 	@Override
@@ -201,7 +202,8 @@ public class Commands implements CommandExecutor {
 							PotionEffectType.BLINDNESS, 10 * 20, 5, false,
 							false));
 					for (Player pl : PluginMain.GetPlayers())
-						pl.sendMessage(player.getDisplayName() + " unlolled "
+						pl.sendMessage(player.getDisplayName()
+								+ (Lastlolornot ? " unlolled " : " unlaughed ")
 								+ p.getDisplayName());
 					Lastlol = null;
 				}
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index 4f86cd8..fbddc42 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -155,9 +155,16 @@ public class PlayerListener implements Listener { // 2015.07.16.
 		}
 
 		boolean greentext = event.getMessage().startsWith(">");
-		if (event.getMessage().contains("lol"))
+		String msg = event.getMessage().toLowerCase();
+		if (msg.contains("lol")) {
 			Commands.Lastlol = MaybeOfflinePlayer.AllPlayers.get(event
 					.getPlayer().getUniqueId());
+			Commands.Lastlolornot = true;
+		} else if (msg.contains("xd") || msg.contains("lel")) {
+			Commands.Lastlol = MaybeOfflinePlayer.AllPlayers.get(event
+					.getPlayer().getUniqueId());
+			Commands.Lastlolornot = false;
+		}
 
 		MaybeOfflinePlayer player = MaybeOfflinePlayer.AllPlayers.get(event
 				.getPlayer().getUniqueId());
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class
index 736a5ed..50dc676 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$1.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class
index 54f0041..bbbb981 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class
index 6a96d2c..446d534 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class
index a0efe9a..508dc64 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index 011c559..51f9202 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ