diff --git a/docs/en/general/AUS.ics b/docs/en/general/AUS.ics
index c3b9e56e7..1666bc7b1 100644
--- a/docs/en/general/AUS.ics
+++ b/docs/en/general/AUS.ics
@@ -450,10 +450,10 @@ SUMMARY:Men's 400m - T52 Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/AUT.ics b/docs/en/general/AUT.ics
index 4b169d0bb..40cbd9586 100644
--- a/docs/en/general/AUT.ics
+++ b/docs/en/general/AUT.ics
@@ -62,10 +62,10 @@ SUMMARY:Men's Individual Compound Open Ranking Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/CHI.ics b/docs/en/general/CHI.ics
index d1e7bc855..a7390203d 100644
--- a/docs/en/general/CHI.ics
+++ b/docs/en/general/CHI.ics
@@ -120,10 +120,10 @@ SUMMARY: CHAN Ho Yuen 🇭🇰 - 🇨🇱 Jaime ARANGUIZ
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 13c263287..4ca50e86d 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -936,20 +936,10 @@ SUMMARY: ZHAO/MAO 🇨🇳 - 🇬🇧 STACEY/TWOMEY
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091000Z-para-badminton-WOMENS-DOUBLES-WH1-WH2-GROUP-PLAY-STAGE
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
 DTSTAMP:20240830T091000Z
 DTSTART:20240830T091000Z
-DTEND:20240830T095000Z
-DESCRIPTION:Para Badminton - Women's Doubles WH1-WH2 Group Play Stage -
-  Group A
-SUMMARY: LIU/YIN 🇨🇳 - 🇯🇵 SATOMI/YAMAZAKI
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
@@ -960,6 +950,16 @@ SUMMARY:Men's 100m Breaststroke - SB8 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T091000Z-para-badminton-WOMENS-DOUBLES-WH1-WH2-GROUP-PLAY-STAGE
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T095000Z
+DESCRIPTION:Para Badminton - Women's Doubles WH1-WH2 Group Play Stage -
+  Group A
+SUMMARY: LIU/YIN 🇨🇳 - 🇯🇵 SATOMI/YAMAZAKI
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T091400Z-para-athletics-WOMENS-400M-T11-ROUND-1
 DTSTAMP:20240830T091400Z
 DTSTART:20240830T091400Z
diff --git a/docs/en/general/COL.ics b/docs/en/general/COL.ics
index 52c97c7ac..5829c7aef 100644
--- a/docs/en/general/COL.ics
+++ b/docs/en/general/COL.ics
@@ -208,10 +208,10 @@ SUMMARY:Women's Shot Put - F41 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/ESP.ics b/docs/en/general/ESP.ics
index 4e3990c3f..0991e9cd3 100644
--- a/docs/en/general/ESP.ics
+++ b/docs/en/general/ESP.ics
@@ -463,10 +463,10 @@ SUMMARY:Men's 100m Backstroke - S13 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/EST.ics b/docs/en/general/EST.ics
index a70f84d2a..18a1a3ad7 100644
--- a/docs/en/general/EST.ics
+++ b/docs/en/general/EST.ics
@@ -27,10 +27,10 @@ SUMMARY:Women's 50m Freestyle - S10 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/ITA.ics b/docs/en/general/ITA.ics
index 48e9b15a5..b1706cea3 100644
--- a/docs/en/general/ITA.ics
+++ b/docs/en/general/ITA.ics
@@ -514,10 +514,10 @@ SUMMARY:Men's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/NZL.ics b/docs/en/general/NZL.ics
index ecadafc6f..dc649fb63 100644
--- a/docs/en/general/NZL.ics
+++ b/docs/en/general/NZL.ics
@@ -81,10 +81,10 @@ SUMMARY:Women's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 8a52e4581..89324d433 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -3717,6 +3717,20 @@ SUMMARY: Tanapan SOTTHISET 🇹🇭 - 🇦🇷 Juan Eduardo SAMORANO
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
+DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
+  Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
+  FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
+  Ting\n🇪🇸 Oscar SALGUERO GALISTEO\n🇪🇪 Robin LIKSOR\n🇦🇺 Timothy
+  HODGE\n🇨🇱 Vicente Enrique ALMONACID HEYL\n🇨🇳 XU Haijiao\n🇨🇳 YANG
+  Guanglong
+SUMMARY:Men's 100m Breaststroke - SB8 Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T091000Z-para-badminton-WOMENS-DOUBLES-WH1-WH2-GROUP-PLAY-STAGE
 DTSTAMP:20240830T091000Z
 DTSTART:20240830T091000Z
