diff --git a/NightX.iws b/NightX.iws
index 89a72405..8049ce28 100644
--- a/NightX.iws
+++ b/NightX.iws
@@ -6,8 +6,18 @@
   <component name="ChangeListManager">
     <list default="true" id="af093b99-5942-419c-869b-8b2d7cb4dd2a" name="変更" comment="">
       <change beforePath="$PROJECT_DIR$/NightX.iws" beforeDir="false" afterPath="$PROJECT_DIR$/NightX.iws" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Speed.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Speed.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/SilentView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/visual/SilentView.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Step.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/aspw/client/features/module/impl/player/Step.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -190,7 +200,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStart" />
       <option name="VM_PARAMETERS" value="-Dfml.coreMods.load=net.aspw.client.injection.forge.TransformerLoader -Ddev-mode" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -265,7 +275,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStart" />
       <option name="VM_PARAMETERS" value="-Dfml.coreMods.load=net.aspw.client.injection.forge.TransformerLoader -Ddev-mode" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -292,7 +302,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -307,7 +317,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -382,7 +392,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
@@ -397,7 +407,7 @@
       <option name="MAIN_CLASS_NAME" value="GradleStartServer" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-Client\run" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../NightX-master\run" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
diff --git a/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt b/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt
index 2203e78d..063ee14d 100644
--- a/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/combat/AntiVelocity.kt
@@ -12,6 +12,7 @@ import net.aspw.client.util.timer.MSTimer
 import net.aspw.client.value.BoolValue
 import net.aspw.client.value.FloatValue
 import net.aspw.client.value.ListValue
+import net.minecraft.client.settings.GameSettings
 import net.minecraft.network.play.client.C03PacketPlayer
 import net.minecraft.network.play.client.C03PacketPlayer.*
 import net.minecraft.network.play.client.C0FPacketConfirmTransaction
