diff --git a/gradle.properties b/gradle.properties
index 8fbad09..ea5a003 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19-pre4
-yarn_mappings=1.19-pre4+build.1
+minecraft_version=1.19-pre5
+yarn_mappings=1.19-pre5+build.3
 loader_version=0.14.6
 # Mod Properties
 mod_version=1.2.0
@@ -11,4 +11,4 @@ maven_group=semmieboy_yt
 archives_base_name=disc_jockey
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.53.4+1.19
+fabric_version=0.54.0+1.19
diff --git a/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java b/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java
index 2aabd97..090ca9c 100644
--- a/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java
+++ b/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java
@@ -1,32 +1,22 @@
 package semmiedev.disc_jockey;
 
-import com.google.common.base.Predicate;
+import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.PlaceCommand;
 import net.minecraft.text.Text;
 import semmiedev.disc_jockey.gui.screen.DiscJockeyScreen;
 
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class DiscjockeyCommand {
-    public static void register() {
-        ClientCommandManager.DISPATCHER.register(
+    public static void register(CommandDispatcher<FabricClientCommandSource> commandDispatcher) {
+        commandDispatcher.register(
                 literal("discjockey")
                         .executes(context -> {
                             FabricClientCommandSource source = context.getSource();
diff --git a/src/main/java/semmiedev/disc_jockey/Main.java b/src/main/java/semmiedev/disc_jockey/Main.java
index 0588cc5..092c420 100644
--- a/src/main/java/semmiedev/disc_jockey/Main.java
+++ b/src/main/java/semmiedev/disc_jockey/Main.java
@@ -4,6 +4,7 @@ import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigHolder;
 import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents;
@@ -45,8 +46,6 @@ public class Main implements ClientModInitializer {
         songsFolder = new File(FabricLoader.getInstance().getConfigDir()+File.separator+MOD_ID+File.separator+"songs");
         if (!songsFolder.isDirectory()) songsFolder.mkdirs();
 
-        DiscjockeyCommand.register();
-
         SongLoader.loadSongs();
 
         KeyBinding openScreenKeyBind = KeyBindingHelper.registerKeyBinding(new KeyBinding(MOD_ID+".key_bind.open_screen", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_J, "key.category."+MOD_ID));
@@ -76,6 +75,10 @@ public class Main implements ClientModInitializer {
             for (ClientTickEvents.StartWorldTick listener : TICK_LISTENERS) listener.onStartTick(world);
         });
 
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
+            DiscjockeyCommand.register(dispatcher);
+        });
+
         ClientLoginConnectionEvents.DISCONNECT.register((handler, client) -> {
             PREVIEWER.stop();
             SONG_PLAYER.stop();
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8341eba..097db3f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -19,11 +19,7 @@
     ]
   },
   "depends": {
-    "fabric-command-api-v2": "*",
-    "fabric-lifecycle-events-v1": "*",
-    "fabric-networking-api-v1": "*",
-    "fabric-rendering-v1": "*",
-    "fabric-key-binding-api-v1": "*",
-    "minecraft": "1.19-beta.4"
+    "fabric": "*",
+    "minecraft": "1.19-beta.5"
   }
 }