diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..f79121b8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto
+*.sh text eol=lf
+*.conf text eol=lf
+*.bash text eol=lf
+*.yml text eol=lf
\ No newline at end of file
diff --git a/README.md b/README.md
index 5cab8a5e..fe622d82 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,8 @@ The platform uses the project **OperatorFabric** for notification management.
 ### Prerequisites
 
 - [Git (version 2.40.1)](https://git-scm.com/)
-- [Docker (version 24.0.2)](https://www.docker.com/)
-- [Docker Compose (version 1.25.0 or later)](https://www.docker.com/) 
+- [Docker Engine (version 27)](https://www.docker.com/)
+- [Docker Compose V2](https://www.docker.com/) 
 
 
 ### Setting Up the Environment
@@ -63,7 +63,7 @@ Below are the steps to start all services. For other methods, please consult the
 
 ### Running All Services (Dev Mode)
 
-1. Set-up environement variables
+1. **Set-up environement variables**
    
 
 `VITE_POWERGRID_SIMU`, `VITE_RAILWAY_SIMU` , `VITE_ATM_SIMU` are the simulators' endpoints.
@@ -79,31 +79,34 @@ export VITE_ATM_SIMU=http://[Service url]:[Service port]
 > **_NOTE:_** For this step, you should already have a running simulator. If not, you can use the simulator we provided as an example. For this, please follow the tutorial provided in InteractiveAI/usecases_examples/PowerGrid/ then set the VITE_POWERGRID_SIMU variable to http://YOUR_SERVER_ADDRESS:5100/
 >
 > 
-2. Run InteractiveAI assistant
+2. **Run InteractiveAI assistant**
 ```sh
 cd config/dev/cab-standalone
 ./docker-compose.sh
 ```
 > **_NOTE:_** You will see the word cab (Cockpit Assistant Bidirectionnel) on most files in the project. Note that it was the initial project name of InteractiveAI. Might be updated later. 
 
-3. Setting up Keycloak `Frontend URL`  
-    * **Access Keycloak Interface**: 
+3. **Setting up Keycloak `Frontend URL`**  
+    * Access Keycloak Interface: 
       - Ensure that your Keycloak instance is running and accessible.
       - Open a web browser and navigate to the Keycloak admin console, typically available at `http://localhost:89/auth/admin`.  
-    * **Login to Keycloak Admin Console**: 
+    * Login to Keycloak Admin Console: 
       - Log in to the Keycloak admin console using your administrator credentials (`admin:admin` by default)
-    * **Navigate to Client Settings**:
+    * Configure frontendUrl:
+      - On the Keycloak admin console, locate and click on the "Realm Settings" section.
+      - In the Frontend URL setting, add the URL of your Assistant Platform frontend as a valid redirect URI. This URL is typically where your frontend application is hosted. For example, if your frontend is hosted locally for development purposes, you might add `http://localhost:3200/*`.
+      - After adding the frontend URL, save the changes to update the client settings.
+    * Configure Valid Redirect URIs:
       - On the Keycloak admin console, locate and click on the "Clients" section.
       - Select the client representing your Assistant Platform application.  
-    * **Configure FrontendUrl**:
       - Within the client settings, look for the "Valid Redirect URIs" or similar configuration field.
-      - Add the URL of your Assistant Platform frontend as a valid redirect URI. This URL is typically where your frontend application is hosted. For example, if your frontend is hosted locally for development purposes, you might add `http://localhost:3200/*`.
-      - Ensure that the frontend URL you specify matches the actual URL where your frontend application is accessible.
-    * **Save Changes**:
-      - After adding the frontend URL, save the changes to update the client settings.
+      - Add the URL of your Assistant Platform frontend, it should match the one used in the frontendUrl setting.
+      - After adding the Valid Redirect URIs, save the changes to update the client settings.
+
+
+4. **Load resources**
 
-4. Load resources
-**WARINING:** You need to restart the frontend after updating the URL on keycloak do it before loading the resources. 
+**WARNING:** You need to restart the frontend after updating the URL on keycloak do it before loading the resources. 
 ```sh
 docker restart frontend
 ```
diff --git a/backend/context-service/resources/ATM/schemas.py b/backend/context-service/resources/ATM/schemas.py
index 1dfe9489..c065325b 100644
--- a/backend/context-service/resources/ATM/schemas.py
+++ b/backend/context-service/resources/ATM/schemas.py
@@ -2,10 +2,35 @@
 
 from api.schemas import MetadataSchema
 from apiflask.fields import Dict, String, Float, List, Integer
-class MetadataSchemaATM(MetadataSchema):
+from apiflask import Schema, fields
+from marshmallow import pre_load
+class PlaneMetadataSchemaATM(MetadataSchema):
+    id_plane = String()
     ApDest = Dict()
     Current_airspeed = Float()
     Latitude = Float()
     Longitude = Float()
     wpList = List(Dict())
-    id_plane = Integer()
+
+class MetadataSchemaATM(MetadataSchema):
+    airplanes = List(fields.Nested(PlaneMetadataSchemaATM), required=True)
+    
+    # Backward compatibility: optional fields for the single airplane case
+    ApDest = Dict(required=False)
+    Current_airspeed = Float(required=False)
+    Latitude = Float(required=False)
+    Longitude = Float(required=False)
+    wpList = List(Dict(), required=False)
+
+    @pre_load
+    def handle_backward_compatibility(self, data, **kwargs):
+        # If the new 'airplanes' field is not provided, assume the old format.
+        if 'airplanes' not in data:
+            airplane = {}
+            for field in ['ApDest', 'Current_airspeed', 'Latitude', 'Longitude', 'wpList']:
+                if field in data:
+                    airplane[field] = data[field]
+            # Provide a default id_plane if not present.
+            airplane.setdefault('id_plane', "X")
+            data['airplanes'] = [airplane]
+        return data
\ No newline at end of file
diff --git a/backend/recommendation-service/resources/PowerGrid/PowerGridgrid2op_poc_simulator/assistant_manager.py b/backend/recommendation-service/resources/PowerGrid/PowerGridgrid2op_poc_simulator/assistant_manager.py
index e9491219..401710a2 100644
--- a/backend/recommendation-service/resources/PowerGrid/PowerGridgrid2op_poc_simulator/assistant_manager.py
+++ b/backend/recommendation-service/resources/PowerGrid/PowerGridgrid2op_poc_simulator/assistant_manager.py
@@ -196,7 +196,7 @@ def get_parade_info(self, act):
                 "Redispatch"  # pour renvoyer le kpi type_of_the_reco
             )
             title.append(
-                "Parade injection: redispatch de source de production"
+                "Injection recommendation: production source redispatch"
             )
             cpt = 0
             for gen_idx in range(act.n_gen):
@@ -213,9 +213,9 @@ def get_parade_info(self, act):
         # storage
         if act._modif_storage:
             kpis["type_of_the_reco"] = (
-                "Stockage"  # pour renvoyer le kpi type_of_the_reco
+                "Storage"  # pour renvoyer le kpi type_of_the_reco
             )
-            title.append("Parade stockage")
+            title.append("Storage recommendation")
             cpt = 0
             for stor_idx in range(act.n_storage):
                 amount_ = act._storage_power[stor_idx]
@@ -225,8 +225,8 @@ def get_parade_info(self, act):
                         description.append(", ")
                     cpt = 1
                     description.append(
-                        f'Demande à l\'unité "{name_}" de '
-                        f'{"charger" if amount_ > 0.0 else "decharger"} '
+                        f'Ask unit "{name_}" to '
+                        f'{"charge" if amount_ > 0.0 else "discharge"} '
                         f'{abs(amount_):.2f} MW (setpoint: {amount_:.2f} MW)'
                     )
 
@@ -235,7 +235,7 @@ def get_parade_info(self, act):
             kpis["type_of_the_reco"] = (
                 "Injection"  # pour renvoyer le kpi type_of_the_reco
             )
-            title.append("Parade injection")
+            title.append("Injection recommendation")
             cpt = 0
             for gen_idx in range(act.n_gen):
                 amount_ = act._curtail[gen_idx]
@@ -245,8 +245,8 @@ def get_parade_info(self, act):
                         description.append(", ")
                     cpt = 1
                     description.append(
-                        f'Limiter l\'unité "{name_}" à '
-                        f'{100.0 * amount_:.1f}% de sa capacité max '
+                        f'Limit unit "{name_}" to '
+                        f'{100.0 * amount_:.1f}% of its maximum capacity '
                         f'(setpoint: {amount_:.3f})'
                     )
 
@@ -254,22 +254,22 @@ def get_parade_info(self, act):
         force_line_impact = impact["force_line"]
         if force_line_impact["changed"]:
             kpis["type_of_the_reco"] = (
-                "Topologique"  # pour renvoyer le kpi type_of_the_reco
+                "Topological"  # pour renvoyer le kpi type_of_the_reco
             )
             title.append(
-                "Parade topologique: connection/deconnection de ligne"
+                "Topological recommendation: connection/disconnection of line"
             )
             reconnections = force_line_impact["reconnections"]
             if reconnections["count"] > 0:
                 description.append(
-                    f"Reconnection de {reconnections['count']} lignes "
+                    f"Reconnection of {reconnections['count']} lines "
                     f"({reconnections['powerlines']})"
                 )
 
             disconnections = force_line_impact["disconnections"]
             if disconnections["count"] > 0:
                 description.append(
-                    f"Déconnection de {disconnections['count']} lignes "
+                    f"Disconnection of {disconnections['count']} lines "
                     f"({disconnections['powerlines']})"
                 )
 
@@ -277,11 +277,11 @@ def get_parade_info(self, act):
         swith_line_impact = impact["switch_line"]
         if swith_line_impact["changed"]:
             kpis["type_of_the_reco"] = (
-                "Topologique"  # pour renvoyer le kpi type_of_the_reco
+                "Topological"  # pour renvoyer le kpi type_of_the_reco
             )
-            title.append("Parade topologique: changer l'état d'une ligne")
+            title.append("Topological: change a line state")
             description.append(
-                f"Changer le statut de {swith_line_impact['count']} lignes "
+                f"Change the state of {swith_line_impact['count']} lines "
                 f"({swith_line_impact['powerlines']})"
             )
 
@@ -289,27 +289,27 @@ def get_parade_info(self, act):
         bus_switch_impact = impact["topology"]["bus_switch"]
         if len(bus_switch_impact) > 0:
             kpis["type_of_the_reco"] = (
-                "Topologique"  # pour renvoyer le kpi type_of_the_reco
+                "Topological"  # pour renvoyer le kpi type_of_the_reco
             )
             title.append(
-                "Parade topologique: prise de schéma au poste "
+                "Topological recommendation: Schematic acquisition at substation "
                 + str(bus_switch_impact["substation"])
             )
-            description.append("Changement de bus:")
+            description.append("Busbar change:")
             for switch in bus_switch_impact:
                 description.append(
-                    f"\t \t - Switch bus de {switch['object_type']} id "
-                    f"{switch['object_id']} [au poste {switch['substation']}]"
+                    f"\t \t - Switch bus of {switch['object_type']} id "
+                    f"{switch['object_id']} [at station {switch['substation']}]"
                 )
 
         assigned_bus_impact = impact["topology"]["assigned_bus"]
         disconnect_bus_impact = impact["topology"]["disconnect_bus"]
         if len(assigned_bus_impact) > 0 or len(disconnect_bus_impact) > 0:
             kpis["type_of_the_reco"] = (
-                "Topologique"  # pour renvoyer le kpi type_of_the_reco
+                "Topological"  # pour renvoyer le kpi type_of_the_reco
             )
             title.append(
-                "Parade topologique: prise de schéma au poste "
+                "Topological recommendation: Schematic acquisition at substation "
                 + str(assigned_bus_impact[0]["substation"])
             )
             if assigned_bus_impact:
@@ -320,7 +320,7 @@ def get_parade_info(self, act):
                     description.append(", ")
                 cpt = 1
                 description.append(
-                    f" Assigner le bus {assigned['bus']} à "
+                    f" Assign bus {assigned['bus']} to "
                     f"{assigned['object_type']} id {assigned['object_id']}"
                 )
             if disconnect_bus_impact:
@@ -331,8 +331,8 @@ def get_parade_info(self, act):
                     description.append(", ")
                 cpt = 1
                 description.append(
-                    f"Déconnecter {disconnected['object_type']} avec l'id "
-                    f"{disconnected['object_id']} [au niveau du poste "
+                    f"Disconnect {disconnected['object_type']} with id "
+                    f"{disconnected['object_id']} [at the substation level "
                     f"{disconnected['substation']}]"
                 )
 
@@ -340,11 +340,11 @@ def get_parade_info(self, act):
         # then the recommendation is most likely "Do nothing"
         if not title and act == self.action_do_nothing:
             kpis["type_of_the_reco"] = (
-                "Ne rien faire"  # pour renvoyer le kpi type_of_the_reco
+                "Do nothing"  # pour renvoyer le kpi type_of_the_reco
             )
             title.append("Poursuivre")
             description.append(
-                "Poursuite du scénario sans intervention extérieur"
+                "Continuation of the scenario without operator action"
             )
 
         title = "".join(title)
diff --git a/backend/recommendation-service/resources/Railway/manager.py b/backend/recommendation-service/resources/Railway/manager.py
index 85b0a9b7..881de5c0 100644
--- a/backend/recommendation-service/resources/Railway/manager.py
+++ b/backend/recommendation-service/resources/Railway/manager.py
@@ -1,4 +1,4 @@
-# backend/recommendation-service/resources/RTE/manager.py
+# backend/recommendation-service/resources/Railway/manager.py
 
 from api.manager.base_manager import BaseRecommendationManager
 
diff --git a/config/dev/cab-standalone/docker-compose.sh b/config/dev/cab-standalone/docker-compose.sh
index 281eeeec..bac36288 100755
--- a/config/dev/cab-standalone/docker-compose.sh
+++ b/config/dev/cab-standalone/docker-compose.sh
@@ -44,4 +44,4 @@ fi
 echo "HOST_IP=${HOST_IP}" >> .env
 
 cat .env
-docker-compose up -d
+docker compose up -d
diff --git a/config/dev/cab-standalone/nginx-cors-permissive.conf b/config/dev/cab-standalone/nginx-cors-permissive.conf
index 3a6979ac..87c4e5f5 100644
--- a/config/dev/cab-standalone/nginx-cors-permissive.conf
+++ b/config/dev/cab-standalone/nginx-cors-permissive.conf
@@ -1,4 +1,4 @@
-# docker-compose DNS used to resolved keycloak services
+# docker compose DNS used to resolved keycloak services
 resolver 127.0.0.11 ipv6=off;
 server {
     listen 80;
diff --git a/config/dev/cab-standalone/nginx-kubernetes.conf b/config/dev/cab-standalone/nginx-kubernetes.conf
index 0a47b524..3a331ce7 100644
--- a/config/dev/cab-standalone/nginx-kubernetes.conf
+++ b/config/dev/cab-standalone/nginx-kubernetes.conf
@@ -1,4 +1,4 @@
-# docker-compose DNS used to resolved users service
+# docker compose DNS used to resolved users service
 # resolver 127.0.0.11 ipv6=off;
 
 # Log format to have msec in time + request processing time
diff --git a/config/dev/cab-standalone/nginx.conf b/config/dev/cab-standalone/nginx.conf
index bf718b7e..2631ed6b 100644
--- a/config/dev/cab-standalone/nginx.conf
+++ b/config/dev/cab-standalone/nginx.conf
@@ -1,4 +1,4 @@
-# docker-compose DNS used to resolved users service
+# docker compose DNS used to resolved users service
 resolver 127.0.0.11 ipv6=off;
 
 # Log format to have msec in time + request processing time
diff --git a/config/dev/cab-standalone/stopOpfab.sh b/config/dev/cab-standalone/stopOpfab.sh
index 354ca1f4..43ca918a 100755
--- a/config/dev/cab-standalone/stopOpfab.sh
+++ b/config/dev/cab-standalone/stopOpfab.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose down -v
\ No newline at end of file
+docker compose down -v
\ No newline at end of file
diff --git a/config/dev/recommendation-service/docker-compose.bash b/config/dev/recommendation-service/docker-compose.bash
index 1a4adccf..72e6e5db 100755
--- a/config/dev/recommendation-service/docker-compose.bash
+++ b/config/dev/recommendation-service/docker-compose.bash
@@ -25,4 +25,4 @@ fi
 
 echo "HOST_IP=${HOST_IP}" > .env
 
-docker-compose -f "docker-compose-recommendation-service.yml" up --build
+docker compose -f "docker-compose-recommendation-service.yml" up --build
diff --git a/config/dev/recommendation-service/nginx.conf b/config/dev/recommendation-service/nginx.conf
index 5cbc5a0c..b9ad9014 100644
--- a/config/dev/recommendation-service/nginx.conf
+++ b/config/dev/recommendation-service/nginx.conf
@@ -1,4 +1,4 @@
-# docker-compose DNS used to resolved keycloak services
+# docker compose DNS used to resolved keycloak services
 resolver 127.0.0.11 ipv6=off;
 server {
     listen 80;
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 142a6d68..c3c82cea 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -3,6 +3,39 @@
 
 Are you having issues with setting up your environment? Here are some tips that might help.
 
+## Ports already in use
+
+InteractiveAI uses about twenty ports on server. If a port needed for InteractiveAI is already in use, InteractiveAI will fail (with messages in logs but the can be missed).
+The script `resources/checkPorts.sh` tests the availability of each port specified in `config/dev/cab-standalone/docker-compose.yml` and write a diagnosis on console.
+
+It it succeeds:
+```
+brettevi@PCAlien:~/Projets/InteractiveAI$ ./resources/checkPorts.sh
+Ports used for InteractiveAI: 89 3200 5000 5100 5200 5400 5433 5434 5436 5437 5438 5500 12002 12100 12102 12103 12104 27017
+All is fine: all ports used by InteractiveAI are available
+```
+
+If it fails:
+```
+brettevi@PCAlien:~/Projets/InteractiveAI$ ./resources/checkPorts.sh
+Ports used for InteractiveAI: 89 3200 5000 5100 5200 5400 5433 5434 5436 5437 5438 5500 12002 12100 12102 12103 12104 27017
+docker: Error response from daemon: driver failed programming external connectivity on endpoint stoic_williams (b69f8285b2ec63145267ad7ea04969cf58dc423528729c7c3f07b5d5c3ccc342): Bind for 0.0.0.0:89 failed: port is already allocated.
+...
+docker: Error response from daemon: driver failed programming external connectivity on endpoint zen_feistel (f3047f6ae4ebf5e78dc034137d24a832e2ff60490424ba8ba4ae2531d2222142): Bind for 0.0.0.0:12104 failed: port is already allocated.
+docker: Error response from daemon: driver failed programming external connectivity on endpoint keen_swanson (82f2ac17d11057767379dc0f492b5a9b8fd7620fb562e8107e9ce1453e548052): Bind for 0.0.0.0:27017 failed: port is already allocated.
+Check your counfiguration: 18 port(s) used by InteractiveAI are already used
+InteractiveAI can't run on this platform with this /home/brettevi/Projets/InteractiveAI/config/dev/cab-standalone/docker-compose.yml ports configuration
+```
+
+This command may also be used with a specific docker-compose.yml file. For example, to test Powergrid simulator ports availability, one can use:
+```
+brettevi@PCAlien:~/Projets/InteractiveAI$ ./resources/checkPorts.sh usecases_examples/PowerGrid/docker-compose.yml
+Ports used for InteractiveAI: 5150
+docker: Error response from daemon: driver failed programming external connectivity on endpoint funny_rhodes (6291f43617a7798a833fdeee05c32c75c2d0bf765eac5dc3b8fe08b7255e57a1): Bind for 0.0.0.0:5150 failed: port is already allocated.
+Check your counfiguration: 1 port(s) used by InteractiveAI are already used
+InteractiveAI can't run on this platform with this usecases_examples/PowerGrid/docker-compose.yml ports configuration
+```
+
 ## EoL Sequence Configuration errors.
 
 Some users may encounter issues if their system is automatically converting end of line sequence from LF to CRLF.
@@ -18,6 +51,6 @@ The .env should contain:
 HOST_IP=<IP_Address>
 ```
 
-If the IP_Address is not your network IP address, please set it manually and run the system using native docker-compose commands.
+If the IP_Address is not your network IP address, please set it manually and run the system using native docker compose commands.
 
 > **_NOTE:_** You are welcome to contribute with any issue that you encounter during setup.
\ No newline at end of file
diff --git a/frontend/public/img/icons/map_markers/DA.svg b/frontend/public/img/icons/map_markers/ATM.svg
similarity index 100%
rename from frontend/public/img/icons/map_markers/DA.svg
rename to frontend/public/img/icons/map_markers/ATM.svg
diff --git a/frontend/public/img/icons/map_markers/SNCF.svg b/frontend/public/img/icons/map_markers/Railway.svg
similarity index 100%
rename from frontend/public/img/icons/map_markers/SNCF.svg
rename to frontend/public/img/icons/map_markers/Railway.svg
diff --git a/frontend/src/components/organisms/Map.vue b/frontend/src/components/organisms/Map.vue
index 81e4841d..be58466b 100644
--- a/frontend/src/components/organisms/Map.vue
+++ b/frontend/src/components/organisms/Map.vue
@@ -83,11 +83,12 @@ import { useMapStore } from '@/stores/components/map'
 import type { Waypoint } from '@/types/components/map'
 import { criticalityToColor, maxCriticality } from '@/utils/utils'
 
-withDefaults(
+const props = withDefaults(
   defineProps<{
     tileLayers?: string[]
     contextClick?: (waypoint: Waypoint) => void
     waypointClick?: (waypoint: Waypoint) => void
+    autoFit?: boolean
   }>(),
   {
     tileLayers: () => ['http://{s}.tile.osm.org/{z}/{x}/{y}.png'],
@@ -103,9 +104,17 @@ const lockView = ref(true)
 const zoom = ref(6)
 const map = ref()
 
-watch(mapStore.contextWaypoints, () => {
-  toggleLockView()
-})
+watch(
+  () => mapStore.contextWaypoints, 
+  () => {
+    if (props.autoFit) {
+      toggleLockView()
+    }
+  
+}
+)
+
+
 watch(appStore.panels, () => {
   map.value.leafletObject.invalidateSize()
 })
diff --git a/frontend/src/entities/ATM/CAB/Context.vue b/frontend/src/entities/ATM/CAB/Context.vue
index b030d08a..14b20887 100644
--- a/frontend/src/entities/ATM/CAB/Context.vue
+++ b/frontend/src/entities/ATM/CAB/Context.vue
@@ -3,18 +3,17 @@
     <Map v-if="appStore.tab.context === 0" />
   </Context>
 </template>
+
 <script setup lang="ts">
-import { onBeforeMount, onUnmounted, ref, watch } from 'vue'
+import { onBeforeMount, onUnmounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-
 import Context from '@/components/organisms/CAB/Context.vue'
 import Map from '@/components/organisms/Map.vue'
-import type { System } from '@/entities/ATM/types'
+import type { AirplaneContext, LegacyContext, ContextType } from '@/entities/ATM/types'
 import { useAppStore } from '@/stores/app'
 import { useMapStore } from '@/stores/components/map'
 import { useServicesStore } from '@/stores/services'
 
-
 const { t, locale } = useI18n()
 const servicesStore = useServicesStore()
 const mapStore = useMapStore()
@@ -23,40 +22,86 @@ const appStore = useAppStore()
 const contextPID = ref(0)
 const faulty = ref(false)
 
-
 onBeforeMount(async () => {
   locale.value = `en-ATM`
-  contextPID.value = await servicesStore.getContext('ATM', (context) => {
-    mapStore.addContextWaypoint({
-      lat: context.data.Latitude,
-      lng: context.data.Longitude,
-      id: t('map.context')
-    })
-    const waypoints = [
-      ...(context.data.wpList
-        ? context.data.wpList.map(({ wplat, wplon, wpid }) => ({
-            id: wpid,
-            lat: wplat,
-            lng: wplon
-          }))
-        : []),
-      ...(context.data.ApDest
-        ? [
-            {
-              id: context.data.ApDest.apid,
-              lat: context.data.ApDest.aplat,
-              lng: context.data.ApDest.aplon,
-              permanentTooltip: true
-            }
-          ]
-        : [])
-    ]
-    mapStore.addPolyline({
-      id: 'current_route',
-      waypoints
-    })
+  contextPID.value = await servicesStore.getContext('ATM', (context: { data: ContextType }) => {
+    // New context data: iterate over the airplanes array
+    // 1-  Clear last tick's markers and ROUTE waypoints
     mapStore.removeCategoryWaypoint('ROUTE')
-    for (const waypoint of waypoints) mapStore.addWaypoint({ ...waypoint, category: 'ROUTE' })
+    // 2- add new markers and ROUTE waypoints
+    if ('airplanes' in context.data) {
+      context.data.airplanes.forEach((airplane: AirplaneContext) => {
+        mapStore.addContextWaypoint({
+          lat: airplane.Latitude,
+          lng: airplane.Longitude,
+          id: `plane-${airplane.id_plane}`
+        })
+        // build the route waypoints
+        const waypoints = [
+          ...(airplane.wpList
+            ? airplane.wpList.map(({ wplat, wplon, wpid }) => ({
+                id: wpid,
+                lat: wplat,
+                lng: wplon
+              }))
+            : []),
+          ...(airplane.ApDest
+            ? [
+                {
+                  id: airplane.ApDest.apid,
+                  lat: airplane.ApDest.aplat,
+                  lng: airplane.ApDest.aplon,
+                  permanentTooltip: true
+                }
+              ]
+            : [])
+        ]
+        // draw polyline for the plane
+        mapStore.addPolyline({
+          id: `current_route_plane-${airplane.id_plane}`,
+          waypoints
+        })
+        // add each wp a ROUTE waypoint
+        for (const waypoint of waypoints) {
+          mapStore.addWaypoint({ ...waypoint, category: 'ROUTE' })
+        }
+      })
+    } else {
+      // Legacy context data handling
+      const legacy = context.data as LegacyContext
+      mapStore.addContextWaypoint({
+        lat: legacy.Latitude,
+        lng: legacy.Longitude,
+        id: t('map.context')
+      })
+      const waypoints = [
+        ...(legacy.wpList
+          ? legacy.wpList.map(({ wplat, wplon, wpid }) => ({
+              id: wpid,
+              lat: wplat,
+              lng: wplon
+            }))
+          : []),
+        ...(legacy.ApDest
+          ? [
+              {
+                id: legacy.ApDest.apid,
+                lat: legacy.ApDest.aplat,
+                lng: legacy.ApDest.aplon,
+                permanentTooltip: true
+              }
+            ]
+          : [])
+      ]
+      mapStore.addPolyline({
+        id: 'current_route',
+        waypoints
+      })
+      //mapStore.removeCategoryWaypoint('ROUTE')
+      for (const waypoint of waypoints) {
+        mapStore.addWaypoint({ ...waypoint, category: 'ROUTE' })
+      }
+    }
   })
 })
 
diff --git a/frontend/src/entities/ATM/types.ts b/frontend/src/entities/ATM/types.ts
index d05e58e9..f5bdba48 100644
--- a/frontend/src/entities/ATM/types.ts
+++ b/frontend/src/entities/ATM/types.ts
@@ -1,43 +1,68 @@
+export type AirplaneContext = {
+  id_plane: number;
+  Current_airspeed: number;
+  Latitude: number;
+  Longitude: number;
+  ApDest?: {
+    apcity: string;
+    apid: Uppercase<string>;
+    aplat: number;
+    aplon: number;
+    apname: string;
+  };
+  wpList?: {
+    wpid: Uppercase<string>;
+    wpidx: number;
+    wplat: number;
+    wplon: number;
+  }[];
+};
+
+export type LegacyContext = {
+  Current_airspeed: number;
+  Latitude: number;
+  Longitude: number;
+  ApDest?: {
+    apcity: string;
+    apid: Uppercase<string>;
+    aplat: number;
+    aplon: number;
+    apname: string;
+  };
+  wpList?: {
+    wpid: Uppercase<string>;
+    wpidx: number;
+    wplat: number;
+    wplon: number;
+  }[];
+};
+
+export type ContextType = { airplanes: AirplaneContext[] } | LegacyContext;
+
 export type ATM = {
-  Context: {
-    'Current airspeed': number
-    Latitude: number
-    Longitude: number
-    ApDest?: {
-      apcity: string
-      apid: Uppercase<string>
-      aplat: number
-      aplon: number
-      apname: string
-    }
-    wpList?: {
-      wpid: Uppercase<string>
-      wpidx: number
-      wplat: number
-      wplon: number
-    }[]
-  }
-  Metadata: { event_type: string; system: string }
+  Context: ContextType;
+  Metadata: { event_type: string; system: string };
   Action: {
     airport_destination: {
-      apcity: string
-      apid: Uppercase<string>
-      apname: Uppercase<string>
-      latitude: number
-      longitude: number
-    }
+      apcity: string;
+      apid: Uppercase<string>;
+      apname: Uppercase<string>;
+      latitude: number;
+      longitude: number;
+    };
     waypoints: {
-      wplat: number
-      wplon: number
-      wpidx: number
-      wpid: Uppercase<string>
-    }[]
-  }
-}
+      wplat: number;
+      wplon: number;
+      wpidx: number;
+      wpid: Uppercase<string>;
+    }[];
+  };
+};
+
 
 export const SYSTEMS = [
   'ENGINE',
   'ELECTRIC',
-] as const
-Object.freeze(SYSTEMS)
-export type System = (typeof SYSTEMS)[number]
+] as const;
+Object.freeze(SYSTEMS);
+export type System = (typeof SYSTEMS)[number];
diff --git a/frontend/src/entities/PowerGrid/CAB/Context.vue b/frontend/src/entities/PowerGrid/CAB/Context.vue
index 871b553a..1b848a11 100644
--- a/frontend/src/entities/PowerGrid/CAB/Context.vue
+++ b/frontend/src/entities/PowerGrid/CAB/Context.vue
@@ -2,7 +2,7 @@
   <Context :tabs="[$t('cab.tab.context')]">
     <template v-if="appStore.tab.context === 0">
       <img v-if="context" :src="`data:image/png;base64, ${context}`" class="cab-context-topology" />
-      <h1 v-else>Pas de contexte</h1>
+      <h1 v-else>{{  $t('cab.tab.nocontext') }}</h1>
     </template>
     <Notification
       :card="appStore.card('PowerGrid')"
diff --git a/frontend/src/entities/PowerGrid/locales/en.json b/frontend/src/entities/PowerGrid/locales/en.json
index 490f88ab..43a25940 100644
--- a/frontend/src/entities/PowerGrid/locales/en.json
+++ b/frontend/src/entities/PowerGrid/locales/en.json
@@ -8,11 +8,11 @@
   "recommendations.button.secondary": "Use the study tool",
   "recommendations.button1": "Maximum charge",
   "recommendations.button2": "LTTD > 2h",
-  "recommendations.description": "Parry description",
-  "recommendations.modal": "You are about to apply the {recommendation} parry. Would you like to continue?",
+  "recommendations.description": "Description",
+  "recommendations.modal": "You are about to apply the {recommendation} recommendation. Would you like to continue?",
   "PowerGrid.kpis.curtailment_volume": "Curtailment volume",
   "PowerGrid.kpis.distance_from_reference_topology": "Distance to reference topology",
-  "PowerGrid.kpis.efficiency": "Maximum charge",
+  "PowerGrid.kpis.efficiency_of_the_reco": "Maximum charge",
   "PowerGrid.kpis.max_overload": "Maximum line load",
   "PowerGrid.kpis.redispatching_volume": "Redispatch volume",
   "PowerGrid.kpis.renewable_energy_share": "Proportion of renewable",
diff --git a/frontend/src/entities/Railway/locales/en.json b/frontend/src/entities/Railway/locales/en.json
index 7b2afd4e..c7dd336c 100644
--- a/frontend/src/entities/Railway/locales/en.json
+++ b/frontend/src/entities/Railway/locales/en.json
@@ -5,7 +5,7 @@
   "card.event_type.INFRASTRUCTURE": "Infrastructure",
   "card.event_type.PASSENGER": "Passenger",
   "card.event_type.RAIL": "Rail",
-  "event.button.primary": "Recalculate transport plans",
+  "event.button.primary": "Get recommendation from maze",
   "event.button.primary.passenger": "Show procedure",
   "event.button.secondary": "Continue the procedure follow-up",
   "event.button.secondary.passenger": "Put on hold",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index bf2eba0d..e8e93dfc 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -34,6 +34,7 @@
   "cab.status.notifications": "Notifications",
   "cab.status.requests": "Requests",
   "cab.tab.context": "Context",
+  "cab.tab.nocontext": "No context available",
   "cab.tab.dependencies": "Dependencies",
   "cab.tab.graph": "Graph",
   "cab.tab.map": "Map",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index b55b1a59..b3080899 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -34,6 +34,7 @@
   "cab.status.notifications": "Notifications",
   "cab.status.requests": "Requêtes",
   "cab.tab.context": "Contexte",
+  "cab.tab.nocontext": "Aucun contexte disponible",
   "cab.tab.graph": "Graphe",
   "cab.tab.map": "Carte",
   "cab.tab.network": "Réseau",
diff --git a/resources/README.md b/resources/README.md
index a1bbec0f..57e2b630 100644
--- a/resources/README.md
+++ b/resources/README.md
@@ -82,7 +82,7 @@ pip install -r requirements-app.txt
 3. For the Docker environment, use the provided docker-compose.yml and Dockerfile.
 ```
 cd PowerGrid
-docker-compose up -d --build
+docker compose up -d --build
 ```
 
 # 2 Run the simulator
diff --git a/resources/checkPorts.sh b/resources/checkPorts.sh
new file mode 100644
index 00000000..1a72ddd6
--- /dev/null
+++ b/resources/checkPorts.sh
@@ -0,0 +1,38 @@
+#! /bin/bash
+#
+# Tries to open all ports specified in docker-compose.yml to see if they are available
+#
+
+if [ $# -ge 1 ]; then
+    DCOMPOSE=$1
+else
+    DCOMPOSE=$(realpath $(dirname $0)/..)/config/dev/cab-standalone/docker-compose.yml
+fi
+if [ ! -r "$DCOMPOSE" ]; then
+    echo "Usage: $0 [ <path to docker-compose.yml file> ]"
+    echo "Can't open $DCOMPOSE"
+    exit 1
+fi
+which docker >/dev/null
+if [ $? -ne 0 ]; then
+    echo "Usage: $0 [ <path to docker-compose.yml file> ]"
+    echo "Can't find docker command"
+    exit 2
+fi
+
+PORTS=$(sed -e 's/#.*//' $DCOMPOSE | egrep "[ '\"][0-9]+:[0-9]+" | sed -e 's/^[^0-9]*//' -e 's/:.*//'i | sort -nu | tr '\n' ' ' )
+echo "Ports used for InteractiveAI: $PORTS"
+NOK=0
+for port in $PORTS; do
+    docker run -p $port:80 hello-world >/dev/null
+    if [ $? -ne 0 ]; then
+        let NOK=$NOK+1
+    fi
+done
+if [ $NOK -eq 0 ]; then
+    echo "All is fine: all ports used by InteractiveAI are available"
+else
+    echo "Check your counfiguration: $NOK port(s) used by InteractiveAI are already used"
+    echo "InteractiveAI can't run on this platform with this $DCOMPOSE ports configuration"
+fi
+exit $NOK
diff --git a/usecases_examples/PowerGrid/PowerGrid_poc_simulator_consol.py b/usecases_examples/PowerGrid/PowerGrid_poc_simulator_consol.py
index 64c693eb..7c6d36d9 100644
--- a/usecases_examples/PowerGrid/PowerGrid_poc_simulator_consol.py
+++ b/usecases_examples/PowerGrid/PowerGrid_poc_simulator_consol.py
@@ -92,10 +92,10 @@ def _stop_if_anticipation_security_analysis(self, obs, env, contingency_line_ids
             rho = []
             for j, value in enumerate(flow):
                 if value / thermal_limit[j] >= 1.0:
-                    impacted_lines = obs.name_line[j]
+                    impacted_lines = get_formatted_name_line(obs,j)
                     rho.append(value / thermal_limit[j])
             if len(impacted_lines) > 0:
-                line_name = obs.name_line[c_value]
+                line_name = get_formatted_name_line(obs,c_value)
                 anticipation.append((line_name, impacted_lines, rho))
 
         self._anticipation = None
@@ -688,17 +688,19 @@ def search_chronic_num_from_name(scenario_name,
 
 
 def get_curent_lines_in_bad_KPI(obs):
-    """Identify the line with the worst KPI in the grid."""
-    res = np.where(obs.rho == obs.rho.max())
-    name = obs.name_line[res[0]]
-    return name[0]
+    """Identify the line with the worst KPI in the grid in the following format: {line_or_to_subid}:{line_ex_to_subid}:{name_line}."""
+    res = (obs.rho == obs.rho.max()).tolist().index(True)
+    return get_formatted_name_line(obs, res)
 
 
 def get_curent_lines_lost(obs):
-    """Identify disconnected lines in the grid."""
-    res = np.where(obs.line_status is False)
-    name = obs.name_line[res[0]]
-    return name[0]
+    """Identify disconnected lines in the grid in the following format: {line_or_to_subid}:{line_ex_to_subid}:{name_line}."""
+    res = (obs.line_status is False).tolist().index(True)
+    return get_formatted_name_line(obs, res)
+
+def get_formatted_name_line(obs, idx):
+    """Format line name to {line_or_to_subid}:{line_ex_to_subid}:{name_line}"""
+    return f"{obs.line_or_to_subid[idx]}:{obs.line_ex_to_subid[idx]}:{obs.name_line[idx]}"
 
 
 def get_zone_where_alarm_occured(obs):
diff --git a/usecases_examples/PowerGrid/README.md b/usecases_examples/PowerGrid/README.md
index 9c6fb0e0..456f174e 100644
--- a/usecases_examples/PowerGrid/README.md
+++ b/usecases_examples/PowerGrid/README.md
@@ -43,16 +43,21 @@ Follow this section in case you are working on localhost, and without Docker.
 
 ### Create a virtual environment 
 ```commandline
-cd InteractiveAI/usecases_examples/PowerGrid
-pip3 install -U virtualenv
-python3 -m virtualenv venv_grid2op
+cd usecases_examples/PowerGrid
+python3 -m venv venv_grid2op
 ```
 
 ### Enter the virtual environment
+- On Linux based systems:
 ```commandline
 source venv_grid2op/bin/activate
 ```
 
+- On Windows based systems:
+```commandline
+source venv_grid2op/scripts/activate
+```
+
 ## 1.3 Installation of the simulator layer
 Either use CASE 1 or CASE 2 to install the PowerGrid's simulator of your choice.
 
@@ -69,7 +74,7 @@ pip install -r requirements-consol.txt
 2. Launch the InteractiveAI event listener server, compatible with the console simulator.
 
 ```commandline
-docker-compose up -d --build api
+docker compose up -d --build api
 ```
 
 The launched API might be accessible at this address: 
@@ -89,7 +94,7 @@ pip install -r requirements-app.txt
 **2. Launch the whole all in one web app simulator through docker on a computer (BEST APPROACH):** 
 
 ```commandline
-docker-compose up -d --build app
+docker compose up -d --build app
 ```
 
 The launched app might be accessible at this address: 
diff --git a/usecases_examples/PowerGrid/app/models/Communicate.py b/usecases_examples/PowerGrid/app/models/Communicate.py
index f98c8c96..dd1ab6d4 100644
--- a/usecases_examples/PowerGrid/app/models/Communicate.py
+++ b/usecases_examples/PowerGrid/app/models/Communicate.py
@@ -334,6 +334,7 @@ def send_event_online(self,
                           duration=None,
                           case_overload=False,
                           case_assist_alarm=False,
+                          case_assist_alert=False,
                           case_anticip=False,
                           case_line_lost=False):
         """
@@ -366,9 +367,9 @@ def send_event_online(self,
                 payload_dict = {}
                 payload_dict = {
                     "criticality": "HIGH",
-                    "title": f"Surcharge sur ligne {line_name}",
+                    "title": f"Overload in line {line_name}",
                     "description": (
-                        f"Attention la ligne {line_name} est en surcharge de "
+                        f"Warning: the {line_name} line is overloaded by "
                         f"{np.round(np.float64(obs.rho.max() * 100),decimals=1,out=None)}%"
                     ),
                     "start_date": f"{context_date}",
@@ -396,8 +397,8 @@ def send_event_online(self,
                 payload_dict = {}
                 payload_dict = {
                     "criticality": "MEDIUM",
-                    "title": "Alerte Agent IA",
-                    "description": f"Soyez vigilant sur la zone {zone}",
+                    "title": "AI agent Alarm",
+                    "description": f"Be vigilant in zone {zone}",
                     "start_date": f"{context_date}",
                     "end_date": f"{context_date + timedelta(minutes=float(5))}",
                     "data": {
@@ -417,6 +418,32 @@ def send_event_online(self,
             except Exception as e:
                 logging.error(e)
 
+        if ("Assistant raised an alert" in current_issues) and case_assist_alert:
+            try:
+                self.payload = {}
+                payload_dict = {}
+                payload_dict = {
+                    "criticality": "MEDIUM",
+                    "title": "AI agent Warning",
+                    "description": f"Risk on lines: {line}",
+                    "start_date": f"{context_date}",
+                    "end_date": f"{context_date + timedelta(minutes=float(5))}",
+                    "data": {
+                        "event_type": "agent",
+                        "line": line,
+                        "kpis": kpis,
+                        "event_context": img_b64
+                    },
+                    "use_case": "PowerGrid",
+                    "is_active": False
+                }
+
+                payload = json.dumps(payload_dict)
+                # print(f"Assistant alarm description: {payload}")
+                self.send_payload_and_store_it(payload, obs, scn_first_step)
+            except Exception as e:
+                logging.error(e)
+
         if ("Anticipation N-1" in current_issues) and case_anticip:
             anticip_date = context_date + timedelta(minutes=float(5*duration))
             try:
@@ -424,10 +451,10 @@ def send_event_online(self,
                 payload_dict = {}
                 payload_dict = {
                     "criticality": "MEDIUM",
-                    "title": f"Risque sur aléa N-1 sur la ligne {line[0]}",
+                    "title": f"Risk of N-1 contingency on line {line[0]}",
                     "description": (
-                        f"Lignes impactées {line[1]}, "
-                        f"charge max {np.round(max(line[2]) * 100, decimals=1, out=None)}%"
+                        f"Impacted lines {line[1]}, "
+                        f"Maximum charge {np.round(max(line[2]) * 100, decimals=1, out=None)}%"
                     ),
                     "start_date": f"{anticip_date}",
                     "end_date": f"{anticip_date + timedelta(minutes=float(5*duration))}",
@@ -455,8 +482,8 @@ def send_event_online(self,
                 payload_dict = {}
                 payload_dict = {
                     "criticality": "ROUTINE",
-                    "title": f"Ligne {line_name} déconnectée",
-                    "description": f"La ligne {line_name} est déconnectée",
+                    "title": f"Line {line_name} disconnected",
+                    "description": f"Line {line_name} is disconnected",
                     "start_date": f"{context_date}",
                     "end_date": f"{context_date + timedelta(minutes=float(5))}",
                     "data": {
@@ -541,13 +568,13 @@ def get_act_from_api(self):
                 if get_act_counter == 0:
                     message = {
                         "div": "message-container",
-                        "content": "La simulation est en pause. Veillez consulter les recommendations de InteractiveAI avant de faire une nouvelle action ici!"
+                        "content": "The simulation is paused. Please consult the recommendations from InteractiveAI before taking any further action here!"
                     }
                     yield f"data: {json.dumps(message)}\n\n"
                     time.sleep(1)
                     yield (
                         "data: {\"div\": \"status-div\", \"content\": "
-                        "\"Cliquez sur 'Continuer' après avoir fait votre choix dans InteractiveAI\"}\n\n"
+                        "\"Click 'Continuer' after making your selection in InteractiveAI\"}\n\n"
                     )
                     time.sleep(1)
                     set_pause(True)
@@ -556,13 +583,13 @@ def get_act_from_api(self):
                 else:
                     message = {
                         "div": "message-container",
-                        "content": "Aucune recommendation n'a été reçu de InteractiveAI!"
+                        "content": "No recommendation has been received from InteractiveAI!"
                     }
                     yield f"data: {json.dumps(message)}\n\n"
                     time.sleep(1)
                     yield (
                         "data: {\"div\": \"status-div\", \"content\": "
-                        "\"Réitérez votre choix dans InteractiveAI puis cliquez à nouveau sur "
+                        "\"Repeat your selection in InteractiveAI, then click again on "
                         "'Continuer'\"}\n\n"
                     )
                     time.sleep(1)
@@ -581,12 +608,12 @@ def get_act_from_api(self):
                 self.act_dict = response.json()
                 if bool(self.act_dict) is False and get_act_counter >= 1:
                     logging.info(
-                        "\n Aucune recommendation n'a été reçu ! \n"
-                        " La siumation se prousuivra avec la recommendation NULL par défaut."
+                        "\n No recommendation has been received! \n"
+                        " The simulation will continue with the default Do Nothing recommendation."
                     )
                     message = {
                         "div": "message-container",
-                        "content": "Aucune recommendation n'a été reçu ! La siumation se prousuivra avec la recommendation NULL par défaut."
+                        "content": "No recommendation has been received! The simulation will continue with the default Do Nothing recommendation."
                     }
                     yield f"data: {json.dumps(message)}\n\n"
                     time.sleep(1)
@@ -595,11 +622,11 @@ def get_act_from_api(self):
                     logging.info("\n InteractiveAI' s recommendation received! \n")
                     message = {
                         "div": "message-container",
-                        "content": "La recommendation de InteractiveAI vient dêtre reçu !"
+                        "content": "The recommendation from InteractiveAI has just been received!"
                     }
                     yield f"data: {json.dumps(message)}\n\n"
                     time.sleep(1)
                 get_act_counter += 1
 
         except Exception as e:
-            logging.error(e)
\ No newline at end of file
+            logging.error(e)
diff --git a/usecases_examples/PowerGrid/app/models/Listener.py b/usecases_examples/PowerGrid/app/models/Listener.py
index d2402250..6e35e0cc 100644
--- a/usecases_examples/PowerGrid/app/models/Listener.py
+++ b/usecases_examples/PowerGrid/app/models/Listener.py
@@ -2,6 +2,9 @@
 from config.config import logging
 from lightsim2grid import SecurityAnalysis
 
+from app.models.utils import get_formatted_name_line
+
+
 class Listener:
     """This class has all the simulator's functions 
     that will stream and diagnose any Grid2Op selected data and events."""
@@ -65,7 +68,7 @@ def _stop_if_line_disconnected(self, obs):
             return True
         return False
 
-    def _stop_if_alarm(self, obs):
+    def _stop_if_alarm(self, obs, otherwise__=""):
         """
         Checks if an alarm has been triggered by the assistant.
 
@@ -75,11 +78,24 @@ def _stop_if_alarm(self, obs):
         Returns:
             bool: True if an alarm has been triggered, False otherwise.
         """
-        do_stop_if_alarm = True
-        if do_stop_if_alarm:
-            if np.any(obs.time_since_last_alarm == 0):
-                logging.info("Assistant raised an alarm")
-                return True
+        if np.any(obs.time_since_last_alarm == 0):
+            logging.info("Assistant raised an alarm")
+            return True
+        return False
+
+    def _stop_if_alert(self, obs, otherwise__=""):
+        """
+        Checks if an alert has been triggered by the assistant.
+
+        Args:
+            obs: The current observation of the network.
+
+        Returns:
+            bool: True if an alert has been triggered, False otherwise.
+        """
+        if np.any(obs.time_since_last_alert == 0):
+            logging.info("Assistant raised an alert")
+            return True
         return False
 
     def _stop_if_anticipation_security_analysis(self, obs, env, contingency_line_ids):
@@ -104,12 +120,12 @@ def _stop_if_anticipation_security_analysis(self, obs, env, contingency_line_ids
 
         for i, c_value in enumerate(contingency_line_ids):
             flow = np.array(res_a[i])
-            impacted_lines = [(obs.name_line[j], value / thermal_limit[j])
+            impacted_lines = [(get_formatted_name_line(obs,j), value / thermal_limit[j])
                             for j, value in enumerate(flow)
                             if value / thermal_limit[j] >= 1.0]
             
             if impacted_lines:
-                line_name = obs.name_line[c_value]
+                line_name = get_formatted_name_line(obs,c_value)
                 anticipation.append((line_name, *zip(*impacted_lines)))
 
         self._anticipation = anticipation if anticipation else None
@@ -133,6 +149,9 @@ def _stop_if_issue(self, obs, f_obs, f_env, contingency_line_ids):
         if self._stop_if_alarm(obs):
             issues.append("Assistant raised an alarm")
 
+        if self._stop_if_alert(obs):
+            issues.append("Assistant raised an alert")
+
         if self._stop_if_bad_kpi(obs):
             issues.append("Overload")
 
diff --git a/usecases_examples/PowerGrid/app/models/Simulator.py b/usecases_examples/PowerGrid/app/models/Simulator.py
index 42b17cfb..9d6683ad 100644
--- a/usecases_examples/PowerGrid/app/models/Simulator.py
+++ b/usecases_examples/PowerGrid/app/models/Simulator.py
@@ -12,7 +12,7 @@
 matplotlib.use('agg')
 from app.models.Listener import Listener
 from config.config import logging, set_pause, get_pause_status
-from app.models.utils import (create_observation_image, search_chronic_num_from_name,
+from app.models.utils import (create_observation_image, get_alert_lines, search_chronic_num_from_name,
                    get_curent_lines_in_bad_kpi, get_curent_lines_lost,
                    get_zone_where_alarm_occured, expand_act_from_cab,
                    load_assistant, local_xd_silly, targeted_scenario_act_fixed, generate_graph_html)
@@ -294,8 +294,8 @@ def run_simulator(self, com):
                                               line_name=get_curent_lines_in_bad_kpi(
                                                   self.obs),
                                               case_overload=True)
-                    if (self.obs.current_step < self.config['scenario_first_step']) or \
-                            (com.cab_api_on is False):
+                        
+                    if (self.obs.current_step < self.config['scenario_first_step']) or (com.cab_api_on is False):
                         # Utiliser XD_Silly en cache (en local)
                         act = local_xd_silly(self.obs, self.local_assistant)
                         if com.cab_api_on is False:
@@ -336,7 +336,7 @@ def run_simulator(self, com):
                                                         img_b64_current)
                                 context_just_sent = True
 
-                        logging.info("Status: Il y a une alerte de l'agent IA")
+                        logging.info("Status: Il y a une alarme de l'agent IA")
                         yield (
                             "data: {\"div\": \"events-div\", \"content\": "
                             "{ \"title\": \"Status: Il y a une alerte de l'agent IA\", "
@@ -348,8 +348,7 @@ def run_simulator(self, com):
                                                                        self.obs)
                         com.send_event_online(context_date,
                                               self.config['scenario_first_step'],
-                                              self.listen.trigger_kpis(
-                                                  self.obs, act),
+                                              self.listen.trigger_kpis(self.obs, act),
                                               self.obs,
                                               self.listen.current_issues,
                                               img_b64_current,
@@ -358,7 +357,7 @@ def run_simulator(self, com):
                                               case_assist_alarm=True)
                         event_resolved_trigger = True
 
-                if "Anticipation N-1" in self.listen.current_issues:
+                if "Assistant raised an alert" in self.listen.current_issues:
                     if self.obs.current_step >= self.config['scenario_first_step']:
 
                         com.push_step = self.obs.current_step + send_tempo
@@ -373,6 +372,40 @@ def run_simulator(self, com):
                                                         img_b64_current)
                                 context_just_sent = True
 
+                        logging.info("Status: Il y a une alerte de l'agent IA")
+                        yield (
+                            "data: {\"div\": \"events-div\", \"content\": "
+                            "{ \"title\": \"Status: Il y a une alerte de l'agent IA\", "
+                            "\"description\": \"\" } }\n\n"
+                        )
+
+                        if not img_b64_current:
+                            img_b64_current = create_observation_image(self.env,
+                                                                       self.obs)
+                        com.send_event_online(context_date,
+                                              self.config['scenario_first_step'],
+                                              self.listen.trigger_kpis(self.obs, act),
+                                              self.obs,
+                                              self.listen.current_issues,
+                                              img_b64_current,
+                                              line=get_alert_lines(self.obs),
+                                              case_assist_alert=True)
+                        event_resolved_trigger = True
+
+                if "Anticipation N-1" in self.listen.current_issues:
+                    if self.obs.current_step >= self.config['scenario_first_step']:
+                        com.push_step = self.obs.current_step + send_tempo
+                        if com.cab_api_on is True and context_just_sent is False:
+                            if not img_b64_current:
+                                img_b64_current = create_observation_image(self.env,
+                                                                           self.obs)
+                            if img_b64_current:
+                                com.send_context_online(self.obs,
+                                                        self.config['scenario_first_step'],
+                                                        context_date,
+                                                        img_b64_current)
+                                context_just_sent = True
+
                         logging.info(
                             "Status: Il y a un événement de type 'anticipation N-1' ")
                         message = {
@@ -390,9 +423,11 @@ def run_simulator(self, com):
                                 f"\"description\": \"{x}\"}} }}\n\n"
                             )
 
-                            if not img_b64_forecast:
-                                img_b64_forecast = create_observation_image(obs_forecast._obs_env,
-                                                                            obs_forecast)
+                            n_1_line_name = x[0].split(":")[-1]
+                            n_1_line_id = self.obs.name_line.tolist().index(n_1_line_name)
+                            obs_forecast_n_1, *_ = self.obs.simulate(self.env.action_space({"set_line_status":[(n_1_line_id,-1)]}), self.config['time_step_forecast'])
+                            img_b64_forecast = create_observation_image(obs_forecast_n_1._obs_env,
+                                                                        obs_forecast_n_1)
                             com.send_event_online(context_date,
                                                   self.config['scenario_first_step'],
                                                   self.listen.trigger_kpis(
@@ -439,7 +474,7 @@ def run_simulator(self, com):
                                      get_curent_lines_lost(self.obs))
                         
                         logging.info(
-                            "Status: Il y a un événement de type 'anticipation N-1' ")
+                            "Status: Il y a un événement de type 'perte de ligne' ")
                         message = {
                             "div": "message-container",
                             "content": "Status: Il y a une perte de ligne ' "
diff --git a/usecases_examples/PowerGrid/app/models/utils.py b/usecases_examples/PowerGrid/app/models/utils.py
index 85e1a445..b1a2202b 100644
--- a/usecases_examples/PowerGrid/app/models/utils.py
+++ b/usecases_examples/PowerGrid/app/models/utils.py
@@ -67,11 +67,10 @@ def get_curent_lines_in_bad_kpi(obs):
         obs: The current observation.
 
     Returns:
-        str: Name of the line with the worst KPI.
+        str: Name of the line with the worst KPI in the following format: {line_or_to_subid}:{line_ex_to_subid}:{name_line}
     """
-    res = np.where(obs.rho == obs.rho.max())
-    name = obs.name_line[res[0]]
-    return name[0]
+    res = (obs.rho == obs.rho.max()).tolist().index(True)
+    return get_formatted_name_line(obs, res)
 
 
 def get_curent_lines_lost(obs):
@@ -82,11 +81,28 @@ def get_curent_lines_lost(obs):
         obs: The current observation.
 
     Returns:
-        str: Name of the first lost line.
+        str: Name of the first lost line in the following format: {line_or_to_subid}:{line_ex_to_subid}:{name_line}.
     """
-    res = np.where(obs.line_status is False)
-    name = obs.name_line[res[0]]
-    return name[0]
+    res = (obs.line_status is False).tolist().index(True)
+    return get_formatted_name_line(obs, res)
+
+
+def get_alert_lines(obs):
+    """
+    Identifies the lines where an alert occured.
+
+    Args:
+        obs: The current observation.
+
+    Returns:
+        str: Name of the first lost line in the following format: {line_or_to_subid}:{line_ex_to_subid}:{name_line}.
+    """
+    idx_list = np.where(obs.active_alert)[0]
+    return [get_formatted_name_line(obs, idx) for idx in idx_list]
+
+
+def get_formatted_name_line(obs, idx):
+    return f"{obs.line_or_to_subid[idx]}:{obs.line_ex_to_subid[idx]}:{obs.name_line[idx]}"
 
 
 def get_zone_where_alarm_occured(obs):