diff --git a/src/org/cain/cfbanner/CFBanner.java b/src/org/cain/cfbanner/CFBanner.java
old mode 100644
new mode 100755
index 2eacc8f..e958ce3
--- a/src/org/cain/cfbanner/CFBanner.java
+++ b/src/org/cain/cfbanner/CFBanner.java
@@ -1,17 +1,17 @@
 package org.cain.cfbanner;
 
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.cain.cfbanner.listeners.playerListener;
 
 public class CFBanner extends JavaPlugin {
 	
+	@Override
 	public void onEnable() {
-		getServer().getPluginManager().registerEvent(Type.PLAYER_LOGIN, new playerListener(), Priority.Normal, this);
+		getServer().getPluginManager().registerEvents(new playerListener(), this);
 		System.out.println("[CFBanner] CFBanner has been enabled!");
 	}
 	
+	@Override
 	public void onDisable() {
 		System.out.println("[CFBanner] CFBanner has been disabled!");
 	}
diff --git a/src/org/cain/cfbanner/listeners/playerListener.java b/src/org/cain/cfbanner/listeners/playerListener.java
old mode 100644
new mode 100755
index d5be47b..ce63748
--- a/src/org/cain/cfbanner/listeners/playerListener.java
+++ b/src/org/cain/cfbanner/listeners/playerListener.java
@@ -1,15 +1,17 @@
 package org.cain.cfbanner.listeners;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
 
-public class playerListener extends PlayerListener {
+public class playerListener implements Listener {
 	
 	String ZOMBE_FLY = "§f §f §1 §0 §2 §4";
 	String ZOMBE_CHEAT = "§f §f §2 §0 §4 §8";
 	String ZOMBE_NOCLIP = "§f §f §4 §0 §9 §6";
 	
+	@EventHandler
 	public void onPlayerLogin(PlayerLoginEvent e) {
 		Player p = e.getPlayer();
 		if(!p.hasPermission("cfbanner.zombe.fly")) {
@@ -21,7 +23,6 @@ public void onPlayerLogin(PlayerLoginEvent e) {
 		if(!p.hasPermission("cfbanner.zombe.noclip")) {
 			p.sendMessage(ZOMBE_NOCLIP);
 		}
-		return;
 	}
 
 }
diff --git a/src/plugin.yml b/src/plugin.yml
old mode 100644
new mode 100755
index a9eec1c..1c77953
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,4 +1,4 @@
 name: CFBanner
-version: 2.00
-author: CainFoool
+version: 2.1
+author: CainFoool, jascotty2
 main: org.cain.cfbanner.CFBanner
\ No newline at end of file