diff --git a/lib/screens/excursion/widgets/hinweise.dart b/lib/screens/excursion/widgets/hinweise.dart
index 401d060..33fe5fb 100644
--- a/lib/screens/excursion/widgets/hinweise.dart
+++ b/lib/screens/excursion/widgets/hinweise.dart
@@ -11,22 +11,38 @@ class Hinweise extends StatefulWidget {
   @override
   State<Hinweise> createState() => _HinweiseState();
 }
-// TODO mail
 class _HinweiseState extends State<Hinweise> {
   // Vars for Checkboxes
-  bool liegestelleChecked = false;
-  bool kadaverChecked = false;
-  bool sichtungChecked = false;
-  bool heulenChecked = false;
-  bool sonstigesChecked = false;
+ late bool liegestelleChecked; 
+ late bool kadaverChecked; 
+ late bool sichtungChecked; 
+ late bool heulenChecked; 
+ bool sonstigesChecked = false; 
 
   // for sonstiges textfield
   TextEditingController sonstigesController = TextEditingController();
 
   @override
   void initState() {
-    super.initState();
     sonstigesController.addListener(updateController);
+
+    liegestelleChecked = widget.hinweise.text.contains("liegestelle") ? true : false;
+    kadaverChecked = widget.hinweise.text.contains("kadaver") ? true : false;
+    sichtungChecked = widget.hinweise.text.contains("sichtung") ? true : false;
+    heulenChecked = widget.hinweise.text.contains("heulen") ? true : false;
+
+    bool firstRun = true;
+
+    for (String val in widget.hinweise.text.split(",")) {
+      if (val != "liegestelle" && val != "kadaver" && val != "sichtung" && val != "heulen" && val != "") {
+        sonstigesChecked = true;
+        if (!firstRun) sonstigesController.text += ",";
+        sonstigesController.text += val;
+        firstRun = false;
+      }
+    }
+    
+    super.initState();
   }
 
   @override