@@ -3755,20 +3769,6 @@ SUMMARY: Suhas L.Y. 🇮🇳 - 🇰🇷 SHIN Kyung Hwan
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
-DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
-  Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
-  FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
-  Ting\n🇪🇸 Oscar SALGUERO GALISTEO\n🇪🇪 Robin LIKSOR\n🇦🇺 Timothy
-  HODGE\n🇨🇱 Vicente Enrique ALMONACID HEYL\n🇨🇳 XU Haijiao\n🇨🇳 YANG
-  Guanglong
-SUMMARY:Men's 100m Breaststroke - SB8 Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T091400Z-para-athletics-WOMENS-400M-T11-ROUND-1
 DTSTAMP:20240830T091400Z
 DTSTART:20240830T091400Z
@@ -3984,6 +3984,15 @@ SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇰🇷 SEO Minkyu
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T094200Z-para-swimming-MENS-100M-BREASTSTROKE-SB9-HEATS-SWIM-OF
+DTSTAMP:20240830T094200Z
+DTSTART:20240830T094200Z
+DTEND:20240830T094600Z
+DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB9 Heats Swim-off
+SUMMARY:Men's 100m Breaststroke - SB9 Heats Swim-off
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T094500Z-shooting-para-sport-R2-WOMENS-10M-AIR-RIFLE-STANDING-S
 DTSTAMP:20240830T094500Z
 DTSTART:20240830T094500Z
diff --git a/docs/en/para-swimming/AUS.ics b/docs/en/para-swimming/AUS.ics
index 39330ae8a..d80faadfd 100644
--- a/docs/en/para-swimming/AUS.ics
+++ b/docs/en/para-swimming/AUS.ics
@@ -174,10 +174,10 @@ SUMMARY:Women's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/AUT.ics b/docs/en/para-swimming/AUT.ics
index ac1136ca5..1025ba339 100644
--- a/docs/en/para-swimming/AUT.ics
+++ b/docs/en/para-swimming/AUT.ics
@@ -24,10 +24,10 @@ SUMMARY:Women's 100m Butterfly - S13 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/CHI.ics b/docs/en/para-swimming/CHI.ics
index 6e4646bf8..8e96f25ab 100644
--- a/docs/en/para-swimming/CHI.ics
+++ b/docs/en/para-swimming/CHI.ics
@@ -29,10 +29,10 @@ SUMMARY:Men's 100m Backstroke - S2 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/CHN.ics b/docs/en/para-swimming/CHN.ics
index a1c480a56..0b468151d 100644
--- a/docs/en/para-swimming/CHN.ics
+++ b/docs/en/para-swimming/CHN.ics
@@ -235,10 +235,10 @@ SUMMARY:Women's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/COL.ics b/docs/en/para-swimming/COL.ics
index 19cbbd67a..6dd64b43a 100644
--- a/docs/en/para-swimming/COL.ics
+++ b/docs/en/para-swimming/COL.ics
@@ -59,10 +59,10 @@ SUMMARY:Men's 200m Individual Medley - SM6 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/ESP.ics b/docs/en/para-swimming/ESP.ics
index 6140db730..4db9edeae 100644
--- a/docs/en/para-swimming/ESP.ics
+++ b/docs/en/para-swimming/ESP.ics
@@ -250,10 +250,10 @@ SUMMARY:Men's 100m Backstroke - S13 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/EST.ics b/docs/en/para-swimming/EST.ics
index 22af90b0b..df8127db0 100644
--- a/docs/en/para-swimming/EST.ics
+++ b/docs/en/para-swimming/EST.ics
@@ -18,10 +18,10 @@ SUMMARY:Women's 50m Freestyle - S10 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/ITA.ics b/docs/en/para-swimming/ITA.ics
index 11944a1df..4074cfa89 100644
--- a/docs/en/para-swimming/ITA.ics
+++ b/docs/en/para-swimming/ITA.ics
@@ -302,10 +302,10 @@ SUMMARY:Men's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/NZL.ics b/docs/en/para-swimming/NZL.ics
index 7af3117be..b3ea1459f 100644
--- a/docs/en/para-swimming/NZL.ics
+++ b/docs/en/para-swimming/NZL.ics
@@ -29,10 +29,10 @@ SUMMARY:Women's 100m Breaststroke - SB9 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
diff --git a/docs/en/para-swimming/general.ics b/docs/en/para-swimming/general.ics
index e72590980..c73315120 100644
--- a/docs/en/para-swimming/general.ics
+++ b/docs/en/para-swimming/general.ics
@@ -476,10 +476,10 @@ SUMMARY:Men's 100m Backstroke - S13 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T091022Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
-DTSTAMP:20240830T091022Z
-DTSTART:20240830T091022Z
-DTEND:20240830T091757Z
+UID:20240830T091000Z-para-swimming-MENS-100M-BREASTSTROKE-SB8-HEATS
+DTSTAMP:20240830T091000Z
+DTSTART:20240830T091000Z
+DTEND:20240830T091700Z
 DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB8 Heats\n🇦🇹
   Andreas ONEA\n🇨🇴 Carlos Daniel SERRANO ZARATE\n🇪🇸 Carlos MARTINEZ
   FERNANDEZ\n🇮🇹 Federico MORLACCHI\n🇳🇿 Joshua WILLMER\n🇨🇳 LI
