diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..a4dbb76
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>nl.martenm</groupId>
+  <artifactId>ServerTutorialPlus</artifactId>
+  <version>1.25.2</version>
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>plugin.yml</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <relocations>
+            <relocation>
+              <pattern>com.zaxxer.hikari</pattern>
+              <shadedPattern>nl.martenm.libs.hikari</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.bstats</pattern>
+              <shadedPattern>nl.martenm.libs.bstats</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>com.cryptomorin.xseries</pattern>
+              <shadedPattern>nl.martenm.libs.xseries</shadedPattern>
+            </relocation>
+          </relocations>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+    </repository>
+    <repository>
+      <id>placeholderapi</id>
+      <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+    </repository>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.20.4-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>joml</artifactId>
+          <groupId>org.joml</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>bungeecord-chat</artifactId>
+          <groupId>net.md-5</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>me.clip</groupId>
+      <artifactId>placeholderapi</artifactId>
+      <version>2.11.7</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>org.jetbrains</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>adventure-platform-bukkit</artifactId>
+          <groupId>net.kyori</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index d84021b..8d506f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
         <!--Spigot API and NMS-->
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <artifactId>spigot-api</artifactId>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -39,10 +39,18 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.9</version>
+            <version>2.11.7</version>
             <scope>provided</scope>
         </dependency>
 
+        <!--JSONSimple -->
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+
         <!-- String utils -->
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java
index 4b28577..3090330 100644
--- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java
+++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java
@@ -53,10 +53,17 @@ public void start(){
         //FIRE event!
         TutorialStartEvent event = new TutorialStartEvent(serverTutorial, player);
         plugin.getServer().getPluginManager().callEvent(event);
+        if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) {
+            player.performCommand("tab scoreboard off " + player.getName() + " -s");
+        }
+
         if(event.isCancelled()){
             plugin.inTutorial.remove(player.getUniqueId());
             plugin.lockedPlayers.remove(player.getUniqueId());
             plugin.lockedViews.remove(player.getUniqueId());
+            if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) {
+                player.performCommand("tab scoreboard on " + player.getName() + " -s");
+            }
             return;
         }
 
@@ -136,6 +143,9 @@ private void finishPoint(){
         if(current == serverTutorial.points.size() - 1){
             //Tutorial has been finished!
             finish();
+            if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) {
+                player.performCommand("tab scoreboard on " + player.getName() + " -s");
+            }
         } else{
             current++;
             playedPoint = serverTutorial.points.get(current).createPlay(player, oldValuesPlayer, this::finishPoint);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index d03a067..768280a 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ name: ServerTutorialPlus
 prefix: Server Tutorial Plus
 author: MartenM
 version: ${project.version}
-api-version: "1.20"
+api-version: "1.20.4"
 description: "§6The plugin to guide players around your server using tutorials."
 softdepend: [PlaceholderAPI, Multiverse-Core, MultiWorld]
 commands: