diff --git a/pom.xml b/pom.xml
index 1dfc9e9..4a91078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
 		<powermock.version>2.0.2</powermock.version>
 		<!-- More visible way how to change dependency versions -->
 		<spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
-		<bentobox.version>1.14.0</bentobox.version>
-		<level.version>1.6.0</level.version>
+		<bentobox.version>1.15.4</bentobox.version>
+		<level.version>2.5.0</level.version>
 		<vault.version>1.7</vault.version>
 		<!-- Revision variable removes warning about dynamic version -->
 		<revision>${build.version}-SNAPSHOT</revision>
diff --git a/src/main/java/world/bentobox/challenges/listeners/ResetListener.java b/src/main/java/world/bentobox/challenges/listeners/ResetListener.java
index 182ff17..2106e03 100644
--- a/src/main/java/world/bentobox/challenges/listeners/ResetListener.java
+++ b/src/main/java/world/bentobox/challenges/listeners/ResetListener.java
@@ -7,8 +7,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import world.bentobox.bentobox.api.events.island.IslandEvent;
-import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
+import world.bentobox.bentobox.api.events.island.IslandCreatedEvent;
+import world.bentobox.bentobox.api.events.island.IslandRegisteredEvent;
+import world.bentobox.bentobox.api.events.island.IslandResettedEvent;
 import world.bentobox.challenges.ChallengesAddon;
 
 /**
@@ -24,15 +25,39 @@ public class ResetListener implements Listener {
         this.addon = addon;
     }
 
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-    public void onIslandReset(IslandEvent e) {
-        if (addon.getChallengesSettings().isResetChallenges())
-        {
-            if (e.getReason().equals(IslandEvent.Reason.CREATED) ||
-                e.getReason().equals(IslandEvent.Reason.RESETTED) ||
-                e.getReason().equals(IslandEvent.Reason.REGISTERED)) {
-                addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
-            }
-        }
+
+    /**
+     * This method handles Island Created event.
+     *
+     * @param e Event that must be handled.
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onIslandCreated(IslandCreatedEvent e)
+    {
+        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
+    }
+
+
+    /**
+     * This method handles Island Resetted event.
+     *
+     * @param e Event that must be handled.
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onIslandCreated(IslandResettedEvent e)
+    {
+        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
+    }
+
+
+    /**
+     * This method handles Island Registered event.
+     *
+     * @param e Event that must be handled.
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onIslandCreated(IslandRegisteredEvent e)
+    {
+        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
     }
 }