@@ -527,6 +527,15 @@ SUMMARY:Mixed 4x50m Freestyle Relay - 20 Points Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T094200Z-para-swimming-MENS-100M-BREASTSTROKE-SB9-HEATS-SWIM-OF
+DTSTAMP:20240830T094200Z
+DTSTART:20240830T094200Z
+DTEND:20240830T094600Z
+DESCRIPTION:Para Swimming - Men's 100m Breaststroke - SB9 Heats Swim-off
+SUMMARY:Men's 100m Breaststroke - SB9 Heats Swim-off
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T153000Z-para-swimming-MENS-100M-FREESTYLE-S5-FINAL
 DTSTAMP:20240830T153000Z
 DTSTART:20240830T153000Z
diff --git a/docs/today.html b/docs/today.html
index 69a171e81..dbfebe747 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -8188,6 +8188,32 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240830T091000Z" data-end="20240830T091700Z" data-noc="AUS,AUT,CHI,CHN,COL,ESP,EST,ITA,NZL" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   PARA SWIMMING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's 100m Breaststroke - SB8 Heats</div>
+    <div class="competitor AUT">🇦🇹 Andreas ONEA </div>
+    <div class="competitor COL">🇨🇴 Carlos Daniel SERRANO ZARATE </div>
+    <div class="competitor ESP">🇪🇸 Carlos MARTINEZ FERNANDEZ </div>
+    <div class="competitor ITA">🇮🇹 Federico MORLACCHI </div>
+    <div class="competitor NZL">🇳🇿 Joshua WILLMER </div>
+    <div class="competitor CHN">🇨🇳 LI Ting </div>
+    <div class="competitor ESP">🇪🇸 Oscar SALGUERO GALISTEO </div>
+    <div class="competitor EST">🇪🇪 Robin LIKSOR </div>
+    <div class="competitor AUS">🇦🇺 Timothy HODGE </div>
+    <div class="competitor CHI">🇨🇱 Vicente Enrique ALMONACID HEYL </div>
+    <div class="competitor CHN">🇨🇳 XU Haijiao </div>
+    <div class="competitor CHN">🇨🇳 YANG Guanglong </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240830T091000Z" data-end="20240830T095000Z" data-noc="CHN,JPN" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -8272,32 +8298,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240830T091022Z" data-end="20240830T091757Z" data-noc="AUS,AUT,CHI,CHN,COL,ESP,EST,ITA,NZL" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA SWIMMING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's 100m Breaststroke - SB8 Heats</div>
-    <div class="competitor AUT">🇦🇹 Andreas ONEA </div>
-    <div class="competitor COL">🇨🇴 Carlos Daniel SERRANO ZARATE </div>
-    <div class="competitor ESP">🇪🇸 Carlos MARTINEZ FERNANDEZ </div>
-    <div class="competitor ITA">🇮🇹 Federico MORLACCHI </div>
-    <div class="competitor NZL">🇳🇿 Joshua WILLMER </div>
-    <div class="competitor CHN">🇨🇳 LI Ting </div>
-    <div class="competitor ESP">🇪🇸 Oscar SALGUERO GALISTEO </div>
-    <div class="competitor EST">🇪🇪 Robin LIKSOR </div>
-    <div class="competitor AUS">🇦🇺 Timothy HODGE </div>
-    <div class="competitor CHI">🇨🇱 Vicente Enrique ALMONACID HEYL </div>
-    <div class="competitor CHN">🇨🇳 XU Haijiao </div>
-    <div class="competitor CHN">🇨🇳 YANG Guanglong </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240830T091400Z" data-end="20240830T094600Z" data-noc="ANG,BRA,CHN,COL,NAM,POL,THA,UZB,VEN" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -8768,6 +8768,20 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240830T094200Z" data-end="20240830T094600Z" data-noc="" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   PARA SWIMMING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's 100m Breaststroke - SB9 Heats Swim-off</div>
+ </div>
+</div>
 <div class="event py-4 bg-amber-400" data-start="20240830T094500Z" data-end="20240830T101500Z" data-noc="CHN,IND,KOR,SVK,SWE,UKR" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>