diff --git a/Athos-Contacts.md b/Athos-Contacts.md
index cd0462b..2bc0310 100644
--- a/Athos-Contacts.md
+++ b/Athos-Contacts.md
@@ -17,15 +17,11 @@ Contact list in case of issues with photon diagnostic devices and services
   }
 }%%
 
+
 flowchart TD
-    A[Spatial diagnostics user guide] -->|Still an issue?| B{Current user?}
+    A[Spatial diagnostics user guide] -->|Still an issue?| B(Elizabeth Skoropata)
     click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Athos-spatial-diagnostics/Aramis-spatial-user-guide"
-    B --> |Maloja| C(Andre Al Haddad)
-    B --> |Furka| D(Hiroki Ueda)
-    B --> |Commisioning| E(Ulrich Wagner)   
-    C --> |All not available| F(Chris Arrell)
-    D --> |All not available| F(Chris Arrell)
-    E --> |All not available| F(Chris Arrell)
+    B -->|Not available| C(Chris Arrell)
 ```
 # Spectral diagnostics (PMOS)
 
@@ -47,9 +43,8 @@ flowchart TD
 flowchart TD
     A[PMOS user guide] -->|Still an issue?| B{Current user?}
     click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Athos-spectral-diagnostics/PMOS-user-guide"
-    B --> |Maloja| C(Andre Al Haddad)
-    B --> |Furka| D(Hiroki Ueda)
-    B --> |Commisioning/MD| E(Chris Arrell)   
+    B --> |User| C(Elizabeth Skoropata)
+    B --> |Commisioning/MD| D(Chris Arrell)   
 ```
 
 # Intensity diagnostics (PDIM, PCEL)
@@ -69,9 +64,9 @@ flowchart TD
 }%%
 
 flowchart TD
-    A[Intensity diagnostics user guide] -->|Still an issue?| B(Ulrich Wagner)
+    A[Intensity diagnostics user guide] -->|Still an issue?| B(Elizabeth Skoropata)
     click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Athos-intensity-diagnostics/Intensity-user-guide"
-    B --> |Not available| C(Claude Pradervand)
+    B --> |Not available| C(Ulrich Wager/Claude Pradervand)
 ```
 # Online services (Pipelines, Web app)
 ```mermaid
@@ -93,8 +88,6 @@ flowchart TD
 
  A[Online services user guide] -->|Still an issue?| B{Current user?}
     click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Athos-online-diagnostics/Online-user-guide"
-    B --> |Maloja| C(Andre Al Haddad)
-    B --> |Furka| D(Hiroki Ueda)
-    C --> |All not available| F(Chris Arrell)
-    D --> |All not available| F(Chris Arrell)
+    B --> |User| C(Elizabeth Skoropata)
+    B --> |Commisioning/MD| D(Chris Arrell)
 ```
\ No newline at end of file