diff --git a/src/server/BreCal/notifications/notifier.py b/src/server/BreCal/notifications/notifier.py
index 3f0f591..c97eeeb 100644
--- a/src/server/BreCal/notifications/notifier.py
+++ b/src/server/BreCal/notifications/notifier.py
@@ -76,6 +76,9 @@ class Notifier():
                     # create an Email and send it to each eligible_user. 
                     # #TODO: this method must be a distributor. It should send emails for those, who want emails, and provide placeholders for other types of notifications
                     Notifier.create_and_send_email_notification(email_handler, mail_pwd, eligible_users, notification, update_database=update_database, debug=debug)
+
+            # #TODO: except... logging?
+
             finally:
                 email_handler.close()
         return
@@ -334,14 +337,34 @@ class Notifier():
         looking up its history, and finding all attached users.
         For each user, a notification will be created for each subscribed notification type (e.g., Email)
         """
-        # get the respective shipcall
         shipcall = Notifier.get_shipcall(shipcall_id)
+        notifications = execute_sql_query_standalone(query=SQLQuery.get_notifications(), param={"scid" : shipcall_id}, model=model.Notification, command_type="query")
+        latest_notification = Notifier.find_latest_notification(notifications)
 
-        # find all attached users of the shipcall (checks the history, then reads out the user ids and builds the users)
-        users = Notifier.get_users_via_history(shipcall_id=shipcall.id)
+        old_state = model.EvaluationType(latest_notification.level) if latest_notification is not None else model.EvaluationType.undefined
+        new_state = shipcall.evaluation
 
-        # for each user, create one notification for each subscribed notification type (e.g., Email)
-        Notifier.create_notifications_for_user_list(shipcall, users)
+        # identify, whether the severity of the shipcall has increased to see, whether a notification is required
+        severity_increase = Notifier.check_higher_severity(old_state=old_state, new_state=new_state)
+
+        # when the severity increases, set the 'evaluation_notifications_sent' argument to 0 (False)
+        if severity_increase:
+            ### UPDATE Shipcall ###
+            # prepare and create a query
+            evaluation_notifications_sent = 0
+            schemaModel = {"id":shipcall.id, "evaluation_notifications_sent":evaluation_notifications_sent} # #TODO: should this require the 'modified' tag to be adapted?
+            query = SQLQuery.get_shipcall_put(schemaModel)
+
+            # execute the PUT-Request
+            schemas = execute_sql_query_standalone(query=query, param=schemaModel, command_type="execute")
+
+            ### Generate Notifications ###
+            # find all attached users of the shipcall (checks the history, then reads out the user ids and builds the users)
+            users = Notifier.get_users_via_history(shipcall_id=shipcall.id)
+
+            # for each user, identify the notification_types, which must be generated. Finally, create those
+            # notifications with a POST-request
+            Notifier.create_notifications_for_user_list(shipcall, users)
         return
         
     @staticmethod
diff --git a/src/server/BreCal/services/schedule_routines.py b/src/server/BreCal/services/schedule_routines.py
index 5725594..e46ead9 100644
--- a/src/server/BreCal/services/schedule_routines.py
+++ b/src/server/BreCal/services/schedule_routines.py
@@ -39,6 +39,7 @@ def UpdateShipcalls(options:dict = {'past_days':2}):
         for shipcall_id in shipcall_ids:
             # apply 'Traffic Light' evaluation to obtain 'GREEN', 'YELLOW' or 'RED' evaluation state. The function internally updates the mysql database
             evaluate_shipcall_state(mysql_connector_instance=pooledConnection, shipcall_id=shipcall_id) # new_id (last insert id) refers to the shipcall id
+            Notifier.generate_notifications(shipcall_id)
 
         pooledConnection.close()