diff --git a/pom.xml b/pom.xml
index 8701851..822d641 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
     <packaging>jar</packaging>
-    <version>3.6.7</version>
+    <version>3.6.8</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java
index 4ca2c7b..6185f95 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java
@@ -144,9 +144,9 @@ public class BetterRTP extends JavaPlugin {
     //(Re)Load all plugin systems/files/cache
     private void loadAll() {
         playerDataManager.clear();
-        databaseHandler.load();
         files.loadAll();
         settings.load();
+        databaseHandler.load();
         rtpLogger.setup(this);
         invs.load();
         cooldowns.load();
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
index d3e2d46..2ee3c31 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
@@ -71,13 +71,11 @@ class RTPDelay implements Listener {
         Bukkit.getServer().getPluginManager().callEvent(new RTP_CancelledEvent(rtp.getPlayer()));
     }
 
-    private BukkitRunnable run(final CommandSender sendi, final RTPDelay cls) {
-        return new BukkitRunnable() {
-            @Override public void run() {
-                HandlerList.unregisterAll(cls);
-                if (getPl().getpInfo().getRtping().containsKey(rtp.getPlayer()))
-                    rtp.randomlyTeleport(sendi);
-            }
+    private Runnable run(final CommandSender sendi, final RTPDelay cls) {
+        return () -> {
+            HandlerList.unregisterAll(cls);
+            if (getPl().getpInfo().getRtping().containsKey(rtp.getPlayer()))
+                rtp.randomlyTeleport(sendi);
         };
     }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 347cf75..2dcf586 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,6 +2,7 @@ main: me.SuperRonanCraft.BetterRTP.BetterRTP
 version: ${project.version}
 name: BetterRTP
 author: SuperRonanCraft
+folia-supported: true #As of 3.6.8 thanks to LOOHP#6007, TechnicallyCoded#9095 and loving11ish#2066
 softdepend:
     - Vault
     - WorldGuard #Respect WorldGuard areas (https://dev.bukkit.org/projects/worldguard)