diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.java b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.java
index a53b8557e..90f7c49cc 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.java
@@ -13,9 +13,8 @@ import java.util.Objects;
 /**
  * Created by 086 on 11/04/2018.
  * Updated by Itistheend on 28/12/19.
- * Updated by S-B99 on 24/02/20
+ * Updated by S-B99 on 29/02/20
  */
-
 @Module.Info(name = "ElytraFlight", description = "Modifies elytras to fly at custom velocities and fall speeds", category = Module.Category.MOVEMENT)
 public class ElytraFlight extends Module {
     public Setting<ElytraFlightMode> mode = register(Settings.e("Mode", ElytraFlightMode.HIGHWAY));
@@ -110,14 +109,19 @@ public class ElytraFlight extends Module {
     }
 
     public void cycle() { /* This fixes a bug with your wings not being opened sometimes */
-        if (mode.getValue().equals(ElytraFlightMode.HIGHWAY)) {
-            mode.setValue(ElytraFlightMode.FLY);
-            mode.setValue(ElytraFlightMode.HIGHWAY);
-
-        }
-        else if (mode.getValue().equals(ElytraFlightMode.FLY)) {
-            mode.setValue(ElytraFlightMode.HIGHWAY);
-            mode.setValue(ElytraFlightMode.FLY);
+        switch (mode.getValue()) {
+            case HIGHWAY:
+                mode.setValue(ElytraFlightMode.BOOST);
+                mode.setValue(ElytraFlightMode.FLY);
+                mode.setValue(ElytraFlightMode.HIGHWAY);
+            case FLY:
+                mode.setValue(ElytraFlightMode.HIGHWAY);
+                mode.setValue(ElytraFlightMode.BOOST);
+                mode.setValue(ElytraFlightMode.FLY);
+            case BOOST:
+                mode.setValue(ElytraFlightMode.FLY);
+                mode.setValue(ElytraFlightMode.HIGHWAY);
+                mode.setValue(ElytraFlightMode.BOOST);
         }
     }
 
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlightCycle.java b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlightCycle.java
index ce75b2bea..f8f86dbcb 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlightCycle.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlightCycle.java
@@ -1,8 +1,11 @@
 package me.zeroeightsix.kami.module.modules.movement;
 
-import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.module.Module;
 
+/**
+ * @author S-B99
+ * @see ElytraFlight
+ */
 @Module.Info(name = "ElytraFlightCycle", description = "Cycles through the ElytraFlight modes as a fix for some servers", category = Module.Category.MOVEMENT, showOnArray = Module.ShowOnArray.OFF)
 public class ElytraFlightCycle extends Module {
 }