diff --git a/Klausuren/Sd1/2021summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_3_BmiCategory.java b/Klausuren/Sd1/2021summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_3_BmiCategory.java
index 6a077af38bfb9f82ca38854d9b73412664a7d6a2..a161511249695e0bd3e2ee25b0c00e5d81cb84b7 100644
--- a/Klausuren/Sd1/2021summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_3_BmiCategory.java
+++ b/Klausuren/Sd1/2021summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/_3_BmiCategory.java
@@ -53,11 +53,23 @@ public enum _3_BmiCategory {
      * @return A category's successor or <code>null</code> if starting from {@link #VERY_SEVERELY_OBESE}.
      */
     public _3_BmiCategory getFollowingCategory() {
-        if (ordinal() < VERY_SEVERELY_OBESE.ordinal()) {
-            return values()[ordinal() + 1];
-        } else {
-            return null;
+
+        switch (this) {
+            case UNDERWEIGHT: return NORMALWEIGHT;
+            case NORMALWEIGHT: return OVERWEIGHT;
+            case OVERWEIGHT: return MODERATELY_OBESE;
+            case MODERATELY_OBESE: return SEVERELY_OBESE;
+            case SEVERELY_OBESE: return VERY_SEVERELY_OBESE;
+            default: return null;
         }
+
+// Using ordinal() instead:
+
+//        if (ordinal() < VERY_SEVERELY_OBESE.ordinal()) {
+//            return values()[ordinal() + 1];
+//        } else {
+//            return null;
+//        }
     }
 
     /**