diff --git a/bin/App.class b/bin/App.class
index a1337e9..c5db714 100644
Binary files a/bin/App.class and b/bin/App.class differ
diff --git a/bin/TimeTable.class b/bin/TimeTable.class
index 9464b94..c2b7ad2 100644
Binary files a/bin/TimeTable.class and b/bin/TimeTable.class differ
diff --git a/src/App.java b/src/App.java
index 7fe1158..97a132b 100644
--- a/src/App.java
+++ b/src/App.java
@@ -1,6 +1,5 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Scanner;
@@ -16,9 +15,6 @@ public class App {
     // Date constants for Start and End Dates
     private static final String[] DATES = { "2024-11-04", "2024-11-05", "2024-11-06", "2024-11-07", "2024-11-08" };
 
-    private static final ArrayList<Break[]> SHORT_BREAKS = new ArrayList<>();
-    private static final ArrayList<Break[]> LONG_BREAKS = new ArrayList<>();
-
     // #region Initialization
     public static URL generateLink(int channelNumber, String date) throws MalformedURLException {
         String baseUrl = "https://api.thingspeak.com/channels/";
@@ -58,37 +54,36 @@ public class App {
 
     private static void initializeTeachers() {
         // Mapping short names to full teacher names
-        Teacher.nameMap.put("Hm", "Johann Hummel");
-        Teacher.nameMap.put("Bd", "Fender Bender");
-        Teacher.nameMap.put("Bu", "Luca Burger");
-        Teacher.nameMap.put("Cg", "Jesus Chung");
-        Teacher.nameMap.put("Do", "Brother Doe");
-        Teacher.nameMap.put("Eh", "Johnny Ehrlich");
-        Teacher.nameMap.put("Fh", "Karl Fischer");
-        Teacher.nameMap.put("Gi", "Bobby Giordano");
-        Teacher.nameMap.put("Gr", "Graham");
-        Teacher.nameMap.put("Hi", "Higgins");
-        Teacher.nameMap.put("Kg", "Kang");
-        Teacher.nameMap.put("Kh", "Khan");
-        Teacher.nameMap.put("Lz", "Lozano");
-        Teacher.nameMap.put("Lu", "Lund");
-        Teacher.nameMap.put("Or", "Ortega");
-        Teacher.nameMap.put("Re", "Reyes");
-        Teacher.nameMap.put("Se", "Seng");
-        Teacher.nameMap.put("Ts", "Tanaka");
-        Teacher.nameMap.put("Vt", "Vetter");
-        Teacher.nameMap.put("Zu", "Zuniga");
-        Teacher.nameMap.put("Kp", "Kevin Peters");
-        Teacher.nameMap.put("KP", "Kevin Peters");
-        Teacher.nameMap.put("Ba", "Barbara Allen");
-        Teacher.nameMap.put("Bz", "Basil Zephyr");
-        Teacher.nameMap.put("Hn", "Hannah Nguyen");
-        Teacher.nameMap.put("Le", "Full Name for Le");
-        Teacher.nameMap.put("Du", "Full Name for Du");
-        Teacher.nameMap.put("Bt", "Full Name for Bt");
-        Teacher.nameMap.put("Es", "Full Name for Es");
-        Teacher.nameMap.put("Hu", "Full Name for Hu");
-        Teacher.nameMap.put("Ge", "Full Name for Ge");
+        Teacher.nameMap.put("Hm", "Markus Hofer");
+        Teacher.nameMap.put("Bd", "Larissa Binder");
+        Teacher.nameMap.put("Bu", "Dominic Baur");
+        Teacher.nameMap.put("Cg", "Stefan Castelberg");
+        Teacher.nameMap.put("Do", "Corinna Dohr");
+        Teacher.nameMap.put("Eh", "Matthias Ehrensperger");
+        Teacher.nameMap.put("Fh", "Lukas Fehr");
+        Teacher.nameMap.put("Gi", "Johannes Giesinger ");
+        Teacher.nameMap.put("Gr", "Fabian Gross");
+        Teacher.nameMap.put("Hi", "Anne-Kathrin Hiestand");
+        Teacher.nameMap.put("Kg", "Ulrich Kugler");
+        Teacher.nameMap.put("Kh", "Salome Kühne");
+        Teacher.nameMap.put("Lz", "Valentino Leanza");
+        Teacher.nameMap.put("Lu", "Manuela Lucke");
+        Teacher.nameMap.put("Or", "Esther Ortolani");
+        Teacher.nameMap.put("Re", "Nadja Reuteler");
+        Teacher.nameMap.put("Se", "Christian Steiner");
+        Teacher.nameMap.put("Ts", "Georg Tscholl");
+        Teacher.nameMap.put("Vt", "Martin Vogt");
+        Teacher.nameMap.put("Zu", "Andrina Zumbühl ");
+        Teacher.nameMap.put("Kp", "Yannick Kampl");
+        Teacher.nameMap.put("Ba", "Pierre Barès");
+        Teacher.nameMap.put("Bz", "Pascal Benz");
+        Teacher.nameMap.put("Hn", "Mario Hermann");
+        Teacher.nameMap.put("Le", "Regula Lehmann");
+        Teacher.nameMap.put("Du", "Myriam Dudli");
+        Teacher.nameMap.put("Bt", "Armin Baumgartner");
+        Teacher.nameMap.put("Es", "Roger Eugster");
+        Teacher.nameMap.put("Hu", "Astrid Hubov");
+        Teacher.nameMap.put("Ge", "Pascal Griffel");
 
         // Initialize the teachers array with the size of nameMap
         teachers = new Teacher[Teacher.nameMap.size()];
diff --git a/src/TimeTable.java b/src/TimeTable.java
index 00c917e..d304979 100644
--- a/src/TimeTable.java
+++ b/src/TimeTable.java
@@ -25,7 +25,7 @@ public class TimeTable {
     private void fillRoom37() {
         shortTeacher = new String[][] {
                 { "Hm", "Ts", "Lu", "Gi", "Kp" },
-                { "Hm", "Ts", "Lu", "Gi", "KP" },
+                { "Hm", "Ts", "Lu", "Gi", "Kp" },
                 { "Hi", "Ts", "Lu", "Ba", "Or" },
                 { "Hm", "Ts", "Lu", "Ba", "Vt" },
                 { "Hm", "Le", "Cg", "Ba", "Vt" },