@@ -308,7 +309,7 @@ class AntiVelocity : Module() {
             }
 
             "matrixground" -> {
-                if (mc.thePlayer.onGround && !mc.gameSettings.keyBindJump.isKeyDown)
+                if (mc.thePlayer.onGround && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                     mc.thePlayer.onGround = false
             }
 
@@ -453,7 +454,7 @@ class AntiVelocity : Module() {
                 "matrixground" -> {
                     packet.motionX = (packet.getMotionX() * 0.36).toInt()
                     packet.motionZ = (packet.getMotionZ() * 0.36).toInt()
-                    if (mc.thePlayer.onGround && !mc.gameSettings.keyBindJump.isKeyDown) {
+                    if (mc.thePlayer.onGround && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                         packet.motionY = (-628.7).toInt()
                         packet.motionX = (packet.getMotionX() * 0.6).toInt()
                         packet.motionZ = (packet.getMotionZ() * 0.6).toInt()
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt b/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt
index 3ba8b840..37f4086f 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/Flight.kt
@@ -880,7 +880,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = vanillaMotionYValue.get().toDouble()
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -894,7 +894,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = -1E-10
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += 0.4f
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -932,7 +932,7 @@ class Flight : Module() {
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
                 mc.thePlayer.noClip = true
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -995,7 +995,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = 0.0
                 mc.thePlayer.motionZ = 0.0
 
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1087,7 +1087,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = 0.0
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1135,7 +1135,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = 0.0
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1268,7 +1268,7 @@ class Flight : Module() {
             }
 
             "aac1.9.10" -> {
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     aacJump += 0.2
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1316,7 +1316,7 @@ class Flight : Module() {
                 mc.netHandler.addToSendQueue(
                     C06PacketPlayerPosLook(
                         mc.thePlayer.posX + mc.thePlayer.motionX * 999,
-                        mc.thePlayer.posY + (if (mc.gameSettings.keyBindJump.isKeyDown) 1.5624 else 0.00000001) - if (mc.gameSettings.keyBindSneak.isKeyDown) 0.0624 else 0.00000002,
+                        mc.thePlayer.posY + (if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) 1.5624 else 0.00000001) - if (mc.gameSettings.keyBindSneak.isKeyDown) 0.0624 else 0.00000002,
                         mc.thePlayer.posZ + mc.thePlayer.motionZ * 999,
                         mc.thePlayer.rotationYaw,
                         mc.thePlayer.rotationPitch,
@@ -1347,7 +1347,7 @@ class Flight : Module() {
                 mc.thePlayer.motionY = 0.0
                 mc.thePlayer.motionX = 0.0
                 mc.thePlayer.motionZ = 0.0
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += vanillaVSpeed.toDouble()
                 }
                 if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1358,11 +1358,11 @@ class Flight : Module() {
             }
 
             "jetpack" -> {
-                if (mc.gameSettings.keyBindJump.isKeyDown) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                     mc.thePlayer.motionY += 0.14
                     if (mc.thePlayer.isSprinting) {
-                        mc.thePlayer.motionX *= 1.15
-                        mc.thePlayer.motionZ *= 1.15
+                        mc.thePlayer.motionX *= 1.12
+                        mc.thePlayer.motionZ *= 1.12
                     }
                 }
             }
@@ -1455,7 +1455,7 @@ class Flight : Module() {
                         .equals("damage", ignoreCase = true) && pearlState == 1 && mc.thePlayer.hurtTime > 0
                 ) pearlState = 2
                 if (pearlState == 2) {
-                    if (mc.gameSettings.keyBindJump.isKeyDown) {
+                    if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
                         mc.thePlayer.motionY += vanillaSpeed.toDouble()
                     }
                     if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
@@ -1612,7 +1612,10 @@ class Flight : Module() {
                 when (event.eventState) {
                     EventState.PRE -> {
                         mc.thePlayer.motionY =
-                            if (mc.gameSettings.keyBindJump.isKeyDown) 2.0 else if (mc.gameSettings.keyBindJump.isKeyDown) -2.0 else 0.0
+                            if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) 2.0 else if (GameSettings.isKeyDown(
+                                    mc.gameSettings.keyBindJump
+                                )
+                            ) -2.0 else 0.0
                         var var10_8 = 0
                         while (var10_8 < 3) {
                             PacketUtils.sendPacketNoEvent(
@@ -2199,7 +2202,10 @@ class Flight : Module() {
             "clip" -> if (clipNoMove.get()) event.zeroXZ()
 
             "veruslowhop" -> {
-                if (!mc.thePlayer.isInWeb && !mc.thePlayer.isInLava && !mc.thePlayer.isInWater && !mc.thePlayer.isOnLadder && !mc.gameSettings.keyBindJump.isKeyDown && mc.thePlayer.ridingEntity == null) {
+                if (!mc.thePlayer.isInWeb && !mc.thePlayer.isInLava && !mc.thePlayer.isInWater && !mc.thePlayer.isOnLadder && !GameSettings.isKeyDown(
+                        mc.gameSettings.keyBindJump
+                    ) && mc.thePlayer.ridingEntity == null
+                ) {
                     if (MovementUtils.isMoving()) {
                         mc.gameSettings.keyBindJump.pressed = false
                         if (mc.thePlayer.onGround) {
@@ -2221,7 +2227,7 @@ class Flight : Module() {
                     event.z = Math.cos(Math.toRadians(mc.thePlayer.rotationYaw.toDouble())) * 2.4
                     cubecraftTeleportTickTimer.reset()
                 }
-                if (mc.gameSettings.keyBindJump.isKeyDown && cubecraftTeleportYTickTimer.hasTimePassed(2)) {
+                if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump) && cubecraftTeleportYTickTimer.hasTimePassed(2)) {
                     event.y = 1.6
                     cubecraftTeleportYTickTimer.reset()
                 }
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt b/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt
index 0d03f3be..9abf6d5d 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/Parkour.kt
@@ -6,13 +6,16 @@ import net.aspw.client.features.module.Module
 import net.aspw.client.features.module.ModuleCategory
 import net.aspw.client.features.module.ModuleInfo
 import net.aspw.client.util.MovementUtils
+import net.minecraft.client.settings.GameSettings
 
 @ModuleInfo(name = "Parkour", description = "", category = ModuleCategory.MOVEMENT)
 class Parkour : Module() {
 
     @EventTarget
     fun onUpdate(event: UpdateEvent) {
-        if (MovementUtils.isMoving() && mc.thePlayer.onGround && !mc.thePlayer.isSneaking && !mc.gameSettings.keyBindSneak.isKeyDown && !mc.gameSettings.keyBindJump.isKeyDown &&
+        if (MovementUtils.isMoving() && mc.thePlayer.onGround && !mc.thePlayer.isSneaking && !mc.gameSettings.keyBindSneak.isKeyDown && !GameSettings.isKeyDown(
+                mc.gameSettings.keyBindJump
+            ) &&
             mc.theWorld.getCollidingBoundingBoxes(
                 mc.thePlayer, mc.thePlayer.entityBoundingBox
                     .offset(0.0, -0.5, 0.0).expand(-0.001, 0.0, -0.001)
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java
index 1b095483..a302ccb2 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/Jump.java
@@ -5,6 +5,7 @@
 import net.aspw.client.features.module.impl.movement.Speed;
 import net.aspw.client.features.module.impl.movement.speeds.SpeedMode;
 import net.aspw.client.util.MovementUtils;
+import net.minecraft.client.settings.GameSettings;
 
 /**
  * The type Jump.
@@ -30,7 +31,7 @@ public void onUpdate() {
 
         if (speed == null)
             return;
-        if (MovementUtils.isMoving() && mc.thePlayer.onGround && !mc.gameSettings.keyBindJump.isKeyDown() && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && mc.thePlayer.jumpTicks == 0) {
+        if (MovementUtils.isMoving() && mc.thePlayer.onGround && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump) && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && mc.thePlayer.jumpTicks == 0) {
             mc.thePlayer.jump();
             mc.thePlayer.jumpTicks = 10;
         }
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java
index 093bbd39..6fdb9a21 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/other/YPort.java
@@ -8,6 +8,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
@@ -36,7 +37,7 @@ public YPort() {
 
     @Override
     public void onMotion() {
-        if (!safeJump && !mc.gameSettings.keyBindJump.isKeyDown() && !mc.thePlayer.isOnLadder() && !mc.thePlayer.isInsideOfMaterial(Material.water) && !mc.thePlayer.isInsideOfMaterial(Material.lava) && !mc.thePlayer.isInWater() && ((!(this.getBlock(-1.1) instanceof BlockAir) && !(this.getBlock(-1.1) instanceof BlockAir)) || (!(this.getBlock(-0.1) instanceof BlockAir) && mc.thePlayer.motionX != 0.0 && mc.thePlayer.motionZ != 0.0 && !mc.thePlayer.onGround && mc.thePlayer.fallDistance < 3.0f && mc.thePlayer.fallDistance > 0.05)) && this.level == 3)
+        if (!safeJump && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump) && !mc.thePlayer.isOnLadder() && !mc.thePlayer.isInsideOfMaterial(Material.water) && !mc.thePlayer.isInsideOfMaterial(Material.lava) && !mc.thePlayer.isInWater() && ((!(this.getBlock(-1.1) instanceof BlockAir) && !(this.getBlock(-1.1) instanceof BlockAir)) || (!(this.getBlock(-0.1) instanceof BlockAir) && mc.thePlayer.motionX != 0.0 && mc.thePlayer.motionZ != 0.0 && !mc.thePlayer.onGround && mc.thePlayer.fallDistance < 3.0f && mc.thePlayer.fallDistance > 0.05)) && this.level == 3)
             mc.thePlayer.motionY = -0.3994;
 
         double xDist = mc.thePlayer.posX - mc.thePlayer.prevPosX;
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java
index 83a226be..9b39cd1c 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/spartan/SpartanYPort.java
@@ -3,6 +3,7 @@
 import net.aspw.client.event.MoveEvent;
 import net.aspw.client.features.module.impl.movement.speeds.SpeedMode;
 import net.aspw.client.util.MovementUtils;
+import net.minecraft.client.settings.GameSettings;
 
 /**
  * The type Spartan y port.
@@ -20,7 +21,7 @@ public SpartanYPort() {
 
     @Override
     public void onMotion() {
-        if (!mc.gameSettings.keyBindJump.isKeyDown() && MovementUtils.isMoving()) {
+        if (!GameSettings.isKeyDown(mc.gameSettings.keyBindJump) && MovementUtils.isMoving()) {
             if (mc.thePlayer.onGround) {
                 mc.thePlayer.jump();
                 airMoves = 0;
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java
index c67f7690..aa02eba0 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogBoost.java
@@ -5,6 +5,7 @@
 import net.aspw.client.features.module.impl.movement.Speed;
 import net.aspw.client.features.module.impl.movement.speeds.SpeedMode;
 import net.aspw.client.util.MovementUtils;
+import net.minecraft.client.settings.GameSettings;
 
 /**
  * The type Watchdog boost.
@@ -34,7 +35,7 @@ public void onMove(MoveEvent event) {
         if (speed == null) return;
 
         mc.timer.timerSpeed = 1F;
-        if (MovementUtils.isMoving() && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && !mc.gameSettings.keyBindJump.isKeyDown()) {
+        if (MovementUtils.isMoving() && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
             double moveSpeed = Math.max(MovementUtils.getBaseMoveSpeed() * speed.baseStrengthValue.get(), MovementUtils.getSpeed());
 
             if (mc.thePlayer.onGround) {
diff --git a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java
index aa6c7292..69908da2 100644
--- a/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java
+++ b/src/main/java/net/aspw/client/features/module/impl/movement/speeds/watchdog/WatchdogStable.java
@@ -5,6 +5,7 @@
 import net.aspw.client.features.module.impl.movement.Speed;
 import net.aspw.client.features.module.impl.movement.speeds.SpeedMode;
 import net.aspw.client.util.MovementUtils;
+import net.minecraft.client.settings.GameSettings;
 
 /**
  * The type Watchdog stable.
@@ -34,7 +35,7 @@ public void onMove(MoveEvent event) {
         final Speed speed = Client.moduleManager.getModule(Speed.class);
         if (speed == null) return;
 
-        if (MovementUtils.isMoving() && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && !mc.gameSettings.keyBindJump.isKeyDown()) {
+        if (MovementUtils.isMoving() && !(mc.thePlayer.isInWater() || mc.thePlayer.isInLava()) && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) {
             double moveSpeed = Math.max(MovementUtils.getBaseMoveSpeed() * speed.baseStrengthValue.get(), MovementUtils.getSpeed());
 
             if (mc.thePlayer.onGround) {
diff --git a/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt b/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt
index 1da5e620..58a36825 100644
--- a/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/other/FreeLook.kt
@@ -4,6 +4,7 @@ import net.aspw.client.features.module.Module
 import net.aspw.client.features.module.ModuleCategory
 import net.aspw.client.features.module.ModuleInfo
 import net.aspw.client.util.MinecraftInstance
+import org.lwjgl.input.Keyboard
 import org.lwjgl.opengl.Display
 
 @ModuleInfo(
@@ -11,7 +12,7 @@ import org.lwjgl.opengl.Display
     spacedName = "Free Look",
     description = "",
     category = ModuleCategory.OTHER,
-    array = false
+    keyBind = Keyboard.KEY_F9
 )
 class FreeLook : Module() {
     override fun onEnable() {
diff --git a/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt b/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt
index 2fa18cb4..9c14790a 100644
--- a/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/player/Freecam.kt
@@ -55,7 +55,7 @@ class Freecam : Module() {
         mc.thePlayer.motionY = 0.0
         mc.thePlayer.motionX = 0.0
         mc.thePlayer.motionZ = 0.0
-        if (mc.gameSettings.keyBindJump.isKeyDown) mc.thePlayer.motionY += value.toDouble()
+        if (GameSettings.isKeyDown(mc.gameSettings.keyBindJump)) mc.thePlayer.motionY += value.toDouble()
         if (GameSettings.isKeyDown(mc.gameSettings.keyBindSneak)) {
             mc.thePlayer.motionY -= value.toDouble()
             mc.gameSettings.keyBindSneak.pressed = false
diff --git a/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt b/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt
index 07928e3c..7e4acc84 100644
--- a/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/player/Scaffold.kt
@@ -335,7 +335,7 @@ class Scaffold : Module() {
     fun onUpdate(event: UpdateEvent?) {
         if (faceBlock)
             place()
-        if (allowTower.get() && mc.gameSettings.keyBindJump.isKeyDown && !GameSettings.isKeyDown(mc.gameSettings.keyBindSneak) && blocksAmount > 0 && MovementUtils.isRidingBlock() && (!MovementUtils.isMoving() && !towerMove.get() || towerMove.get())
+        if (allowTower.get() && GameSettings.isKeyDown(mc.gameSettings.keyBindJump) && !GameSettings.isKeyDown(mc.gameSettings.keyBindSneak) && blocksAmount > 0 && MovementUtils.isRidingBlock() && (!MovementUtils.isMoving() && !towerMove.get() || towerMove.get())
         ) {
             canTower = true
             when (towerModeValue.get().lowercase(Locale.getDefault())) {
@@ -1097,7 +1097,7 @@ class Scaffold : Module() {
                             if (rotationModeValue.get().equals(
                                     "static",
                                     ignoreCase = true
-                                ) && (keepRotOnJumpValue.get() || !mc.gameSettings.keyBindJump.isKeyDown)
+                                ) && (keepRotOnJumpValue.get() || !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                             ) rotation = Rotation(
                                 MovementUtils.getScaffoldRotation(
                                     mc.thePlayer.rotationYaw, mc.thePlayer.moveStrafing
@@ -1107,19 +1107,19 @@ class Scaffold : Module() {
                                     .equals(
                                         "static3",
                                         ignoreCase = true
-                                    )) && (keepRotOnJumpValue.get() || !mc.gameSettings.keyBindJump.isKeyDown)
+                                    )) && (keepRotOnJumpValue.get() || !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                             ) rotation = Rotation(rotation.yaw, staticPitchValue.get())
                             if (rotationModeValue.get().equals(
                                     "custom",
                                     ignoreCase = true
-                                ) && (keepRotOnJumpValue.get() || !mc.gameSettings.keyBindJump.isKeyDown)
+                                ) && (keepRotOnJumpValue.get() || !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                             ) rotation = Rotation(
                                 mc.thePlayer.rotationYaw + customYawValue.get(), customPitchValue.get()
                             )
                             if (rotationModeValue.get().equals(
                                     "watchdog",
                                     ignoreCase = true
-                                ) && (keepRotOnJumpValue.get() || !mc.gameSettings.keyBindJump.isKeyDown)
+                                ) && (keepRotOnJumpValue.get() || !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                             ) {
                                 val yaw = MovementUtils.getRawDirection() - watchdogYaw.get()
                                 val pitch = watchdogPitch.get().toFloat()
@@ -1132,7 +1132,7 @@ class Scaffold : Module() {
                             if (rotationModeValue.get().equals(
                                     "spin",
                                     ignoreCase = true
-                                ) && speenRotation != null && (keepRotOnJumpValue.get() || !mc.gameSettings.keyBindJump.isKeyDown)
+                                ) && speenRotation != null && (keepRotOnJumpValue.get() || !GameSettings.isKeyDown(mc.gameSettings.keyBindJump))
                             ) rotation = speenRotation as Rotation
                             val rotationVector = (if (rotationLookupValue.get()
                                     .equals("same", ignoreCase = true)
diff --git a/src/main/java/net/aspw/client/features/module/impl/player/Step.kt b/src/main/java/net/aspw/client/features/module/impl/player/Step.kt
index 1dd76984..ef808164 100644
--- a/src/main/java/net/aspw/client/features/module/impl/player/Step.kt
+++ b/src/main/java/net/aspw/client/features/module/impl/player/Step.kt
@@ -11,6 +11,7 @@ import net.aspw.client.value.BoolValue
 import net.aspw.client.value.FloatValue
 import net.aspw.client.value.IntegerValue
 import net.aspw.client.value.ListValue
+import net.minecraft.client.settings.GameSettings
 import net.minecraft.init.Blocks
 import net.minecraft.item.ItemStack
 import net.minecraft.network.play.client.C03PacketPlayer
@@ -93,7 +94,7 @@ class Step : Module() {
         // Motion steps
         when {
             mode.equals("jump", true) && mc.thePlayer.isCollidedHorizontally && mc.thePlayer.onGround
-                    && !mc.gameSettings.keyBindJump.isKeyDown -> {
+                    && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump) -> {
                 fakeJump()
                 mc.thePlayer.motionY = jumpHeightValue.get().toDouble()
             }
@@ -146,7 +147,7 @@ class Step : Module() {
             mode.equals(
                 "motionncp",
                 true
-            ) && mc.thePlayer.isCollidedHorizontally && !mc.gameSettings.keyBindJump.isKeyDown -> {
+            ) && mc.thePlayer.isCollidedHorizontally && !GameSettings.isKeyDown(mc.gameSettings.keyBindJump) -> {
                 when {
                     mc.thePlayer.onGround && couldStep() -> {
                         fakeJump()