diff --git a/pom.xml b/pom.xml
index 2c1f898..3f245e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
     <packaging>jar</packaging>
-    <version>3.6.8-3-DEVBUILD</version>
+    <version>3.6.8-3</version>
 
     <!-- Upload patches to https://repo.ronanplugins.com/#/ -->
 
@@ -358,6 +358,7 @@
             <groupId>com.ronanplugins</groupId>
             <artifactId>Residence</artifactId>
             <version>4.9.1.9</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
index 2a060f5..cbf5360 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
@@ -1,11 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
-import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
 import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP_Info;
 import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp;
 import me.SuperRonanCraft.BetterRTP.references.messages.MessagesUsage;
@@ -31,7 +28,7 @@ public class CmdBiome implements RTPCommand, RTPCommandHelpable {
 
     public List<String> tabComplete(CommandSender sendi, String[] args) {
         List<String> list = new ArrayList<>();
-        if (args.length == 2)
+        if (args.length >= 2)
             HelperRTP_Info.addBiomes(list, args);
         return list;
     }
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
index db03c80..d4bb618 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
@@ -63,7 +63,7 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable {
                 if (w.getName().startsWith(args[2]) && !BetterRTP.getInstance().getRTP().getDisabledWorlds().contains(w.getName()))
                     list.add(w.getName());
         } else if (args.length > 3) {
-            if (RTPCommandType.BIOME.getCmd().permission().check(sendi))
+            if (PermissionNode.BIOME.check(sendi))
                 HelperRTP_Info.addBiomes(list, args);
         }
         return list;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
index 6abcba2..a3c84c9 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
@@ -50,7 +50,7 @@ public class CmdWorld implements RTPCommand, RTPCommandHelpable {
                     list.add(_wName);
             }
         } else if (args.length >= 3) {
-            if (RTPCommandType.BIOME.getCmd().permission().check(sendi))
+            if (PermissionNode.BIOME.check(sendi))
                 HelperRTP_Info.addBiomes(list, args);
         }
         return list;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/EventListener.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/EventListener.java
index 952cdb7..e7f0337 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/EventListener.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/EventListener.java
@@ -15,6 +15,7 @@ import org.bukkit.plugin.PluginManager;
 
 public class EventListener implements Listener {
     private final Interact interact = new Interact();
+    private final WorldLoad worldLoad = new WorldLoad();
 
     public void registerEvents(BetterRTP pl) {
         PluginManager pm = pl.getServer().getPluginManager();
@@ -62,6 +63,6 @@ public class EventListener implements Listener {
 
     @EventHandler
     private void worldLoad(WorldLoadEvent e) {
-        WorldLoad.worldLoad();
+        worldLoad.load(e);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
index 8d4a406..ef6407b 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
@@ -2,17 +2,28 @@ package me.SuperRonanCraft.BetterRTP.player.events;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler;
+import me.SuperRonanCraft.BetterRTP.references.helpers.FoliaHelper;
 import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
 import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData;
+import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
+import me.SuperRonanCraft.BetterRTP.versions.FoliaHandler;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.scheduler.BukkitTask;
 
 public class WorldLoad {
 
-    static void worldLoad() {
-        BetterRTP.getInstance().getLogger().info("NEW WORLD!");
-        BetterRTP.getInstance().getDatabaseHandler().load();
+    BukkitTask loader;
+
+    void load(WorldLoadEvent e) {
+        //BetterRTP.getInstance().getLogger().info("NEW WORLD!");
+        if (loader != null)
+            loader.cancel();
+        loader = AsyncHandler.syncLater(() -> {
+            BetterRTP.debug("New world `" + e.getWorld().getName() + "` detected! Reloaded Databases!");
+            BetterRTP.getInstance().getDatabaseHandler().load();
+        }, 20L * 5);
     }
 }