diff --git a/_data/spring.yml b/_data/spring.yml
index 20d2059..0996e45 100644
--- a/_data/spring.yml
+++ b/_data/spring.yml
@@ -1,10 +1,18 @@
-# speaker to id mapping:
+# external speaker to id mapping:
 # behl : 1
 # chiribiri : 2
 # knoll : 3
 # wech : 4
 # wolfgang : 5
 
+# internal speaker to id mapping:
+# schreiber : 1
+# krause : 2
+# hotho : 3
+# dulny : 4
+# jabbarigargari: 5
+# terekhov : 6
+
 days:
     -   title: "Monday 7th April 2025"
         date: '2025-04-07'
@@ -14,7 +22,8 @@ days:
                 end_time: "09:00"
                 color: "#3788d8"
                 id: 1
-                speaker_idx: 4 #
+                external_speaker_idx: 4 # An event can either have external speaker / internal speaker or both (like in this case)
+                internal_speaker_idx: 4 #
                 description: 'This talk focuses on numerical computations to determine the heat shock a patient would get while going through an MRI.'
             -   title: "Welcome Ceremony"
                 start_time: "09:00"
diff --git a/_team_members/1-schreiber.md b/_team_members/1-schreiber.md
index 84b766b..6605bf1 100644
--- a/_team_members/1-schreiber.md
+++ b/_team_members/1-schreiber.md
@@ -11,6 +11,7 @@ address:
     University Hospital Würzburg /
     Am Schwarzenberg 15 /
     97078 Würzburg, Germany
+idx : 1
 ---
 
 
diff --git a/_team_members/2-krause.md b/_team_members/2-krause.md
index 2c87a03..d5c51bc 100644
--- a/_team_members/2-krause.md
+++ b/_team_members/2-krause.md
@@ -11,6 +11,7 @@ address:
     University of Würzburg / 
     Emil-Fischer-Straße 50 / 
     97074 Würzburg Germany
+idx: 2
 ---
 
 
diff --git a/_team_members/3-hotho.md b/_team_members/3-hotho.md
index cc08bad..a7273c3 100644
--- a/_team_members/3-hotho.md
+++ b/_team_members/3-hotho.md
@@ -11,6 +11,7 @@ address:
     University of Würzburg / 
     Emil-Fischer-Straße 50 / 
     97074 Würzburg Germany
+idx: 3
 ---
 
 
diff --git a/_team_members/4-dulny.md b/_team_members/4-dulny.md
index 84fafd4..8297626 100644
--- a/_team_members/4-dulny.md
+++ b/_team_members/4-dulny.md
@@ -11,6 +11,7 @@ address:
     University of Würzburg / 
     Emil-Fischer-Straße 50 / 
     97074 Würzburg Germany
+idx: 4
 ---
 
 {% include team_member_basic_info.html %}
diff --git a/_team_members/5-jabbarigargari.md b/_team_members/5-jabbarigargari.md
index f369e90..af9baab 100644
--- a/_team_members/5-jabbarigargari.md
+++ b/_team_members/5-jabbarigargari.md
@@ -12,6 +12,7 @@ address:
     University Hospital Würzburg /
     Am Schwarzenberg 15 /
     97078 Würzburg, Germany
+idx: 5
 ---
 
 {% include team_member_basic_info.html %}
diff --git a/_team_members/6-terekhov.md b/_team_members/6-terekhov.md
index 9c8319c..3a88cd6 100644
--- a/_team_members/6-terekhov.md
+++ b/_team_members/6-terekhov.md
@@ -11,6 +11,7 @@ address:
     University Hospital Würzburg /
     Am Schwarzenberg 15 /
     97078 Würzburg, Germany
+idx: 6
 ---
 
 
diff --git a/spring_school_2025/detailed_program_schedule.md b/spring_school_2025/detailed_program_schedule.md
index 42697ff..8cef1a1 100644
--- a/spring_school_2025/detailed_program_schedule.md
+++ b/spring_school_2025/detailed_program_schedule.md
@@ -11,7 +11,7 @@ sidebar:
     {% for day in site.data.spring.days %}
         <div class="spring-school-day">
             <h2>{{day.title}}</h2>
-            {% for session in day.sessions%}
+            {% for session in day.sessions %}
                 <div class="session-box" id="{{session.id}}" style="background-color: {{session.color}}; border-radius: 4px; padding: 6px; border: 1px solid gray;">
                     <div class="session-title" style="display: flex;">
                         <div style="flex-shrink: 0; margin-left: 8px;">{{session.start_time}} - {{session.end_time}}</div>
@@ -24,24 +24,39 @@ sidebar:
                     </div>
 
                     <div class="more-information-section">
-                        
                         {% if session.description %}
                             <p style="margin-left: 8px"><span style="font-weight: bold">Content: </span> {{session.description}}</p>
                         {% else %}
                             <p style="margin-left: 8px">Details of each session will be announced later</p>
                         {% endif %}
                         
-                        {% if session.speaker_idx %}
-                            {% for speaker in site.keynote_speakers %}
-                                {% if speaker.idx == session.speaker_idx %}
-                                    {% assign speaker_profile = speaker %}
-                                {% endif %}
-                            {% endfor %}
-                            <div style="margin-left: 8px;"><span style="font-weight: bold">Speaker: </span> <a style='color: black;' href='{{speaker_profile.url}}'> {{speaker_profile.title}}</a></div>
-                        {% endif %}
+
+                        <div style="margin-left: 8px;"><span style="font-weight: bold">Speaker: </span>
+                            {% if session.external_speaker_idx %}
+                                {% for speaker in site.keynote_speakers %}
+                                    {% if speaker.idx == session.external_speaker_idx %}
+                                        {% assign external_speaker_profile = speaker %}
+                                    {% endif %}
+                                {% endfor %}
+                                <a style='color: black;' href='{{external_speaker_profile.url}}'> {{external_speaker_profile.title}}</a>
+                            {% endif %}
+
+                            {% if session.internal_speaker_idx %}
+                                {% for speaker in site.team_members %}
+                                    {% if speaker.idx == session.internal_speaker_idx %}
+                                        {% assign internal_speaker_profile = speaker %}
+                                    {% endif %}
+                                {% endfor %}
+                                <a style='color: black;' href='{{internal_speaker_profile.url}}'> {{internal_speaker_profile.title}}</a>
+                            {% endif %}
+
+                        </div>
+
+
                     </div>
+
                 </div>
             {% endfor %}
         </div>
     {% endfor %}
-</div>
\ No newline at end of file
+</div>