diff --git a/Aramis-Contacts.md b/Aramis-Contacts.md
index f4cd217..77f14e6 100644
--- a/Aramis-Contacts.md
+++ b/Aramis-Contacts.md
@@ -17,15 +17,9 @@ Contact list in case of issues with photon diagnostic devices and services
 }%%
 
 flowchart TD
-    A[Aramis spatial diagnostics issue] --> B(Chris Arrell)
-    B --> |Not available| C{Type of issue}
-    C -->|Motion control| D[Scott Stubbs]
-    C -->|Camera issue| E[Scott Stubbs]
-    C -->|Data issue| F[Edwin Divall]
-    D -->|Not available| G[Claude Pradervand]
-    E -->|Not available| G[Claude Pradervand]
-    F -->|Not available| G[Claude Pradervand]
-
+    A[Spatial diagnostics user guide] -->|Still an issue?| B(Chris Arrell)
+    click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Aramis-spatial-diagnostics/Aramis-spatial-user-guide"
+    B --> |Not available| C(Hiroki Ueda)   
 ```
 # Spectral diagnostics (PSSS, PSSS-LB)
 
@@ -45,18 +39,9 @@ flowchart TD
 }%%
 
 flowchart TD
-    A[Aramis spectral diagnostics issue] --> B(Chris Arrell)
-    B --> |Not available| C{Type of issue}
-    C -->|Motion control| D[Scott Stubbs]
-    C -->|Spectrum not updating| E[Alex Gobbo]
-    C -->|Data issue| F[Edwin Divall]
-    C -->|Can't find spectrum| G[User Guide Click me!]
-    click G "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Aramis-spectral-diagnostics/PSSS-user-guide"
-    G -->|Still can't| I[Henrik Lemke/Claudio Cirelli]
-    D -->|Not available| H[Claude Pradervand]
-    E -->|Not available| H[Claude Pradervand]
-    F -->|Not available| H[Claude Pradervand]
-
+    A[Spectral diagnostics user guide] -->|Still an issue?| B(Chris Arrell)
+    click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Aramis-spectral-diagnostics/PSSS-user-guide"
+    B --> |Not available| C(Hiroki Ueda)   
 ```
 
 # Intensity diagnostics (PDIM, PBPS)
@@ -76,15 +61,28 @@ flowchart TD
 }%%
 
 flowchart TD
-    A[Aramis intensity diagnostics] --> B(Chris Arrell)
-    B --> |Not available| C{Type of issue}
-    C -->|Motion control| D[Scott Stubbs]
-    C -->|Pipleline not updating| E[Alex Gobbo]
-    C -->|Data issue| F[Edwin Divall]
-    C -->|Electronics| G[Frank Herzog/Arturo Alarcon]
-    D -->|Not available| H[Claude Pradervand]
-    E -->|Not available| H[Claude Pradervand]
-    F -->|Not available| H[Claude Pradervand]
-    G -->|Not available| H[Claude Pradervand]
-     
+    A[Intensity diagnostics user guide] -->|Still an issue?| B(Chris Arrell)
+    click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Aramis-intensity-diagnostics/Intensity-user-guide"
+    B --> |Not available| C(Andre Al Haddad)
+```
+# Online services (Pipelines, Web app)
+```mermaid
+%%{
+  init: {
+    'theme': 'base',
+    'themeVariables': {
+      'primaryColor': '#825AA6',
+      'primaryTextColor': '#fff',
+      'primaryBorderColor': '#825AA6',
+      'lineColor': '#000',
+      'secondaryColor': '#000',
+      'tertiaryColor': '#fff'
+    }
+  }
+}%%
+
+flowchart TD
+    A[Online services user guide] -->|Still an issue?| B(Chris Arrell)
+    click A "https://gitlab.psi.ch/arrell_c/swissfel-photon-diagnostics-guide/-/wikis/Aramis-online-diagnostics/Online-user-guide"
+    B --> |Not available| C(Andre Al Haddad)
 ```
\ No newline at end of file